[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm lonhelpmenu.pm

albertel lon-capa-cvs@mail.lon-capa.org
Mon, 26 Jun 2006 21:54:34 -0000


albertel		Mon Jun 26 17:54:34 2006 EDT

  Modified files:              
    /loncom/interface	lonhelpmenu.pm loncommon.pm 
  Log:
  i- BUG#4701, restoring link styling to helpmenu page
  - moving table nesting stying into CSS
  
  
Index: loncom/interface/lonhelpmenu.pm
diff -u loncom/interface/lonhelpmenu.pm:1.25 loncom/interface/lonhelpmenu.pm:1.26
--- loncom/interface/lonhelpmenu.pm:1.25	Tue May 30 08:46:09 2006
+++ loncom/interface/lonhelpmenu.pm	Mon Jun 26 17:54:34 2006
@@ -162,17 +162,8 @@
    <td width='5'>&nbsp;</td>
    <td>
     <fieldset><legend><img src="$location/lonIcons/minilogo.gif" height='20' width='29' valign='bottom' />&nbsp;&nbsp;<b><font size="+1">LON-CAPA help/support</font></b></legend>
- <table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#000000">
-  <tr>
-   <td>
-    <table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#000000">
-     <tr>
-      <td>
-       <table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#ffffff">
-        <tr>
-         <td>
-	  <table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#ffffff">
-           <tr bgcolor="$tablecolor">
+ <table id="LC_helpmenu_links">
+   <tr>
 END
     if ($component_url) {
 	$r->print("<td align=\"center\"><b><a href=\"$component_url\" target=\"bodyframe\">".
@@ -204,15 +195,6 @@
 END
     }
     $r->print(<<END);
-           </tr>
-          </table>
-         </td>
-        </tr>
-       </table>
-      </td>
-     </tr>
-    </table>
-   </td>
   </tr>
  </table>
 </fieldset>
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.396 loncom/interface/loncommon.pm:1.397
--- loncom/interface/loncommon.pm:1.396	Fri Jun 23 01:56:35 2006
+++ loncom/interface/loncommon.pm	Mon Jun 26 17:54:34 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.396 2006/06/23 05:56:35 albertel Exp $
+# $Id: loncommon.pm,v 1.397 2006/06/26 21:54:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2725,9 +2725,18 @@
 
 =cut
 
-##############################################
+
 sub designparm {
     my ($which,$domain)=@_;
+    my $result = &designparm_real(@_);
+    &Apache::lonnet::logthis(" $which $domain reulted in $result");
+    return $result;
+}
+
+
+##############################################
+sub designparm_real {
+    my ($which,$domain)=@_;
     if ($env{'browser.blackwhite'} eq 'on') {
 	if ($which=~/\.(font|alink|vlink|link)$/) {
 	    return '#000000';
@@ -2739,11 +2748,11 @@
 	    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};
@@ -3413,7 +3422,27 @@
   border-style: solid;
   border-color: $pgbg;
 }
+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;
+}
 
+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
 }