--- loncom/interface/lonhtmlcommon.pm	2012/11/27 23:45:08	1.332
+++ loncom/interface/lonhtmlcommon.pm	2012/12/07 17:15:56	1.337
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.332 2012/11/27 23:45:08 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.337 2012/12/07 17:15:56 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[
@@ -1886,12 +1895,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'});
-    }
+    my @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) {
@@ -1907,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;
@@ -1919,6 +1925,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');
@@ -1933,14 +1940,18 @@ sub docs_breadcrumbs {
                            'no_mt' => 1,
                           });
     }
+    if ($title) {
+        push(@docs_crumbs,
+                          {'title' => $title,
+                           'text'  => $title,
+                           'no_mt' => 1,}
+                          );
+    }
     if (wantarray) {
         unless ($precleared) {
             &clear_breadcrumbs();
         }
         &add_breadcrumb(@docs_crumbs);
-        if ($title) {
-            &add_breadcrumb({text => $title});
-        }
         if ($contenteditor) {
             $plain=~s/\&gt\;\s*$//;
         }
@@ -1951,7 +1962,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;
     }
@@ -3105,7 +3116,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) {
@@ -3149,6 +3160,9 @@ sub jump_to_editres {
             if ($forcereg) {
                 $cfile .= (($cfile=~/\?/)?'&amp;':'?').'register=1';
             }
+            if ($todocs) {
+               $cfile .= (($cfile=~/\?/)?'&amp;':'?').'todocs=1';
+            }
         }
         $jscall = "go('$cfile')";
     }
@@ -3521,6 +3535,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__