--- loncom/auth/lonroles.pm	2009/05/18 15:40:20	1.223
+++ loncom/auth/lonroles.pm	2009/05/22 17:57:03	1.225
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.223 2009/05/18 15:40:20 raeburn Exp $
+# $Id: lonroles.pm,v 1.225 2009/05/22 17:57:03 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -167,7 +167,9 @@ sub redirect_user {
     $r->print(<<ENDREDIR);
 $start_page
 <script type="text/javascript">
+// <![CDATA[
 $swinfo
+// ]]>
 </script>
 $navwindow
 <p>$msg</p>
@@ -183,9 +185,12 @@ sub error_page {
     $r->send_http_header;
     return OK if $r->header_only;
     $r->print(&Apache::loncommon::start_page('Problems during Course Initialization').
-	      '<script type="text/javascript">'.
-	      &Apache::lonmenu::rawconfig().'</script>'.
-	      '<p>'.&mt('The following problems occurred:').
+        '<script type="text/javascript">'.
+        '// <![CDATA['.
+        &Apache::lonmenu::rawconfig().
+        '// ]]>'.
+        '</script>'.
+	      '<p class="LC_error">'.&mt('The following problems occurred:').
 	      $error.
 	      '</p><br /><a href="'.$dest.'">'.&mt('Continue').'</a>'.
 	      &Apache::loncommon::end_page());
@@ -367,9 +372,11 @@ sub handler {
 				 $r->print(<<ENDENTEREDKEY);
 $start_page
 <script type="text/javascript">
+// <![CDATA[
 $swinfo
+// ]]>
 </script>
-<form method="post">
+<form action="" method="post">
 <input type="hidden" name="selectrole" value="1" />
 <input type="hidden" name="$trolecode" value="1" />
 <span class="LC_fontsize_large">$message</span><br />
@@ -390,9 +397,11 @@ ENDENTEREDKEY
 				 $r->print(<<ENDENTERKEY);
 $start_page
 <script type="text/javascript">
+// <![CDATA[
 $swinfo
+// ]]>
 </script>
-<form method="post">
+<form action="" method="post">
 <input type="hidden" name="selectrole" value="1" />
 <input type="hidden" name="$trolecode" value="1" />
 <input type="text" size="20" name="newkey" value="$env{'form.newkey'}" />
@@ -553,9 +562,18 @@ ENDENTERKEY
     $r->send_http_header;
     return OK if $r->header_only;
 
-    my $brcrum =[{href=>"/admm/roles",text=>"User Roles"}];
+    my $crumbtext = 'User Roles';
+    my $pagetitle = 'My Roles';
+    my $recent = &mt('Recent Roles');
+    my $show_course=&Apache::loncommon::show_course();
+    if ($show_course) {
+        $crumbtext = 'Courses';
+        $pagetitle = 'My Courses';
+        $recent = &mt('Recent Courses');
+    }
+    my $brcrum =[{href=>"/adm/roles",text=>$crumbtext}];
     my $swinfo=&Apache::lonmenu::rawconfig();
-    my $start_page=&Apache::loncommon::start_page('My Roles',undef,{bread_crumbs=>$brcrum});
+    my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum});
     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 />';
@@ -567,6 +585,7 @@ $start_page
 $noscript
 </noscript>
 <script type="text/javascript">
+// <![CDATA[
 $swinfo
 window.focus();
 
@@ -583,6 +602,7 @@ function enterrole (thisform,rolecode,bu
        alert('$standby');
     }   
 }
+// ]]>
 </script>
 ENDHEADER
 
@@ -875,7 +895,7 @@ ENDHEADER
 	return OK;
     }
 # ----------------------------------------------------------------------- Table
-    unless ((!&Apache::lonmenu::show_course()) || ($nochoose) || ($countactive==1)) {
+    unless ((!&Apache::loncommon::show_course()) || ($nochoose) || ($countactive==1)) {
 	$r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n");
     }
     my $doheaders = &roletable_headers($r,\%roleclass,\%sortrole,$nochoose);
@@ -904,7 +924,7 @@ ENDHEADER
 	if ($output) {
 	    $r->print(&Apache::loncommon::start_data_table_empty_row()
                      .'<td align="center" colspan="5">'
-                     .&mt('Recent Roles')
+                     .$recent
                      .'</td>'
                      .&Apache::loncommon::end_data_table_empty_row()
             );
@@ -962,7 +982,7 @@ ENDHEADER
 		 .'<a href="/adm/logout">'.&mt('Logout').'</a>&nbsp;&nbsp;'
                  .'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
                  .&mt('Course Catalog')
-                 .'</small></p>');
+                 .'</a></small></p>');
     }
     $r->print(&Apache::loncommon::end_page());
     return OK;
@@ -1237,31 +1257,31 @@ sub build_roletext {
         } elsif ($tstatus eq 'is') {
             $roletext.='<td'.$rowspan.' class="'.$tbg.'">'.
                         '<input name="'.$buttonname.'" type="button" value="'.
-                        &mt('Select').'" onClick="javascript:enterrole(this.form,\''.
+                        &mt('Select').'" onclick="javascript:enterrole(this.form,\''.
                         $trolecode."','".$buttonname.'\');" /></td>';
         } elsif ($tryagain) {
             $roletext.=
                 '<td'.$rowspan.' class="'.$tbg.'">'.
                 '<input name="'.$buttonname.'" type="button" value="'.
-                &mt('Try Selecting Again').'" onClick="javascript:enterrole(this.form,\''.
+                &mt('Try Selecting Again').'" onclick="javascript:enterrole(this.form,\''.
                         $trolecode."','".$buttonname.'\');" /></td>';
         } elsif ($advanced) {
             $roletext.=
                 '<td'.$rowspan.' class="'.$tbg.'">'.
                 '<input name="'.$buttonname.'" type="button" value="'.
-                &mt('Re-Initialize').'" onClick="javascript:enterrole(this.form,\''.
+                &mt('Re-Initialize').'" onclick="javascript:enterrole(this.form,\''.
                         $trolecode."','".$buttonname.'\');" /></td>';
         } elsif ($reinit) {
             $roletext.= 
                 '<td'.$rowspan.' class="'.$tbg.'">'.
                 '<input name="'.$buttonname.'" type="button" value="'.
-                &mt('Re-Select').'" onClick="javascript:enterrole(this.form,\''.
+                &mt('Re-Select').'" onclick="javascript:enterrole(this.form,\''.
                         $trolecode."','".$buttonname.'\');" /></td>';
         } else {
             $roletext.=
                 '<td'.$rowspan.' class="'.$tbg.'">'.
                 '<input name="'.$buttonname.'" type="button" value="'.
-                &mt('Re-Initialize').'" onClick="javascript:enterrole(this.form,\''.
+                &mt('Re-Select').'" onclick="javascript:enterrole(this.form,\''.
                         $trolecode."','".$buttonname.'\');" /></td>';
         }
     }
@@ -1428,6 +1448,7 @@ sub coursepick_jscript {
              );
     my $verify_script = <<"END";
 <script type="text/javascript">
+// <![CDATA[
 function verifyCoursePick(caller) {
     var numbutton = getIndex(caller)
     var pickedCourse = document.rolechoice.elements[numbutton+4].value
@@ -1456,6 +1477,7 @@ function getIndex(caller) {
     }
     return -1;
 }
+// ]]>
 </script>
 END
     return $verify_script;