A lot of minor styling fixes (bug: 1465107)

behatnotneeded: Styling fixes only

Change-Id: I064dc0e6d859249ff3c58f7e576fca9287d779eb

htdocs/account/institutions.php

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

 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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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>';
     }