--- loncom/interface/lonhtmlcommon.pm	2012/11/30 11:28:51	1.335
+++ loncom/interface/lonhtmlcommon.pm	2013/02/05 16:22:27	1.341
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.335 2012/11/30 11:28:51 bisitz Exp $
+# $Id: lonhtmlcommon.pm,v 1.341 2013/02/05 16:22:27 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1396,7 +1396,8 @@ sub htmlareaselectactive {
     #   is used to determine when the countdown timer turns red to warn the user
     #   to think about submitting.
 
-    my $dueDateLayout = &mt('Due in: {dn} {dl} {hnn}{sep}{mnn}{sep}{snn} [_1]',"<span id='submitearly'></span>");
+    my $dueDateLayout = &mt('Due in: {dn} {dl} {hnn}{sep}{mnn}{sep}{snn} [_1]',
+                            "<span id='submitearly'></span>");
     my $early = '- <b>'.&mt('Submit Early').'</b>';
     my $pastdue = '- <b>'.&mt('Past Due').'</b>';
     $output .= <<JAVASCRIPT;
@@ -1760,11 +1761,24 @@ returns: nothing
                              .$links 
 ;
         }
-        
-        &render_tools(\$links);
-        $links = &htmltag('div', $links, 
-                        { id => "LC_breadcrumbs" }) unless ($CourseBreadcrumbs) ;
-        &render_advtools(\$links);
+        my $nav_and_tools = 0;
+        foreach my $item ('navigation','tools') {
+            if (ref($tools{$item}) eq 'ARRAY') {
+                $nav_and_tools += scalar(@{$tools{$item}})
+            }
+        }
+        if (($links ne '') || ($nav_and_tools)) {
+            &render_tools(\$links);
+            $links = &htmltag('div', $links, 
+                              { id => "LC_breadcrumbs" }) unless ($CourseBreadcrumbs) ;
+        }
+        my $adv_tools = 0;
+        if (ref($tools{'advtools'}) eq 'ARRAY') {
+            $adv_tools = scalar(@{$tools{'advtools'}});
+        }
+        if (($links ne '') || ($adv_tools)) {
+            &render_advtools(\$links);
+        }
 
         # Return the @Crumbs stack to what we started with
         push(@Crumbs,$last);
@@ -1895,12 +1909,9 @@ returns: nothing
 sub docs_breadcrumbs {
     my ($allowed,$crstype,$contenteditor,$title,$precleared)=@_;
     my ($folderpath,@folders);
-    if ($env{'form.pagepath'}) {
-        @folders = split('&',$env{'form.pagepath'});
-    } else {
-        @folders = split('&',$env{'form.folderpath'});
-    }
+    @folders = split('&',$env{'form.folderpath'});
     my $plain='';
+    my $container = 'sequence';
     my ($randompick,$isencrypted,$ishidden,$is_random_order) = (-1,0,0,0);
     my @docs_crumbs;
     while (@folders) {
@@ -1916,9 +1927,9 @@ sub docs_breadcrumbs {
         }
         $url .= &escape($folderpath);
         my $name=&unescape($foldername);
-# each of randompick number, hidden, encrypted, random order are 
-# appended with ":"s to the foldername
-        $name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//;
+# each of randompick number, hidden, encrypted, random order, is_page 
+# are appended with ":"s to the foldername
+        $name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)\:?(\d*)$//;
         if ($contenteditor) { 
             if ($1 ne '') {
                 $randompick=$1;
@@ -1928,6 +1939,7 @@ sub docs_breadcrumbs {
             if ($2) { $ishidden=1; }
             if ($3) { $isencrypted=1; }
             if ($4 ne '') { $is_random_order = 1; }
+            if ($5 == 1) {$container = 'page'; }
         }
         if ($folder eq 'supplemental') {
             $name = &mt('Supplemental '.$crstype.' Contents');
@@ -1964,7 +1976,7 @@ sub docs_breadcrumbs {
         return (&breadcrumbs(undef,undef,$menulink,'nohelp',undef,undef,
                              $contenteditor),
                              $randompick,$ishidden,$isencrypted,$plain,
-                             $is_random_order);
+                             $is_random_order,$container);
     } else {
         return \@docs_crumbs;
     }
@@ -2197,11 +2209,11 @@ sub course_selection {
 
     my $courseform='<b>'.&Apache::loncommon::selectcourse_link
                      ($formname,'pickcourse','pickdomain','coursedesc','',1,$crstype).'</b>';
-        $output .= '<input type="radio" name="coursepick" value="all" onclick="coursePick(this.form)" />'.$allcrs.'<br />';
+        $output .= '<label><input type="radio" name="coursepick" value="all" onclick="coursePick(this.form)" />'.$allcrs.'</label><br />';
     if ($totcodes > 0) {
         my $numtitles = @$codetitles;
         if ($numtitles > 0) {
-            $output .= '<input type="radio" name="coursepick" value="category" onclick="coursePick(this.form);alert('."'".&mt('Choose categories, from left to right')."'".')" />'.&mt('Pick courses by category:').' <br />';
+            $output .= '<label><input type="radio" name="coursepick" value="category" onclick="coursePick(this.form);alert('."'".&mt('Choose categories, from left to right')."'".')" />'.&mt('Pick courses by category:').'</label><br />';
             $output .= '<table><tr><td>'.$$codetitles[0].'<br />'."\n".
                '<select name="'.$standardnames->[0].
                '" onChange="setPick(this.form);courseSet('."'$$codetitles[0]'".')">'."\n".
@@ -2242,7 +2254,15 @@ sub course_selection {
             $output .= '</tr></table><br />';
         }
     }
-    $output .= '<input type="radio" name="coursepick" value="specific" onclick="coursePick(this.form);opencrsbrowser('."'".$formname."','dccourse','dcdomain','coursedesc','','1','$crstype'".')" />'.$pickspec.' '.$courseform.'&nbsp;&nbsp;<input type="text" value="0" size="4" name="coursetotal" /><input type="hidden" name="courselist" value="" />selected.<br />'."\n";
+    $output .=
+        '<label><input type="radio" name="coursepick" value="specific"'
+       .' onclick="coursePick(this.form);opencrsbrowser('."'".$formname."','dccourse','dcdomain','coursedesc','','1','$crstype'".')" />'
+       .$pickspec.'</label>'
+       .' '.$courseform.'&nbsp;&nbsp;'
+       .&mt('[_1] selected.',
+                '<input type="text" value="0" size="4" name="coursetotal" readonly="readonly" />'
+               .'<input type="hidden" name="courselist" value="" />')
+       .'<br />'."\n";
     return $output;
 }
 
@@ -3027,7 +3047,10 @@ PARAMSONE
     }
     if ((chkh == 1) || (listwchange)) {
         var primaryheight = document.getElementById('LC_nav_bar').offsetHeight;
-        var secondaryheight = document.getElementById('LC_secondary_menu').offsetHeight;
+        var secondaryheight;
+        if (document.getElementById('LC_secondary_menu') != null) { 
+            secondaryheight = document.getElementById('LC_secondary_menu').offsetHeight;
+        }
         var crumbsheight = document.getElementById('LC_breadcrumbs').offsetHeight;
         var dccidheight = 0;
         if (document.getElementById('dccid') != null) {
@@ -3118,7 +3141,7 @@ ENDUTILITY
 
 sub jump_to_editres {
     my ($cfile,$home,$switchserver,$forceedit,$forcereg,$symb,$folderpath,
-        $title,$idx,$suppurl) = @_;
+        $title,$idx,$suppurl,$todocs) = @_;
     my $jscall;
     if ($switchserver) {
         if ($home) {
@@ -3162,6 +3185,9 @@ sub jump_to_editres {
             if ($forcereg) {
                 $cfile .= (($cfile=~/\?/)?'&amp;':'?').'register=1';
             }
+            if ($todocs) {
+               $cfile .= (($cfile=~/\?/)?'&amp;':'?').'todocs=1';
+            }
         }
         $jscall = "go('$cfile')";
     }