--- loncom/publisher/lonpubdir.pm	2008/11/28 16:10:26	1.115
+++ loncom/publisher/lonpubdir.pm	2010/03/10 21:26:04	1.126
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.115 2008/11/28 16:10:26 bisitz Exp $
+# $Id: lonpubdir.pm,v 1.126 2010/03/10 21:26:04 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,7 +62,7 @@ sub handler {
     &Apache::loncacc::constructaccess(
              $fn,$r->dir_config('lonDefDomain')); 
   unless (($uname) && ($udom)) {
-     $r->log_reason($uname.' at '.$udom.
+     $r->log_reason($uname.':'.$udom.
          ' trying to list directory '.$env{'form.filename'}.
          ' ('.$fn.') - not authorized', 
          $r->filename); 
@@ -74,7 +74,7 @@ sub handler {
   $fn=~s/\/$//;
 
   unless ($fn) { 
-     $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
+     $r->log_reason($env{'user.name'}.':'.$env{'user.domain'}.
          ' trying to list empty directory', $r->filename); 
      return HTTP_NOT_FOUND;
   } 
@@ -93,19 +93,14 @@ sub handler {
   my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
 
   &startpage($r, $uname, $udom, $thisdisfn);   # Put out the start of page.
-  if ($env{'environment.remote'} eq 'off') {
-      &dircontrols($r,$uname,$udom,$thisdisfn);    # Put out actions for directory, 
+  &dircontrols($r,$uname,$udom,$thisdisfn);    # Put out actions for directory, 
                                                # browse/upload + new file page.
-  } else {
-      &pubbuttons($r,$uname,$thisdisfn);
-  }
   &resourceactions($r,$uname,$udom,$thisdisfn); #Put out form used for printing/deletion etc.
 
   my $numdir = 0;
   my $numres = 0;
   
   # Start off the directory table.
-  $r->print('<h3>'.&mt('Directory Contents:').'</h3>');
   $r->print(&Apache::loncommon::start_data_table()
            .&Apache::loncommon::start_data_table_header_row()
            .'<th>'.&mt('Type').'</th>'
@@ -160,7 +155,7 @@ sub getEffectiveUrl {
 	#   Replace the ~username of the URL with /home/username/public_html
 	#   so that we don't have to worry about ~ expansion internally.
 	#
-	$fn=~s/^http\:\/\/[^\/]+\///;
+	$fn=~s/^https?\:\/\/[^\/]+\///;
         $fn=~s/^\///;
         $fn=~s{~($LONCAPA::username_re)}{/home/$1/public_html};
 	
@@ -200,25 +195,21 @@ sub startpage {
 
     my $formaction='/priv/'.$uname.$thisdisfn.'/';
     $formaction=~s|/+|/|g;
-    my $pagetitle .= &Apache::loncommon::help_open_menu('','',3,'Authoring').
-        '<font face="Arial, Helvetica, sans-serif" size="+1"><b>'.&mt('Construction Space').'</b>:</font>&nbsp;'.
-        '<form name="dirs" method="post" action="'.$formaction.
-        '" target="_parent"><tt><b>'.
-        &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/','_top','/priv','','+1',1)."</b></tt><br />".
-        &Apache::lonhtmlcommon::select_recent('construct','recent',
-                 'this.form.action=this.form.recent.value;this.form.submit()').
-              '</form>';
     &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
-    if ($env{'environment.remote'} eq 'off') {
-	$env{'request.noversionuri'}=$currdir.'/';
-	$r->print(&Apache::loncommon::start_page('Construction Space',undef,
-						 {'body_title' =>
-						      $pagetitle,}));
-    } else {
-	$r->print(&Apache::loncommon::start_page('Construction Space',undef,
-						 { 'only_body' => 1,}));
-	$r->print($pagetitle);
-    }
+
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    &Apache::lonhtmlcommon::add_breadcrumb({
+        'text'  => 'Construction Space',
+        'href'  => &Apache::loncommon::authorspace(),
+    });
+    # breadcrumbs (and tools) will be created 
+    # in start_page->bodytag->innerregister
+
+    $env{'request.noversionuri'}=$currdir.'/';
+    $r->print(&Apache::loncommon::start_page('Construction Space',undef));
+
+    $r->print(&Apache::loncommon::head_subbox(
+                &Apache::loncommon::CSTR_pageheader(1)));
 
     my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn);
     my $doctitle = 'LON-CAPA '.&mt('Construction Space');
@@ -331,12 +322,6 @@ parent.lastknownpriv='/~$uname$esc_thisd
 </script>
 ENDPUBDIRSCRIPT
     $r->print($pubdirscript);
-
-    if ((($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) &&
-	$env{'environment.remote'} ne 'off') {
-	$r->print('<h3>'.&mt('Co-Author').': '.$uname.' at '.$udom.
-		  '</h3>');
-    }
 }
 
 sub dircontrols {
@@ -377,42 +362,46 @@ sub dircontrols {
                                       );
     my $mytype = $lt{'type'}; # avoid conflict with " and ' in javascript
     $r->print(<<END);
-        <table id="LC_cstr_controls">
-         <tr>
-          <th>$lt{'acti'}</th>
-          <th>$lt{'updc'}</th>
-          <th>$lt{'crea'}</th>
-        </tr>
-        <tr>
-         <td>
-          <form name="curractions" method="post" action="">
-           <select name="dirtask" onchange="currdiract(this.form)">
+<div class="LC_columnSection">
+  <div>
+    <form name="curractions" method="post" action="">
+      <fieldset>
+        <legend>$lt{'acti'}</legend>
+        <select name="dirtask" onchange="currdiract(this.form)">
             <option>$lt{'sela'}</option>
             <option value="publish">$lt{'pubd'}</option>
             <option value="editmeta">$lt{'edit'}</option>
             <option value="printdir">$lt{'prnt'}</option>
             <option value="delete">$lt{'dedr'}</option>
-           </select>
-           <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
-          </form>
-          <form name="publishdir" method="post" action="/adm/publish" target="_parent">
-           <input type="hidden" name="pubrec" value="" />
-           <input type="hidden" name="filename" value="" />
-          </form>
-          <form name="printdir" method="post" action="/adm/printout" target="_parent">
-           <input type="hidden" name="postdata" value="" />
-          </form>
-         </td>
-         <td>
-	    <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">
-	      <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
-	      <input type="file" name="upfile" size="20" />
-	      <input type="button" value="$lt{'uplo'}"  onclick="checkUpload(this.form)" />
-	    </form>
-	 </td>
-	 <td>
-	    <form name="fileaction" method="post" action="/adm/cfile" target="_parent">
-	      <span style="white-space: nowrap">
+        </select>
+        <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
+      </fieldset>
+    </form>
+    <form name="publishdir" method="post" action="/adm/publish" target="_parent">
+      <input type="hidden" name="pubrec" value="" />
+      <input type="hidden" name="filename" value="" />
+    </form>
+    <form name="printdir" method="post" action="/adm/printout" target="_parent">
+      <input type="hidden" name="postdata" value="" />
+    </form>
+  </div>
+
+  <div>
+    <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">
+      <fieldset>
+        <legend>$lt{'updc'}</legend>
+        <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
+        <input type="file" name="upfile" size="20" />
+        <input type="button" value="$lt{'uplo'}"  onclick="checkUpload(this.form)" />
+      </fieldset>
+    </form>
+  </div>
+
+  <div>
+    <form name="fileaction" method="post" action="/adm/cfile" target="_parent">
+      <fieldset>
+              <legend>$lt{'crea'}</legend>
+	      <span class="LC_nobreak">
 		<input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
                   <script type="text/javascript">
                     function validate_go() {
@@ -438,24 +427,13 @@ sub dircontrols {
 	            <option value="newdir">$lt{'nsub'}:</option>
 		  </select>&nbsp;<input type="text" name="newfilename" value="$lt{'type'}" onfocus="if (this.value == '$mytype') this.value=''" />&nbsp;<input type="button" value="Go" onclick="validate_go();" />
 		 </span>
-		</form>
-	  </td>
-         </tr>
-        </table>
+      </fieldset>
+    </form>
+  </div>
+</div>
 END
 }
 
-sub pubbuttons {
-    my ($r,$uname,$thisdisfn) = @_;
-    $r->print('<form method="post" action="/adm/publish" target="_parent">'.
-              '<table><tr><td><input type="hidden" name="filename" value="/~'.
-               $uname.$thisdisfn.'/" />'.
-              '<input type="submit" value="'.&mt('Publish Directory').'" /></td><td>'.
-'<input type="button" onclick="window.location='."'/~".
-               $uname.$thisdisfn."/default.meta'".'" value="'.
-&mt('Edit Directory Catalog Information').'" /></td></tr></table></form>');
-}
-
 sub resourceactions {
     my ($r,$uname,$udom,$thisdisfn) = @_;
     $r->print(<<END);
@@ -566,7 +544,7 @@ sub putdirectory {
         }
 	$r->print('<tr class="LC_browser_folder">'.
 		  '<td><img src="'.
-		  $Apache::lonnet::perlvar{'lonIconsURL'}.'/folder_closed.gif" alt="folder" /></td>'.
+		  $Apache::lonnet::perlvar{'lonIconsURL'}.'/navmap.folder.closed.gif" alt="folder" /></td>'.
 		  '<td>'.$actionitem.'</td>'.
 		  '<td><span class="LC_filename"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/" target="_parent">'.
 		  $disfilename.'</a></span></td>'.
@@ -625,9 +603,17 @@ sub putresource {
 	    $meta_same = 0;
 	}
 	$publish_button=&mt('Re-publish');
-	my $rights_status =
-	    &mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
-	    &mt(&getSourceRightString($targetdir.'/'.$filename));
+
+        my $rights_status =
+            &mt(&getCopyRightString($targetdir.'/'.$filename)).', ';
+
+        my %lt_SourceRight = &Apache::lonlocal::texthash(
+               'open'   => 'Source: open',
+               'closed' => 'Source: closed',
+        );
+        $rights_status .=
+            $lt_SourceRight{&getSourceRightString($targetdir.'/'.$filename)};
+
 	$title = '<a href="/res/'.$targetdir.'/'.$filename.
 	    '.meta" target="cat">'.
 	    &getTitleString($targetdir.'/'.$filename).'</a>';