--- loncom/interface/loncommon.pm	2008/09/29 22:53:20	1.688
+++ loncom/interface/loncommon.pm	2008/12/01 14:38:49	1.698
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.688 2008/09/29 22:53:20 raeburn Exp $
+# $Id: loncommon.pm,v 1.698 2008/12/01 14:38:49 harmsja Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -677,7 +677,7 @@ sub select_datelocale {
             if ($id ne '') {
                 my $en_terr = $locale->{'en_territory'};
                 my $native_terr = $locale->{'native_territory'};
-                my @languages = &preferred_languages();
+                my @languages = &Apache::lonlocal::preferred_languages();
                 if (grep(/^en$/,@languages) || !@languages) {
                     if ($en_terr ne '') {
                         $locale_names{$id} = '('.$en_terr.')';
@@ -926,7 +926,7 @@ sub help_open_topic {
     if ($text ne "") {
 	$template .= 
             "<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>".
-            "<td bgcolor='#5555FF'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+            "<td bgcolor='#5555FF'><span class=\"LC_nobreak\"><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
     }
 
     # Add the graphic
@@ -935,7 +935,7 @@ sub help_open_topic {
     $template .= <<"ENDTEMPLATE";
  <a target="_top" href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a>
 ENDTEMPLATE
-    if ($text ne '') { $template.='</td></tr></table>' };
+    if ($text ne '') { $template.='</span></td></tr></table>' };
     return $template;
 
 }
@@ -2998,7 +2998,7 @@ sub fileextensions {
 
 sub display_languages {
     my %languages=();
-    foreach my $lang (&preferred_languages()) {
+    foreach my $lang (&Apache::lonlocal::preferred_languages()) {
 	$languages{$lang}=1;
     }
     &get_unprocessed_cgi($ENV{'QUERY_STRING'},['displaylanguage']);
@@ -3010,59 +3010,9 @@ sub display_languages {
     return %languages;
 }
 
-sub preferred_languages {
-    my @languages=();
-    if (($env{'request.role.adv'}) && ($env{'form.languages'})) {
-        @languages=(@languages,split(/\s*(\,|\;|\:)\s*/,$env{'form.languages'}));
-    }
-    if ($env{'course.'.$env{'request.course.id'}.'.languages'}) {
-	@languages=(@languages,split(/\s*(\,|\;|\:)\s*/,
-	         $env{'course.'.$env{'request.course.id'}.'.languages'}));
-    }
-
-    if ($env{'environment.languages'}) {
-	@languages=(@languages,
-		    split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'}));
-    }
-    my $browser=$ENV{'HTTP_ACCEPT_LANGUAGE'};
-    if ($browser) {
-	my @browser = 
-	    map { (split(/\s*;\s*/,$_))[0] } (split(/\s*,\s*/,$browser));
-	push(@languages,@browser);
-    }
-
-    foreach my $domtype ($env{'user.domain'},$env{'request.role.domain'},
-                         $Apache::lonnet::perlvar{'lonDefDomain'}) {
-        if ($domtype ne '') {
-            my %domdefs = &Apache::lonnet::get_domain_defaults($domtype);
-            if ($domdefs{'lang_def'} ne '') {
-                push(@languages,$domdefs{'lang_def'});
-            }
-        }
-    }
-    return &get_genlanguages(@languages);
-}
-
-sub get_genlanguages {
-    my (@languages) = @_;
-# turn "en-ca" into "en-ca,en"
-    my @genlanguages;
-    foreach my $lang (@languages) {
-        unless ($lang=~/\w/) { next; }
-        push(@genlanguages,$lang);
-        if ($lang=~/(\-|\_)/) {
-            push(@genlanguages,(split(/(\-|\_)/,$lang))[0]);
-        }
-    }
-    #uniqueify the languages list
-    my %count;
-    @genlanguages = map { $count{$_}++ == 0 ? $_ : () } @genlanguages;
-    return @genlanguages;
-}
-
 sub languages {
     my ($possible_langs) = @_;
-    my @preferred_langs = &preferred_languages();
+    my @preferred_langs = &Apache::lonlocal::preferred_languages();
     if (!ref($possible_langs)) {
 	if( wantarray ) {
 	    return @preferred_langs;
@@ -4454,6 +4404,7 @@ sub standard_css {
     my $mail_other_hover     = '#669999';
     my $table_header         = '#DDDDDD';
     my $feedback_link_bg     = '#BBBBBB';
+    my $lg_border_color	     = '#D5FF6F';
 
     my $border = ($env{'browser.type'} eq 'explorer' ||
 		  $env{'browser.type'} eq 'safari'     ) ? '0px 2px 0px 2px'
@@ -4461,18 +4412,25 @@ sub standard_css {
 
 
     return <<END;
-h1, h2, h3, th { font-family: $sans }
+body{
+     font-family: $sans;
+     line-height:130%;
+     font-size:0.8em;
+     color:$font;
+  }
+
 a:focus { color: red; background: yellow } 
 table.thinborder,
-
 table.thinborder tr th {
   border-style: solid;
   border-width: 1px;
+  border-color: $lg_border_color;
   background: $tabbg;
 }
 table.thinborder tr td {
   border-style: solid;
-  border-width: 1px
+  border-width: 1px;
+  border-color: $lg_border_color;
 }
 
 form, .inline { display: inline; }
@@ -4635,13 +4593,13 @@ table#LC_mainmenu td.LC_mainmenu_column
 .LC_menubuttons_inline_text {
   color: $font;
   font-family: $sans;
-  font-size: smaller;
+  font-size: 90%;
 }
 
 .LC_menubuttons_link {
   text-decoration: none;
 }
-#2008--9-5: new menu style sheet.Changed category
+/*2008--9-5: new menu style sheet.Changed category*/
 .LC_menubuttons_category {
   color: $font;
   background: $pgbg;
@@ -4651,11 +4609,9 @@ table#LC_mainmenu td.LC_mainmenu_column
 }
 
 td.LC_menubuttons_text {
-  width: 90%;
-  color: $font;
-  font-family: $sans;
+ 	color: $font;
+ 	width: 90%;
 }
-
 td.LC_menubuttons_img {
 }
 
@@ -4869,24 +4825,6 @@ table.LC_mail_list tr.LC_mail_even {
 table.LC_mail_list tr.LC_mail_odd {
 }
 
-
-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;
@@ -4905,33 +4843,25 @@ table#LC_cstr_controls tr th {
   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 {
+table.LC_data_table tr > td.LC_browser_file,
+table.LC_data_table tr > td.LC_browser_file_published {
   background: #CCFF88;
 }
-table#LC_browser tr.LC_browser_file_locked,
-table#LC_browser tr.LC_browser_file_unpublished {
+table.LC_data_table tr > td.LC_browser_file_locked,
+table.LC_data_table tr > td.LC_browser_file_unpublished {
   background: #FFAA99;
 }
-table#LC_browser tr.LC_browser_file_obsolete {
+table.LC_data_table tr > td.LC_browser_file_obsolete {
   background: #AAAAAA;
 }
-table#LC_browser tr.LC_browser_file_modified,
-table#LC_browser tr.LC_browser_file_metamodified {
+table.LC_data_table tr > td.LC_browser_file_modified,
+table.LC_data_table tr > td.LC_browser_file_metamodified {
   background: #FFFF77;
 }
-table#LC_browser tr.LC_browser_folder {
+table.LC_data_table tr.LC_browser_folder > td {
   background: #CCCCFF;
 }
+
 span.LC_current_location {
   font-size: x-large;
   background: $pgbg;
@@ -5441,10 +5371,10 @@ table.LC_scantron_action {
   width: 100%;
 }
 table.LC_scantron_action tr th {
-  font: normal bold $sans;
+  font-weight:bold;
+  font-style:normal;
 }
-
-div.LC_edit_problem_header, 
+.LC_edit_problem_header, 
 div.LC_edit_problem_footer {
   font: normal medium $sans;
   margin: 2px;
@@ -5520,6 +5450,309 @@ fieldset#LC_mainmenu_fieldset {
   margin:0px 10px 10px 0px;
 
 }
+/* ---- Remove when done ----
+# The following styles is part of the redesign of LON-CAPA and are
+# subject to change during this project.
+# Don't rely on their current functionality as they might be 
+# changed or removed.
+# --------------------------*/
+
+a:hover,
+ol.smallMenu a:hover,
+ol#MenuBreadcrumbs a:hover,
+ul#TabMainMenuContent a:hover,
+.FormSectionClearButton input:hover{
+	color:#BF2317;
+        text-decoration:none;
+}
+
+h1 { 
+	padding:5px 10px 5px 20px;
+	line-height:130%;
+}
+
+h2,h3,h4,h5,h6
+{
+margin:5px 0px 5px 0px;
+line-height:130%;
+}
+.hcell{
+        padding:3px 15px 3px 15px;
+        margin:0px;
+        background: $pgbg;
+        border-bottom:solid 1px $lg_border_color;       
+}
+.right {
+	text-align: right;
+}
+.left {
+	text-align: left;
+}
+.noBorder {
+        border:0px;
+}
+/*
+.bgLightGrey { background:URL(images/TabMenuBG.png) repeat-x left top; }
+.bgLightGreyYellow {background-color:#EFECE0;}
+*/
+
+
+/* Main Header with discription of Person, Course, etc. */
+.HeadRight {
+	text-align: right;
+	float: right;
+	margin: 0px;
+	padding: 0px;
+        right:0;
+        position:absolute;
+        overflow:hidden;
+}
+
+p {
+	padding: 10px;
+
+}
+.FormSectionClearButton input {
+        background-color:transparent;
+        border:0px;
+        cursor:pointer;
+        text-decoration:underline;
+}
+
+
+dl,ul,div,fieldset {
+	margin: 10px 10px 10px 0px;
+	overflow:hidden;
+}
+ol.smallMenu {
+	margin: 0px;
+}
+
+ol.smallMenu li {
+	display: inline;
+	padding: 5px 5px 0px 10px;
+	vertical-align: top;
+}
+
+ol.smallMenu li img {
+	vertical-align: bottom;
+}
+
+ol.smallMenu a {
+	font-size: 90%;
+	color: RGB(80, 80, 80);
+	text-decoration: none;
+}
+
+ol#TabMainMenuContent {
+	
+	margin: 0px 0px 10px 0px;
+	padding: 0px;
+}
+
+ol#TabMainMenuContent li {
+	display: inline;
+	vertical-align: bottom;
+	border-bottom: solid 1px RGB(175, 175, 175);
+	border-right: solid 1px RGB(175, 175, 175);
+	padding: 5px 15px 5px 15px;
+	margin-right:4px;
+	line-height: 140%;
+	font-weight: bold;
+	overflow:hidden;
+/*	background: RGB(211, 206, 205) URL(images/TabMenuBG.png) repeat-x left top;*/
+}
+
+ol#TabMainMenuContent li a{
+	color: RGB(47, 47, 47);
+	text-decoration: none;
+}
+
+ol#TabMainMenuContent div.columnSection {
+	margin-bottom: 0px;
+}
+
+ol#MenuBreadcrumbs, ol#PathBreadcrumbs {
+	border-top: solid 1px RGB(255, 255, 255);
+	height: 20px;
+	line-height: 20px;
+	vertical-align: bottom;
+	margin: 0px 0px 30px 0px;
+	padding-left: 10px;
+	list-style-position: inside;
+/*	background: RGB(211, 206, 205) URL(images/TabMenuBG.png) repeat-x left
+		top;*/
+}
+
+ol#MenuBreadcrumbs li, ol#PathBreadcrumbs li {
+/*	background: url(images/pfeil_white.png) no-repeat left center;*/
+	display: inline;
+	padding: 0px 0px 0px 10px;
+	vertical-align: bottom;
+	overflow:hidden;
+}
+
+ol#MenuBreadcrumbs li a {
+	text-decoration: none;
+	font-size:90%;
+}
+ol#PathBreadcrumbs li a{
+	text-decoration:none;
+	font-size:100%;
+	font-weight:bold;
+}
+
+.ContentBoxSpecial
+{
+	border: solid 1px $lg_border_color;
+}
+.ContentBox {
+	padding:10px;
+}
+.PopUp
+{
+	padding:10px;
+	border-left:solid 1px $lg_border_color;
+ 	border-top:solid 1px $lg_border_color;
+	border-bottom:outset 1px $lg_border_color;
+	border-right:outset 1px $lg_border_color;
+	display:none;
+	position:absolute;
+	right:0;
+	background-color:white;
+	z-index:5;
+}
+
+dl.ListStyleClean dt {
+	padding-right: 5px;
+	display: table-header-group;
+}
+
+dl.ListStyleClean dd {
+	display: table-row;
+}
+
+.ListStyleClean,
+.ListStyleSimple,
+.ListStyleNormal,
+.ListStyleNormal_Border,
+.ListStyleSpecial
+	{
+	/*display:block;	*/
+	list-style-position: inside;
+	list-style-type: none;
+	overflow: hidden;
+	padding: 0px;
+}
+
+.ListStyleSimple li,
+.ListStyleSimple dd,
+.ListStyleNormal li,
+.ListStyleNormal dd,
+.ListStyleSpecial li,
+.ListStyleSpecial dd
+	{
+	margin: 0px;
+	padding: 5px 5px 5px 10px;
+	clear: both;
+	/*display:block;*/
+}
+
+.ListStyleClean li,
+.ListStyleClean dd {
+	padding-top: 0px;
+	padding-bottom: 0px;
+}
+
+.ListStyleSimple dd,
+.ListStyleSimple li{
+	border-bottom: solid 1px $lg_border_color;
+}
+
+.ListStyleSpecial li,
+.ListStyleSpecial dd {
+	list-style-type: none;
+	background-color: RGB(220, 220, 220);
+	margin-bottom: 4px;
+}
+
+table.SimpleTable {
+	margin:5px;
+	border:solid 1px $lg_border_color;
+	}
+
+table.SimpleTable tr {
+	padding:0px;
+	border:solid 1px $lg_border_color;
+}
+table.SimpleTable thead{
+	 background:rgb(220,220,220);
+}
+
+div.columnSection {
+	display: block;
+	clear: both;
+	overflow: hidden;
+	margin:0px;
+}
+
+div.columnSection>* {
+	float: left;
+	margin: 10px 20px 10px 0px;
+	overflow:hidden;	
+}
+div.columnSection > .ContentBox,
+div.columnSection > .ContentBoxSpecial
+	{
+	width: 400px;
+	
+}
+
+.LC_loginpage_container {
+	text-align:left;
+	margin : 0 auto;
+	width:65%;
+	padding: 10px;
+	height: auto;
+	background-color:#FFFFFF;
+	border:1px solid #CCCCCC;
+}
+
+
+.LC_loginpage_loginContainer {
+	float:left;
+	width:60%;
+}
+
+.LC_loginpage_loginInfo {
+	margin-top:20px;
+	margin-left:20px;
+	float:left;
+	width:30%;
+	border:1px solid #CCCCCC;
+	padding:10px;
+}
+
+.LC_loginpage_space {
+	clear:both;
+	margin-bottom:20px;
+	border-bottom: 1px solid #CCCCCC;
+}
+
+.LC_loginpage_fieldset{
+	border: 1px solid #CCCCCC;
+	margin: 0 auto;
+}
+
+.LC_loginpage_legend{
+	padding: 2px;
+	margin: 0px;
+	font-size:14px;
+	font-weight:bold;
+}
+
+
+
 END
 }
 
@@ -7707,7 +7940,7 @@ sub csv_print_select_table {
               &end_data_table_header_row()."\n");
     foreach my $array_ref (@$d) {
 	my ($value,$display,$defaultcol)=@{ $array_ref };
-	$r->print(&start_data_table_row().'<tr><td>'.$display.'</td>');
+	$r->print(&start_data_table_row().'<td>'.$display.'</td>');
 
 	$r->print('<td><select name=f'.$i.
 		  ' onchange="javascript:flip(this.form,'.$i.');">');
@@ -9271,10 +9504,10 @@ sub construct_course {
         $outcome .= ($fatal?$errtext:'read ok').' - ';
         my $title; my $url;
         if ($args->{'firstres'} eq 'syl') {
-	    $title='Syllabus';
+	    $title=&mt('Syllabus');
             $url='/public/'.$$crsudom.'/'.$$crsunum.'/syllabus';
         } else {
-            $title='Navigate Contents';
+            $title=&mt('Navigate Contents');
             $url='/adm/navmaps';
         }
 
@@ -9328,28 +9561,14 @@ sub icon {
     return &lonhttpdurl($iconname);
 } 
 
-sub lonhttpd_port {
-    my $lonhttpd_port=$Apache::lonnet::perlvar{'lonhttpdPort'};
-    if (!defined($lonhttpd_port)) { $lonhttpd_port='8080'; }
-    # IE doesn't like a secure page getting images from a non-secure
-    # port (when logging we haven't parsed the browser type so default
-    # back to secure
-    if ((!exists($env{'browser.type'}) || $env{'browser.type'} eq 'explorer')
-	&& $ENV{'SERVER_PORT'} == 443) {
-	return 443;
-    }
-    return $lonhttpd_port;
-
-}
-
 sub lonhttpdurl {
+#
+# Had been used for "small fry" static images on separate port 8080.
+# Modify here if lightweight http functionality desired again.
+# Currently eliminated due to increasing firewall issues.
+#
     my ($url)=@_;
-
-    my $lonhttpd_port = &lonhttpd_port();
-    if ($lonhttpd_port == 443) {
-	return 'https://'.$ENV{'SERVER_NAME'}.$url;
-    }
-    return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url;
+    return $url;
 }
 
 sub connection_aborted {