MDL-13880 Overridden and excluded grades are now coloured with alternate row colours...

diff --git a/lang/en_utf8/forum.php b/lang/en_utf8/forum.php
index a03c82853b4b2016aaf3cee5548e9ab36b69c741..988464c8ab177d16ba01b85b8cd8048a7d991031 100644 (file)
--- a/lang/en_utf8/forum.php
+++ b/lang/en_utf8/forum.php
@@ -184,6 +184,8 @@ $string['overviewnumunread'] = 'total unread';
 $string['parent'] = 'Show parent';
 $string['parentofthispost'] = 'Parent of this post';
 $string['postadded'] = '<p>Your post was successfully added.</p> <p>You have $a to edit it if you want to make any changes.</p>';
+$string['postaddedsuccess'] = 'Your post was successfully added.';
+$string['postaddedtimeleft'] = 'You have $a to edit it if you want to make any changes.';
 $string['postincontext'] = 'See this post in context';
 $string['postmailinfo'] = 'This is a copy of a message posted on the $a website.
 

diff --git a/lib/uploadlib.php b/lib/uploadlib.php
index 190058c512f16b2c043ff0c1ea2a0749226f900f..824c174da7564afdbb34f718bf052edc95c5d229 100644 (file)
--- a/lib/uploadlib.php
+++ b/lib/uploadlib.php
@@ -454,7 +454,11 @@ class upload_manager {
      * @return string
      */
     function get_errors() {
-        return '<p class="notifyproblem">'. $this->notify .'</p>';
+        if (!empty($this->notify)) {
+            return '<p class="notifyproblem">'. $this->notify .'</p>';
+        } else {
+            return null;
+        }
     }
 }
 

diff --git a/lib/weblib.php b/lib/weblib.php
index f71cd496294f705e4c44c0d6016f4c3660662ab0..1f0f143b5cbc9a72b4741128bac2639d2cd1def0 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -6123,9 +6123,9 @@ function redirect($url, $message='', $delay=-1) {
     } else {
         print_container_end_all(false, $THEME->open_header_containers);
     }
-    echo '<div style="text-align:center">';
-    echo '<div>'. $message .'</div>';
-    echo '<div>( <a href="'. $encodedurl .'">'. get_string('continue') .'</a> )</div>';
+    echo '<div id="redirect">';
+    echo '<div id="message">' . $message . '</div>';
+    echo '<div id="continue">( <a href="'. $encodedurl .'">'. get_string('continue') .'</a> )</div>';
     echo '</div>';
 
     if (!$errorprinted) {

diff --git a/mod/forum/post.php b/mod/forum/post.php
index e3d727d22b83e2f42fb421ad91b60038ee0060b1..7d42ba5040a7010ad5aa6179e92415c6c83c6848 100644 (file)
--- a/mod/forum/post.php
+++ b/mod/forum/post.php
@@ -536,7 +536,8 @@
                     $message .= get_string("postmailnow", "forum");
                     $timemessage = 4;
                 } else {
-                    $message .= '<br />'.get_string("postadded", "forum", format_time($CFG->maxeditingtime));
+                    $message .= '<p>'.get_string("postaddedsuccess", "forum") . '</p>';
+                    $message .= '<p>'.get_string("postaddedtimeleft", "forum", format_time($CFG->maxeditingtime)) . '</p>';
                 }
 
                 if ($forum->type == 'single') {
@@ -585,7 +586,8 @@
                     $message .= get_string("postmailnow", "forum");
                     $timemessage = 4;
                 } else {
-                    $message .= '<br />'.get_string("postadded", "forum", format_time($CFG->maxeditingtime));
+                    $message .= '<p>'.get_string("postaddedsuccess", "forum") . '</p>';
+                    $message .= '<p>'.get_string("postaddedtimeleft", "forum", format_time($CFG->maxeditingtime)) . '</p>';
                 }
 
                 if ($subscribemessage = forum_post_subscription($discussion)) {

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 44fc06538358a9c8b1153f07ad210640c7cb87da..4323d13a5c8e5ef5dcf3b1d2947d87a4576d7539 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -86,6 +86,18 @@ h6.main {
   visibility: hidden;
 }
 
+#redirect {
+  text-align: center;
+}
+
+#redirect #message {
+  
+}
+
+#redirect #continue {
+  
+}
+
 /* .clearfix {display: inline-table;} */
 
 /* Hides from IE-mac \*/
@@ -4239,4 +4251,4 @@ wikiadminactions {
   background: #eee;
   border: 1px dashed #ddd;
   padding: 3px;
-}
\ No newline at end of file
+}