[LON-CAPA-cvs] cvs: loncom /interface londocs.pm

ehlerst ehlerst@source.lon-capa.org
Tue, 07 Apr 2009 20:12:56 -0000


ehlerst		Tue Apr  7 20:12:56 2009 EDT

  Modified files:              
    /loncom/interface	londocs.pm 
  Log:
  fixing composite page problem.
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.361 loncom/interface/londocs.pm:1.362
--- loncom/interface/londocs.pm:1.361	Sat Apr  4 21:47:40 2009
+++ loncom/interface/londocs.pm	Tue Apr  7 20:12:55 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.361 2009/04/04 21:47:40 bisitz Exp $
+# $Id: londocs.pm,v 1.362 2009/04/07 20:12:55 ehlerst Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -121,7 +121,7 @@
     if ($home) {
 	return '<input type="submit" name="dumpcourse" value="'.
 	    &mt('Dump '.$type.' DOCS to Construction Space').'" />'.
-	    &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs');
+	    &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs').'<br />';
     } else {
 	return '<div>'.
      &mt('Dump '.$type.
@@ -264,7 +264,7 @@
     my $type = &Apache::loncommon::course_type();
     return '<input type="submit" name="exportcourse" value="'.
             &mt('Export '.$type.' to IMS').'" />'.
-    &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs');
+    &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'<br />';
 }
 
 
@@ -2891,7 +2891,7 @@
     my $activeClass = 1;
     my $active = '';
     $r->print('<ul class="LC_TabContentBigger" id="mainnav">');
-    if (($standard) && ($allowed) && (!$forcesupplement) && ($env{'form.folderpath'}=~/^default/)) {
+    if (($standard) && ($allowed) && (!$forcesupplement) && (($env{'form.folderpath'}=~/^default/) || ($env{'form.pagepath'}))) {
         if($activeClass == 1){
            $active = 'class="active"';
 	   $activeClass = 0;
@@ -3170,6 +3170,7 @@
        }else{
 	  $env{'form.folderpath'} = $savefolderpath;
        }
+       $env{'form.pagepath'} = '';
        if ($allowed) {
 	   my $folderseq=
 	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
@@ -3311,8 +3312,8 @@
  <form action="/adm/coursedocs" method="post" name="courseverify">
            <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}<br />
            <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}<br />
-           $dumpbut<br />
-           $exportbut<br />
+           $dumpbut
+           $exportbut
           <input type="submit" name="listsymbs" value="$lt{'ls'}" />
           <input type="hidden" name="folder" value="$env{'form.folder'}" /><br />
           <input type="submit" name="docslog" value="$lt{'sl'}" />