Skip to content

GitLab

mahara
mahara
Commit 0665c527 authored by Pat Kira's avatar Pat Kira Committed by Robert Lyon
Browse files
Options

A lot of minor styling fixes (bug: 1465107) 

behatnotneeded: Styling fixes only

Change-Id: I064dc0e6d859249ff3c58f7e576fca9287d779eb
parent 8c5e8bc8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 762 additions and 671 deletions
htdocs/account/institutions.php
View file @ 0665c527
......@@ -31,6 +31,7 @@ if (!empty($member)) {
$elements[] = array(
'type' => 'submit',
'name' => '_leave_' . $i->institution,
'class' => 'btn-default',
'confirm' => get_string('reallyleaveinstitution'),
'title' => get_string('youareamemberof', 'mahara', $institutions[$i->institution]->displayname),
'value' => get_string('leaveinstitution')
......@@ -83,6 +84,7 @@ if (!empty($requested)) {
$elements[] = array(
'type' => 'submit',
'name' => '_cancelrequest_' . $i,
'class' => 'btn-default',
'title' => get_string('youhaverequestedmembershipof', 'mahara',
$institutions[$i]->displayname),
'value' => get_string('cancelrequest')
......
htdocs/admin/site/licenses.php
View file @ 0665c527
......@@ -48,5 +48,6 @@ setpageicon($smarty, 'icon-legal');
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('licenses', $licenses);
$smarty->assign('extralicenses', $extralicenses);
$smarty->assign('allowextralicenses', get_config('licenseallowcustom'));
$smarty->assign('enabled', get_config('licensemetadata'));
$smarty->display('admin/site/licenses.tpl');
htdocs/admin/site/networking.php
View file @ 0665c527
......@@ -106,7 +106,7 @@ $networkingform = pieform(
'value' => 'submit'
),
'deletesubmit' => array(
'class' => 'btn-default',
'class' => 'btn-default ptm',
'name' => 'submit', // must be called submit so we can access it's value
'type' => 'button',
'usebuttontag' => true,
......
htdocs/admin/users/edit.php
View file @ 0665c527
......@@ -600,7 +600,7 @@ if (empty($suspended)) {
),
'reason' => array(
'type' => 'textarea',
'class' => 'in-modal',
'class' => 'under-label',
'rows' => 5,
'cols' => 28,
'title' => get_string('reason'),
......
htdocs/artefact/annotation/lib.php
View file @ 0665c527
......@@ -1190,8 +1190,8 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'value' => get_string('delete'),
'class' => 'btn-default',
'value' => '<span class="icon icon-trash text-danger"></span><span class="sr-only">' . get_string('delete') . '</span>',
'elementtitle' => get_string('delete'),
'confirm' => get_string('reallydeletethisannotationfeedback', 'artefact.annotation'),
'name' => 'delete_annotation_feedback_submit',
......@@ -1761,7 +1761,8 @@ class ActivityTypeArtefactAnnotationAnnotationfeedback extends ActivityTypePlugi
$this->message = strip_tags(str_shorten_html($body, 200, true));
// Seen as things like emaildigest base the message on $this->message
// we need to set the language for the $removedbyline here based on first user.
$user = $this->users[0];
$firstuser = key($this->users);
$user = $this->users[$firstuser];
$lang = (empty($user->lang) || $user->lang == 'default') ? get_config('lang') : $user->lang;
// Comment deleted notification
......
htdocs/artefact/blog/blocktype/recentposts/js/recentposts.js
View file @ 0665c527
function addNewPostShortcut(blockid) {
forEach(
getElementsByTagAndClassName('a', 'btnshortcut', 'blockinstance_' + blockid),
function(a) {
disconnectAll(a);
connect(a, 'onclick', function(e) {
e.stop();
var p = getFirstParentByTagAndClassName(a, 'div', 'shortcut');
var blogselect = getFirstElementByTagAndClassName('select','select', p);
window.open(config.wwwroot + 'artefact/blog/post.php?blog=' + blogselect.value,'_blank');
});
var addentry = jQuery('#blockinstance_' + blockid + ' .blockinstance-content');
addentry.find('a').first().click(function(e) {
e.preventDefault();
var blogselect = addentry.find('select').first().val();
if (!blogselect) {
blogselect = jQuery(this).find('span').first().attr('id').match( /\d+/);
}
);
window.open(config.wwwroot + 'artefact/blog/post.php?blog=' + blogselect, '_blank');
});
}
htdocs/artefact/blog/lang/en.utf8/artefact.blog.php
View file @ 0665c527
......@@ -156,7 +156,7 @@ $string['enablemultipleblogstext'] = 'You have one journal. If you would like to
$string['hiddenblogsnotification'] = 'Additional journal(s) have been made for you, but your account does not have the multiple journals option activated. You can enable it on the <a href="%saccount/index.php">account settings</a> page.';
$string['shortcutaddpost'] = 'Add a new entry to';
$string['shortcutgo'] = 'Go';
$string['shortcutadd'] = 'Add';
$string['shortcutnewentry'] = 'New entry';
$string['duplicatedblog'] = 'Duplicated journal';
......
htdocs/artefact/file/blocktype/html/lib.php
View file @ 0665c527
......@@ -95,6 +95,7 @@ class PluginBlocktypeHtml extends PluginBlocktype {
'artefacttype' => array('file'),
'filetype' => self::get_allowed_mimetypes(),
);
$element['accept'] = implode(',', self::get_allowed_mimetypes());
return $element;
}
......
htdocs/artefact/file/blocktype/internalmedia/lib.php
View file @ 0665c527
......@@ -128,6 +128,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
'artefacttype' => array('file', 'audio', 'video'),
'filetype' => self::get_allowed_mimetypes(),
);
$element['accept'] = implode(',', self::get_allowed_mimetypes());
return $element;
}
......@@ -280,7 +281,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
'allowscriptaccess' => 'never',
'allownetworking' => 'never'
);
$html = '<a class="media-link" href="' . $url . '">' . hsc($artefact->get('title')) . '</a><br>
$html = '<a class="media-link text-small" href="' . $url . '">' . hsc($artefact->get('title')) . '</a><br>
<span class="blocktype_internalmedia_mp3" id="' . $id . '">('
. get_string('flashanimation', 'blocktype.file/internalmedia') . ')</span>
<script type="application/javascript">
......@@ -335,8 +336,8 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
$html = '<span class="blocktype_internalmedia_mp3" id="' . $id . '" style="display:block;width:'.$width.'px;height:'.$height.'px;"></span>';
$html .= '<span id="' . $id . '_h">' . get_string('flashanimation', 'blocktype.file/internalmedia') . '</span>';
$html .= '<div class="ptm"><span class="icon icon-download prs"></span><span class="sr-only">'.get_string('Download', 'artefact.internal').'</span><a class="media-link" href="' . $url . '">' . hsc($artefact->get('title')) . '</a>';
$html .= '<span class="text-muted"> ['.$filesize.'] </span></div>';
$html .= '<div class="ptm"><span class="icon icon-download prs"></span><span class="sr-only">'.get_string('Download', 'artefact.internal').'</span><a class="media-link text-small" href="' . $url . '">' . hsc($artefact->get('title')) . '</a>';
$html .= '<span class="text-lighttone text-small"> ['.$filesize.'] </span></div>';
$html .= '<script type="application/javascript">
flowplayer("'.$id.'", "'.$playerurl.'", {
clip: {
......@@ -375,7 +376,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
$mimetype = $artefact->get('filetype');
$autostart = 'false';
return '<a class="media-link" href="' . $url . '">' . hsc($artefact->get('title')) . '</a><br>'
return '<a class="media-link text-small" href="' . $url . '">' . hsc($artefact->get('title')) . '</a><br>'
. '<span class="blocktype_internalmedia_real">
<script type="application/javascript">
//<![CDATA[
......@@ -408,7 +409,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
$mimetype = 'video/x-ms-wmv'; // hardcode this
$autostart = 'false';
return '<a class="media-link" href="' . $url . '">' . hsc($artefact->get('title')) . '</a><br>'
return '<a class="media-link text-small" href="' . $url . '">' . hsc($artefact->get('title')) . '</a><br>'
. '<span class="mediaplugin mediaplugin_wmp">
<object classid="CLSID:6BF52A52-394A-11d3-B153-00C04F79FAA6" ' . $size . '
standby="Loading Microsoft(R) Windows(R) Media Player components..."
......@@ -450,7 +451,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
$mimetype = $artefact->get('filetype');
$autostart = 'false';
return '<a class="media-link" href="' . $url . '">' . hsc($artefact->get('title')) . '</a><br>'
return '<a class="media-link text-small" href="' . $url . '">' . hsc($artefact->get('title')) . '</a><br>'
. '<span class="mediaplugin mediaplugin_qt">
<object classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
codebase="http://www.apple.com/qtactivex/qtplugin.cab" ' . $size . '>
......
htdocs/collection/views.json.php
View file @ 0665c527
......@@ -140,7 +140,7 @@ if ($views) {
'usebuttontag' => true,
'class' => 'btn-link btn-sm',
'confirm' => get_string('viewconfirmremove', 'collection'),
'value' => '<span class="icon icon-times text-danger"><span class="sr-only">' . get_string('remove') . '</span></span>' ),
'value' => '<span class="icon icon-times icon-lg text-danger"><span class="sr-only">' . get_string('remove') . '</span></span>' ),
),
));
}
......
htdocs/collection/views.php
View file @ 0665c527
......@@ -110,7 +110,7 @@ if ($views) {
'usebuttontag' => true,
'class' => 'btn-link btn-sm',
'confirm' => get_string('viewconfirmremove', 'collection'),
'value' => '<span class="icon icon-times text-danger"><span class="sr-only">' . get_string('remove') . '</span></span>',
'value' => '<span class="icon icon-times icon-lg text-danger"><span class="sr-only">' . get_string('remove') . '</span></span>',
),
),
));
......
htdocs/group/addmembers.php
View file @ 0665c527
......@@ -52,7 +52,7 @@ $form = pieform(array(
),
'submit' => array(
'type' => 'submit',
'class' => 'btn-default',
'class' => 'btn-primary',
'value' => get_string('submit'),
)
)
......
htdocs/group/invite.php
View file @ 0665c527
......@@ -66,6 +66,7 @@ $form = pieform(array(
),
'submit' => array(
'type' => 'submitcancel',
'class' => 'btn-primary',
'value' => array(get_string('invite', 'group'), get_string('cancel')),
'goto' => profile_url($user),
)
......
htdocs/interaction/forum/topic.php
View file @ 0665c527
......@@ -267,6 +267,7 @@ function renderpost($post, $indent, $mode) {
'validatecallback' => 'postnotobjectionable_validate',
'successcallback' => 'postnotobjectionable_submit',
'renderer' => 'div',
'class' => 'form-condensed',
'plugintype' => 'interaction',
'pluginname' => 'forum',
'autofocus' => false,
......@@ -277,7 +278,7 @@ function renderpost($post, $indent, $mode) {
),
'text' => array(
'type' => 'html',
'class' => 'postnotobjectionable pb0 pt0',
'class' => 'postnotobjectionable',
'value' => get_string('postnotobjectionable', 'interaction.forum'),
),
'submit' => array(
......@@ -291,7 +292,7 @@ function renderpost($post, $indent, $mode) {
),
'details' => array(
'type' => 'fieldset',
'class' => 'last',
'class' => 'last mtm',
'collapsible' => true,
'collapsed' => true,
'legend' => get_string('reporteddetails', 'interaction.forum'),
......
htdocs/js/customlayout.js
View file @ 0665c527
......@@ -19,7 +19,7 @@
}
else {
// wanring: classes are modified above for any subsequent button instances
$(newrow).append('<button name="removerow" class="pull-left btn btn-sm btn-default removecustomrow_' + (numrows + 1) + '" onclick="CustomLayoutManager.customlayout_remove_row(this)"><span class="icon icon-lg icon-times text-danger"></span><span class="hidden-xs pls"> ' + get_string('removethisrow', 'view') + '</span></button>');
$(newrow).append('<button name="removerow" class="pull-left btn btn-sm btn-default removecustomrow_' + (numrows + 1) + '" onclick="CustomLayoutManager.customlayout_remove_row(this)"><span class="icon icon-lg icon-trash text-danger"></span><span class="hidden-xs pls"> ' + get_string('removethisrow', 'view') + '</span></button>');
}
$('#customrow_' + numrows).after(newrow);
$('#viewlayout_customlayoutnumrows').val(numrows + 1);
......
htdocs/lang/en.utf8/admin.php
View file @ 0665c527
......@@ -266,8 +266,8 @@ $string['groupmemberaverage'] = 'On average, each user is in %s groups';
$string['viewsperuser'] = 'Users who make pages have about %s pages each';
$string['Cron'] = 'Cron';
$string['runningnormally'] = 'Running normally';
$string['cronnotrunning1'] = '<span class="error">Cron is not running.</span><br>See the <a href="http://wiki.mahara.org/System_Administrator\'s_Guide/Installing_Mahara">installation guide</a> for instructions on how to set it up. If you have already set up cron, one or more of its activities have failed to run recently.';
$string['cronnotrunningsiteclosed'] = '<span class="error">Cron is not running.</span><br>The site is currently closed. Please re-open the site for the cron to run.';
$string['cronnotrunning2'] = '<strong class="error text-danger">Cron is not running.</strong><br>See the <a href="http://wiki.mahara.org/System_Administrator\'s_Guide/Installing_Mahara">installation guide</a> for instructions on how to set it up. If you have already set up cron, one or more of its activities have failed to run recently.';
$string['cronnotrunningsiteclosed1'] = '<strong class="error text-danger">Cron is not running.</strong><br>The site is currently closed. Please re-open the site for the cron to run.';
$string['Loggedin'] = 'Logged in';
$string['youraverageuser'] = 'Your average user...';
$string['statsmaxfriends1'] = array(
......
htdocs/lib/group.php
View file @ 0665c527
......@@ -1083,11 +1083,10 @@ function group_get_join_form($name, $groupid, $returnto='view') {
'name' => $name,
'successcallback' => 'joingroup_submit',
'autofocus' => false,
'elements' => array(
'btngroup' => array(
'type' => 'fieldset',
'class' => 'text-right btn-top-right btn-group btn-group-top',
'class' => 'group-request btn-top-right btn-group btn-group-top',
'elements' => array(
'join' => array(
'type' => 'button',
......@@ -1115,24 +1114,23 @@ function group_get_join_form($name, $groupid, $returnto='view') {
function group_get_accept_form($name, $groupid, $returnto) {
return pieform(array(
'name' => $name,
'class' => 'group-request',
'renderer' => 'div',
'successcallback' => 'group_invite_submit',
'elements' => array(
'btngroup' => array(
'type' => 'fieldset',
'class' => 'text-right btn-top-right btn-group btn-group-top',
'class' => 'group-request btn-top-right btn-group btn-group-top',
'elements' => array(
'accept' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default',
'class' => 'btn-default form-as-button pull-left',
'value' => '<span class="icon icon-lg icon-check text-success prs"></span> ' . get_string('acceptinvitegroup', 'group')
),
'decline' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default text-danger',
'class' => 'btn-default form-as-button pull-left',
'value' => '<span class="icon icon-lg icon-ban text-danger prs"></span> ' . get_string('declineinvitegroup', 'group')
)
),
......
htdocs/lib/license.php
View file @ 0665c527
......@@ -227,7 +227,7 @@ function license_form_files($prefix, $prefix2=null) {
$rowattr = '';
}
else {
$rowattr = 'class="required"';
$rowattr = 'required';
}
$html = '';
foreach (array(
......@@ -236,7 +236,7 @@ function license_form_files($prefix, $prefix2=null) {
$rendered['license_advanced']['elements'][$prefix . '_licensorurl'],
) as $e) {
$helphtml = preg_replace('/files_filebrowser_(edit_)?licens/', 'licens', $e['helphtml']);
$html .= '<div class="form-group">' . $rowattr . '' . $e['labelhtml'] . '' .
$html .= '<div class="form-group'.' '.$rowattr.'">' . $e['labelhtml'] . '' .
'' . $e['html'] . $helphtml . '</div>';
$rowattr = '';
}
......
htdocs/lib/objectionable.php
View file @ 0665c527
......@@ -27,7 +27,7 @@ function objection_form() {
$form['elements']['message'] = array(
'type' => 'textarea',
'class' => 'in-modal',
'class' => 'under-label',
'title' => get_string('complaint'),
'rows' => 5,
'cols' => 80,
......
htdocs/lib/pieforms/pieform/elements/fieldset.php
View file @ 0665c527
......@@ -74,7 +74,7 @@ function pieform_element_fieldset(Pieform $form, $element) {
$legendcontent .= '<span class="icon icon-'.$element['iconclass'].' prl type-icon"> </span>';
}
$legendcontent .= Pieform::hsc($element['legend']);
$legendcontent .= '<span class="icon icon-chevron-down collapse-indicator pull-right"> </span> ';
$legendcontent .= '<span class="icon icon-chevron-down collapse-indicator right pull-right"> </span> ';
$legendcontent .= '</a>';
}
......
htdocs/search/elasticsearch/lib.php
View file @ 0665c527
......@@ -299,7 +299,7 @@ class PluginSearchElasticsearch extends PluginSearch {
'type' => 'textarea',
'rows' => 10,
'cols' => 100,
'class' => 'in-modal',
'class' => 'under-label',
'title' => get_string('artefacttypemaplegend', 'search.elasticsearch'),
'description' => get_string('artefacttypemapdescription', 'search.elasticsearch'),
'defaultvalue' => implode("\n", $artefacttypesmap_array),
......
htdocs/theme/default/sass/utilities/_theme-variables.scss
View file @ 0665c527
......@@ -10,3 +10,4 @@ $theme-accent-color: #474220;
$theme-text-lighttone-color: #888;
$theme-text-midtone-color: #888;
htdocs/theme/raw/js/filebrowser.js
View file @ 0665c527
......@@ -21,11 +21,11 @@ jQuery(function($) {
var selectfileTitle = $('.select-file legend a'),
title = e.originalEvent.data.title;
// Display the file name
// Display the file name
if(selectfileTitle.find('.file-name').length > 0) {
selectfileTitle.find('.file-name').text(' - ' + title);
} else {
selectfileTitle.find('.collapse-indicator').before('<span class="metadata file-name"> - '+ title + '</span>');
selectfileTitle.find('.collapse-indicator').before('<span class="text-small text-midtone file-name"> - '+ title + '</span>');
}
}
......
htdocs/theme/raw/pieforms/export.php
View file @ 0665c527
......@@ -9,7 +9,7 @@ return <<<EOF
<div class="checkbox">
{$element['html']}
{$element['labelhtml']}
<div class="metadata with-label">
<div class="text-small text-lighttone with-label">
{$element['description']}
<a href="{$element['viewlink']}" class="viewlink text-small nojs-hidden-inline" target="_blank">{$strclicktopreview}</a>
</div>
......@@ -73,7 +73,7 @@ $row = $col = 0;
$itemsinrow = 3;
foreach ($elements as $key => $element) {
if (substr($key, 0, 11) == 'collection_') {
$body[$row][$col] = '<div class="checkbox">' . $element['html'] . $element['labelhtml'] . '<p class="with-label metadata labeldescriptpreview">' . hsc($element['description']) . '</p></div>';
$body[$row][$col] = '<div class="checkbox">' . $element['html'] . $element['labelhtml'] . '<p class="with-label text-small text-lighttone labeldescriptpreview">' . hsc($element['description']) . '</p></div>';
$col++;
if ($col % $itemsinrow == 0) {
$row++;
......
htdocs/theme/raw/plugintype/artefact/annotation/templates/annotationfeedbackview.tpl
View file @ 0665c527
{if !$editing}
<div id="annotationfeedbackview_{$blockid}" class="annotation-feedback">
<ul id="annotationfeedbacktable_{$blockid}"class="annotationfeedbacktable flush list-group list-group-lite list-unstyled">
{$annotationfeedback->tablerows|safe}
</ul>
{$annotationfeedback->pagination|safe}
{if $annotationfeedback != 0}
<ul id="annotationfeedbacktable_{$blockid}"class="annotationfeedbacktable flush list-group list-group-lite list-unstyled">
{$annotationfeedback->tablerows|safe}
</ul>
{$annotationfeedback->pagination|safe}
{/if}
{if $allowfeedback}
<div class="annotationfeedback">
<a id="feedback_{$blockid}" class="placeannotationfeedback link-blocktype last" data-toggle="modal-docked" data-target="#annotation_feedback_{$blockid}" href="#">
......@@ -12,7 +14,6 @@
</a>
</div>
{/if}
<div id="annotation_feedback_{$blockid}" class="feedbacktable modal modal-docked">
<div class="modal-dialog modal-lg">
<div class="modal-content">
......
htdocs/theme/raw/plugintype/artefact/blog/blocktype/recentposts/templates/recentposts.tpl
View file @ 0665c527
<ul class="recentblogpost list-group list-group-link">
{foreach from=$mostrecent item=post}
<li class="list-group-item list-group-item-link">
<h4 class="list-group-item-heading mb0">
<a href="{$WWWROOT}artefact/artefact.php?artefact={$post->id}&amp;view={$view}" class="">
{$post->title}
<span class="metadata">
{str tag='postedin' section='blocktype.blog/recentposts'}
{$post->parenttitle}
{str tag='postedon' section='blocktype.blog/recentposts'}
{$post->displaydate}
</span>
</a>
</h4>
</li>
{/foreach}
</ul>
{if ($editing)}
{if (count($blogs) == 1)}
<a class="panel-footer {if (count($blogs) != 1)} hidden{/if}">
<span class="icon icon-plus prs"></span>
<span id="blog_{$blogs[0]->id}" class="icon icon-plus prs"></span>
{str tag='shortcutnewentry' section='artefact.blog'}
</a>
{else}
......@@ -33,10 +16,27 @@
</select>
<span class="input-group-btn">
<a class="btn btn-default btnshortcut">
<span class="icon icon-plus prs"></span> {str tag='shortcutgo' section='artefact.blog'}
<span class="icon icon-plus text-success prs"></span> {str tag='shortcutadd' section='artefact.blog'}
</a>
</span>
</div>
</div>
{/if}
{/if}
<div class="recentblogpost list-group">
{foreach from=$mostrecent item=post}
<div class="list-group-item">
<h4 class="list-group-item-heading mb0">
<a href="{$WWWROOT}artefact/artefact.php?artefact={$post->id}&amp;view={$view}" class="">
{$post->title}
</a>
{str tag='postedin' section='blocktype.blog/recentposts'}
<a href="{$WWWROOT}artefact/artefact.php?artefact={$post->parent}&amp;view={$view}">{$post->parenttitle}</a>
<span class="metadata">
{str tag='postedon' section='blocktype.blog/recentposts'}
{$post->displaydate}
</span>
</h4>
</div>
{/foreach}
</div>
htdocs/theme/raw/plugintype/artefact/blog/blocktype/taggedposts/templates/taggedposts.tpl
View file @ 0665c527
{if ($editing)}
<div class="shortcut nojs-hidden-block mtl">
<div class="panel-footer mtl {if (count($blogs) == 1)}hidden{/if}">
<div class="shortcut nojs-hidden-block">
<div class="panel-footer {if (count($blogs) == 1)}hidden{/if}">
<label class="text">{str tag='shortcutaddpost' section='artefact.blog'} </label>
<div class="input-group">
<span class="picker">
......@@ -9,8 +9,8 @@
<input class="select" type="hidden" value="{$tagselect}">
<span class="input-group-btn">
<a class="btn btnshortcut btn-default">
<span class="icon icon-plus prs"></span>
{str tag='shortcutgo' section='artefact.blog'}
<span class="icon icon-plus text-success prs"></span>
{str tag='shortcutadd' section='artefact.blog'}
</a>
</span>
</div>
......@@ -22,7 +22,7 @@
</div>
{/if}
<h4>
<p class="taggedpost-title text-lighttone mtm">
{$blockheading|clean_html|safe}
{if $viewowner}
{$tag} {str tag='by' section='artefact.blog'}
......@@ -30,12 +30,12 @@
{else}
<a href="{$WWWROOT}tags.php?tag={$tag}&sort=name&type=text">{$tag}</a>
{/if}
</h4>
</p>
{if $configerror}
<span class="metadata">{str tag='configerror' section='blocktype.blog/taggedposts'}</span>
<span class="text-lighttone">{str tag='configerror' section='blocktype.blog/taggedposts'}</span>
{elseif $badtag}
<span class="metadata">{str tag='notags' section='blocktype.blog/taggedposts' arg1=$badtag}</span>
<span class="text-lighttone">{str tag='notags' section='blocktype.blog/taggedposts' arg1=$badtag}</span>
{elseif $full}
<div id="blogdescription">
<div id="postlist_{$blockid}" class="postlist list-group list-group-unbordered">
......@@ -109,23 +109,25 @@
</div>
</div>
{else}
<ul class="taggedposts">
<div class="taggedposts list-group">
{foreach from=$results item=post}
<li>
<strong>
<a href="{$WWWROOT}artefact/artefact.php?artefact={$post->id}&view={$view}">{$post->title}</a>
</strong>
{str tag='postedin' section='blocktype.blog/taggedposts'}
{if $viewowner}
{$post->parenttitle}
{else}
<a href="{$WWWROOT}artefact/artefact.php?artefact={$post->parent}&view={$view}">{$post->parenttitle}</a>
{/if}
<span class="postdetails">
{str tag='postedon' section='blocktype.blog/taggedposts'} {$post->displaydate}
</span>
</li>
<div class="list-group-item">
<h4 class="list-group-item-heading mb0">
<a href="{$WWWROOT}artefact/artefact.php?artefact={$post->id}&amp;view={$view}">
{$post->title}
</a>
{str tag='postedin' section='blocktype.blog/taggedposts'}
{if $viewowner}
{$post->parenttitle}
{else}
<a href="{$WWWROOT}artefact/artefact.php?artefact={$post->parent}&amp;view={$view}">{$post->parenttitle}</a>
{/if}
<span class="metadata">
{str tag='postedon' section='blocktype.blog/taggedposts'}
{$post->displaydate}
</span>
</h4>
</div>
{/foreach}
</ul>
</div>
{/if}
htdocs/theme/raw/plugintype/artefact/blog/templates/artefactchooser-element.tpl
View file @ 0665c527
<div class="checkbox fullwidth">
<div class="artefactchooser-item list-group-item list-group-item-default">
{$formcontrols|safe}
<label for="{$elementname}_{$artefact->id}">{$artefact->title}{if $artefact->draft} [{str tag=draft section=artefact.blog}]{/if}
<span class="metadata">{if $artefact->blog}({$artefact->blog}){/if}</span>
<label for="{$elementname}_{$artefact->id}">
{$artefact->title}
{if $artefact->draft}
[{str tag=draft section=artefact.blog}]
{/if}
<span class="text-midtone text-small">{if $artefact->blog}({$artefact->blog}){/if}</span>
</label>
{if $artefact->description}
<div class="text-small with-label">{$artefact->description|clean_html|safe}</div>
<div class="text-small detail">
{$artefact->description|clean_html|safe}</div>
{/if}
</div>
\ No newline at end of file
htdocs/theme/raw/plugintype/artefact/blog/templates/blog.tpl
View file @ 0665c527
<div class="blog">
{if ($editing && $canaddpost)}
<a class="panel-footer" href="{$WWWROOT}artefact/blog/post.php?blog={$blogid}" target="_blank">
<span class="icon icon-plus text-success prs"></span>
{str tag='shortcutnewentry' section='artefact.blog'}
</a>
{/if}
{if !$options.hidetitle}
<h2>{$artefacttitle|safe}</h2>
{/if}
<div id="blogdescription" class="blogdescription ptl">{$description|clean_html|safe}
<div id="blogdescription" class="blogdescription ptm">{$description|clean_html|safe}
{if $tags}
<div class="tags pbl">
<strong>{str tag=tags}:</strong> {list_tags owner=$owner tags=$tags}
......@@ -32,11 +38,4 @@
{literal}}{/literal});
</script>
{/if}
{if ($editing && $canaddpost)}
<a class="panel-footer" href="{$WWWROOT}artefact/blog/post.php?blog={$blogid}" target="_blank">
<span class="icon icon-plus prs"></span>
{str tag='shortcutnewentry' section='artefact.blog'}
</a>
{/if}
</div>