From 1ca801982a53ad84afc3895671d62f2b0f8fc0d2 Mon Sep 17 00:00:00 2001
From: nicolasconnault <nicolasconnault>
Date: Thu, 20 Mar 2008 06:26:20 +0000
Subject: [PATCH] MDL-13880 Overridden and excluded grades are now coloured
 with alternate row colours that override the default alternate row colours
 (gray). I also fixed the long-standing notice about aggregationposition. See
 attached patch. Merging from HEAD

---
 lang/en_utf8/forum.php           |  2 ++
 lib/uploadlib.php                |  4 ++++
 lib/weblib.php                   |  6 +++---
 mod/forum/post.php               |  6 ++++--
 theme/standard/styles_layout.css | 12 ++++++++++++
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/lang/en_utf8/forum.php b/lang/en_utf8/forum.php
index a03c82853b4..988464c8ab1 100644
--- 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 190058c512f..5a96940b5e2 100644
--- a/lib/uploadlib.php
+++ b/lib/uploadlib.php
@@ -454,7 +454,11 @@ class upload_manager {
      * @return string
      */
     function get_errors() {
+        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 227b4f4a84c..e2e346b9827 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -6085,9 +6085,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 e3d727d22b8..7d42ba5040a 100644
--- 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 3d3aee6a71b..8292faa18df 100644
--- 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 \*/