Merge pull request #146 from catalyst/table-boxes

Issue #141: Added border class to divs for tables

Author: Peterburnett

classes/local/admin_setting_managemfa.php

@@ -193,7 +193,7 @@ public function define_factor_combinations_table() {
         $txt = get_strings(array('combination', 'totalweight'), 'tool_mfa');
         $table = new \html_table();
         $table->id = 'managemfatable';
-        $table->attributes['class'] = 'admintable generaltable';
+        $table->attributes['class'] = 'admintable generaltable table table-bordered';
         $table->head  = array($txt->combination, $txt->totalweight);
         $table->colclasses = array('leftalign', 'centeralign');
         $table->data  = array();

classes/manager.php

@@ -42,8 +42,7 @@ public static function display_debug_notification() {
         if (!get_config('tool_mfa', 'debugmode')) {
             return;
         }
-
-        $output = $OUTPUT->heading(get_string('debugmode:heading', 'tool_mfa'), 3);
+        $html = $OUTPUT->heading(get_string('debugmode:heading', 'tool_mfa'), 3);
 
         $table = new \html_table();
         $table->head = array(
@@ -53,7 +52,7 @@ public static function display_debug_notification() {
             get_string('achievedweight', 'tool_mfa'),
             get_string('status'),
         );
-        $table->attributes['class'] = 'admintable generaltable';
+        $table->attributes['class'] = 'admintable generaltable table table-bordered';
         $table->colclasses = array(
             'text-right',
             '',
@@ -131,7 +130,8 @@ public static function display_debug_notification() {
             $OUTPUT->get_state_badge($finalstate),
         );
 
-        echo \html_writer::table($table);
+        $html .= \html_writer::table($table);
+        echo $html;
     }
 
     /**

renderer.php

@@ -91,6 +91,7 @@ public function setup_factor($factor) {
         $html .= $OUTPUT->single_button($setupurl, $factor->get_setup_string());
         $html .= html_writer::end_tag('div');
         $html .= html_writer::end_tag('div');
+        $html .= '<br>';
 
         return $html;
     }
@@ -117,7 +118,7 @@ public function active_factors() {
 
         $table = new \html_table();
         $table->id = 'active_factors';
-        $table->attributes['class'] = 'generaltable';
+        $table->attributes['class'] = 'generaltable table table-bordered';
         $table->head  = array(
             $headers->factor,
             $headers->devicename,
@@ -176,9 +177,8 @@ public function active_factors() {
         if (count($table->data) == 0) {
             return '';
         }
-        $html .= $OUTPUT->box_start('generalbox');
         $html .= \html_writer::table($table);
-        $html .= $OUTPUT->box_end();
+        $html .= '<br>';
 
         return $html;
     }