mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
nicolasconnault 2008-03-20 06:05:44 +00:00
parent 94c824304a
commit 902d5cc046
5 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/en_utf8/forum.php
View File

@ -184,6 +184,8 @@ $string['overviewnumunread'] = 'total unread';
$string['parent'] = 'Show parent'; $string['parent'] = 'Show parent';
$string['parentofthispost'] = 'Parent of this post'; $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['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['postincontext'] = 'See this post in context';
$string['postmailinfo'] = 'This is a copy of a message posted on the $a website. $string['postmailinfo'] = 'This is a copy of a message posted on the $a website.

6
lib/uploadlib.php
View File

@ -454,7 +454,11 @@ class upload_manager {
* @return string * @return string
*/ */
function get_errors() { function get_errors() {
return '<p class="notifyproblem">'. $this->notify .'</p>'; if (!empty($this->notify)) {
return '<p class="notifyproblem">'. $this->notify .'</p>';
} else {
return null;
}
} }
} }

6
lib/weblib.php
View File

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

6
mod/forum/post.php
View File

@ -536,7 +536,8 @@
$message .= get_string("postmailnow", "forum"); $message .= get_string("postmailnow", "forum");
$timemessage = 4; $timemessage = 4;
} else { } 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') { if ($forum->type == 'single') {
@ -585,7 +586,8 @@
$message .= get_string("postmailnow", "forum"); $message .= get_string("postmailnow", "forum");
$timemessage = 4; $timemessage = 4;
} else { } 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)) { if ($subscribemessage = forum_post_subscription($discussion)) {

14
theme/standard/styles_layout.css
View File

@ -86,6 +86,18 @@ h6.main {
visibility: hidden; visibility: hidden;
} }
#redirect {
text-align: center;
}
#redirect #message {
}
#redirect #continue {
}
/* .clearfix {display: inline-table;} */ /* .clearfix {display: inline-table;} */
/* Hides from IE-mac \*/ /* Hides from IE-mac \*/
@ -4239,4 +4251,4 @@ wikiadminactions {
background: #eee; background: #eee;
border: 1px dashed #ddd; border: 1px dashed #ddd;
padding: 3px; padding: 3px;
} }