--- loncom/interface/lonviewclasslist.pm	2007/09/07 00:09:07	1.9
+++ loncom/interface/lonviewclasslist.pm	2010/03/25 17:38:43	1.13
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to display the classlist 
 #
-# $Id: lonviewclasslist.pm,v 1.9 2007/09/07 00:09:07 albertel Exp $
+# $Id: lonviewclasslist.pm,v 1.13 2010/03/25 17:38:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,14 +60,8 @@ sub handler {
         $r->send_http_header;
         return OK;
     }
-#    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-#                                            ['action','state']);
-    &Apache::lonhtmlcommon::clear_breadcrumbs();
-    &Apache::lonhtmlcommon::add_breadcrumb
-        ({href=>"/adm/viewclasslist",
-          text=>"View Classlist",
-          faq=>9,bug=>'Instructor Interface',});
-    #  Needs to be in a course
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                            ['register']);
     if (! ($env{'request.course.fn'})) {
         $env{'user.error.msg'}=
             "/adm/viewclasslist:not in course role";
@@ -76,12 +70,18 @@ sub handler {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     #
-    my $start_page = &Apache::loncommon::start_page('Classlist');
-    my $breadcrumbs= &Apache::lonhtmlcommon::breadcrumbs(undef,
-							 'Enrollment Manager');
+    my $start_page;
+    if ($env{'form.register'}) {
+        $start_page = &Apache::loncommon::start_page('Classlist',undef,
+                             {'force_register' => $env{'form.register'}});
+    } else {
+        my $brcrum = [{'href' => 'adm/viewclasslist',
+                       'text' => 'View Classlist'},];
+        $start_page = &Apache::loncommon::start_page('Classlist',undef,
+                                                     {'bread_crumbs' => $brcrum});
+    }
     $r->print(<<ENDHEADER);
 $start_page
-$breadcrumbs
 ENDHEADER
 
     # Get classlist view settings
@@ -91,9 +91,9 @@ ENDHEADER
     if (keys(%viewsettings) > 0) {
         $r->print(&html_classlist($r,\%viewsettings));
     } else {
-        $r->print('<h3>'.
+        $r->print('<div class="LC_info">'.
                   &mt("Display of a student-viewable course roster is not currently enabled.").
-                  '</h3>');
+                  '</div>');
     }
     #
     # Finish up
@@ -262,7 +262,7 @@ sub html_classlist {
             '<td>'.('&nbsp;'x2).
             &Apache::loncommon::messagewrapper
             ('<img src="/adm/lonIcons/mailto.gif" border="0" />&nbsp;'.
-             $username.'@'.$domain,$username,$domain).'</td>';
+             $username.':'.$domain,$username,$domain).'</td>';
         if (! $viewsettings->{'limit_to_section'}) {
             $Str .= '<td>'.$section.'</td>';
         }
@@ -337,7 +337,7 @@ sub process_student_prefs {
         my $putresult = &Apache::lonnet::put('environment',
                                              \%changeHash,$udom,$uname);
         if ($putresult eq 'ok') {
-            &Apache::lonnet::appenv(%changeHash);
+            &Apache::lonnet::appenv(\%changeHash);
             my $result = &Apache::lonnet::put('publicroster',{$student => $showinroster,},$cdom,$cnum);
             if ($result eq 'ok') {
                 $output .= &mt('Display of your name in the student-viewable roster set to <b>[_1]</b>.',$visibility);