FIX: remove deprecated css

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I83a5945d5cfd051eefc0752d910253d193e14042

htdocs/admin/site/cookieconsent.php

@@ -202,7 +202,7 @@ function cookieconsent_submit(Pieform $form, $values) {
 }
 
 
-$smarty = smarty(array('expandable'));
+$smarty = smarty();
 setpageicon($smarty, 'icon-shield');
 
 $smarty->assign('form', $form);

htdocs/admin/site/cookieconsent2.php

@@ -192,7 +192,7 @@ $data = array(
     )
 );
 
-$smarty = smarty(array('expandable'));
+$smarty = smarty();
 $smarty->assign('modifications', get_string('additionalmodifications','cookieconsent'));
 $smarty->assign('data', $data);
 $smarty->assign('PAGEHEADING', TITLE);

htdocs/artefact/artefact.php

@@ -143,8 +143,7 @@ addLoadEvent(function () {
 });
 EOF;
 
-$javascript = array('paginator', 'viewmenu', 'expandable');
-$extrastylesheets = array('style/views.css');
+$javascript = array('paginator', 'viewmenu');
 
 if ($artefact->get('allowcomments') && ( $USER->is_logged_in() || (!$USER->is_logged_in() && get_config('anonymouscomments')))) {
     $addfeedbackform = pieform(ArtefactTypeComment::add_comment_form(false, $artefact->get('approvecomments')));
@@ -189,7 +188,6 @@ $smarty = smarty(
     $headers,
     array(),
     array(
-        'stylesheets' => $extrastylesheets,
         'sidebars'    => false,
         'skin'        => $skin,
     )

htdocs/artefact/blog/view/index.php

@@ -114,7 +114,7 @@ function delete_success(form, data) {
 }
 EOF;
 
-$smarty = smarty(array('paginator', 'expandable'));
+$smarty = smarty(array('paginator'));
 $smarty->assign('PAGEHEADING', $blog->get('title'));
 $smarty->assign('INLINEJAVASCRIPT', $js);
 

htdocs/artefact/internal/notes.php

@@ -196,7 +196,7 @@ jQuery(function($) {
     });
 });';
 
-$smarty = smarty(array('expandable'));
+$smarty = smarty();
 $smarty->assign('PAGEHEADING', $pageheading);
 $smarty->assign('INLINEJAVASCRIPT', $js);
 $smarty->assign_by_ref('data', $data);

htdocs/js/views.js

@@ -72,6 +72,7 @@
             rewriteConfigureButton(newblock.find('.configurebutton'));
             rewriteDeleteButton(newblock.find('.deletebutton'));
         }
+
         hideDock();
         showMediaPlayers();
         setTimeout(function() {

htdocs/lib/form/elements/artefactchooser.php

@@ -155,20 +155,20 @@ if (ul) {
         // Need to make sure the accessible hidden <span> is present
         // If loaded via ajax it may not be present
         if (a.childNodes.length < 2) {
-            jQuery(a).append('<span class="accessible-hidden">(' + get_string_ajax('tab', 'mahara') + ')</span>');
+            jQuery(a).append('<span class="sr-only">(' + get_string_ajax('tab', 'mahara') + ')</span>');
         }
 
         if (!doneBrowse) {
             browseA = a;
-            jQuery(browseA).find('.accessible-hidden').html('(' + get_string_ajax('tab', 'mahara') + ' ' + get_string_ajax('selected', 'mahara') + ')');
+            jQuery(browseA).find('.sr-only').html('(' + get_string_ajax('tab', 'mahara') + ' ' + get_string_ajax('selected', 'mahara') + ')');
             doneBrowse = true;
 
             // Hide the search form
             connect(a, 'onclick', function(e) {
                 hideElement('artefactchooser-searchform');
                 removeElementClass(searchA.parentNode, 'active');
-                jQuery(browseA).find('.accessible-hidden').html('(' + get_string_ajax('tab', 'mahara') + ' ' + get_string_ajax('selected', 'mahara') + ')');
-                jQuery(searchA).find('.accessible-hidden').html('(' + get_string_ajax('tab', 'mahara') + ')');
+                jQuery(browseA).find('.sr-only').html('(' + get_string_ajax('tab', 'mahara') + ' ' + get_string_ajax('selected', 'mahara') + ')');
+                jQuery(searchA).find('.sr-only').html('(' + get_string_ajax('tab', 'mahara') + ')');
                 addElementClass(browseA.parentNode, 'active');
                 browseA.blur();
                 $('artefactchooser-searchfield').value = ''; // forget the search for now, easier than making the tabs remember it
@@ -186,8 +186,8 @@ if (ul) {
             connect(a, 'onclick', function(e) {
                 showElement('artefactchooser-searchform');
                 removeElementClass(browseA.parentNode, 'active');
-                jQuery(searchA).find('.accessible-hidden').html('(' + get_string_ajax('tab', 'mahara') + ' ' + get_string_ajax('selected', 'mahara') + ')');
-                jQuery(browseA).find('.accessible-hidden').html('(' + get_string_ajax('tab', 'mahara') + ')');
+                jQuery(searchA).find('.sr-only').html('(' + get_string_ajax('tab', 'mahara') + ' ' + get_string_ajax('selected', 'mahara') + ')');
+                jQuery(browseA).find('.sr-only').html('(' + get_string_ajax('tab', 'mahara') + ')');
                 addElementClass(searchA.parentNode, 'active');
 
                 connect('artefactchooser-searchfield', 'onkeypress', function(e) {

htdocs/lib/view.php

@@ -3092,7 +3092,7 @@ class View {
         // If lazyload is set, immediately return an empty resultset
         // In the case of forms using lazyload, lazyload is set to false by subsequent requests via ajax,
         // for example in views/artefactchooser.json.php, at which time the full resultset is returned.
-        if ($data['lazyload']) {
+        if (isset($data['lazyload']) && $data['lazyload']) {
             $result =  '';
             $pagination = build_pagination(array(
                 'id' => $data['name'] . '_pagination',

htdocs/theme/default/sass/utilities/_bootstrap-variables.scss

@@ -43,7 +43,7 @@ $state-warning-text:             #8a6d3b !default;
 $state-warning-bg:               #fcf8e3 !default;
 $state-warning-border:           darken(adjust-hue($state-warning-bg, -10), 5%) !default;
 
-$state-danger-text:              $brand-danger !default;
+$state-danger-text:              darken($brand-danger, 10%) !default;
 $state-danger-bg:                lighten($brand-danger, 30%) !default;
 $state-danger-border:            darken(adjust-hue($state-danger-bg, -10), 5%) !default;
 

htdocs/theme/default/style/style.css

@@ -727,12 +727,12 @@ a.text-warning:hover {
 
 /* line 5, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss */
 .text-danger {
-  color: #f04f50;
+  color: #d11213;
 }
 
 /* line 8, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss */
 a.text-danger:hover {
-  color: #ec2021;
+  color: #a20e0f;
 }
 
 /* line 119, ../../../lib/bootstrap/assets/stylesheets/bootstrap/_type.scss */
@@ -2863,29 +2863,29 @@ select[multiple].input-lg,
 .has-error .checkbox,
 .has-error .radio-inline,
 .has-error .checkbox-inline, .has-error.radio label, .has-error.checkbox label, .has-error.radio-inline label, .has-error.checkbox-inline label {
-  color: #f04f50;
+  color: #d11213;
 }
 /* line 21, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_forms.scss */
 .has-error .form-control {
-  border-color: #f04f50;
+  border-color: #d11213;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
 }
 /* line 24, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_forms.scss */
 .has-error .form-control:focus {
-  border-color: #ec2021;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #f8adad;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #f8adad;
+  border-color: #a20e0f;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #f15859;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #f15859;
 }
 /* line 31, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_forms.scss */
 .has-error .input-group-addon {
-  color: #f04f50;
-  border-color: #f04f50;
+  color: #d11213;
+  border-color: #d11213;
   background-color: #fcdcdc;
 }
 /* line 37, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_forms.scss */
 .has-error .form-control-feedback {
-  color: #f04f50;
+  color: #d11213;
 }
 
 /* line 371, ../../../lib/bootstrap/assets/stylesheets/bootstrap/_forms.scss */
@@ -5237,7 +5237,7 @@ a.thumbnail.active {
 .alert-danger {
   background-color: #fcdcdc;
   border-color: #fac4ce;
-  color: #f04f50;
+  color: #d11213;
 }
 /* line 8, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_alerts.scss */
 .alert-danger hr {
@@ -5245,7 +5245,7 @@ a.thumbnail.active {
 }
 /* line 11, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_alerts.scss */
 .alert-danger .alert-link {
-  color: #ec2021;
+  color: #a20e0f;
 }
 
 @-webkit-keyframes progress-bar-stripes {
@@ -5568,13 +5568,13 @@ a.list-group-item-warning.active, a.active.list-group-item.draft, a.list-group-i
 
 /* line 4, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_list-group.scss */
 .list-group-item-danger {
-  color: #f04f50;
+  color: #d11213;
   background-color: #fcdcdc;
 }
 
 /* line 11, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_list-group.scss */
 a.list-group-item-danger {
-  color: #f04f50;
+  color: #d11213;
 }
 /* line 14, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_list-group.scss */
 a.list-group-item-danger .list-group-item-heading {
@@ -5582,14 +5582,14 @@ a.list-group-item-danger .list-group-item-heading {
 }
 /* line 18, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_list-group.scss */
 a.list-group-item-danger:hover, a.list-group-item-danger:focus {
-  color: #f04f50;
+  color: #d11213;
   background-color: #fac4c5;
 }
 /* line 23, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_list-group.scss */
 a.list-group-item-danger.active, a.list-group-item-danger.active:hover, a.list-group-item-danger.active:focus {
   color: #fff;
-  background-color: #f04f50;
-  border-color: #f04f50;
+  background-color: #d11213;
+  border-color: #d11213;
 }
 
 /* line 117, ../../../lib/bootstrap/assets/stylesheets/bootstrap/_list-group.scss */
@@ -6014,7 +6014,7 @@ a.list-group-item-danger.active, a.list-group-item-danger.active:hover, a.list-g
 }
 /* line 6, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_panels.scss */
 .panel-danger > .panel-heading {
-  color: #f04f50;
+  color: #d11213;
   background-color: #fcdcdc;
   border-color: #fac4ce;
 }
@@ -6025,7 +6025,7 @@ a.list-group-item-danger.active, a.list-group-item-danger.active:hover, a.list-g
 /* line 14, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_panels.scss */
 .panel-danger > .panel-heading .badge {
   color: #fcdcdc;
-  background-color: #f04f50;
+  background-color: #d11213;
 }
 /* line 20, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_panels.scss */
 .panel-danger > .panel-footer + .panel-collapse > .panel-body {
@@ -11146,7 +11146,7 @@ body {
 }
 /* line 10, ../../raw/sass/layout/_layout.scss */
 body.admin {
-  background-color: #ececec;
+  background-color: #f1f1f1;
 }
 /* line 13, ../../raw/sass/layout/_layout.scss */
 body.admin .main {
@@ -16138,7 +16138,7 @@ a.user-icon:hover:after, a.user-icon:focus:after, a .user-icon:hover:after, a .u
 }
 /* line 37, ../../raw/sass/lib/_star.scss */
 .rating-cancel.star-rating-hover a {
-  color: #f04f50;
+  color: #d11213;
 }
 /* line 41, ../../raw/sass/lib/_star.scss */
 .rating-cancel.star-rating-readonly {

htdocs/theme/raw/sass/layout/_layout.scss

@@ -8,7 +8,7 @@ body {
         padding-top: 65px; // Move down content because we have a fixed navbar on desktop/tablet that is 50px tall
     }
     &.admin {
-        background-color: $brand-default;
+        background-color: lighten($brand-default, 2%);
 
         .main {
           padding-top: 0;

htdocs/theme/raw/templates/footer.tpl

@@ -44,10 +44,12 @@
             {/foreach}
             </ul>
            
-            <div class="metadata pull-right ptm">
+            <div class="metadata pull-right ptm" id="version">
+             {mahara_version}
+            </div>
+             <div class="metadata text-center ptm fullwidth pull-left">
               <!-- there is a div id="performance-info" wrapping this -->
               {mahara_performance_info}
-              <div id="version">{mahara_version}</div>
             </div>
             <div class="clearfix">
       </div>

htdocs/theme/raw/templates/form/artefactchooser.tpl

@@ -7,7 +7,7 @@
     <div class="cb artefactchooser-splitter">
         <div id="artefactchooser-searchform" class="form-group" {if !$.request.s} class="hidden"{/if}> {* Use a smarty var, not smarty.request *}
             <label for="artefactchooser-searchfield">{str tag=search section=mahara}</label>
-            <input type="text" class="text" id="artefactchooser-searchfield" name="search" value="{$.request.search}" tabindex="42">
+            <input type="text" class="text form-control" id="artefactchooser-searchfield" name="search" value="{$.request.search}" tabindex="42">
             <input type="hidden" name="s" value="1">
             <input class="submit btn btn-success" type="submit" id="artefactchooser-searchsubmit" name="action_acsearch_id_{$blockinstance}" value="{str tag=go}" tabindex="42">
         </div>

htdocs/user/view.php

@@ -93,7 +93,7 @@ if (!$restrictedview) {
     $viewcontent = $view->build_rows(); // Build content before initialising smarty in case pieform elements define headers.
 }
 
-$javascript = array('paginator', 'lib/pieforms/static/core/pieforms.js', 'expandable');
+$javascript = array('paginator', 'lib/pieforms/static/core/pieforms.js');
 $blocktype_js = $view->get_all_blocktype_javascript();
 $javascript = array_merge($javascript, $blocktype_js['jsfiles']);
 $inlinejs = "addLoadEvent( function() {\n" . join("\n", $blocktype_js['initjs']) . "\n});";
@@ -103,7 +103,7 @@ $viewtheme = $view->get('theme');
 if ($viewtheme && $THEME->basename != $viewtheme) {
     $THEME = new Theme($viewtheme);
 }
-$stylesheets = array('<link rel="stylesheet" type="text/css" href="' . append_version_number(get_config('wwwroot') . 'theme/views.css') . '">');
+$stylesheets = array();
 $stylesheets = array_merge($stylesheets, $view->get_all_blocktype_css());
 // include slimbox2 js and css files, if it is enabled...
 if (get_config_plugin('blocktype', 'gallery', 'useslimbox2')) {
@@ -308,7 +308,6 @@ $smarty = smarty(
     $stylesheets,
     array(),
     array(
-        'stylesheets' => array('style/views.css'),
         'sidebars'    => false,
         'skin' => $skin
     )

htdocs/view/blocks.php

@@ -113,7 +113,6 @@ if (empty($category)) {
 $view->process_changes($category, $new);
 
 $extraconfig = array(
-    'stylesheets' => array('style/views.css'),
     'sidebars'    => false,
 );
 
@@ -123,15 +122,14 @@ $viewtheme = $view->set_user_theme();
 $allowedthemes = get_user_accessible_themes();
 
 // Pull in cross-theme view stylesheet and file stylesheets
-$stylesheets = array('<link rel="stylesheet" type="text/css" href="' . append_version_number(get_config('wwwroot') . 'theme/views.css') . '">');
+$stylesheets = array();
 foreach (array_reverse($THEME->get_url('style/style.css', true, 'artefact/file')) as $sheet) {
     $stylesheets[] = '<link rel="stylesheet" type="text/css" href="' . append_version_number($sheet) . '">';
 }
 foreach (array_reverse($THEME->get_url('style/select2.css', true)) as $sheet) {
     $stylesheets[] = '<link rel="stylesheet" type="text/css" href="' . append_version_number($sheet) . '">';
 }
-$stylesheets[] = '<link rel="stylesheet" type="text/css" href="' . append_version_number(get_config('wwwroot') . 'js/jquery/jquery-ui/css/ui-lightness/jquery-ui-1.10.2.min.css') . '">';
-$stylesheets[] = '<link rel="stylesheet" type="text/css" href="' . append_version_number(get_config('wwwroot') . 'theme/raw/static/style/switchbox.css') . '">';
+
 $stylesheets = array_merge($stylesheets, $view->get_all_blocktype_css());
 // Tell the user to change the view theme if the current one is no
 // longer available to them.
@@ -147,7 +145,7 @@ if ($viewtheme && !isset($allowedthemes[$viewtheme])) {
     exit;
 }
 
-$javascript = array('views', 'tinymce', 'paginator', 'expandable', 'js/jquery/jquery-ui/js/jquery-ui-1.10.2.min.js',
+$javascript = array('views', 'tinymce', 'paginator', 'js/jquery/jquery-ui/js/jquery-ui-1.10.2.min.js',
                     'js/jquery/jquery-ui/js/jquery-ui.touch-punch.min.js', 'tablerenderer', 'artefact/file/js/filebrowser.js',
                     'lib/pieforms/static/core/pieforms.js','js/jquery/modernizr.custom.js', 'js/select2/select2.js');
 $blocktype_js = $view->get_all_blocktype_javascript();

htdocs/view/view.php

@@ -190,13 +190,11 @@ function releaseview_submit() {
     redirect($view->get_url());
 }
 
-$javascript = array('paginator', 'viewmenu', 'expandable', 'author', 'js/jquery/jquery-ui/js/jquery-ui-1.10.2.min.js');
+$javascript = array('paginator', 'viewmenu', 'author');
 $blocktype_js = $view->get_all_blocktype_javascript();
 $javascript = array_merge($javascript, $blocktype_js['jsfiles']);
 $inlinejs = "addLoadEvent( function() {\n" . join("\n", $blocktype_js['initjs']) . "\n});";
 
-$extrastylesheets = array('style/views.css');
-
 // If the view has comments turned off, tutors can still leave
 // comments if the view is submitted to their group.
 if (!empty($releaseform) || ($commenttype = $view->user_comments_allowed($USER))) {
@@ -224,7 +222,7 @@ $viewtheme = $view->get('theme');
 if ($viewtheme && $THEME->basename != $viewtheme) {
     $THEME = new Theme($viewtheme);
 }
-$headers = array('<link rel="stylesheet" type="text/css" href="' . append_version_number(get_config('wwwroot') . 'theme/views.css') . '">');
+$headers = array();
 $headers[] = '<link rel="stylesheet" type="text/css" href="' . append_version_number(get_config('wwwroot') . 'js/jquery/jquery-ui/css/ui-lightness/jquery-ui-1.10.2.min.css') . '">';
 $headers = array_merge($headers, $view->get_all_blocktype_css());
 // Set up skin, if the page has one
@@ -273,7 +271,6 @@ $smarty = smarty(
           'View' => 'view',
           'Collection' => 'collection'),
     array(
-        'stylesheets' => $extrastylesheets,
         'sidebars' => false,
         'skin' => $skin
     )