Commit 0665c527 authored by Pat Kira's avatar Pat Kira Committed by Robert Lyon

A lot of minor styling fixes (bug: 1465107)

behatnotneeded: Styling fixes only

Change-Id: I064dc0e6d859249ff3c58f7e576fca9287d779eb
parent 8c5e8bc8
...@@ -31,6 +31,7 @@ if (!empty($member)) { ...@@ -31,6 +31,7 @@ if (!empty($member)) {
$elements[] = array( $elements[] = array(
'type' => 'submit', 'type' => 'submit',
'name' => '_leave_' . $i->institution, 'name' => '_leave_' . $i->institution,
'class' => 'btn-default',
'confirm' => get_string('reallyleaveinstitution'), 'confirm' => get_string('reallyleaveinstitution'),
'title' => get_string('youareamemberof', 'mahara', $institutions[$i->institution]->displayname), 'title' => get_string('youareamemberof', 'mahara', $institutions[$i->institution]->displayname),
'value' => get_string('leaveinstitution') 'value' => get_string('leaveinstitution')
...@@ -83,6 +84,7 @@ if (!empty($requested)) { ...@@ -83,6 +84,7 @@ if (!empty($requested)) {
$elements[] = array( $elements[] = array(
'type' => 'submit', 'type' => 'submit',
'name' => '_cancelrequest_' . $i, 'name' => '_cancelrequest_' . $i,
'class' => 'btn-default',
'title' => get_string('youhaverequestedmembershipof', 'mahara', 'title' => get_string('youhaverequestedmembershipof', 'mahara',
$institutions[$i]->displayname), $institutions[$i]->displayname),
'value' => get_string('cancelrequest') 'value' => get_string('cancelrequest')
......
...@@ -48,5 +48,6 @@ setpageicon($smarty, 'icon-legal'); ...@@ -48,5 +48,6 @@ setpageicon($smarty, 'icon-legal');
$smarty->assign('PAGEHEADING', TITLE); $smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('licenses', $licenses); $smarty->assign('licenses', $licenses);
$smarty->assign('extralicenses', $extralicenses); $smarty->assign('extralicenses', $extralicenses);
$smarty->assign('allowextralicenses', get_config('licenseallowcustom'));
$smarty->assign('enabled', get_config('licensemetadata')); $smarty->assign('enabled', get_config('licensemetadata'));
$smarty->display('admin/site/licenses.tpl'); $smarty->display('admin/site/licenses.tpl');
...@@ -106,7 +106,7 @@ $networkingform = pieform( ...@@ -106,7 +106,7 @@ $networkingform = pieform(
'value' => 'submit' 'value' => 'submit'
), ),
'deletesubmit' => array( 'deletesubmit' => array(
'class' => 'btn-default', 'class' => 'btn-default ptm',
'name' => 'submit', // must be called submit so we can access it's value 'name' => 'submit', // must be called submit so we can access it's value
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
......
...@@ -600,7 +600,7 @@ if (empty($suspended)) { ...@@ -600,7 +600,7 @@ if (empty($suspended)) {
), ),
'reason' => array( 'reason' => array(
'type' => 'textarea', 'type' => 'textarea',
'class' => 'in-modal', 'class' => 'under-label',
'rows' => 5, 'rows' => 5,
'cols' => 28, 'cols' => 28,
'title' => get_string('reason'), 'title' => get_string('reason'),
......
...@@ -1190,8 +1190,8 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType { ...@@ -1190,8 +1190,8 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
'submit' => array( 'submit' => array(
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'value' => get_string('delete'),
'class' => 'btn-default', 'class' => 'btn-default',
'value' => '<span class="icon icon-trash text-danger"></span><span class="sr-only">' . get_string('delete') . '</span>',
'elementtitle' => get_string('delete'), 'elementtitle' => get_string('delete'),
'confirm' => get_string('reallydeletethisannotationfeedback', 'artefact.annotation'), 'confirm' => get_string('reallydeletethisannotationfeedback', 'artefact.annotation'),
'name' => 'delete_annotation_feedback_submit', 'name' => 'delete_annotation_feedback_submit',
...@@ -1761,7 +1761,8 @@ class ActivityTypeArtefactAnnotationAnnotationfeedback extends ActivityTypePlugi ...@@ -1761,7 +1761,8 @@ class ActivityTypeArtefactAnnotationAnnotationfeedback extends ActivityTypePlugi
$this->message = strip_tags(str_shorten_html($body, 200, true)); $this->message = strip_tags(str_shorten_html($body, 200, true));
// Seen as things like emaildigest base the message on $this->message // 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. // 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; $lang = (empty($user->lang) || $user->lang == 'default') ? get_config('lang') : $user->lang;
// Comment deleted notification // Comment deleted notification
......
function addNewPostShortcut(blockid) { function addNewPostShortcut(blockid) {
forEach( var addentry = jQuery('#blockinstance_' + blockid + ' .blockinstance-content');
getElementsByTagAndClassName('a', 'btnshortcut', 'blockinstance_' + blockid), addentry.find('a').first().click(function(e) {
function(a) { e.preventDefault();
disconnectAll(a); var blogselect = addentry.find('select').first().val();
connect(a, 'onclick', function(e) { if (!blogselect) {
e.stop(); blogselect = jQuery(this).find('span').first().attr('id').match( /\d+/);
var p = getFirstParentByTagAndClassName(a, 'div', 'shortcut');
var blogselect = getFirstElementByTagAndClassName('select','select', p);
window.open(config.wwwroot + 'artefact/blog/post.php?blog=' + blogselect.value,'_blank');
});
} }
); window.open(config.wwwroot + 'artefact/blog/post.php?blog=' + blogselect, '_blank');
});
} }
...@@ -156,7 +156,7 @@ $string['enablemultipleblogstext'] = 'You have one journal. If you would like to ...@@ -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['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['shortcutaddpost'] = 'Add a new entry to';
$string['shortcutgo'] = 'Go'; $string['shortcutadd'] = 'Add';
$string['shortcutnewentry'] = 'New entry'; $string['shortcutnewentry'] = 'New entry';
$string['duplicatedblog'] = 'Duplicated journal'; $string['duplicatedblog'] = 'Duplicated journal';
......
...@@ -95,6 +95,7 @@ class PluginBlocktypeHtml extends PluginBlocktype { ...@@ -95,6 +95,7 @@ class PluginBlocktypeHtml extends PluginBlocktype {
'artefacttype' => array('file'), 'artefacttype' => array('file'),
'filetype' => self::get_allowed_mimetypes(), 'filetype' => self::get_allowed_mimetypes(),
); );
$element['accept'] = implode(',', self::get_allowed_mimetypes());
return $element; return $element;
} }
......
...@@ -128,6 +128,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype { ...@@ -128,6 +128,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
'artefacttype' => array('file', 'audio', 'video'), 'artefacttype' => array('file', 'audio', 'video'),
'filetype' => self::get_allowed_mimetypes(), 'filetype' => self::get_allowed_mimetypes(),
); );
$element['accept'] = implode(',', self::get_allowed_mimetypes());
return $element; return $element;
} }
...@@ -280,7 +281,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype { ...@@ -280,7 +281,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
'allowscriptaccess' => 'never', 'allowscriptaccess' => 'never',
'allownetworking' => '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 . '">(' <span class="blocktype_internalmedia_mp3" id="' . $id . '">('
. get_string('flashanimation', 'blocktype.file/internalmedia') . ')</span> . get_string('flashanimation', 'blocktype.file/internalmedia') . ')</span>
<script type="application/javascript"> <script type="application/javascript">
...@@ -335,8 +336,8 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype { ...@@ -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 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 .= '<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 .= '<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-muted"> ['.$filesize.'] </span></div>'; $html .= '<span class="text-lighttone text-small"> ['.$filesize.'] </span></div>';
$html .= '<script type="application/javascript"> $html .= '<script type="application/javascript">
flowplayer("'.$id.'", "'.$playerurl.'", { flowplayer("'.$id.'", "'.$playerurl.'", {
clip: { clip: {
...@@ -375,7 +376,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype { ...@@ -375,7 +376,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
$mimetype = $artefact->get('filetype'); $mimetype = $artefact->get('filetype');
$autostart = 'false'; $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"> . '<span class="blocktype_internalmedia_real">
<script type="application/javascript"> <script type="application/javascript">
//<![CDATA[ //<![CDATA[
...@@ -408,7 +409,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype { ...@@ -408,7 +409,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
$mimetype = 'video/x-ms-wmv'; // hardcode this $mimetype = 'video/x-ms-wmv'; // hardcode this
$autostart = 'false'; $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"> . '<span class="mediaplugin mediaplugin_wmp">
<object classid="CLSID:6BF52A52-394A-11d3-B153-00C04F79FAA6" ' . $size . ' <object classid="CLSID:6BF52A52-394A-11d3-B153-00C04F79FAA6" ' . $size . '
standby="Loading Microsoft(R) Windows(R) Media Player components..." standby="Loading Microsoft(R) Windows(R) Media Player components..."
...@@ -450,7 +451,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype { ...@@ -450,7 +451,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
$mimetype = $artefact->get('filetype'); $mimetype = $artefact->get('filetype');
$autostart = 'false'; $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"> . '<span class="mediaplugin mediaplugin_qt">
<object classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" <object classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
codebase="http://www.apple.com/qtactivex/qtplugin.cab" ' . $size . '> codebase="http://www.apple.com/qtactivex/qtplugin.cab" ' . $size . '>
......
...@@ -140,7 +140,7 @@ if ($views) { ...@@ -140,7 +140,7 @@ if ($views) {
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-link btn-sm', 'class' => 'btn-link btn-sm',
'confirm' => get_string('viewconfirmremove', 'collection'), '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>' ),
), ),
)); ));
} }
......
...@@ -110,7 +110,7 @@ if ($views) { ...@@ -110,7 +110,7 @@ if ($views) {
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn-link btn-sm', 'class' => 'btn-link btn-sm',
'confirm' => get_string('viewconfirmremove', 'collection'), '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>',
), ),
), ),
)); ));
......
...@@ -52,7 +52,7 @@ $form = pieform(array( ...@@ -52,7 +52,7 @@ $form = pieform(array(
), ),
'submit' => array( 'submit' => array(
'type' => 'submit', 'type' => 'submit',
'class' => 'btn-default', 'class' => 'btn-primary',
'value' => get_string('submit'), 'value' => get_string('submit'),
) )
) )
......
...@@ -66,6 +66,7 @@ $form = pieform(array( ...@@ -66,6 +66,7 @@ $form = pieform(array(
), ),
'submit' => array( 'submit' => array(
'type' => 'submitcancel', 'type' => 'submitcancel',
'class' => 'btn-primary',
'value' => array(get_string('invite', 'group'), get_string('cancel')), 'value' => array(get_string('invite', 'group'), get_string('cancel')),
'goto' => profile_url($user), 'goto' => profile_url($user),
) )
......
...@@ -267,6 +267,7 @@ function renderpost($post, $indent, $mode) { ...@@ -267,6 +267,7 @@ function renderpost($post, $indent, $mode) {
'validatecallback' => 'postnotobjectionable_validate', 'validatecallback' => 'postnotobjectionable_validate',
'successcallback' => 'postnotobjectionable_submit', 'successcallback' => 'postnotobjectionable_submit',
'renderer' => 'div', 'renderer' => 'div',
'class' => 'form-condensed',
'plugintype' => 'interaction', 'plugintype' => 'interaction',
'pluginname' => 'forum', 'pluginname' => 'forum',
'autofocus' => false, 'autofocus' => false,
...@@ -277,7 +278,7 @@ function renderpost($post, $indent, $mode) { ...@@ -277,7 +278,7 @@ function renderpost($post, $indent, $mode) {
), ),
'text' => array( 'text' => array(
'type' => 'html', 'type' => 'html',
'class' => 'postnotobjectionable pb0 pt0', 'class' => 'postnotobjectionable',
'value' => get_string('postnotobjectionable', 'interaction.forum'), 'value' => get_string('postnotobjectionable', 'interaction.forum'),
), ),
'submit' => array( 'submit' => array(
...@@ -291,7 +292,7 @@ function renderpost($post, $indent, $mode) { ...@@ -291,7 +292,7 @@ function renderpost($post, $indent, $mode) {
), ),
'details' => array( 'details' => array(
'type' => 'fieldset', 'type' => 'fieldset',
'class' => 'last', 'class' => 'last mtm',
'collapsible' => true, 'collapsible' => true,
'collapsed' => true, 'collapsed' => true,
'legend' => get_string('reporteddetails', 'interaction.forum'), 'legend' => get_string('reporteddetails', 'interaction.forum'),
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
} }
else { else {
// wanring: classes are modified above for any subsequent button instances // 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); $('#customrow_' + numrows).after(newrow);
$('#viewlayout_customlayoutnumrows').val(numrows + 1); $('#viewlayout_customlayoutnumrows').val(numrows + 1);
......
...@@ -266,8 +266,8 @@ $string['groupmemberaverage'] = 'On average, each user is in %s groups'; ...@@ -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['viewsperuser'] = 'Users who make pages have about %s pages each';
$string['Cron'] = 'Cron'; $string['Cron'] = 'Cron';
$string['runningnormally'] = 'Running normally'; $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['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['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['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['Loggedin'] = 'Logged in';
$string['youraverageuser'] = 'Your average user...'; $string['youraverageuser'] = 'Your average user...';
$string['statsmaxfriends1'] = array( $string['statsmaxfriends1'] = array(
......
...@@ -1083,11 +1083,10 @@ function group_get_join_form($name, $groupid, $returnto='view') { ...@@ -1083,11 +1083,10 @@ function group_get_join_form($name, $groupid, $returnto='view') {
'name' => $name, 'name' => $name,
'successcallback' => 'joingroup_submit', 'successcallback' => 'joingroup_submit',
'autofocus' => false, 'autofocus' => false,
'elements' => array( 'elements' => array(
'btngroup' => array( 'btngroup' => array(
'type' => 'fieldset', '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( 'elements' => array(
'join' => array( 'join' => array(
'type' => 'button', 'type' => 'button',
...@@ -1115,24 +1114,23 @@ function group_get_join_form($name, $groupid, $returnto='view') { ...@@ -1115,24 +1114,23 @@ function group_get_join_form($name, $groupid, $returnto='view') {
function group_get_accept_form($name, $groupid, $returnto) { function group_get_accept_form($name, $groupid, $returnto) {
return pieform(array( return pieform(array(
'name' => $name, 'name' => $name,
'class' => 'group-request',
'renderer' => 'div', 'renderer' => 'div',
'successcallback' => 'group_invite_submit', 'successcallback' => 'group_invite_submit',
'elements' => array( 'elements' => array(
'btngroup' => array( 'btngroup' => array(
'type' => 'fieldset', '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( 'elements' => array(
'accept' => array( 'accept' => array(
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, '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') 'value' => '<span class="icon icon-lg icon-check text-success prs"></span> ' . get_string('acceptinvitegroup', 'group')
), ),
'decline' => array( 'decline' => array(
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, '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') 'value' => '<span class="icon icon-lg icon-ban text-danger prs"></span> ' . get_string('declineinvitegroup', 'group')
) )
), ),
......
...@@ -227,7 +227,7 @@ function license_form_files($prefix, $prefix2=null) { ...@@ -227,7 +227,7 @@ function license_form_files($prefix, $prefix2=null) {
$rowattr = ''; $rowattr = '';
} }
else { else {
$rowattr = 'class="required"'; $rowattr = 'required';
} }
$html = ''; $html = '';
foreach (array( foreach (array(
...@@ -236,7 +236,7 @@ function license_form_files($prefix, $prefix2=null) { ...@@ -236,7 +236,7 @@ function license_form_files($prefix, $prefix2=null) {
$rendered['license_advanced']['elements'][$prefix . '_licensorurl'], $rendered['license_advanced']['elements'][$prefix . '_licensorurl'],
) as $e) { ) as $e) {
$helphtml = preg_replace('/files_filebrowser_(edit_)?licens/', 'licens', $e['helphtml']); $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>'; '' . $e['html'] . $helphtml . '</div>';
$rowattr = ''; $rowattr = '';
} }
......
...@@ -27,7 +27,7 @@ function objection_form() { ...@@ -27,7 +27,7 @@ function objection_form() {
$form['elements']['message'] = array( $form['elements']['message'] = array(
'type' => 'textarea', 'type' => 'textarea',
'class' => 'in-modal', 'class' => 'under-label',
'title' => get_string('complaint'), 'title' => get_string('complaint'),
'rows' => 5, 'rows' => 5,
'cols' => 80, 'cols' => 80,
......
...@@ -74,7 +74,7 @@ function pieform_element_fieldset(Pieform $form, $element) { ...@@ -74,7 +74,7 @@ function pieform_element_fieldset(Pieform $form, $element) {
$legendcontent .= '<span class="icon icon-'.$element['iconclass'].' prl type-icon"> </span>'; $legendcontent .= '<span class="icon icon-'.$element['iconclass'].' prl type-icon"> </span>';
} }
$legendcontent .= Pieform::hsc($element['legend']); $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>'; $legendcontent .= '</a>';
} }
......
...@@ -299,7 +299,7 @@ class PluginSearchElasticsearch extends PluginSearch { ...@@ -299,7 +299,7 @@ class PluginSearchElasticsearch extends PluginSearch {
'type' => 'textarea', 'type' => 'textarea',
'rows' => 10, 'rows' => 10,
'cols' => 100, 'cols' => 100,
'class' => 'in-modal', 'class' => 'under-label',
'title' => get_string('artefacttypemaplegend', 'search.elasticsearch'), 'title' => get_string('artefacttypemaplegend', 'search.elasticsearch'),
'description' => get_string('artefacttypemapdescription', 'search.elasticsearch'), 'description' => get_string('artefacttypemapdescription', 'search.elasticsearch'),
'defaultvalue' => implode("\n", $artefacttypesmap_array), 'defaultvalue' => implode("\n", $artefacttypesmap_array),
......
...@@ -10,3 +10,4 @@ $theme-accent-color: #474220; ...@@ -10,3 +10,4 @@ $theme-accent-color: #474220;
$theme-text-lighttone-color: #888; $theme-text-lighttone-color: #888;
$theme-text-midtone-color: #888; $theme-text-midtone-color: #888;
...@@ -21,11 +21,11 @@ jQuery(function($) { ...@@ -21,11 +21,11 @@ jQuery(function($) {
var selectfileTitle = $('.select-file legend a'), var selectfileTitle = $('.select-file legend a'),
title = e.originalEvent.data.title; title = e.originalEvent.data.title;
// Display the file name // Display the file name
if(selectfileTitle.find('.file-name').length > 0) { if(selectfileTitle.find('.file-name').length > 0) {
selectfileTitle.find('.file-name').text(' - ' + title); selectfileTitle.find('.file-name').text(' - ' + title);
} else { } 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>');
} }
} }
......
...@@ -9,7 +9,7 @@ return <<<EOF ...@@ -9,7 +9,7 @@ return <<<EOF
<div class="checkbox"> <div class="checkbox">
{$element['html']} {$element['html']}
{$element['labelhtml']} {$element['labelhtml']}
<div class="metadata with-label"> <div class="text-small text-lighttone with-label">
{$element['description']} {$element['description']}
<a href="{$element['viewlink']}" class="viewlink text-small nojs-hidden-inline" target="_blank">{$strclicktopreview}</a> <a href="{$element['viewlink']}" class="viewlink text-small nojs-hidden-inline" target="_blank">{$strclicktopreview}</a>
</div> </div>
...@@ -73,7 +73,7 @@ $row = $col = 0; ...@@ -73,7 +73,7 @@ $row = $col = 0;
$itemsinrow = 3; $itemsinrow = 3;
foreach ($elements as $key => $element) { foreach ($elements as $key => $element) {
if (substr($key, 0, 11) == 'collection_') { 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++; $col++;
if ($col % $itemsinrow == 0) {