BUG: Minor bug fixes (bootstrap)

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I1b31ed419d325409888e88f90848eaee49e769ad

htdocs/export/index.php

@@ -56,6 +56,7 @@ $elements = array(
     ),
     'includefeedback' => array(
         'type' => 'checkbox',
+        'class' => 'checkbox',
         'title' => get_string('includefeedback', 'export'),
         'description' => get_string('includefeedbackdescription', 'export'),
         'separator' => '</div><div>',
@@ -68,6 +69,7 @@ if ($viewids = get_column_sql('SELECT id FROM {view} WHERE owner = ? AND type =
         $view = new View($viewid);
         $elements['view_' . $viewid] = array(
             'type' => 'checkbox',
+            'class' => 'checkbox',
             'title' => $view->get('title'),
             'description' => $view->get('description'),
             'viewlink' => $view->get_url(true, true),
@@ -88,6 +90,7 @@ if ($viewids = get_column_sql('SELECT id FROM {view} WHERE owner = ? AND type =
         foreach ($collections as $collection) {
             $elements['collection_' . $collection->id] = array(
                 'type' => 'checkbox',
+                'class' => 'checkbox',
                 'title' => $collection->name,
                 'description' => $collection->description,
             );

htdocs/group/find.php

@@ -64,7 +64,7 @@ if (get_config('allowgroupcategories')
                 'type'         => 'select',
                 'options'      => $options,
                 'defaultvalue' => $groupcategory,
-                'help'         => true);
+                'class'        => 'input-small text');
 }
 $elements['search'] = array(
             'type' => 'submit',

htdocs/theme/bootstrap/pieforms/export.php

@@ -6,13 +6,22 @@ function export_form_cell_html($element) {
     $strpreview = get_string('Preview');
     $element['description'] = clean_html($element['description']);
 return <<<EOF
-<td>
-<div class="checkbox">{$element['html']}</div>
-<div class="labeldescriptpreview">{$element['labelhtml']}
-{$element['description']}
-<a href="{$element['viewlink']}" class="viewlink nojs-hidden-inline" target="_blank">{$strclicktopreview}</a>
+
+<div class="checkbox">
+
+
+    {$element['html']}
+
+    {$element['labelhtml']}
+    <div class="text-small with-label plxs">
+    {$element['description']}
+    <a href="{$element['viewlink']}" class="viewlink nojs-hidden-inline" target="_blank">{$strclicktopreview}</a>
+    </div>
+
 </div>
-</td>
+
+
+
 EOF;
 }
 
@@ -22,12 +31,12 @@ echo '<h2 class="mtxl ptxl">' . get_string('chooseanexportformat', 'export') . '
 echo '<div class="element form-group" id="exportformat-buttons">';
 echo '<div>' . $elements['format']['html'] . '</div>';
 echo '</div>';
-echo '<h2>' . get_string('whatdoyouwanttoexport', 'export') . '</h2>';
+echo '<h2 class="ptl">' . get_string('whatdoyouwanttoexport', 'export') . '</h2>';
 echo '<div class="element form-group" id="whattoexport-buttons">';
 echo '<div>'. $elements['what']['html'] . '</div>';
 echo '</div>';
 
-echo '<div id="whatviews" class="js-hidden"><fieldset><legend>' . get_string('viewstoexport', 'export') . "</legend>\n";
+echo '<div id="whatviews" class="js-hidden"><fieldset><legend><h2 class="ptl">' . get_string('viewstoexport', 'export') . "</h2></legend>\n";
 $body = array();
 $row = $col = 0;
 foreach ($elements as $key => $element) {
@@ -45,32 +54,19 @@ if ($body) {
     echo '<div id="whatviewsselection" class="hidden"><a href="" id="selection_all">'
         . get_string('selectall') . '</a> | <a href="" id="selection_reverse">'
         . get_string('reverseselection', 'export') . '</a></div>';
-    echo "<table>\n";
+    echo '<div class="form-group checkbox">';
+
     foreach ($body as $rownum => $row) {
-        if ($rownum == 0) {
-            switch (count($row)) {
-            case 2:
-                echo '<colgroup><col width="50%"><col width="50%"></colgroup>' . "\n";
-                break;
-            case 3:
-                echo '<colgroup><col width="33%"><col width="33%"><col width="33%"></colgroup>' . "\n";
-                break;
-            }
-            echo "    <tbody>\n";
-        }
-        echo '    <tr class="r' . $rownum % 2 . "\">\n";
+
         $i = 0;
         foreach ($row as $col) {
             echo $col . "\n";
             $i++;
         }
-        for (; $i < 3; $i++) {
-            echo "<td></td>\n";
-        }
-        echo "    </tr>\n";
+
     }
-    echo "    </tbody>\n";
-    echo "</table>\n";
+
+    echo "</div>\n";
 }
 
 echo '</fieldset></div>';

htdocs/theme/bootstrap/static/sass/features/_dashboard-widget.scss

@@ -4,8 +4,6 @@ $logged-in-height-mobile: 100px;
 
 .dashboard-widget-container {
     @include clearfix;
-    padding: $grid-gutter-width 0;
-    border-bottom: 1px solid #eee;
     margin-bottom: $grid-gutter-width - 10px;
 
     .remove-widgets {
@@ -173,3 +171,8 @@ $logged-in-height-mobile: 100px;
         }
     }
 }
+
+.dashboard-editable {
+    padding: ($grid-gutter-width - 10) 0;
+    border-top: 1px solid #eee;
+}

htdocs/theme/bootstrap/static/sass/form/_form.scss

@@ -17,6 +17,9 @@ label,
     }
 }
 
+legend {
+    border-bottom: 0;
+}
 
 .checkbox .with-label {
     padding-left: 17px;

htdocs/theme/bootstrap/static/sass/utilities/_whitespace.scss

@@ -14,6 +14,9 @@
 // Padding Top
 .pt0 {
     padding-top: 0 !important;
+}
+.plxs {
+    
 }
 .pts {
     padding-top: 5px !important;

htdocs/theme/bootstrap/templates/group/group.tpl

@@ -33,8 +33,8 @@
                 </div>
                 {if $group->membercount}
                     <div class="membernumber ">
-                        <a href="{$WWWROOT}group/members.php?id={$group->id}" class="label label-default inner-link">
-                            {str tag=nmembers section=group arg1=$group->membercount}
+                        <a href="{$WWWROOT}group/members.php?id={$group->id}" class="inner-link">
+                            {str tag=Members section=group}: {$group->membercount}
                         </a>
                     </div>
                 {/if}