--- loncom/auth/lonroles.pm	2007/03/02 23:17:48	1.176
+++ loncom/auth/lonroles.pm	2008/03/22 03:52:04	1.181.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.176 2007/03/02 23:17:48 albertel Exp $
+# $Id: lonroles.pm,v 1.181.2.2 2008/03/22 03:52:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -201,7 +201,7 @@ sub handler {
 				 }
 				 $r->print(<<ENDENTEREDKEY);
 $start_page
-<script>
+<script type="text/javascript">
 $swinfo
 </script>
 <form method="post">
@@ -224,7 +224,7 @@ ENDENTEREDKEY
 				 my $end_page=&Apache::loncommon::end_page();
 				 $r->print(<<ENDENTERKEY);
 $start_page
-<script>
+<script type="text/javascript">
 $swinfo
 </script>
 <form method="post">
@@ -365,11 +365,15 @@ ENDENTERKEY
     my $start_page=&Apache::loncommon::start_page('User Roles');
     my $standby=&mt('Role selected. Please stand by.');
     $standby=~s/\n/\\n/g;
+    my $noscript='<span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';
 
     $r->print(<<ENDHEADER);
 $start_page
 <br />
-<script>
+<noscript>
+$noscript
+</noscript>
+<script type="text/javascript">
 $swinfo
 window.focus();
 
@@ -406,16 +410,16 @@ ENDHEADER
 # -------------------------------------------------------- Generate Page Output
 # --------------------------------------------------------------- Error Header?
     if ($error) {
-	$r->print("<h1>LON-CAPA Access Control</h1>");
+        $r->print("<h1>".&mt('LON-CAPA Access Control')."</h1>");
 	$r->print("<!-- LONCAPAACCESSCONTROLERRORSCREEN --><hr /><pre>");
 	if ($priv ne '') {
-	    $r->print("Access  : ".&Apache::lonnet::plaintext($priv)."\n");
+            $r->print(&mt('Access  : ').&Apache::lonnet::plaintext($priv)."\n");
 	}
 	if ($fn ne '') {
-	    $r->print("Resource: ".&Apache::lonenc::check_encrypt($fn)."\n");
+            $r->print(&mt('Resource: ').&Apache::lonenc::check_encrypt($fn)."\n");
 	}
 	if ($msg ne '') {
-	    $r->print("Action  : $msg\n");
+            $r->print(&mt('Action  : ').$msg."\n");
 	}
 	$r->print("</pre><hr />");
 	my $url=$fn;
@@ -438,19 +442,11 @@ ENDHEADER
     }
 # -------------------------------------------------------- Choice or no choice?
     if ($nochoose) {
-	$r->print("<h2>".&mt('Sorry ...')."</h2>\n".
-		  &mt('This action is currently not authorized.').
+	$r->print("<h2>".&mt('Sorry ...')."</h2>\n<span class='LC_error'>".
+		  &mt('This action is currently not authorized.').'</span>'.
 		  &Apache::loncommon::end_page());
 	return OK;
     } else {
-        if ($advanced) {
-	    $r->print(&mt("Your home server is ").
-		      &Apache::lonnet::hostname(&Apache::lonnet::homeserver
-                      ($env{'user.name'},$env{'user.domain'})).
-		      "<br />\n");
-	    $r->print(&mt(
-      "Author and Co-Author roles are not available on servers other than their respective home servers."));
-        }
         if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {
     	    $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
         }
@@ -461,9 +457,9 @@ ENDHEADER
     }
     if ($env{'user.adv'}) {
 	$r->print(
-	      '<br /><label>'.&mt('Show all roles').': <input type="checkbox" name="showall"');
+	      '<br /><span class="LC_rolesinfo"><label>'.&mt('Show all roles').': <input type="checkbox" name="showall"');
 	if ($env{'form.showall'}) { $r->print(' checked="checked" '); }
-	$r->print(' /></label><input type="submit" value="'.&mt('Display').'" />');
+	$r->print(' /></label><input type="submit" value="'.&mt('Display').'" /></span>');
     }
 
     my (%roletext,%sortrole,%roleclass);
@@ -636,19 +632,20 @@ ENDHEADER
 # Is there only one choice?
     } elsif (($countactive==1) && ($env{'request.role'} eq 'cm')) {
 	$r->print('<h3>'.&mt('Please stand by.').'</h3>'.
-	    '<input type="hidden" name="'.$possiblerole.'" value="1" />');
+	    '<input type="hidden" name="'.$possiblerole.'" value="1" />'.
+            '<noscript><br /><input type="submit" name="submit" value="'.&mt('Continue').'" /></noscript>');
 	$r->print("</form>\n");
 	$r->rflush();
-	$r->print('<script>document.forms.rolechoice.submit();</script>');
+	$r->print('<script type="text/javascript">document.forms.rolechoice.submit();</script>');
 	$r->print(&Apache::loncommon::end_page());
 	return OK;
     }
 # More than one possible role
 # ----------------------------------------------------------------------- Table
-    unless (($advanced) || ($nochoose)) {
+    unless ((!&Apache::lonmenu::show_course()) || ($nochoose)) {
 	$r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n");
     }
-    $r->print('<br /><table><tr>');
+    $r->print('<br /><table id="LC_rolesmenu"><tr>');
     unless ($nochoose) { $r->print('<th>&nbsp;</th>'); }
     $r->print('<th>'.&mt('User Role').'</th><th>'.&mt('Extent').
          '</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th></tr>'."\n");
@@ -730,8 +727,8 @@ ENDHEADER
 	    $r->print('<td>&nbsp;</td>');
 	}
     }
-    $r->print('<td colspan="3"><font color="'.$tfont.'">'.&mt('No role specified').
-      '</font></td><td><font color="'.$tfont.'">'.$tremark.
+    $r->print('<td colspan="3"><font color="'.$tfont.'"><span class="LC_rolesinfo">'.&mt('No role specified').
+      '</font></span></td><td><font color="'.$tfont.'">'.$tremark.
       '&nbsp;</font></td></tr>'."\n");
 
     $r->print('</table>');
@@ -835,7 +832,7 @@ sub role_status {
 
 sub build_roletext {
     my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver) = @_;
-    my $roletext='<tr bgcolor="'.$tbg.'">';
+    my $roletext='<tr bgcolor="'.$tbg.'" class="LC_rolesmenu_'.$tstatus.'">';
     my $is_dc=($trolecode =~ m/^dc\./);
     my $rowspan=($is_dc) ? ''
                          : ' rowspan="2" ';
@@ -845,8 +842,8 @@ sub build_roletext {
         $buttonname=~s/\W//g;
         if (!$button) {
             if ($switchserver) {
-                $roletext.='<td'.$rowspan.'><a href="/adm/switchserver?'.
-                $switchserver.'">'.&mt('Switch Server').'</a></td>';
+                $roletext.='<td'.$rowspan.'><span class="LC_rolesinfo"><a href="/adm/switchserver?'.
+                $switchserver.'">'.&mt('Switch Server').'</a></span></td>';
             } else {
                 $roletext.=('<td'.$rowspan.'>&nbsp;</td>');
             }
@@ -878,8 +875,8 @@ sub build_roletext {
                '</font></td><td><font color="'.$tfont.'">'.$tpend.
                '</font></td></tr>';
     if (!$is_dc) {
-	$roletext.='<tr bgcolor="'.$tbg.'"><td colspan="4"><font color="'.$tfont.'">'.$tremark.
-	    '&nbsp;</font></td></tr><tr><td colspan="5" height="3"></td></tr>'."\n";
+	$roletext.='<tr bgcolor="'.$tbg.'"><td colspan="4"><font color="'.$tfont.'"><span class="LC_rolesinfo">'.$tremark.
+	    '</span>&nbsp;</font></td></tr><tr><td colspan="5" height="3"></td></tr>'."\n";
     }
     return $roletext;
 }
@@ -933,8 +930,12 @@ sub courselink {
 }
 
 sub coursepick_jscript {
+    my %lt = &Apache::lonlocal::texthash(
+                  plsu => "Please use the 'Select Course' link to open a separate pick course window where you may select the course you wish to enter.",
+                  youc => 'You can only use this screen to select courses in the current domain.',
+            );
     my $verify_script = <<"END";
-<script>
+<script type="text/javascript">
 function verifyCoursePick(caller) {
     var numbutton = getIndex(caller)
     var pickedCourse = document.rolechoice.elements[numbutton+4].value
@@ -948,11 +949,11 @@ function verifyCoursePick(caller) {
             }
         }
         else {
-            alert("Please use the 'Select Course' link to open a separate pick course window where you may select the course you wish to enter.");
+            alert("$lt{'plsu'}");
         }
     }
     else {
-        alert("You can only use this screen to select courses in the current domain")
+        alert("$lt{'youc'}");
     }
 }
 function getIndex(caller) {
@@ -968,32 +969,6 @@ END
     return $verify_script;
 }
 
-sub processpick {
-    my $process_pick = <<"END";
-<script>
-function process_pick(dom) {
-    var pickedCourse=opener.document.rolechoice.$env{'form.cnumelement'}.value;
-    var pickedDomain=opener.document.rolechoice.$env{'form.cdomelement'}.value;
-    var okDomain = 0;
-
-    if (pickedDomain == dom) {
-        if (pickedCourse != '') {
-            var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse
-            opener.document.title='Role selected. Please stand by.';
-            opener.status='Role selected. Please stand by.';
-	    opener.document.rolechoice.newrole.value=courseTarget
-            opener.document.rolechoice.submit()
-        }
-    } else {
-        alert("You may only use this screen to select courses in the current domain: "+dom+"\\nPlease return to the roles page window and click the 'Select Course' link for domain: "+pickedDomain+",\\n if you are a Domain Coordinator in that domain, and wish to become a Course Coordinator in a course in the domain");
-    }
-}
- 
-</script>
-END
-    return $process_pick;
-}
-
 sub display_cc_role {
     my $rolekey = shift;
     my $roletext;
@@ -1032,10 +1007,9 @@ sub allcourses_row {
                  ' <td colspan="5">';
     my $selectlink = &courselink($dcdom,$rowtype);
     my $ccrole = &Apache::lonnet::plaintext('cc');
-    $output.= '<font color="#002200">'.$ccrole.'</font>'.
-              ' <b>'.$selectlink.'</b>'.
-              ' from '.&mt('Domain').' '.$dcdom.'<br />';
-    $output .= '</tr><tr><td colspan="5" height="3"></td></tr>'."\n";
+    $output.= '<span class="LC_rolesinfo">'.
+            &mt('[_1]: [_2] from domain [_3]',$ccrole,$selectlink,$dcdom).
+            '</span><br /></tr><tr><td colspan="5" height="3"></td></tr>'."\n";
     return $output;
 }