MDL-13103 merging from 1.9

diff --git a/admin/index.php b/admin/index.php
index afddaf5e49b89fe06343e993cc1bfc45805eda16..178dc1c8a65cca2a1449c72f4ae51077fe8de6b9 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -317,6 +317,9 @@
                 print_box_end();
                 print_plugin_tables();
                 echo "<br />";
+                echo '<div class="continuebutton">';
+                print_single_button('index.php', array('confirmupgrade' => 1, 'confirmrelease' => 1), get_string('reload'), 'get');
+                echo '</div><br />';
                 echo '<form action="index.php"><div>';
                 echo '<input type="hidden" name="confirmupgrade" value="1" />';
                 echo '<input type="hidden" name="confirmrelease" value="1" />';

diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index 88ec75793c57d89d6540d0e795af447f2a0a991b..92a8263af94605aab264dadc09d14af869f5ed79 100644 (file)
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -1222,6 +1222,7 @@ $string['registrationno'] = 'No, I do not want to receive email';
 $string['registrationsend'] = 'Send registration information to moodle.org';
 $string['registrationyes'] = 'Yes, please notify me about important issues';
 $string['reject'] = 'Reject';
+$string['reload'] = 'Reload';
 $string['remotemaharauser'] = 'Remote Mahara User';
 $string['remove'] = 'Remove';
 $string['removeadmin'] = 'Remove admin';

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 0f0763248aae51d1f074b780c11dd8023ac7e435..165978420a628d7dfd6f38b29f889df6ef1ca320 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -4631,6 +4631,8 @@ function print_plugin_tables() {
     $strabouttobeinstalled = '(' . get_string('abouttobeinstalled') . ')';
 
     $html = '';
+    
+    $html .= '<table class="generaltable plugincheckwrapper" cellspacing="4" cellpadding="1"><tr valign="top">';
 
     foreach ($plugins_ondisk as $cat => $list_ondisk) {
         $strcaption = get_string($cat);
@@ -4640,7 +4642,7 @@ function print_plugin_tables() {
             $strcaption = get_string('managefilters');
         }
 
-        $html .= '<table class="plugincompattable generaltable boxaligncenter" cellspacing="1" cellpadding="5" '
+        $html .= '<td><table class="plugincompattable generaltable boxaligncenter" cellspacing="1" cellpadding="5" '
               . 'id="' . $cat . 'compattable" summary="compatibility table"><caption>' . $strcaption . '</caption>' . "\n";
         $html .= '<tr class="r0"><th class="header c0">' . get_string('directory') . "</th>\n"
                . '<th class="header c1">' . get_string('name') . "</th>\n"
@@ -4704,9 +4706,11 @@ function print_plugin_tables() {
             }
         }
 
-        $html .= '</table><br />';
+        $html .= '</table></td>';
     }
     
+    $html .= '</tr></table><br />';
+    
     echo $html;
 }
 

diff --git a/theme/standard/styles_fonts.css b/theme/standard/styles_fonts.css
index 7bc6551f526493772a5b2d18e9938bde9d3b39d5..062884f2adeef029e75330c15b4ef594e3fffeee 100644 (file)
--- a/theme/standard/styles_fonts.css
+++ b/theme/standard/styles_fonts.css
@@ -276,6 +276,10 @@ body#admin-index .copyright {
   font-size: 0.8em;
 }
 
+.plugincompattable {
+    font-size: 70%;
+}
+
 .plugincompattable td.standard {
     font-weight: normal;
 }
@@ -291,6 +295,14 @@ body#admin-index .copyright {
 .plugincompattable td.warning {
     font-style: normal;
 }
+
+.plugincompattable { 
+    text-align: left;
+}
+
+.plugincheckwrapper { 
+    text-align: center;
+}
 /***
  *** Blocks
  ***/

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index ca4727f6bd2f8b7426853b41091e43845c8b1263..49a498954d9d2b07dd0acdb31ad35f50d2d5e9dc 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -1007,6 +1007,13 @@ body#admin-modules table.generaltable td.c0
   font-size: 130%;
 }
 
+.plugincheckwrapper td{
+  border: 1px #bbbbbb solid;
+}
+
+.plugincheckwrapper{
+    width: 100%;
+}
 /* Admin settings */
 #adminsettings div.form-item {
   clear: both;