[LON-CAPA-cvs] cvs: loncom /auth lonauth.pm londatecheck.pm lonlogin.pm /homework bridgetask.pm structuretags.pm /interface printout.pl
goltermann
goltermann at source.lon-capa.org
Wed Apr 11 07:40:14 EDT 2012
goltermann Wed Apr 11 11:40:14 2012 EDT
Modified files:
/loncom/homework bridgetask.pm structuretags.pm
/loncom/auth londatecheck.pm lonauth.pm lonlogin.pm
/loncom/interface printout.pl
Log:
changed <h1> to <p class='LC_error/warning/info'> where a headline is misplaced
-------------- next part --------------
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.258 loncom/homework/bridgetask.pm:1.259
--- loncom/homework/bridgetask.pm:1.258 Tue Jan 3 00:28:17 2012
+++ loncom/homework/bridgetask.pm Wed Apr 11 11:40:00 2012
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.258 2012/01/03 00:28:17 raeburn Exp $
+# $Id: bridgetask.pm,v 1.259 2012/04/11 11:40:00 goltermann Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -743,22 +743,22 @@
}
my $msg;
if ($status eq 'UNAVAILABLE') {
- $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
+ $msg.='<p class="LC_error">'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</p>';
} elsif ($status eq 'NOT_IN_A_SLOT') {
- $msg.='<h1>'.&mt('You are not currently signed up to work at this time and/or place.').'</h1>';
+ $msg.='<p class="LC_warning">'.&mt('You are not currently signed up to work at this time and/or place.').'</p>';
$msg.=&add_request_another_attempt_button("Sign up for time to work");
} elsif ($status eq 'NEEDS_CHECKIN') {
- $msg.='<h1>'.&mt('You need the Proctor to validate you.').
- '</h1>'.&proctor_validation_screen($slot);
+ $msg.='<p class="LC_warning">'.&mt('You need the Proctor to validate you.').
+ '</p>'.&proctor_validation_screen($slot);
} elsif ($status eq 'WAITING_FOR_GRADE') {
- $msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>';
+ $msg.='<p class="LC_info">'.&mt('Your submission is in the grading queue.').'</p>';
} elsif ($env{'form.donescreen'}) {
$result .= &done_screen($version);
} elsif ($status eq 'NOT_YET_VIEWED') {
my $symb=&Apache::lonnet::symbread();
$msg.=&Apache::structuretags::firstaccess_msg($accessmsg,$symb);
} else {
- $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
+ $msg.='<p class="LC_warning">'.&mt('Not open to be viewed').'</p>';
}
if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
$msg.='The problem '.$accessmsg;
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.503 loncom/homework/structuretags.pm:1.504
--- loncom/homework/structuretags.pm:1.503 Thu Apr 5 09:49:51 2012
+++ loncom/homework/structuretags.pm Wed Apr 11 11:40:00 2012
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.503 2012/04/05 09:49:51 foxr Exp $
+# $Id: structuretags.pm,v 1.504 2012/04/11 11:40:00 goltermann Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -990,19 +990,19 @@
my $foldertitle=&Apache::lonnet::gettitle($map);
&Apache::lonxml::debug("map is $map title is $foldertitle");
- $result .= "<h2>".&mt('The resources in "[_1]" are open for a limited time.'
- .' Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".'
- ,$foldertitle,$time)."</h2>";
+ $result .= "<h2>".&mt('The resources in "[_1]" are open for a limited time.',$foldertitle)."</h2>"
+ .'<p>'.&mt('Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".'
+ ,$foldertitle,$time)."</p>";
} elsif ($interval[1] eq 'course') {
my $course = $env{'course.'.$env{'request.course.id'}.'.description'};
- $result .= "<h2>".&mt('The resources in "[_1]" are open for a limited time.'
- .' Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".'
- ,$course,$time)."</h2>";
+ $result .= "<h2>".&mt('The resources in "[_1]" are open for a limited time.',$course)."</h2>"
+ .'<p>'.&mt('Once you click the "Show Resource" button below you have [_2] to omplete all resources "[_1]".'
+ ,$course,$time)."</p>";
} else {
my $title=&Apache::lonnet::gettitle($symb);
- $result .= "<h2>".&mt('This resource "[_1]" is open for a limited time.'
- .' Once you click the "Show Resource" button below you have [_2] to complete this resource "[_1]".'
- ,$title,$time)."</h2>";
+ $result .= "<h2>".&mt('This resource "[_1]" is open for a limited time.',$title)."</h2>"
+ .'<p>'.&mt('Once you click the "Show Resource" button below you have [_2] to complete this resource "[_1]".'
+ ,$title,$time)."</p>";
}
my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
my $buttontext = &mt('Show Resource');
@@ -1247,14 +1247,14 @@
if ( $target eq "web" ) {
my $msg;
if ($status eq 'UNAVAILABLE') {
- $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
+ $msg.='<p class="LC_error">'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</p>';
} elsif ($status eq 'NOT_IN_A_SLOT') {
- $msg.='<h1>'.&mt('You are not currently signed up to work at this time and/or place.').'</h1>';
+ $msg.='<p class="LC_warning">'.&mt('You are not currently signed up to work at this time and/or place.').'</p>';
} elsif (($status eq 'RESERVABLE') || ($status eq 'RESERVABLE_LATER') ||
($status eq 'NOTRESERVABLE')) {
- $msg.='<h1>'.&mt('Access requires reservation to work at specific time/place.').'</h1>';
+ $msg.='<p class="LC_warning">'.&mt('Access requires reservation to work at specific time/place.').'</p>';
} elsif ($status ne 'NOT_YET_VIEWED') {
- $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
+ $msg.='<p class="LC_warning">'.&mt('Not open to be viewed').'</p>';
}
if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
$msg.=&mt('The problem ').$accessmsg;
Index: loncom/auth/londatecheck.pm
diff -u loncom/auth/londatecheck.pm:1.12 loncom/auth/londatecheck.pm:1.13
--- loncom/auth/londatecheck.pm:1.12 Thu Apr 13 21:02:34 2006
+++ loncom/auth/londatecheck.pm Wed Apr 11 11:40:07 2012
@@ -1,5 +1,5 @@
# Checks contentopen/close settings disable subsequent PerlHandlers if not open
-# $Id: londatecheck.pm,v 1.12 2006/04/13 21:02:34 albertel Exp $
+# $Id: londatecheck.pm,v 1.13 2012/04/11 11:40:07 goltermann Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,14 +37,14 @@
my $close=&Apache::lonnet::EXT('resource.0.contentclose',$symb);
if ( (defined($open) && $open ne '' && time < $open) ) {
return ('CLOSED',$open,$close,
- '<h1>'.&mt('Not open to be viewed').'</h1>'.
+ '<p class="LC_warning">'.&mt('Not open to be viewed').'</p>'.
&mt("This resource currently isn't open. ".
"It will be available at [_1].",
&Apache::lonlocal::locallocaltime($open)));
}
if ( (defined($close) && $close ne '' && time > $close) ) {
return ('CLOSED',$open,$close,
- '<h1>'.&mt('Not open to be viewed').'</h1>'.
+ '<p class="LC_warning">'.&mt('Not open to be viewed').'</p>'.
&mt("This resource is no longer available to be viewed."));
}
return ('OPEN',$open,$close);
Index: loncom/auth/lonauth.pm
diff -u loncom/auth/lonauth.pm:1.120 loncom/auth/lonauth.pm:1.121
--- loncom/auth/lonauth.pm:1.120 Mon Nov 7 18:15:07 2011
+++ loncom/auth/lonauth.pm Wed Apr 11 11:40:07 2012
@@ -1,7 +1,7 @@
# The LearningOnline Network
# User Authentication Module
#
-# $Id: lonauth.pm,v 1.120 2011/11/07 18:15:07 raeburn Exp $
+# $Id: lonauth.pm,v 1.121 2012/04/11 11:40:07 goltermann Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -227,7 +227,7 @@
}
$r->print(
$start_page
- .'<h1>'.&mt('You are already logged in!').'</h1>'
+ .'<p class="LC_warning>"'.&mt('You are already logged in!').'</p>'
.'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].'
,'<a href="'.$dest.'">','</a>','<a href="/adm/logout">','</a>')
.'</p>'
Index: loncom/auth/lonlogin.pm
diff -u loncom/auth/lonlogin.pm:1.149 loncom/auth/lonlogin.pm:1.150
--- loncom/auth/lonlogin.pm:1.149 Mon Nov 7 18:16:10 2011
+++ loncom/auth/lonlogin.pm Wed Apr 11 11:40:07 2012
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.149 2011/11/07 18:16:10 raeburn Exp $
+# $Id: lonlogin.pm,v 1.150 2012/04/11 11:40:07 goltermann Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -92,7 +92,7 @@
}
$r->print(
$start_page
- .'<h1>'.&mt('You are already logged in!').'</h1>'
+ .'<p class="LC_warning">'.&mt('You are already logged in!').'</p>'
.'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].',
'<a href="'.$dest.'">','</a>','<a href="/adm/logout">','</a>').'</p>'
.$end_page
Index: loncom/interface/printout.pl
diff -u loncom/interface/printout.pl:1.151 loncom/interface/printout.pl:1.152
--- loncom/interface/printout.pl:1.151 Wed Dec 21 21:25:40 2011
+++ loncom/interface/printout.pl Wed Apr 11 11:40:14 2012
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
#
-# $Id: printout.pl,v 1.151 2011/12/21 21:25:40 www Exp $
+# $Id: printout.pl,v 1.152 2012/04/11 11:40:14 goltermann Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -614,7 +614,7 @@
if ($size == $last_size) {
$unchanged_time++;
if ($timeout && ($unchanged_time > $timeout)) {
- print "<h1>Operation timed out!</h1>\n";
+ print '<p class="LC_error">'.&mt('Operation timed out!')."</p>\n";
print "<p>Executing $command, the output file $output_file did not grow\n";
print "after $timeout seconds. This <em>may</em> indicate $command\n";
print "is in an infinite loop.\n";
More information about the LON-CAPA-cvs
mailing list