[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface loncommon.pm

[raeburn]

raeburn		Wed Dec 12 23:03:08 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	loncommon.pm 
  Log:
  - For 2.11
    - Backport 1.1099, 1.1100.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1075.2.16 loncom/interface/loncommon.pm:1.1075.2.17
--- loncom/interface/loncommon.pm:1.1075.2.16	Wed Dec 12 22:59:12 2012
+++ loncom/interface/loncommon.pm	Wed Dec 12 23:03:07 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.16 2012/12/12 22:59:12 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.17 2012/12/12 23:03:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -6254,7 +6254,6 @@
 
 table.LC_data_table tr > td.LC_docs_entry_commands,
 table.LC_data_table tr > td.LC_docs_entry_parameter {
-  background: #DDDDDD;
   font-size: x-small;
 }
 
@@ -7128,6 +7127,27 @@
 		cursor:pointer;
 }
 
+/*
+  styles used by TTH when "Default set of options to pass to tth/m
+  when converting TeX" in course settings has been set
+
+  option passed: -t
+
+*/
+
+td div.comp { margin-top: -0.6ex; margin-bottom: -1ex;}
+td div.comb { margin-top: -0.6ex; margin-bottom: -.6ex;}
+td div.hrcomp { line-height: 0.9; margin-top: -0.8ex; margin-bottom: -1ex;}
+td div.norm {line-height:normal;}
+
+/*
+  option passed -y3
+*/
+
+span.roman {font-family: serif; font-style: normal; font-weight: normal;}
+span.overacc2 {position: relative;  left: .8em; top: -1.2ex;}
+span.overacc1 {position: relative;  left: .6em; top: -1.2ex;}
+
 END
 }
 
@@ -11305,11 +11325,11 @@
     if ($env{'form.folderpath'}) {
         my @items = split('&',$env{'form.folderpath'});
         $folders{'0'} = $items[-2];
-        $containers{'0'}='sequence';
-    } elsif ($env{'form.pagepath'}) {
-        my @items = split('&',$env{'form.pagepath'});
-        $folders{'0'} = $items[-2];
-        $containers{'0'}='page';
+        if ($env{'form.folderpath'} =~ /\:1$/) {
+            $containers{'0'}='page';
+        } else {
+            $containers{'0'}='sequence';
+        }
     }
     my @archdirs = &get_env_multiple('form.archive_directory');
     if ($numitems) {