--- loncom/interface/lonhtmlcommon.pm	2012/11/16 23:37:16	1.331
+++ loncom/interface/lonhtmlcommon.pm	2012/12/03 14:47:30	1.336
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.331 2012/11/16 23:37:16 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.336 2012/12/03 14:47:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -209,10 +209,19 @@ dependencies for a web page uploaded dir
 =cut
 
 sub dependencycheck_js {
-    my ($symb,$title,$url) = @_;
-    my $link = '/adm/dependencies?symb='.&HTML::Entities::encode($symb,'<>&"').
-               '&title='.&HTML::Entities::encode($title,'<>&"').
-               '&url='.&HTML::Entities::encode($url,'<>&"');
+    my ($symb,$title,$url,$folderpath,$uri) = @_;
+    my $link;
+    if ($symb) {
+        $link = '/adm/dependencies?symb='.&HTML::Entities::encode($symb,'<>&"');
+    } elsif ($folderpath) {
+        $link = '/adm/dependencies?folderpath='.&HTML::Entities::encode($folderpath,'<>&"');
+         $url = $uri;
+    }
+    $link .= (($link=~/\?/)?'&amp;':'?').'title='.
+             &HTML::Entities::encode($title,'<>&"');
+    if ($url) {
+        $link .= '&url='.&HTML::Entities::encode($url,'<>&"');
+    }
     return <<ENDJS;
                 <script type="text/javascript">
                 // <![CDATA[
@@ -1505,6 +1514,7 @@ sub show_return_link {
     unless ($env{'request.course.id'}) { return 0; }
     if ($env{'request.noversionuri'}=~m{^/priv/} ||
         $env{'request.uri'}=~m{^/priv/}) { return 1; }
+    return if ($env{'request.noversionuri'} eq '/adm/supplemental');
 
     if (($env{'request.noversionuri'} =~ m{^/adm/(viewclasslist|navmaps)($|\?)})
         || ($env{'request.noversionuri'} =~ m{^/adm/.*/aboutme($|\?)})) {
@@ -1654,7 +1664,7 @@ returns: nothing
                 if ($env{'request.noversionuri'} =~ 
                     m{^/public/($match_domain)/($match_courseid)/syllabus$}) {
                     unless (($env{'course.'.$env{'request.course.id'}.'.domain'} eq $1) &&
-                            ($env{'course.'.$env{'request.course.id'}.'.num'} eq $2)) { 
+                            ($env{'course.'.$env{'request.course.id'}.'.num'} eq $2)) {
                         $description = 'Menu';
                         $no_mt_descr = 0;
                     }
@@ -1883,16 +1893,13 @@ returns: nothing
 } # End of scope for @Crumbs
 
 sub docs_breadcrumbs {
-    my ($allowed,$crstype,$contenteditor)=@_;
+    my ($allowed,$crstype,$contenteditor,$title,$precleared)=@_;
     my ($folderpath,@folders);
-    if ($env{'form.pagepath'}) {
-        @folders = split('&',$env{'form.pagepath'});
-    } else {
-        @folders=split('&',$env{'form.folderpath'});
-    }
+    my @folders = split('&',$env{'form.folderpath'});
     my $plain='';
+    my $container = 'sequence';
     my ($randompick,$isencrypted,$ishidden,$is_random_order) = (-1,0,0,0);
-    &clear_breadcrumbs();
+    my @docs_crumbs;
     while (@folders) {
         my $folder=shift(@folders);
         my $foldername=shift(@folders);
@@ -1906,9 +1913,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;
@@ -1918,30 +1925,47 @@ 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.' Content');
+            $name = &mt('Supplemental '.$crstype.' Contents');
         }
         if ($contenteditor) {
             $plain.=$name.' &gt; ';
         }
-        &add_breadcrumb(
+        push(@docs_crumbs,
                           {'href'  => $url,
                            'title' => $name,
                            'text'  => $name,
                            'no_mt' => 1,
                           });
     }
-    unless ($contenteditor) {
-        if ($env{'httpref.'.$env{'request.noversionuri'}} ne '') {
-            &add_breadcrumb({text => 'View Resource'});
+    if ($title) {
+        push(@docs_crumbs,
+                          {'title' => $title,
+                           'text'  => $title,
+                           'no_mt' => 1,}
+                          );
+    }
+    if (wantarray) {
+        unless ($precleared) {
+            &clear_breadcrumbs();
+        }
+        &add_breadcrumb(@docs_crumbs);
+        if ($contenteditor) {
+            $plain=~s/\&gt\;\s*$//;
         }
+        my $menulink = 0;
+        if (!$allowed && !$contenteditor) {
+            $menulink = 1;
+        }
+        return (&breadcrumbs(undef,undef,$menulink,'nohelp',undef,undef,
+                             $contenteditor),
+                             $randompick,$ishidden,$isencrypted,$plain,
+                             $is_random_order,$container);
     } else {
-        $plain=~s/\&gt\;\s*$//;
+        return \@docs_crumbs;
     }
-    return (&breadcrumbs(undef,undef,0,'nohelp',undef,undef,$contenteditor),
-                         $randompick,$ishidden,$isencrypted,$plain,
-                         $is_random_order);
 }
 
 ############################################################
@@ -3091,13 +3115,18 @@ ENDUTILITY
 }
 
 sub jump_to_editres {
-    my ($cfile,$home,$switchserver,$forceedit,$forcereg,$symb) = @_;
+    my ($cfile,$home,$switchserver,$forceedit,$forcereg,$symb,$folderpath,
+        $title,$idx,$suppurl) = @_;
     my $jscall;
     if ($switchserver) {
-        if ($symb && $home) {
+        if ($home) {
             $cfile = '/adm/switchserver?otherserver='.$home.'&amp;role='.
-                     &HTML::Entities::encode($env{'request.role'},'"<>&').
-                    '&amp;symb='.&HTML::Entities::encode($symb,'"<>&');
+                     &HTML::Entities::encode($env{'request.role'},'"<>&');
+            if ($symb) {
+                $cfile .= '&amp;symb='.&HTML::Entities::encode($symb,'"<>&');
+            } elsif ($folderpath) {
+                $cfile .= '&amp;folderpath='.&HTML::Entities::encode($folderpath,'"<>&');
+            }
             if ($forceedit) {
                 $cfile .= '&amp;forceedit=1';
             }
@@ -3109,7 +3138,21 @@ sub jump_to_editres {
     } else {
         unless ($cfile =~ m{^/priv/}) {
             if ($symb) {
-                $cfile .= (($cfile=~/\?/)?'&amp;':'?')."symb=$symb"; 
+                $cfile .= (($cfile=~/\?/)?'&amp;':'?')."symb=$symb";
+            } elsif ($folderpath) {
+                $cfile .= (($cfile=~/\?/)?'&amp;':'?').
+                          'folderpath='.&HTML::Entities::encode(&escape($folderpath),'"<>&');
+                if ($title) {
+                    $cfile .= (($cfile=~/\?/)?'&amp;':'?').
+                              'title='.&HTML::Entities::encode(&escape($title),'"<>&');
+                }
+                if ($idx) {
+                    $cfile .= (($cfile=~/\?/)?'&amp;':'?').'idx='.$idx;
+                }
+                if ($suppurl) {
+                    $cfile .= (($cfile=~/\?/)?'&amp;':'?').
+                              'suppurl='.&HTML::Entities::encode(&escape($suppurl));
+                }
             }
             if ($forceedit) {
                 $cfile .= (($cfile=~/\?/)?'&amp;':'?').'forceedit=1';
@@ -3489,6 +3532,40 @@ sub funclist_from_array {
                { listattr => {class => 'LC_funclist'} });
 }   
 
+=pod
+
+=item &actionbox( \@array )
+
+Constructs a XHTML list from \@array with the first item being visually
+highlighted and set to the value 'Actions'. The list is wrapped in a division.
+
+The actionlist is used to offer contextual actions, mostly at the bottom
+of a page, on which the outcome of an processed action is shown,
+e.g. a file operation in Construction Space.
+
+=over
+
+=item \@array
+
+A reference to the array containing text. Details: sub funclist_from_array
+
+=back
+ 
+Returns: XHTML div as string. 
+
+=back
+
+=cut  
+
+sub actionbox {
+    my ($items) = @_;
+    return unless(ref($items) eq 'ARRAY');
+    return
+        '<div class="LC_actionbox">'
+       .&funclist_from_array($items, {legend => &mt('Actions')})
+       .'</div>';
+}
+
 1;
 
 __END__