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

raeburn raeburn@source.lon-capa.org
Sat, 14 Aug 2010 00:00:30 -0000


raeburn		Sat Aug 14 00:00:30 2010 EDT

  Modified files:              
    /loncom/interface	londocs.pm loncommon.pm 
  Log:
  - Editing folder contents when enclosing folder has parameters set (or inherits):
    - use ol instead of ul, as ul was interfering with determination of currentNav 
      based on tabnav[1] in openTabs() javascript function.
    - display as horizontal list to reduce vertical scrolling.
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.429 loncom/interface/londocs.pm:1.430
--- loncom/interface/londocs.pm:1.429	Mon Jul  5 12:29:36 2010
+++ loncom/interface/londocs.pm	Sat Aug 14 00:00:29 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.429 2010/07/05 12:29:36 droeschl Exp $
+# $Id: londocs.pm,v 1.430 2010/08/14 00:00:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1607,13 +1607,12 @@
     my $shown=0;
     if (($ishidden) || ($isencrypted) || ($randompick>=0) || ($is_random_order)) {
 	$r->print('<div class="LC_Box">'.
-          '<p>'.&mt('Parameters:').
-          '<ul>'.
-		  ($randompick>=0?'<li>'.&mt('randomly pick [quant,_1,resource]',$randompick).'</li>':'').
-		  ($ishidden?'<li>'.&mt('contents hidden').'</li>':'').
-		  ($isencrypted?'<li>'.&mt('URLs hidden').'</li>':'').
-		  ($is_random_order?'<li>'.&mt('random order').'</li>':'').
-		  '</ul></p>');
+          '<ol class="LC_docs_parameters"><li style="font-weight:bold;">'.&mt('Parameters:').'</li>'.
+		  ($randompick>=0?'<li>&bull;&nbsp;'.&mt('randomly pick [quant,_1,resource]',$randompick).'</li>':'').
+		  ($ishidden?'<li>&bull;&nbsp;'.&mt('contents hidden').'</li>':'').
+		  ($isencrypted?'<li>&bull;&nbsp;'.&mt('URLs hidden').'</li>':'').
+		  ($is_random_order?'<li>&bull;&nbsp;'.&mt('random order').'</li>':'').
+		  '</ol></p>');
         if ($randompick>=0) {
             $r->print('<p class="LC_warning">'
                  .&mt('Caution: this folder is set to randomly pick a subset'
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.974 loncom/interface/loncommon.pm:1.975
--- loncom/interface/loncommon.pm:1.974	Mon Aug  9 11:49:41 2010
+++ loncom/interface/loncommon.pm	Sat Aug 14 00:00:29 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.974 2010/08/09 11:49:41 wenzelju Exp $
+# $Id: loncommon.pm,v 1.975 2010/08/14 00:00:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -6076,6 +6076,18 @@
   color: darkred;
 }
 
+ol.LC_docs_parameters {
+  margin-left: 0;
+  padding: 0;
+  list-style: none;
+}
+
+ol.LC_docs_parameters li {
+  margin: 0;
+  padding-right: 20px;
+  display: inline;
+}
+
 ul#LC_secondary_menu {
   clear: both;
   color: $fontmenu;