[BACK]Return to londocs.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/londocs.pm between versions 1.336 and 1.340

version 1.336, 2009/02/04 13:03:44 version 1.340, 2009/02/12 11:35:07
Line 1899  END Line 1899  END
     }      }
           
     my $orig_url = $url;      my $orig_url = $url;
       $orig_url=~s{http(:|:)//https(:|:)//}{https$2//};
     my $external = ($url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/});      my $external = ($url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/});
     if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) {      if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) {
  my $symb=&Apache::lonnet::symbclean(   my $symb=&Apache::lonnet::symbclean(
Line 2872  ERFORM Line 2873  ERFORM
            $containertag = '<input type="hidden" name="folderpath" value="" />';             $containertag = '<input type="hidden" name="folderpath" value="" />';
            $uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';             $uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
        }         }
    $r->print(<<HIDDENFORM);
        $r->print(&generate_admin_options($containertag,$uploadtag,\%lt,\%help,\%env));   <form name="renameform" method="post" action="/adm/coursedocs">
      <input type="hidden" name="title" />
      <input type="hidden" name="cmd" />
      <input type="hidden" name="markcopy" />
      <input type="hidden" name="copyfolder" />
      $containertag
    </form>
    <form name="simpleedit" method="post" action="/adm/coursedocs">
      <input type="hidden" name="importdetail" value="" />
      $uploadtag
    </form>
   HIDDENFORM
     }      }
 # --------------------------------------------------------- Main tab structure  # --------------------------------------------------------- Main tab structure
     my $activeClass = 1;      my $activeClass = 1;
     $r->print('<div class="LC_ContentBoxSpecial"><ul class="LC_TabContent" id="mainnav">');      $r->print('<ul class="LC_TabContentBigger" id="mainnav">');
     if (($standard) && ($allowed) && (!$forcesupplement)) {      if (($standard) && ($allowed) && (!$forcesupplement)) {
  my $active = '';   my $active = '';
         if($activeClass == 1){          if($activeClass == 1){
Line 2893  ERFORM Line 2905  ERFORM
         }          }
  $r->print('<li '.$active.'onclick="javascript:showPage(this,\'Supplemental Course Documents\',\'mainnav\',\'maincoursedoc\');">'.&mt('Supplemental Course Documents').'</li>');   $r->print('<li '.$active.'onclick="javascript:showPage(this,\'Supplemental Course Documents\',\'mainnav\',\'maincoursedoc\');">'.&mt('Supplemental Course Documents').'</li>');
     }      }
     $r->print('</ul><div id="maincoursedoc" style="margin:0 0;padding:0 0;">');      $r->print('<li onclick="javascript:showPage(this,\'Special Admin Options\',\'mainnav\',\'maincoursedoc\');">'.&mt('Special Admin Options').'</li>');
       $r->print('</ul><div class="LC_ContentBoxSpecial" style="margin:0 0;padding:0 0;"><div id="maincoursedoc" style="margin:0 0;padding:0 0;">');
 # --------------------------------------------------------- Standard documents  # --------------------------------------------------------- Standard documents
     if (($standard) && ($allowed) && (!$forcesupplement)) {      if (($standard) && ($allowed) && (!$forcesupplement)) {
        my $active = 'style="display: none;"';         my $active = 'style="display: none;"';
Line 3154  $r->print('</div>'); Line 3167  $r->print('</div>');
           $active = 'style="display: block;"';            $active = 'style="display: block;"';
        }         }
        $r->print('<div class="LC_ContentBox" id="Supplemental Course Documents" '.$active.'>');         $r->print('<div class="LC_ContentBox" id="Supplemental Course Documents" '.$active.'>');
    &changewarning($r);
        my $folder=$env{'form.folder'};         my $folder=$env{'form.folder'};
        unless ($folder=~/^supplemental/) {         unless ($folder=~/^supplemental/) {
    $folder='supplemental';     $folder='supplemental';
Line 3264  my $error = &editor($r,$coursenum,$cours Line 3278  my $error = &editor($r,$coursenum,$cours
        if ($error) {         if ($error) {
            $r->print('<p><span class="LC_error">'.$error.'</span></p>');             $r->print('<p><span class="LC_error">'.$error.'</span></p>');
        }         }
 $r->print('</div)');  $r->print('</div>');
  }    } 
    }     }
   $r->print('<div class="LC_ContentBox" id="Special Admin Options" style="display: none;">');
   $r->print(&generate_admin_options($containertag,$uploadtag,\%help,\%env));
   $r->print('</div>');
 $r->print('</div>');  $r->print('</div>');
     if ($allowed) {      if ($allowed) {
  $r->print('   $r->print('
Line 3292  $r->print('</div>'); Line 3309  $r->print('</div>');
 }   } 
   
 sub generate_admin_options {  sub generate_admin_options {
   my ($containertag,$uploadtag,$lt_ref,$help_ref,$env_ref) = @_;    my ($containertag,$uploadtag,$help_ref,$env_ref) = @_;
   my %lt = %{$lt_ref};   my %lt=&Apache::lonlocal::texthash(
                                            'vc' => 'Verify Content',
                                            'cv' => 'Check/Set Resource Versions',
                                            'ls' => 'List Symbs',
                                            'sl' => 'Show Log'
                                             );
   my %help = %{$help_ref};    my %help = %{$help_ref};
   my %env = %{$env_ref};    my %env = %{$env_ref};
   my $dumpbut=&dumpbutton();    my $dumpbut=&dumpbutton();
   my $exportbut=&exportbutton();    my $exportbut=&exportbutton();
   return (<<ENDOPTIONFORM);    return (<<ENDOPTIONFORM);
  <form name="renameform" method="post" action="/adm/coursedocs">  
    <input type="hidden" name="title" />  
    <input type="hidden" name="cmd" />  
    <input type="hidden" name="markcopy" />  
    <input type="hidden" name="copyfolder" />  
    $containertag  
  </form>  
  <form name="simpleedit" method="post" action="/adm/coursedocs">  
    <input type="hidden" name="importdetail" value="" />  
    $uploadtag  
  </form>  
  <form action="/adm/coursedocs" method="post" name="courseverify">   <form action="/adm/coursedocs" method="post" name="courseverify">
    <ul style="list-style-type:none">     <ul style="list-style-type:none">
        <li>         <li>
Line 3333  sub generate_admin_options { Line 3344  sub generate_admin_options {
         </li>          </li>
    </ul>     </ul>
  </form>   </form>
  <div style="clear: both; height: 0px;">&nbsp;</div>  <!-- <div style="clear: both; height: 0px;">&nbsp;</div>-->
 ENDOPTIONFORM  ENDOPTIONFORM
   
 }  }
Line 3356  sub generate_edit_table { Line 3367  sub generate_edit_table {
             $form .= '<li onclick="javascript:showPage(this, \''.$tid.$orderhash{$name}.'\', \''.$navigation.$tid.'\',\''.$content.$tid.'\');">'.&mt($orderhash{$name}).'</li>';              $form .= '<li onclick="javascript:showPage(this, \''.$tid.$orderhash{$name}.'\', \''.$navigation.$tid.'\',\''.$content.$tid.'\');">'.&mt($orderhash{$name}).'</li>';
         }          }
     }      }
       $form .= '</ul>';
     $form .= '<div id="'.$content.$tid.'" style="padding: 0 0; margin: 0 0;">';      $form .= '<div id="'.$content.$tid.'" style="padding: 0 0; margin: 0 0;">';
     foreach my $field (keys(%namehash)){      foreach my $field (keys(%namehash)){
         $form .= '<div id="'.$tid.$field.'" class="LC_ContentBox" style="display: none;">'.$namehash{$field}.'</div>';          $form .= '<div id="'.$tid.$field.'" class="LC_ContentBox" style="display: none;">'.$namehash{$field}.'</div>';
Removed from v.1.336  
changed lines
  Added in v.1.340

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>