--- loncom/auth/lonroles.pm	2009/06/11 19:02:27	1.226
+++ loncom/auth/lonroles.pm	2009/09/23 16:42:03	1.231.6.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.226 2009/06/11 19:02:27 raeburn Exp $
+# $Id: lonroles.pm,v 1.231.6.1 2009/09/23 16:42:03 gci Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -157,8 +157,9 @@ sub redirect_user {
     } else {
 	$navwindow.=&Apache::lonnavmaps::close();
     }
+
     my $start_page = &Apache::loncommon::start_page('Switching Role',undef,
-						    {'redirect' => [1,$url],});
+                                                    {'redirect' => [1,$url]});
     my $end_page   = &Apache::loncommon::end_page();
 
 # Note to style police: 
@@ -191,9 +192,10 @@ sub error_page {
         '// ]]>'.
         '</script>'.
 	      '<p class="LC_error">'.&mt('The following problems occurred:').
+              '<br />'.
 	      $error.
 	      '</p><br /><a href="'.$dest.'">'.&mt('Continue').'</a>'.
-	      &Apache::loncommon::end_page());
+              &Apache::loncommon::end_page());
 }
 
 sub handler {
@@ -246,7 +248,7 @@ sub handler {
 		    ($envkey =~ m-^form\.cc\./($match_domain)/($match_courseid)$-)) {
                     if ($dcroles{$domain}) {
                         &Apache::lonnet::check_adhoc_privs($domain,$coursenum,
-                                                           $then,$now,'cc');
+                                                           $then,$refresh,$now,'cc');
                     }
                     last;
                 }
@@ -287,7 +289,7 @@ sub handler {
                         my ($server_status,$home) = &check_author_homeserver($user,$domain);
                         if (($server_status eq 'ok') || ($server_status eq 'switchserver')) {
                             &Apache::lonnet::check_adhoc_privs($domain,$user,$then,
-                                                               $now,'ca');
+                                                               $refresh,$now,'ca');
                             if ($server_status eq 'switchserver') {
                                 my $trolecode = 'ca./'.$domain.'/'.$user; 
                                 my $switchserver = '/adm/switchserver?'
@@ -743,6 +745,14 @@ ENDHEADER
     unless ((!&Apache::loncommon::show_course()) || ($nochoose) || ($countactive==1)) {
 	$r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n");
     }
+    if ($env{'form.destinationurl'}) {
+        $r->print('<input type="hidden" name="destinationurl" value="'.
+                  $env{'form.destinationurl'}.'" />');
+        if ($env{'form.destsymb'} ne '') {
+            $r->print('<input type="hidden" name="destsymb" value="'.
+                      $env{'form.destsymb'}.'" />');
+        }
+    }
     my $doheaders = &roletable_headers($r,\%roleclass,\%sortrole,$nochoose);
     if ($env{'environment.recentroles'}) {
         my %recent_roles =
@@ -821,10 +831,10 @@ ENDHEADER
     $r->print(&Apache::lonnet::getannounce());
     if ($advanced) {
         my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
-	$r->print('<p><small><i>'
-                 .&mt('This is LON-CAPA [_1]',$r->dir_config('lonVersion'))
-		 .'</i><br />'
-		 .'<a href="/adm/logout">'.&mt('Logout').'</a>&nbsp;&nbsp;'
+        $r->print('<p><small><i>'
+                 .&mt('This LON-CAPA server is version [_1]',$r->dir_config('lonVersion'))
+                 .'</i><br />'
+                 .'<a href="/adm/logout">'.&mt('Logout').'</a>&nbsp;&nbsp;'
                  .'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
                  .&mt('Course Catalog')
                  .'</a></small></p>');
@@ -1529,21 +1539,15 @@ sub adhoc_roles_row {
     my ($dcdom,$rowtype) = @_;
     my $output = &Apache::loncommon::continue_data_table_row()
                  .' <td colspan="5">'
-                 .'<table><tr><td>'
                  .&mt('[_1]Ad hoc[_2] roles in domain [_3] --'
                      ,'<span class="LC_cusr_emph">','</span>',$dcdom)
-                 .'</td>'
-                 .'<td>';
+                 .' ';
     my $selectcclink = &courselink($dcdom,$rowtype);
     my $ccrole = &Apache::lonnet::plaintext('cc');
     my $carole = &Apache::lonnet::plaintext('ca');
     my $selectcalink = &coauthorlink($dcdom,$rowtype);
-    $output.=&mt('[_1]: [_2]',$ccrole,$selectcclink)
-            .'<br /></td>'
-            .'<td>&nbsp;&nbsp;</td>'
-            .'<td>'.&mt('[_1]: [_2]',$carole,$selectcalink).'<br /></td>'
-            .'</tr></table>'
-            .'</td>'
+    $output.=$ccrole.': '.$selectcclink
+            .' | '.$carole.': '.$selectcalink
             .&Apache::loncommon::end_data_table_row();
     return $output;
 }