--- loncom/interface/loncommon.pm	2006/06/08 14:29:21	1.380
+++ loncom/interface/loncommon.pm	2006/06/30 04:08:07	1.411
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.380 2006/06/08 14:29:21 www Exp $
+# $Id: loncommon.pm,v 1.411 2006/06/30 04:08:07 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -707,7 +707,7 @@ sub helpLatexCheatsheet {
 }
 
 sub help_open_menu {
-    my ($color,$topic,$component_help,$function,$faq,$bug,$stayOnPage,$width,$height,$text) = @_;
+    my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text) = @_;
     $text = "" if (not defined $text);
     $stayOnPage = 0 if (not defined $stayOnPage);
     if ($env{'browser.interface'} eq 'textual' ||
@@ -721,8 +721,7 @@ sub help_open_menu {
     my $origurl = $ENV{'REQUEST_URI'};
     $origurl=~s|^/~|/priv/|;
     my $timestamp = time;
-    foreach my $datum (\$color,\$function,\$topic,\$component_help,\$faq,
-		       \$bug,\$origurl) {
+    foreach my $datum (\$topic,\$component_help,\$faq,\$bug,\$origurl) {
         $$datum = &escape($$datum);
     }
     if (!$stayOnPage) {
@@ -730,8 +729,8 @@ sub help_open_menu {
     } else {
         $link = "javascript:helpMenu('display')";
     }
-    my $banner_link = "/adm/helpmenu?page=banner&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp&stayonpage=$stayOnPage";
-    my $details_link = "/adm/helpmenu?page=body&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp";
+    my $banner_link = "/adm/helpmenu?page=banner&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp&stayonpage=$stayOnPage";
+    my $details_link = "/adm/helpmenu?page=body&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp";
     my $template;
     if ($text ne "") {
 	$template .= 
@@ -2725,6 +2724,7 @@ Returns: value of designparamter $which
 
 =cut
 
+
 ##############################################
 sub designparm {
     my ($which,$domain)=@_;
@@ -2739,11 +2739,11 @@ sub designparm {
 	    return '#CCCCCC';
 	}
     }
-    if ($env{'environment.color.'.$which}) {
+    if (exists($env{'environment.color.'.$which})) {
 	return $env{'environment.color.'.$which};
     }
     $domain=&determinedomain($domain);
-    if ($designhash{$domain.'.'.$which}) {
+    if (exists($designhash{$domain.'.'.$which})) {
 	return $designhash{$domain.'.'.$which};
     } else {
         return $designhash{'default.'.$which};
@@ -2796,7 +2796,6 @@ Inputs:
 =item * $no_inline_link, if true and in remote mode, don't show the 
          'Switch To Inline Menu' link
 
-
 =back
 
 Returns: A uniform header for LON-CAPA web pages.  
@@ -2867,15 +2866,12 @@ sub bodytag {
 	return $bodytag;
     }
 
-
+    my $name = &plainname($env{'user.name'},$env{'user.domain'});
     
     my $roleinfo=(<<ENDROLE);
 <td class="LC_title_bar_who">
 <div class="LC_title_bar_name">
-    $env{'environment.firstname'}
-    $env{'environment.middlename'}
-    $env{'environment.lastname'}
-    $env{'environment.generation'}
+    $name
     &nbsp;
 </div>
 <div class="LC_title_bar_role">
@@ -2926,7 +2922,7 @@ ENDROLE
 		$lastitem = $thisdisfn;
 	    }
 	    $titleinfo = 
-		&Apache::loncommon::help_open_menu('','','','',3,'Authoring').
+		&Apache::loncommon::help_open_menu('','',3,'Authoring').
 		'<b>Construction Space</b>:&nbsp;'. 
 		'<form name="dirs" method="post" action="'.$formaction
 		.'" target="_top"><tt><b>'
@@ -3098,13 +3094,16 @@ sub standard_css {
     my $tabbg  = &designparm($function.'.tabbg', $domain);
     my $font   = &designparm($function.'.font',  $domain);
     my $sidebg = &designparm($function.'.sidebg',$domain);
-    my $pgbg   = $bgcolor ||
+    my $pgbg_or_bgcolor =
+	         $bgcolor ||
 	         &designparm($function.'.pgbg',  $domain);
+    my $pgbg   = &designparm($function.'.pgbg',  $domain);
     my $alink  = &designparm($function.'.alink', $domain);
     my $vlink  = &designparm($function.'.vlink', $domain);
     my $link   = &designparm($function.'.link',  $domain);
 
     my $sans                 = 'Arial,Helvetica,sans-serif';
+    my $mono                 = 'monospace';
     my $data_table_head      = $tabbg;
     my $data_table_light     = '#EEEEEE';
     my $data_table_dark      = '#DDD';
@@ -3117,7 +3116,10 @@ sub standard_css {
     my $mail_replied_hover   = '#888855';
     my $mail_other           = '#99BBBB';
     my $mail_other_hover     = '#669999';
+    my $table_header         = '#DDDDDD';
 
+    my $border = ($env{'browser.type'} eq 'explorer') ? '0px 2px 0px 2px'
+	                                              : '0px 3px 0px 4px';
     return <<END;
 h1, h2, h3, th { font-family: $sans }
 a:focus { color: red; background: yellow } 
@@ -3125,52 +3127,49 @@ table.thinborder { border-collapse: coll
 table.thinborder tr th, table.thinborder tr td { border-style: solid; border-width: 1px}
 form, .inline { display: inline; }
 .center { text-align: center; }
-.filename {font-family: monospace;}
+.LC_filename {font-family: $mono;}
 .LC_error {
   color: red;
   font-size: larger;
 }
+.LC_warning {
+  color: red;
+}
 .LC_success {
   color: green;
 }
 
-table#LC_top_nav, table#LC_menubuttons, table#LC_nav_location {
-  width: 100%;
-  background: $pgbg;
-  border: 0px;
-  border-spacing: 2px 2px;
-  padding: 0px;
-  margin: 0px;
-  border-collapse: separate;
-}
-table#LC_title_bar {
+table#LC_top_nav, table#LC_menubuttons {
   width: 100%;
-  border: 0;
-  border-spacing: 0px 0px;
-  padding: 0px 2px 0px 2px;
   background: $pgbg;
-  font-family: $sans;
+  border: 2px;
   border-collapse: separate;
+  padding: 0px;
 }
-table#LC_breadcrumbs {
+
+table#LC_title_bar, table.LC_breadcrumbs, table#LC_nav_location,
+table#LC_title_bar.LC_with_remote {
   width: 100%;
-  border: 0;
-  border-spacing: 0px;
-  padding: 0px 2px 0px 2px;
+  border-color: $pgbg;
+  border-style: solid;
+  border-width: $border;
+
   background: $pgbg;
   font-family: $sans;
-  border-collapse: separate;
+  border-collapse: collapse;
+  padding: 0px;
 }
-table#LC_title_bar.LC_with_remote {
+
+table.LC_docs_path {
   width: 100%;
   border: 0;
-  border-spacing: 0;
   background: $pgbg;
   font-family: $sans;
   border-collapse: collapse;
+  padding: 0px;
 }
+
 table#LC_title_bar td {
-  padding: 3px;
   background: $tabbg;
 }
 table#LC_title_bar td.LC_title_bar_who {
@@ -3205,6 +3204,8 @@ table#LC_menubuttons img, table#LC_menub
 }
 table#LC_top_nav td {
   background: $tabbg;
+  border: 0px;
+  font-size: small;
 }
 table#LC_top_nav td a, div#LC_top_nav a {
   color: $font;
@@ -3213,20 +3214,31 @@ table#LC_top_nav td a, div#LC_top_nav a
 table#LC_top_nav td.LC_top_nav_logo {
   background: $tabbg;
   text-align: right;
+  white-space: nowrap;
+  font-weight: bold;
+}
+table#LC_top_nav td.LC_top_nav_logo img {
+  margin-left: 0.2em;
+  vertical-align: bottom;
 }
-table#LC_breadcrumbs td {
+table.LC_breadcrumbs td, table.LC_docs_path td  {
   background: $tabbg;
   color: $font;
   font-family: $sans;
   font-size: smaller;
 }
-table#LC_breadcrumbs td.LC_breadcrumb_component {
+table.LC_breadcrumbs td.LC_breadcrumbs_component,
+table.LC_docs_path td.LC_docs_path_component {
   background: $tabbg;
   color: $font;
   font-family: $sans;
   font-size: larger;
   text-align: right;
 }
+td.LC_table_cell_checkbox {
+  text-align: center;
+}
+
 .LC_menubuttons_inline_text {
   color: $font;
   font-family: $sans;
@@ -3251,7 +3263,7 @@ td.LC_menubuttons_img {
 
 table.LC_data_table, table.LC_mail_list {
   border: 1px solid #000000;
-  border-collapse: seperate;
+  border-collapse: separate;
 }
 table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th {
   font-weight: bold;
@@ -3309,6 +3321,146 @@ table.LC_mail_list tr.LC_mail_other {
 table.LC_mail_list tr.LC_mail_other:hover {
   background-color: $mail_other_hover;
 }
+
+table#LC_portfolio_actions {
+  width: auto;
+  background: $pgbg;
+  border: 0px;
+  border-spacing: 2px 2px;
+  padding: 0px;
+  margin: 0px;
+  border-collapse: separate;
+}
+table#LC_portfolio_actions td.LC_label {
+  background: $tabbg;
+  text-align: right;
+}
+table#LC_portfolio_actions td.LC_value {
+  background: $tabbg;
+}
+
+table#LC_cstr_controls {
+  width: 100%;
+  border-collapse: collapse;
+}
+table#LC_cstr_controls tr td {
+  border: 4px solid $pgbg;
+  padding: 4px;
+  text-align: center;
+  background: $tabbg;
+}
+table#LC_cstr_controls tr th {
+  border: 4px solid $pgbg;
+  background: $table_header;
+  text-align: center;
+  font-family: $sans;
+  font-size: smaller;
+}
+
+table#LC_browser {
+ 
+}
+table#LC_browser tr th {
+  background: $table_header;
+}
+table#LC_browser tr td {
+  padding: 2px;
+}
+table#LC_browser tr.LC_browser_file,
+table#LC_browser tr.LC_browser_file_published {
+  background: #CCFF88;
+}
+table#LC_browser tr.LC_browser_file_locked,
+table#LC_browser tr.LC_browser_file_unpublished {
+  background: #FFAA99;
+}
+table#LC_browser tr.LC_browser_file_obsolete {
+  background: #AAAAAA;
+}
+table#LC_browser tr.LC_browser_file_modified {
+  background: #FFFF77;
+}
+table#LC_browser tr.LC_browser_folder {
+  background: #CCCCFF;
+}
+span.LC_current_location {
+  font-size: x-large;
+  background: $pgbg;
+}
+
+span.LC_parm_menu_item {
+  font-size: larger;
+  font-family: $sans;
+}
+span.LC_parm_scope_all {
+  color: red;
+}
+span.LC_parm_scope_folder {
+  color: green;
+}
+span.LC_parm_scope_resource {
+  color: orange;
+}
+span.LC_parm_part {
+  color: blue;
+}
+span.LC_parm_folder, span.LC_parm_symb {
+  font-size: x-small;
+  font-family: $mono;
+  color: #AAAAAA;
+}
+
+td.LC_parm_overview_level_menu, td.LC_parm_overview_map_menu,
+td.LC_parm_overview_parm_selectors, td.LC_parm_overview_parm_restrictions {
+  border: 1px solid black;
+  border-collapse: collapse;
+}
+table.LC_parm_overview_restrictions td {
+  border-width: 1px 4px 1px 4px;
+  border-style: solid;
+  border-color: $pgbg;
+  text-align: center;
+}
+table.LC_parm_overview_restrictions th {
+  background: $tabbg;
+  border-width: 1px 4px 1px 4px;
+  border-style: solid;
+  border-color: $pgbg;
+}
+table#LC_helpmenu {
+  border: 0px;
+  height: 55px;
+  border-spacing: 0px;
+}
+
+table#LC_helpmenu fieldset legend {
+  font-size: larger;
+  font-weight: bold;
+}
+table#LC_helpmenu_links {
+  width: 100%;
+  border: 1px solid black;
+  background: $pgbg;
+  padding: 0px;
+  border-spacing: 1px;
+}
+table#LC_helpmenu_links tr td {
+  padding: 1px;
+  background: $tabbg;
+  text-align: center;
+  font-weight: bold;
+}
+
+table#LC_helpmenu_links a:link, table#LC_helpmenu_links a:visited,
+table#LC_helpmenu_links a:active {
+  text-decoration: none;
+  color: $font;
+}
+table#LC_helpmenu_links a:hover {
+  text-decoration: underline;
+  color: $vlink;
+}
+
 END
 }
 
@@ -3345,8 +3497,8 @@ sub headtag {
     my $function = $args->{'function'} || &get_users_function();
     my $domain   = $args->{'domain'}   || &determinedomain();
     my $bgcolor  = $args->{'bgcolor'}  || &designparm($function.'.pgbg',$domain);
-    my $url = join(':',$env{'user.name'},$env{'user.domain'},
-		   $env{'environment.color.timestamp'},
+    my $url = join(':',$env{'user.name'},$env{'user.domain'},time(),
+		   #$env{'environment.color.timestamp'},
 		   $function,$domain,$bgcolor);
 
     $url = '/adm/css/'.&escape($url).'.css';
@@ -3466,6 +3618,7 @@ Returns a uniform complete <head>..</hea
 
 Inputs: $title - optional title for the page
         $head_extra - optional extra HTML to put inside the <head>
+
 =back
 
 =cut
@@ -3579,7 +3732,6 @@ Inputs:         $args - additional optio
                                  a html attribute
                  frameset     -> if true will start with a <frameset>
                                  rather than <body>
-=back
 
 =cut
 
@@ -3674,29 +3826,29 @@ sub simple_error_page {
     my $row_count;
     sub start_data_table {
 	undef($row_count);
-	return '<table class="LC_data_table">';
+	return '<table class="LC_data_table">'."\n";
     }
 
     sub end_data_table {
 	undef($row_count);
-	return '</table>';
+	return '</table>'."\n";;
     }
 
     sub start_data_table_row {
 	$row_count++;
-	return  '<tr '.(($row_count % 2)?'':'class="LC_even_row"').'>';
+	return  '<tr '.(($row_count % 2)?'':'class="LC_even_row"').'>'."\n";;
     }
 
     sub end_data_table_row {
-	return '</tr>';
+	return '</tr>'."\n";;
     }
 
     sub start_data_table_header_row {
-	return  '<tr class="LC_header_row">';
+	return  '<tr class="LC_header_row">'."\n";;
     }
 
     sub end_data_table_header_row {
-	return '</tr>';
+	return '</tr>'."\n";;
     }
 }
 
@@ -3704,9 +3856,7 @@ sub simple_error_page {
 
 =pod
 
-=over 4
-
-=item get_users_function
+=item * &get_users_function()
 
 Used by &bodytag to determine the current users primary role.
 Returns either 'student','coordinator','admin', or 'author'.
@@ -3733,7 +3883,7 @@ sub get_users_function {
 
 =pod
 
-=item check_user_status
+=item * &check_user_status
 
 Determines current status of supplied role for a
 specific user. Roles can be active, previous or future.
@@ -3787,7 +3937,7 @@ sub check_user_status {
 
 =pod
 
-=item get_sections
+=item * &get_sections()
 
 Determines all the sections for a course including
 sections with students and sections containing other roles.
@@ -3848,9 +3998,9 @@ sub get_sections {
 ###############################################
 
 =pod
-                                                                                
-=item get_course_users
-                                                                                
+
+=item * &get_course_users()
+
 Retrieves usernames:domains for users in the specified course
 with specific role(s), and access status. 
 
@@ -3873,9 +4023,9 @@ Entries for end, start, section and stat
 of the possibility of multiple values for non-student roles.
 
 =cut
-                                                                                
+
 ###############################################
-                                                                                
+
 sub get_course_users {
     my ($cdom,$cnum,$types,$roles,$sections,$users,$userdata) = @_;
     my %idx = ();
@@ -3978,6 +4128,43 @@ sub get_user_info {
     return;
 }
 
+sub get_secgrprole_info {
+    my ($cdom,$cnum,$needroles,$type)  = @_;
+    my %sections_count = &get_sections($cdom,$cnum);
+    my @sections =  (sort {$a <=> $b} keys(%sections_count));
+    my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
+    my @groups = sort(keys(%curr_groups));
+    my $allroles = [];
+    my $rolehash;
+    my $accesshash = {
+                     active => 'Currently has access',
+                     future => 'Will have future access',
+                     previous => 'Previously had access',
+                  };
+    if ($needroles) {
+        $rolehash = {'all' => 'all'};
+        my %user_roles = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
+	if (&Apache::lonnet::error(%user_roles)) {
+	    undef(%user_roles);
+	}
+        foreach my $item (keys(%user_roles)) {
+            my ($role)=split(/\:/,$item,2);
+            if ($role eq 'cr') { next; }
+            if ($role =~ /^cr/) {
+                $$rolehash{$role} = (split('/',$role))[3];
+            } else {
+                $$rolehash{$role} = &Apache::lonnet::plaintext($role,$type);
+            }
+        }
+        foreach my $key (sort(keys(%{$rolehash}))) {
+            push(@{$allroles},$key);
+        }
+        push (@{$allroles},'st');
+        $$rolehash{'st'} = &Apache::lonnet::plaintext('st',$type);
+    }
+    return (\@sections,\@groups,$allroles,$rolehash,$accesshash);
+}
+
 =pod
 
 =item * get_unprocessed_cgi($query,$possible_names)
@@ -4998,13 +5185,22 @@ sub course_type {
     if (!defined($cid)) {
         $cid = $env{'request.course.id'};
     }
-    if (defined($env{'course.'.$cid.'type'})) {
-        return $env{'course.'.$cid.'type'};
+    if (defined($env{'course.'.$cid.'.type'})) {
+        return $env{'course.'.$cid.'.type'};
     } else {
         return 'Course';
     }
 }
 
+sub group_term {
+    my $crstype = &course_type();
+    my %names = (
+                  'Course' => 'group',
+                  'Group' => 'team',
+                );
+    return $names{$crstype};
+}
+
 sub icon {
     my ($file)=@_;
     my $curfext = (split(/\./,$file))[-1];