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

Diff for /loncom/interface/londocs.pm between versions 1.484.2.12 and 1.484.2.18

version 1.484.2.12, 2012/12/13 00:51:34 version 1.484.2.18, 2012/12/13 04:15:30
Line 312  sub group_import { Line 312  sub group_import {
     return &storemap($coursenum, $coursedom, $folder.'.'.$container,1);      return &storemap($coursenum, $coursedom, $folder.'.'.$container,1);
 }  }
   
 sub breadcrumbs {  
     my ($allowed,$crstype)=@_;  
     &Apache::lonhtmlcommon::clear_breadcrumbs();  
     my (@folders);  
     if ($env{'form.pagepath'}) {  
         @folders = split('&',$env{'form.pagepath'});  
     } else {  
         @folders=split('&',$env{'form.folderpath'});  
     }  
     my $folderpath;  
     my $plain='';  
     my $randompick=-1;  
     my $isencrypted=0;  
     my $ishidden=0;  
     my $is_random_order=0;  
     while (@folders) {  
  my $folder=shift(@folders);  
     my $foldername=shift(@folders);  
  if ($folderpath) {$folderpath.='&';}  
  $folderpath.=$folder.'&'.$foldername;  
         my $url;  
         if ($allowed) {  
             $url = '/adm/coursedocs?folderpath=';  
         } else {  
             $url = '/adm/supplemental?folderpath=';  
         }  
  $url .= &escape($folderpath);  
  my $name=&unescape($foldername);  
 # randompick number, hidden, encrypted, random order, is appended with ":"s to the foldername  
   $name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//;  
  if ($1 ne '') {  
            $randompick=$1;  
         } else {  
            $randompick=-1;  
         }  
         if ($2) { $ishidden=1; }  
         if ($3) { $isencrypted=1; }  
  if ($4 ne '') { $is_random_order = 1; }  
         if ($folder eq 'supplemental') {  
             $name = &mt('Supplemental '.$crstype.' Content');  
         }  
  &Apache::lonhtmlcommon::add_breadcrumb(  
       {'href'=>$url,  
        'title'=>$name,  
        'text'=>$name,  
        'no_mt'=>1,  
        });  
  $plain.=$name.' > ';  
     }  
     $plain=~s/\&gt\;\s*$//;  
     return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp',  
        undef, undef, 1 ),$randompick,$ishidden,  
                                                $isencrypted,$plain,$is_random_order);  
 }  
   
 sub log_docs {  sub log_docs {
     return &Apache::lonnet::write_log('course','docslog',@_);      return &Apache::lonnet::write_log('course','docslog',@_);
 }  }
Line 454  sub docs_change_log { Line 399  sub docs_change_log {
         if ($folderpath eq '') {          if ($folderpath eq '') {
             $folderpath = 'default&'.&escape(&mt('Main '.$crstype.' Documents'));              $folderpath = 'default&'.&escape(&mt('Main '.$crstype.' Documents'));
         }          }
         $pathitem = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';          $pathitem = '<input type="hidden" name="folderpath" value="'.
                       &HTML::Entities::encode($folderpath,'<>&"').'" />';
     }      }
     my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container";      my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container";
     my $jumpto = $readfile;      my $jumpto = $readfile;
Line 463  sub docs_change_log { Line 409  sub docs_change_log {
     if ($supplementalflag) {      if ($supplementalflag) {
         $tid = 2;          $tid = 2;
     }      }
     my ($breadcrumbtrail) = &breadcrumbs($allowed,$crstype);      my ($breadcrumbtrail) =
           &Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1);
     $r->print($breadcrumbtrail.      $r->print($breadcrumbtrail.
               &generate_edit_table($tid,\%orderhash,undef,$iconpath,$jumpto,                &generate_edit_table($tid,\%orderhash,undef,$iconpath,$jumpto,
               $readfile));                $readfile));
Line 1743  sub handle_edit_cmd { Line 1690  sub handle_edit_cmd {
   
 sub editor {  sub editor {
     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype,      my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype,
         $supplementalflag,$orderhash,$iconpath,$uploadtag)=@_;          $supplementalflag,$orderhash,$iconpath,$pathitem)=@_;
     my $container= ($env{'form.pagepath'}) ? 'page'      my $container= ($env{'form.pagepath'}) ? 'page'
                            : 'sequence';                             : 'sequence';
   
     my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) =      my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) =
         &breadcrumbs($allowed,$crstype);          &Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1);
     $r->print($breadcrumbtrail);      $r->print($breadcrumbtrail);
   
     my $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container";      my $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container";
Line 1828  sub editor { Line 1775  sub editor {
  if (defined($item)) {   if (defined($item)) {
     my ($name,$url,$residx)=      my ($name,$url,$residx)=
  map {&unescape($_)} split(/\=/,$item);   map {&unescape($_)} split(/\=/,$item);
                       if ($url=~ m{^\Q/uploaded/$coursedom/$coursenum/\E(default|supplemental)_new\.(sequence|page)$}) {
                           my ($suffix,$errortxt,$locknotfreed) =
                               &newmap_suffix($1,$2,$coursedom,$coursenum);
                           if ($locknotfreed) {
                               $r->print($locknotfreed);
                           }
                           if ($suffix) {
                               $url =~ s/_new\./_$suffix./;
                           } else {
                               return $errortxt;
                           }
                       }
     push(@imports, [$name, $url, $residx]);      push(@imports, [$name, $url, $residx]);
  }   }
     }      }
Line 1900  sub editor { Line 1859  sub editor {
         unless ($name) { $idx++; next; }          unless ($name) { $idx++; next; }
         $output .= &entryline($idx,$name,$url,$folder,$allowed,$res,          $output .= &entryline($idx,$name,$url,$folder,$allowed,$res,
                               $coursenum,$coursedom,$crstype,                                $coursenum,$coursedom,$crstype,
                               $uploadtag,$supplementalflag);                                $pathitem,$supplementalflag);
         $idx++;          $idx++;
         $shown++;          $shown++;
     }      }
Line 1949  sub editor { Line 1908  sub editor {
                     &Apache::lonhtmlcommon::add_item_funclist(                      &Apache::lonhtmlcommon::add_item_funclist(
                         '<a href="/adm/coursedocs?command=direct&forcesupplement=1&'.                          '<a href="/adm/coursedocs?command=direct&forcesupplement=1&'.
                         'supppath='.&HTML::Entities::encode($env{'form.folderpath'}).'">'.                          'supppath='.&HTML::Entities::encode($env{'form.folderpath'}).'">'.
                         '<img src="/res/adm/pages/docs.png" alt="'.$funcname.'" class="LC_icon" />'.                          '<img src="/res/adm/pages/docs-22x22.png" alt="'.$funcname.'" class="LC_icon" />'.
                         '<span class="LC_menubuttons_inline_text">'.$funcname.'</span></a>').                          '<span class="LC_menubuttons_inline_text">'.$funcname.'</span></a>').
                           &Apache::lonhtmlcommon::end_funclist()));                            &Apache::lonhtmlcommon::end_funclist()));
         }          }
Line 2118  sub is_supplemental_title { Line 2077  sub is_supplemental_title {
   
 sub entryline {  sub entryline {
     my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom,      my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom,
         $crstype,$uploadtag,$supplementalflag)=@_;          $crstype,$pathitem,$supplementalflag)=@_;
     my ($foldertitle,$pagetitle,$renametitle);      my ($foldertitle,$pagetitle,$renametitle);
     if (&is_supplemental_title($title)) {      if (&is_supplemental_title($title)) {
  ($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title);   ($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title);
Line 2151  sub entryline { Line 2110  sub entryline {
         $esc_path=&escape($env{'form.pagepath'});          $esc_path=&escape($env{'form.pagepath'});
  $path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"');   $path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"');
     }      }
       my $isexternal;
     if (!$supplementalflag && $residx) {      if (!$supplementalflag && $residx) {
         my $currurl = $url;          my $currurl = $url;
         $currurl =~ s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/};          $currurl =~ s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/};
           if ($currurl =~ m{^/adm/wrapper/ext/}) {
               $isexternal = 1;
           }
         my $path = 'uploaded/'.          my $path = 'uploaded/'.
                    $env{'course.'.$env{'request.course.id'}.'.domain'}.'/'.                     $env{'course.'.$env{'request.course.id'}.'.domain'}.'/'.
                    $env{'course.'.$env{'request.course.id'}.'.num'}.'/';                     $env{'course.'.$env{'request.course.id'}.'.num'}.'/';
Line 2258  sub entryline { Line 2221  sub entryline {
                 $nocopy=1;                  $nocopy=1;
             }              }
         }          }
         my $copylink='&nbsp;';          my ($copylink,$cutlink,$removelink,$renamelink);
         my $cutlink='&nbsp;';  
         my $removelink='&nbsp;';  
   
  my $skip_confirm = 0;   my $skip_confirm = 0;
  if ( $folder =~ /^supplemental/   if ( $folder =~ /^supplemental/
Line 2269  sub entryline { Line 2230  sub entryline {
     |/aboutme$      |/aboutme$
     |/navmaps$      |/navmaps$
     |/bulletinboard$      |/bulletinboard$
     |\.html$      |\.html$)}x)
     |^/adm/wrapper/ext)}x)) {               || $isexternal) { 
     $skip_confirm = 1;      $skip_confirm = 1;
  }   }
           if ($nocopy) {
  if (!$nocopy) {              $copylink=(<<ENDCOPY);
     $copylink=(<<ENDCOPY);  <span style="visibility: hidden;">$lt{'cp'}</span>
   ENDCOPY
           } else {
               $copylink=(<<ENDCOPY);
 <a href="javascript:markcopy('$esc_path','$index','$renametitle','$container','$symb','$folder');" class="LC_docs_copy">$lt{'cp'}</a>  <a href="javascript:markcopy('$esc_path','$index','$renametitle','$container','$symb','$folder');" class="LC_docs_copy">$lt{'cp'}</a>
 ENDCOPY  ENDCOPY
         }          }
  if (!$nocut) {          if ($nocut) {
     $cutlink=(<<ENDCUT);              $cutlink=(<<ENDCUT);
   <span style="visibility: hidden;">$lt{'ct'}</span>
   ENDCUT
           } else {
               $cutlink=(<<ENDCUT);
 <a href="javascript:cutres('$esc_path','$index','$renametitle','$container','$symb','$folder',$skip_confirm);" class="LC_docs_cut">$lt{'ct'}</a>  <a href="javascript:cutres('$esc_path','$index','$renametitle','$container','$symb','$folder',$skip_confirm);" class="LC_docs_cut">$lt{'ct'}</a>
 ENDCUT  ENDCUT
         }          }
         if (!$noremove) {          if ($noremove) {
               $removelink=(<<ENDREM);
   <span style="visibility: hidden;">$lt{'rm'}</a>
   ENDREM
           } else {
             $removelink=(<<ENDREM);              $removelink=(<<ENDREM);
 <a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a>  <a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a>
 ENDREM  ENDREM
         }          }
           $renamelink=(<<ENDREN);
   <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>
   ENDREN
  $form_start = '   $form_start = '
    <form action="/adm/coursedocs" method="post">     <form action="/adm/coursedocs" method="post">
 ';  ';
Line 2318  END Line 2293  END
    $selectbox     $selectbox
    $form_end     $form_end
 </td>  </td>
 <td class="LC_docs_entry_commands">  <td class="LC_docs_entry_commands"><span class="LC_nobreak">
 $removelink  $removelink
   $renamelink
 $cutlink  $cutlink
    <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>  
 $copylink  $copylink
   </span>
 </td>  </td>
 END  END
   
Line 2429  $form_common."\n". Line 2405  $form_common."\n".
 $form_start.  $form_start.
 $form_common.'  $form_common.'
 <span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" onclick="'."this.form.changeparms.value='randomorder';this.form.submit()".'" '.$ro_set.' /> '.&mt('Random Order').' </label></span></form>';  <span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" onclick="'."this.form.changeparms.value='randomorder';this.form.submit()".'" '.$ro_set.' /> '.&mt('Random Order').' </label></span></form>';
       } elsif ($supplementalflag && !$allowed) {
           $url .= ($url =~ /\?/) ? 'amp;':'?';
           $url .= 'folderpath='.&HTML::Entities::encode($esc_path,'<>&"');
     }      }
     if ($ispage) {      if ($ispage) {
         my $pagename=&escape($pagetitle);          my $pagename=&escape($pagetitle);
Line 2459  $form_common.' Line 2438  $form_common.'
             <span class="LC_nobreak">              <span class="LC_nobreak">
             <span class="LC_docs_ext_edit">$lt{'ti'}&nbsp;</span>              <span class="LC_docs_ext_edit">$lt{'ti'}&nbsp;</span>
             <input type="text" size="40" name="exttitle" value="$title" />              <input type="text" size="40" name="exttitle" value="$title" />
             $uploadtag              $pathitem
             <input type="hidden" name="importdetail" value="" />              <input type="hidden" name="importdetail" value="" />
             <input type="button" value="$lt{'sv'}" onclick="javascript:setExternal(this.form,'$residx')" />              <input type="button" value="$lt{'sv'}" onclick="javascript:setExternal(this.form,'$residx')" />
             </span>              </span>
Line 2467  $form_common.' Line 2446  $form_common.'
             </form>              </form>
 EXTLNK  EXTLNK
         } else {          } else {
             my ($cfile,$home,$switchserver,$uploaded) =              my ($cfile,$home,$switchserver,$forceedit,$forceview) =
                 &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom);                  &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url);
             if (($cfile ne '') && ($symb ne '')) {              my $geteditlink;
               if ($supplementalflag) {
                   if ($orig_url eq "/adm/$env{'user.domain'}/$env{'user.name'}/aboutme") {
                       $geteditlink = 1;
                   }
               } elsif (($cfile ne '') && ($symb ne '')) {
                   $geteditlink = 1;
               }
               if ($geteditlink) {
                 my $jscall =                  my $jscall =
                     &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,                      &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,
                                                             $switchserver,                                                              $switchserver,
                                                             $uploaded,$symb);                                                              $forceedit,
                                                               undef,$symb);
                 if ($jscall) {                  if ($jscall) {
                     $editlink = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:'.                      $editlink = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:'.
                                 $jscall.'" >'.&mt('Edit').'</a>';                                  $jscall.'" >'.&mt('Edit').'</a>';
Line 2536  ENDPARMS Line 2524  ENDPARMS
     return $line;      return $line;
 }  }
   
   sub newmap_suffix {
       my ($area,$container,$coursedom,$coursenum) = @_;
       my ($prefix,$idtype,$errtext,$locknotfreed);
       $prefix = 'docs';
       if ($area eq 'supplemental') {
           $prefix = 'supp';
       }
       $prefix .= $container;
       $idtype = 'concat';
       my ($suffix,$freedlock,$error) =
           &Apache::lonnet::get_timebased_id($prefix,'num','uploadedmaps',
                                             $coursedom,$coursenum);
       if (!$suffix) {
           $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new folder/page.');
           if ($error) {
               $errtext .= '<br />'.$error;
           }
       }
       if ($freedlock ne 'ok') {
           $locknotfreed = '<div class="LC_error">'.&mt('There was a problem removing a lockfile. This will prevent creation of additional folders or composite pages in this course.  Please contact the domain coordinator for your LON-CAPA domain.').'</div>';
       }
       return ($suffix,$errtext,$locknotfreed);
   }
   
 =pod  =pod
   
 =item tiehash()  =item tiehash()
Line 3231  sub handler { Line 3243  sub handler {
     my $addentries = {};      my $addentries = {};
     my $container;      my $container;
     my $containertag;      my $containertag;
     my $uploadtag;      my $pathitem;
   
 # Do we directly jump somewhere?  # Do we directly jump somewhere?
   
Line 3364  sub handler { Line 3376  sub handler {
             $container='page';              $container='page';
             $containertag = '<input type="hidden" name="pagepath" value="" />'.              $containertag = '<input type="hidden" name="pagepath" value="" />'.
                     '<input type="hidden" name="pagesymb" value="" />';                      '<input type="hidden" name="pagesymb" value="" />';
             $uploadtag =               $pathitem = 
                 '<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />'.                  '<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />'.
         '<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />'.          '<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />'.
                 '<input type="hidden" name="folderpath" value="" />';                  '<input type="hidden" name="folderpath" value="" />';
Line 3378  sub handler { Line 3390  sub handler {
                 }                  }
             }              }
             $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,'<>&"').'" />';              $pathitem = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
         }          }
         if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {          if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
            $showdoc='/'.$1;             $showdoc='/'.$1;
Line 3533  sub handler { Line 3545  sub handler {
                 'srch' => 'Search',                  'srch' => 'Search',
                 'impo' => 'Import',                  'impo' => 'Import',
                 'lnks' => 'Import from Stored Links',                  'lnks' => 'Import from Stored Links',
                   'impm' => 'Import from Assembled Map',
                 'selm' => 'Select Map',                  'selm' => 'Select Map',
                 'load' => 'Load Map',                  'load' => 'Load Map',
                 'reco' => 'Recover Deleted Documents',                  'reco' => 'Recover Deleted Documents',
Line 3620  IMSFORM Line 3633  IMSFORM
  <br />   <br />
  $lt{'title'}:<br />   $lt{'title'}:<br />
  <input type="text" size="60" name="comment" />   <input type="text" size="60" name="comment" />
  $uploadtag   $pathitem
  <input type="hidden" name="cmd" value="upload_default" />   <input type="hidden" name="cmd" value="upload_default" />
  <br />   <br />
  <span class="LC_nobreak" style="float:left">   <span class="LC_nobreak" style="float:left">
Line 3632  IMSFORM Line 3645  IMSFORM
         </form>          </form>
 FUFORM  FUFORM
   
  my $simpleeditdefaultform=(<<SEDFFORM);          my $importpubform=(<<SEDFFORM);
  <form action="/adm/coursedocs" method="post" name="simpleeditdefault">          <a class="LC_menubuttons_link" href="javascript:toggleMap();">
  <input type="hidden" name="active" value="bb" />          $lt{'impm'}</a>$help{'Load_Map'}
           <form action="/adm/coursedocs" method="post" name="mapimportform">
           <fieldset id="importmapform" style="display: none;" />
           <legend>$lt{'impm'}</legend>
           <input type="hidden" name="active" value="bb" />
           $lt{'copm'}<br />
           <span class="LC_nobreak">
           <input type="text" name="importmap" size="40" value=""
           onfocus="this.blur();openbrowser('mapimportform','importmap','sequence,page','');" />
           &nbsp;<a href="javascript:openbrowser('mapimportform','importmap','sequence,page','');">$lt{'selm'}</a><br />
           <input type="submit" name="loadmap" value="$lt{'load'}" />
           </fieldset>
           </form>
   
 SEDFFORM  SEDFFORM
   
  my @simpleeditdefaultforma = (    my @simpleeditdefaultforma = ( 
  { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => "$uploadtag<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },   { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => "$pathitem<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },
  { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'"  onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },   { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'"  onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
         { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:open_StoredLinks_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_StoredLinks_Import();'>$lt{'lnks'}</a>" },          { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:open_StoredLinks_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_StoredLinks_Import();'>$lt{'lnks'}</a>" },
  );          { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap();" />' => $importpubform }
  $simpleeditdefaultform .= &create_form_ul(&create_list_elements(@simpleeditdefaultforma));          );
  $simpleeditdefaultform .=(<<SEDFFORM);          $importpubform = &create_form_ul(&create_list_elements(@importpubforma));
  <hr id="bb_hrule" style="width:0px;text-align:left;margin-left:0" />  
  $lt{'copm'}<br />  
  <input type="text" size="40" name="importmap" /><br />  
  <span class="LC_nobreak" style="float:left"><input type="button"  
  onclick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"  
  value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" />  
  $help{'Load_Map'}</span>  
  </form>  
 SEDFFORM  
   
       my $extresourcesform=(<<ERFORM);        my $extresourcesform=(<<ERFORM);
       <a class="LC_menubuttons_link" href="javascript:toggleUpload('ext');">$lt{'extr'}</a>$help{'Adding_External_Resource'}        <a class="LC_menubuttons_link" href="javascript:toggleUpload('ext');">$lt{'extr'}</a>$help{'Adding_External_Resource'}
Line 3664  SEDFFORM Line 3682  SEDFFORM
       <input type="button" name="view" value="$lt{'prev'}" onclick="javascript:extUrlPreview('exturl');" /><br />        <input type="button" name="view" value="$lt{'prev'}" onclick="javascript:extUrlPreview('exturl');" /><br />
       $lt{'title'}:<br />        $lt{'title'}:<br />
       <input type="text" size="60" name="exttitle" value="$lt{'extr'}" />        <input type="text" size="60" name="exttitle" value="$lt{'extr'}" />
       $uploadtag        $pathitem
       <br />        <br />
       <input type="hidden" name="importdetail" value="" />        <input type="hidden" name="importdetail" value="" />
       <input type="button" value="$lt{'lnk'}" onclick="javascript:setExternal(this.form,0)" />        <input type="button" value="$lt{'lnk'}" onclick="javascript:setExternal(this.form,0)" />
Line 3689  ERFORM Line 3707  ERFORM
  </form>   </form>
   
 HIDDENFORM  HIDDENFORM
         $r->print(&makesimpleeditform($uploadtag)."\n".          $r->print(&makesimpleeditform($pathitem)."\n".
                   &makedocslogform($uploadtag."\n".                    &makedocslogform($pathitem."\n".
                                    '<input type="hidden" name="folder" value="'.                                     '<input type="hidden" name="folder" value="'.
                                    $env{'form.folder'}.'" />'."\n"));                                     $env{'form.folder'}.'" />'."\n"));
     }      }
Line 3713  HIDDENFORM Line 3731  HIDDENFORM
            $folder='default';             $folder='default';
    $savefolderpath = $env{'form.folderpath'};     $savefolderpath = $env{'form.folderpath'};
    $env{'form.folderpath'}='default&'.&escape(&mt('Content'));     $env{'form.folderpath'}='default&'.&escape(&mt('Content'));
            $uploadtag = '<input type="hidden" name="folderpath" value="'.             $pathitem = '<input type="hidden" name="folderpath" value="'.
        &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';         &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        }         }
        my $postexec='';         my $postexec='';
Line 3727  HIDDENFORM Line 3745  HIDDENFORM
        } else {         } else {
            #$postexec='self.close();';             #$postexec='self.close();';
        }         }
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.         my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.sequence';
                      '.sequence';                       '.sequence';
        my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.         my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.page';
                      '.page';                       '.page';
  my $container='sequence';   my $container='sequence';
  if ($env{'form.pagepath'}) {   if ($env{'form.pagepath'}) {
Line 3740  HIDDENFORM Line 3758  HIDDENFORM
  my $newnavform=(<<NNFORM);   my $newnavform=(<<NNFORM);
  <form action="/adm/coursedocs" method="post" name="newnav">   <form action="/adm/coursedocs" method="post" name="newnav">
  <input type="hidden" name="active" value="cc" />   <input type="hidden" name="active" value="cc" />
  $uploadtag   $pathitem
  <input type="hidden" name="importdetail"    <input type="hidden" name="importdetail" 
  value="$lt{'navc'}=/adm/navmaps" />   value="$lt{'navc'}=/adm/navmaps" />
  <a class="LC_menubuttons_link" href="javascript:document.newnav.submit()">$lt{'navc'}</a>   <a class="LC_menubuttons_link" href="javascript:document.newnav.submit()">$lt{'navc'}</a>
Line 3750  NNFORM Line 3768  NNFORM
  my $newsmppageform=(<<NSPFORM);   my $newsmppageform=(<<NSPFORM);
  <form action="/adm/coursedocs" method="post" name="newsmppg">   <form action="/adm/coursedocs" method="post" name="newsmppg">
  <input type="hidden" name="active" value="cc" />   <input type="hidden" name="active" value="cc" />
  $uploadtag   $pathitem
  <input type="hidden" name="importdetail" value="" />   <input type="hidden" name="importdetail" value="" />
  <a class="LC_menubuttons_link" href="javascript:makesmppage();"> $lt{'sipa'}</a>   <a class="LC_menubuttons_link" href="javascript:makesmppage();"> $lt{'sipa'}</a>
  $help{'Simple Page'}   $help{'Simple Page'}
Line 3760  NSPFORM Line 3778  NSPFORM
  my $newsmpproblemform=(<<NSPROBFORM);   my $newsmpproblemform=(<<NSPROBFORM);
  <form action="/adm/coursedocs" method="post" name="newsmpproblem">   <form action="/adm/coursedocs" method="post" name="newsmpproblem">
  <input type="hidden" name="active" value="cc" />   <input type="hidden" name="active" value="cc" />
  $uploadtag   $pathitem
  <input type="hidden" name="importdetail" value="" />   <input type="hidden" name="importdetail" value="" />
  <a class="LC_menubuttons_link" href="javascript:makesmpproblem();">$lt{'sipr'}</a>   <a class="LC_menubuttons_link" href="javascript:makesmpproblem();">$lt{'sipr'}</a>
  $help{'Simple Problem'}   $help{'Simple Problem'}
Line 3771  NSPROBFORM Line 3789  NSPROBFORM
  my $newdropboxform=(<<NDBFORM);   my $newdropboxform=(<<NDBFORM);
  <form action="/adm/coursedocs" method="post" name="newdropbox">   <form action="/adm/coursedocs" method="post" name="newdropbox">
  <input type="hidden" name="active" value="cc" />   <input type="hidden" name="active" value="cc" />
  $uploadtag   $pathitem
  <input type="hidden" name="importdetail" value="" />   <input type="hidden" name="importdetail" value="" />
  <a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a>   <a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a>
  </form>   </form>
Line 3780  NDBFORM Line 3798  NDBFORM
  my $newexuploadform=(<<NEXUFORM);   my $newexuploadform=(<<NEXUFORM);
  <form action="/adm/coursedocs" method="post" name="newexamupload">   <form action="/adm/coursedocs" method="post" name="newexamupload">
  <input type="hidden" name="active" value="cc" />   <input type="hidden" name="active" value="cc" />
  $uploadtag   $pathitem
  <input type="hidden" name="importdetail" value="" />   <input type="hidden" name="importdetail" value="" />
  <a class="LC_menubuttons_link" href="javascript:makeexamupload();">$lt{'scuf'}</a>   <a class="LC_menubuttons_link" href="javascript:makeexamupload();">$lt{'scuf'}</a>
  $help{'Score_Upload_Form'}   $help{'Score_Upload_Form'}
Line 3790  NEXUFORM Line 3808  NEXUFORM
  my $newbulform=(<<NBFORM);   my $newbulform=(<<NBFORM);
  <form action="/adm/coursedocs" method="post" name="newbul">   <form action="/adm/coursedocs" method="post" name="newbul">
  <input type="hidden" name="active" value="cc" />   <input type="hidden" name="active" value="cc" />
  $uploadtag   $pathitem
  <input type="hidden" name="importdetail" value="" />   <input type="hidden" name="importdetail" value="" />
  <a class="LC_menubuttons_link" href="javascript:makebulboard();" >$lt{'bull'}</a>   <a class="LC_menubuttons_link" href="javascript:makebulboard();" >$lt{'bull'}</a>
  $help{'Bulletin Board'}   $help{'Bulletin Board'}
Line 3800  NBFORM Line 3818  NBFORM
  my $newaboutmeform=(<<NAMFORM);   my $newaboutmeform=(<<NAMFORM);
  <form action="/adm/coursedocs" method="post" name="newaboutme">   <form action="/adm/coursedocs" method="post" name="newaboutme">
  <input type="hidden" name="active" value="cc" />   <input type="hidden" name="active" value="cc" />
  $uploadtag   $pathitem
  <input type="hidden" name="importdetail"    <input type="hidden" name="importdetail" 
  value="$plainname=/adm/$udom/$uname/aboutme" />   value="$plainname=/adm/$udom/$uname/aboutme" />
  <a class="LC_menubuttons_link" href="javascript:document.newaboutme.submit()">$lt{'mypi'}</a>   <a class="LC_menubuttons_link" href="javascript:document.newaboutme.submit()">$lt{'mypi'}</a>
Line 3811  NAMFORM Line 3829  NAMFORM
  my $newaboutsomeoneform=(<<NASOFORM);   my $newaboutsomeoneform=(<<NASOFORM);
  <form action="/adm/coursedocs" method="post" name="newaboutsomeone">   <form action="/adm/coursedocs" method="post" name="newaboutsomeone">
  <input type="hidden" name="active" value="cc" />   <input type="hidden" name="active" value="cc" />
  $uploadtag   $pathitem
  <input type="hidden" name="importdetail" value="" />   <input type="hidden" name="importdetail" value="" />
  <a class="LC_menubuttons_link" href="javascript:makeabout();">$lt{'abou'}</a>   <a class="LC_menubuttons_link" href="javascript:makeabout();">$lt{'abou'}</a>
  </form>   </form>
Line 3821  NASOFORM Line 3839  NASOFORM
  my $newrosterform=(<<NROSTFORM);   my $newrosterform=(<<NROSTFORM);
  <form action="/adm/coursedocs" method="post" name="newroster">   <form action="/adm/coursedocs" method="post" name="newroster">
  <input type="hidden" name="active" value="cc" />   <input type="hidden" name="active" value="cc" />
  $uploadtag   $pathitem
  <input type="hidden" name="importdetail"    <input type="hidden" name="importdetail" 
  value="$lt{'rost'}=/adm/viewclasslist" />   value="$lt{'rost'}=/adm/viewclasslist" />
  <a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a>   <a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a>
Line 3863  NFFORM Line 3881  NFFORM
  my $newsylform=(<<NSYLFORM);   my $newsylform=(<<NSYLFORM);
  <form action="/adm/coursedocs" method="post" name="newsyl">   <form action="/adm/coursedocs" method="post" name="newsyl">
  <input type="hidden" name="active" value="cc" />   <input type="hidden" name="active" value="cc" />
  $uploadtag   $pathitem
  <input type="hidden" name="importdetail"    <input type="hidden" name="importdetail" 
  value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />   value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
  <a class="LC_menubuttons_link" href="javascript:document.newsyl.submit()">$lt{'syll'}</a>   <a class="LC_menubuttons_link" href="javascript:document.newsyl.submit()">$lt{'syll'}</a>
Line 3875  NSYLFORM Line 3893  NSYLFORM
  my $newgroupfileform=(<<NGFFORM);   my $newgroupfileform=(<<NGFFORM);
  <form action="/adm/coursedocs" method="post" name="newgroupfiles">   <form action="/adm/coursedocs" method="post" name="newgroupfiles">
  <input type="hidden" name="active" value="cc" />   <input type="hidden" name="active" value="cc" />
  $uploadtag   $pathitem
  <input type="hidden" name="importdetail"   <input type="hidden" name="importdetail"
  value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />   value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
  <a class="LC_menubuttons_link" href="javascript:document.newgroupfiles.submit()">$lt{'grpo'}</a>   <a class="LC_menubuttons_link" href="javascript:document.newgroupfiles.submit()">$lt{'grpo'}</a>
Line 3918  NGFFORM Line 3936  NGFFORM
   
 my %orderhash = (  my %orderhash = (
                 'aa' => ['Import Content',$fileuploadform],                  'aa' => ['Import Content',$fileuploadform],
                 'bb' => ['Published Content',$simpleeditdefaultform],                  'bb' => ['Published Content',$importpubform],
                 'cc' => ['Grading Resources',$gradingform],                  'cc' => ['Grading Resources',$gradingform],
                 );                  );
 unless ($env{'form.pagepath'}) {  unless ($env{'form.pagepath'}) {
Line 3930  unless ($env{'form.pagepath'}) { Line 3948  unless ($env{'form.pagepath'}) {
  $hadchanges=0;   $hadchanges=0;
        unless (($supplementalflag || $toolsflag)) {         unless (($supplementalflag || $toolsflag)) {
           my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,            my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
                               $supplementalflag,\%orderhash,$iconpath,$uploadtag);                                $supplementalflag,\%orderhash,$iconpath,$pathitem);
           if ($error) {            if ($error) {
              $r->print('<p><span class="LC_error">'.$error.'</span></p>');               $r->print('<p><span class="LC_error">'.$error.'</span></p>');
           }            }
Line 3955  unless ($env{'form.pagepath'}) { Line 3973  unless ($env{'form.pagepath'}) {
   $env{'form.folderpath'} = $savefolderpath;    $env{'form.folderpath'} = $savefolderpath;
        }         }
        $env{'form.pagepath'} = '';         $env{'form.pagepath'} = '';
          $pathitem = '<input type="hidden" name="folderpath" value="'.
                       &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        if ($allowed) {         if ($allowed) {
    my $folderseq=     my $folderseq=
        '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.         '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_new.sequence';
        '.sequence';  
   
    my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');  
   
  my $supupdocform=(<<SUPDOCFORM);   my $supupdocform=(<<SUPDOCFORM);
         <a class="LC_menubuttons_link" href="javascript:toggleUpload('suppdoc');">          <a class="LC_menubuttons_link" href="javascript:toggleUpload('suppdoc');">
Line 3979  unless ($env{'form.pagepath'}) { Line 3996  unless ($env{'form.pagepath'}) {
  $lt{'comment'}:<br />   $lt{'comment'}:<br />
  <textarea cols="50" rows="4" name="comment"></textarea>   <textarea cols="50" rows="4" name="comment"></textarea>
  <br />   <br />
  <input type="hidden" name="folderpath" value="$path" />          $pathitem
  <input type="hidden" name="cmd" value="upload_supplemental" />   <input type="hidden" name="cmd" value="upload_supplemental" />
         <input type='submit' value="$lt{'upld'}" />          <input type='submit' value="$lt{'upld'}" />
         </form>          </form>
Line 3987  unless ($env{'form.pagepath'}) { Line 4004  unless ($env{'form.pagepath'}) {
  my $supnewfolderform=(<<SNFFORM);   my $supnewfolderform=(<<SNFFORM);
  <form action="/adm/coursedocs" method="post" name="supnewfolder">   <form action="/adm/coursedocs" method="post" name="supnewfolder">
  <input type="hidden" name="active" value="ee" />   <input type="hidden" name="active" value="ee" />
  <input type="hidden" name="folderpath" value="$path" />          $pathitem
  <input type="hidden" name="importdetail" value="" />   <input type="hidden" name="importdetail" value="" />
  <a class="LC_menubuttons_link" href="javascript:makenewfolder(document.supnewfolder,'$folderseq');">$lt{'newf'}</a>    <a class="LC_menubuttons_link" href="javascript:makenewfolder(document.supnewfolder,'$folderseq');">$lt{'newf'}</a> 
  $help{'Adding_Folders'}   $help{'Adding_Folders'}
Line 4005  SNFFORM Line 4022  SNFFORM
         <input type="button" name="view" value="$lt{'prev'}" onclick="javascript:extUrlPreview('exturl');" /><br />          <input type="button" name="view" value="$lt{'prev'}" onclick="javascript:extUrlPreview('exturl');" /><br />
         $lt{'title'}:<br />          $lt{'title'}:<br />
         <input type="text" size="60" name="exttitle" value="$lt{'extr'}" />          <input type="text" size="60" name="exttitle" value="$lt{'extr'}" />
         $uploadtag          $pathitem
         <br />          <br />
         <input type="hidden" name="importdetail" value="" />          <input type="hidden" name="importdetail" value="" />
         <input type="button" value="$lt{'lnk'}" onclick="javascript:setExternal(this.form,0)" />          <input type="button" value="$lt{'lnk'}" onclick="javascript:setExternal(this.form,0)" />
Line 4056  my %suporderhash = ( Line 4073  my %suporderhash = (
                 );                  );
         if ($supplementalflag) {          if ($supplementalflag) {
            my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,             my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
                                $supplementalflag,\%suporderhash,$iconpath,$uploadtag);                                 $supplementalflag,\%suporderhash,$iconpath,$pathitem);
            if ($error) {             if ($error) {
               $r->print('<p><span class="LC_error">'.$error.'</span></p>');                $r->print('<p><span class="LC_error">'.$error.'</span></p>');
            }             }
         }          }
     } elsif ($supplementalflag) {      } elsif ($supplementalflag) {
         my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,          my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
                             $supplementalflag,'',$iconpath,$uploadtag);                              $supplementalflag,'',$iconpath,$pathitem);
         if ($error) {          if ($error) {
             $r->print('<p><span class="LC_error">'.$error.'</span></p>');              $r->print('<p><span class="LC_error">'.$error.'</span></p>');
         }          }
Line 4546  function makeabout() { Line 4563  function makeabout() {
 }  }
 }  }
   
   function toggleUpload(caller) {
       var blocks = Array($fieldsets);
       for (var i=0; i<blocks.length; i++) {
           var disp = 'none';
           if (caller == blocks[i]) {
               var curr = document.getElementById('upload'+caller+'form').style.display;
               if (curr == 'none') {
                   disp='block';
               }
           }
           document.getElementById('upload'+blocks[i]+'form').style.display=disp;
       }
       resize_scrollbox('contentscroll','1','1');
       return;
   }
   
   function toggleMap() {
       var disp = 'none';
       var curr = document.getElementById('importmapform').style.display;
       if (curr == 'none') {
           disp='block';
       }
       document.getElementById('importmapform').style.display=disp;
       resize_scrollbox('contentscroll','1','1');
       return;
   }
   
   
 function extUrlPreview(caller) {  function extUrlPreview(caller) {
     if (document.getElementById(caller)) {      if (document.getElementById(caller)) {
         var url = document.getElementById(caller).value;          var url = document.getElementById(caller).value;
Line 4748  function showPage(current, pageId, nav, Line 4793  function showPage(current, pageId, nav,
  currentData.style.display = 'block';   currentData.style.display = 'block';
         activeTab = pageId;          activeTab = pageId;
         toggleUpload();          toggleUpload();
           toggleMap();
         if (nav == 'mainnav') {          if (nav == 'mainnav') {
             var storedpath = "$docs_folderpath";              var storedpath = "$docs_folderpath";
             if (storedpath == '') {              if (storedpath == '') {
Removed from v.1.484.2.12  
changed lines
  Added in v.1.484.2.18

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