--- loncom/interface/loncommon.pm	2009/01/12 04:39:30	1.692.2.12
+++ loncom/interface/loncommon.pm	2008/11/28 14:36:50	1.695
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.692.2.12 2009/01/12 04:39:30 raeburn Exp $
+# $Id: loncommon.pm,v 1.695 2008/11/28 14:36:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -943,30 +943,24 @@ ENDTEMPLATE
 # This is a quicky function for Latex cheatsheet editing, since it 
 # appears in at least four places
 sub helpLatexCheatsheet {
-    my ($topic,$text,$not_author) = @_;
-    my $out;
+    my $other = shift;
     my $addOther = '';
-    if ($topic) {
-	$addOther = Apache::loncommon::help_open_topic($topic,$text,
-						       undef, undef, 600).
-							'</td><td>';
-    }
-    $out = '<table><tr><td>'.
-	   $addOther.
-	   &Apache::loncommon::help_open_topic("Greek_Symbols",&mt('Greek Symbols'),
-					       undef,undef,600).
-	   '</td><td>'.
-	   &Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'),
-					       undef,undef,600).
-	   '</td>';
-    unless ($not_author) {
-        $out .= '<td>'.
-	        &Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'),
-	                                            undef,undef,600).
-	        '</td>';
-    }
-    $out .= '</tr></table>';
-    return $out;
+    if ($other) {
+	$addOther = Apache::loncommon::help_open_topic($other, shift,
+						       undef, undef, 600) .
+							   '</td><td>';
+    }
+    return '<table><tr><td>'.
+	$addOther .
+	&Apache::loncommon::help_open_topic("Greek_Symbols",&mt('Greek Symbols'),
+					    undef,undef,600)
+	.'</td><td>'.
+	&Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'),
+					    undef,undef,600)
+	.'</td><td>'.
+	&Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'),
+	                                    undef,undef,600)
+	.'</td></tr></table>';
 }
 
 sub general_help {
@@ -2723,42 +2717,6 @@ sub flush_email_cache {
     &Apache::lonnet::devalidate_cache_new('emailscache',$id);
 }
 
-# -------------------------------------------------------------------- getlangs
-
-=pod
-
-=item * &getlangs($uname,$udom)
-
-Gets a user's language preference and returns it as a hash with key:
-language.
-
-=cut
-
-sub getlangs {
-    my ($uname,$udom) = @_;
-    if (!$udom)  { $udom =$env{'user.domain'}; }
-    if (!$uname) { $uname=$env{'user.name'};   }
-    my $id=$uname.':'.$udom;
-    my ($langs,$cached)=&Apache::lonnet::is_cached_new('userlangs',$id);
-    if ($cached) {
-        return %{$langs};
-    } else {
-        my %loadlangs=&Apache::lonnet::get('environment',['languages'],
-                                           $udom,$uname);
-        &Apache::lonnet::do_cache_new('userlangs',$id,\%loadlangs);
-        return %loadlangs;
-    }
-}
-
-sub flush_langs_cache {
-    my ($uname,$udom)=@_;
-    if (!$udom)  { $udom =$env{'user.domain'}; }
-    if (!$uname) { $uname=$env{'user.name'};   }
-    return if ($udom eq 'public' && $uname eq 'public');
-    my $id=$uname.':'.$udom;
-    &Apache::lonnet::devalidate_cache_new('userlangs',$id);
-}
-
 # ------------------------------------------------------------------ Screenname
 
 =pod
@@ -3213,7 +3171,7 @@ sub relative_to_absolute {
     }
     $thisdir=~s-/[^/]*$--;
     foreach my $link (@rlinks) {
-	unless (($link=~/^https?\:\/\//i) ||
+	unless (($link=~/^http:\/\//i) ||
 		($link=~/^\//) ||
 		($link=~/^javascript:/i) ||
 		($link=~/^mailto:/i) ||
@@ -3922,14 +3880,7 @@ sub get_domainconf {
         if (ref($domconfig{'login'}) eq 'HASH') {
             if (keys(%{$domconfig{'login'}})) {
                 foreach my $key (keys(%{$domconfig{'login'}})) {
-                    if (ref($domconfig{'login'}{$key}) eq 'HASH') {
-                        foreach my $img (keys(%{$domconfig{'login'}{$key}})) {
-                            $designhash{$udom.'.login.'.$key.'_'.$img} =
-                                $domconfig{'login'}{$key}{$img};
-                        }
-                    } else {
-                        $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
-                    }
+                    $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
                 }
             } else {
                 $legacy{'login'} = 1;
@@ -4640,7 +4591,7 @@ table#LC_mainmenu td.LC_mainmenu_column
 .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;
@@ -4711,10 +4662,6 @@ td.LC_menubuttons_img {
   font-size: smaller;
 }
 
-.LC_mail_functions {
-    font-weight: bold;
-}
-
 table.LC_aboutme_port {
   border: 0px;
   border-collapse: collapse;
@@ -4747,11 +4694,6 @@ table.LC_prior_tries tr th {
   background-color: $data_table_head;
   font-size: smaller;
 }
-table.LC_data_table tr.LC_info_row > td {
-  background-color: #CCC;
-  font-weight: bold;
-  text-align: left;
-}
 table.LC_data_table tr.LC_odd_row > td, 
 table.LC_aboutme_port tr td {
   background-color: $data_table_light;
@@ -5528,11 +5470,331 @@ 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.
+# --------------------------*/
+
+
+body {
+	font-family: Tahoma, Arial,Helvetica,sans-serif;
+	font-size: 0.85em;
+	line-height: 130%;
+	color: RGB(45, 45, 45);
+}
+
+a:link,a:visited {
+	/*color: RGB(0, 118, 127);*/
+	/*text-decoration: underline;*/
+}
+
+a:hover{
+	text-decoration:none;
+}
+/*a:hover,
+UL.smallMenu A:hover,
+UL.MenuBreadcrumbs A:hover,
+UL#TabMainMenuContent A:hover{
+	color: rgb(200, 10, 50);
+}*/
+
+h1 { 
+	padding:5px 10px 5px 20px;
+	line-height:130%;
+}
+h2,h4,h6 {
+	/*color: RGB(0, 118, 127);*/
+}
+h2,h3,h4,h5,h6
+{
+margin:5px 0px 5px 0px;
+line-height:130%;
+}
+
+.right {
+	text-align: right;
+}
+
+.center {
+	text-align: center;
+}
+
+.left {
+	text-align: left;
+}
+
+
+.HeadRight {
+	text-align: right;
+	float: right;
+	margin: 0px;
+	padding: 0px;
+	 right:0;
+        position:absolute;
+}
+
+img {
+/*	border: 0px; */
+}
+
+.personalBgColor {
+	background: RGB(237, 239, 0) url(images/headHighlight.png) repeat-y left top;
+}
+
+p {
+	padding: 10px;
+}
+DL,UL,Div,Fieldset {
+	/*margin: 10px;*/
+	overflow:hidden;
+}
+OL.smallMenu {
+	margin: 0px 0px 0px 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;
+}
 
-div.LC_createcourse {
-    margin: 10px 10px 10px 10px;
+OL#TabMainMenuContent LI A {
+	color: RGB(47, 47, 47);
+	text-decoration: none;
 }
 
+OL#TabMainMenuContent DIV.columnSection {
+	margin-bottom: 0px;
+}
+
+OL#MenuBreadcrumbs {
+	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 {
+	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%;
+}
+
+h4.hcell {
+	padding: 3px 10px 3px 10px;
+	margin: 0px;
+	background: RGB(0, 118, 127);
+	color: white;
+	border: outset 1px;
+}
+
+DIV.DivContentBoxSpecial
+{
+	border: solid 1px RGB(100, 100, 100);
+}
+
+FIELDSET
+{
+	/*width:78%;*/
+}
+DIV.DivContentBox,
+DIV.DivContentBoxSpecial {
+	width: 80%;
+	margin:10px;
+}
+
+FIELDSET legend,DL DT {
+	font-weight: bold;
+	font-size: 110%;
+	/*padding-left: 0px;*/
+/*	margin-left: 0px;*/
+}
+
+DIV.DivImportant {
+	background: url(images/important.png) no-repeat center top;
+	padding: 100px 10px 10px 10px;
+	width: 200px;
+	border: double 4px RGB(200, 200, 200);
+}
+
+
+
+DL.ListStyleClean DT {
+	padding-right: 5px;
+	display: table-header-group;
+}
+
+DL.ListStyleClean DD {
+	display: table-row;
+}
+
+.ListStyleClean,
+.ListStyleSimple,
+.ListStyleNormal,
+.ListStyleNormal_Border,
+.ListStyleSpecial
+	{
+	/*display:block;	*/
+	width: 400px;
+	list-style-position: inside;
+	list-style-type: none;
+	overflow: hidden;
+	padding: 0px;
+}
+
+.ListStyleClean li,
+.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 RGB(150, 150, 150);
+}
+
+.ListStyleSpecial LI,
+.ListStyleSpecial DD {
+	list-style-type: none;
+	background-color: RGB(220, 220, 220);
+	margin-bottom: 4px;
+}
+
+table.SimpleTable *{
+	padding:10px;
+	}
+
+table.SimpleTable td {
+	vertical-align:top;
+	border:solid 1px RGB(210,210,210);
+}
+table.SimpleTable thead{
+	 background:rgb(210,210,210);
+}
+
+DIV.columnSection {
+	display: block;
+	clear: both;
+	overflow: hidden;
+	margin:0px;
+}
+
+DIV.columnSection>* {
+	float: left;
+	margin: 10px 20px 10px 0px;
+	overflow:hidden;	
+}
+
+DIV.columnSection>FIELDSET,
+DIV.columnSection>DIV.DivContentBox,
+DIV.columnSection>DIV.DivContentBoxSpecial
+	{
+	width: 480px;
+	
+}
+
+.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
 }
 
@@ -6563,35 +6825,19 @@ sub default_quota {
         if ($inststatus ne '') {
             my @statuses = split(/:/,$inststatus);
             foreach my $item (@statuses) {
-                if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {
-                    if ($quotahash{'quotas'}{'defaultquota'}{$item} ne '') {
-                        if ($defquota eq '') {
-                            $defquota = $quotahash{'quotas'}{'defaultquota'}{$item};
-                            $settingstatus = $item;
-                        } elsif ($quotahash{'quotas'}{'defaultquota'}{$item} > $defquota) {
-                            $defquota = $quotahash{'quotas'}{'defaultquota'}{$item};
-                            $settingstatus = $item;
-                        }
-                    }
-                } else {
-                    if ($quotahash{'quotas'}{$item} ne '') {
-                        if ($defquota eq '') {
-                            $defquota = $quotahash{'quotas'}{$item};
-                            $settingstatus = $item;
-                        } elsif ($quotahash{'quotas'}{$item} > $defquota) {
-                            $defquota = $quotahash{'quotas'}{$item};
-                            $settingstatus = $item;
-                        }
+                if ($quotahash{'quotas'}{$item} ne '') {
+                    if ($defquota eq '') {
+                        $defquota = $quotahash{'quotas'}{$item};
+                        $settingstatus = $item;
+                    } elsif ($quotahash{'quotas'}{$item} > $defquota) {
+                        $defquota = $quotahash{'quotas'}{$item};
+                        $settingstatus = $item;
                     }
                 }
             }
         }
         if ($defquota eq '') {
-            if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {
-                $defquota = $quotahash{'quotas'}{'defaultquota'}{'default'};
-            } else {
-                $defquota = $quotahash{'quotas'}{'default'};
-            }
+            $defquota = $quotahash{'quotas'}{'default'};
             $settingstatus = 'default';
         }
     } else {
@@ -9072,9 +9318,7 @@ sub construct_course {
                    'policy.email',
                    'comment.email',
                    'pch.users.denied',
-                   'plc.users.denied',
-                   'hidefromcat',
-                   'categories'],
+                   'plc.users.denied'],
                    $$crsudom,$$crsunum);
     }
 
@@ -9532,11 +9776,6 @@ sub init_user_environment {
 	    }
 	}
 
-        foreach my $tool ('aboutme','blog','portfolio') {
-            $userenv{'availabletools.'.$tool} = 
-                &Apache::lonnet::usertools_access($username,$domain,$tool,'reload');
-        }
-
 	$env{'user.environment'} = "$lonids/$cookie.id";
 	
 	if (tie(my %disk_env,'GDBM_File',"$lonids/$cookie.id",
@@ -9575,7 +9814,7 @@ sub _add_to_env {
 # --- Get the symbolic name of a problem and the url
 sub get_symb {
     my ($request,$silent) = @_;
-    (my $url=$env{'form.url'}) =~ s-^https?\://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+    (my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
     my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
     if ($symb eq '') {
         if (!$silent) {
@@ -9602,13 +9841,11 @@ sub get_annotation {
 }
 
 sub clean_symb {
-    my ($symb,$delete_enc) = @_;
+    my ($symb) = @_;
 
     &Apache::lonenc::check_decrypt(\$symb);
     my $enc = $env{'request.enc'};
-    if ($delete_enc) {
-        delete($env{'request.enc'});
-    }
+    delete($env{'request.enc'});
 
     return ($symb,$enc);
 }