[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /auth lonauth.pm

[raeburn]

raeburn		Wed Feb 26 20:46:45 2014 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/auth	lonauth.pm 
  Log:
  - For 2.11
    - Backport 1.132
  
  
Index: loncom/auth/lonauth.pm
diff -u loncom/auth/lonauth.pm:1.121.2.8 loncom/auth/lonauth.pm:1.121.2.9
--- loncom/auth/lonauth.pm:1.121.2.8	Sun Jan  5 11:38:43 2014
+++ loncom/auth/lonauth.pm	Wed Feb 26 20:46:45 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.121.2.8 2014/01/05 11:38:43 raeburn Exp $
+# $Id: lonauth.pm,v 1.121.2.9 2014/02/26 20:46:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -206,18 +206,19 @@
     my $end_page = &Apache::loncommon::end_page();
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
+    my @actions =
+         (&mt('Please [_1]log in again[_2].','<a href="'.$retry.'">','</a>'));
     my $loginhelp = &loginhelpdisplay($udom);
     if ($loginhelp) {
-        $loginhelp = '<p><a href="'.$loginhelp.'">'.&mt('Login problems?').'</a></p>';
+        push(@actions, '<a href="'.$loginhelp.'">'.&mt('Login problems?').'</a>');
     }
+    #FIXME: link to helpdesk might be added here
 
     $r->print(
        $start_page
-      .'<h1>'.&mt('Sorry ...').'</h1>'
-      .'<p class="LC_warning">'.&mt($message).'</p>'
-      .'<p>'.&mt('Please [_1]log in again[_2].','<a href="'.$retry.'">','</a>')
-      .'</p>'
-      .$loginhelp
+      .'<h2>'.&mt('Sorry ...').'</h2>'
+      .&Apache::lonhtmlcommon::confirm_success(&mt($message),1).'<br /><br />'
+      .&Apache::lonhtmlcommon::actionbox(\@actions)
       .$end_page
     );
  }