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

Diff for /loncom/interface/londocs.pm between versions 1.511 and 1.518

version 1.511, 2012/11/29 20:37:07 version 1.518, 2012/12/02 22:40:09
Line 2142  sub entryline { Line 2142  sub entryline {
                                                  &Apache::lonnet::declutter($currurl));                                                   &Apache::lonnet::declutter($currurl));
         }          }
     }      }
     my %lt;      my ($renamelink,%lt);
     if ($allowed) {      if ($allowed) {
  my $incindex=$index+1;   my $incindex=$index+1;
  my $selectbox='';   my $selectbox='';
Line 2239  sub entryline { Line 2239  sub entryline {
                 $nocopy=1;                  $nocopy=1;
             }              }
         }          }
         my ($copylink,$cutlink,$removelink,$renamelink);          my ($copylink,$cutlink,$removelink);
  my $skip_confirm = 0;   my $skip_confirm = 0;
  if ( $folder =~ /^supplemental/   if ( $folder =~ /^supplemental/
      || ($url =~ m{( /smppg$       || ($url =~ m{( /smppg$
Line 2279  ENDREM Line 2279  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);          unless ($isexternal) {
               $renamelink=(<<ENDREN);
 <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>  <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>
 ENDREN  ENDREN
           }
  $form_start = '   $form_start = '
    <form action="/adm/coursedocs" method="post">     <form action="/adm/coursedocs" method="post">
 ';  ';
Line 2313  END Line 2315  END
 </td>  </td>
 <td class="LC_docs_entry_commands"><span class="LC_nobreak">  <td class="LC_docs_entry_commands"><span class="LC_nobreak">
 $removelink  $removelink
 $renamelink  
 $cutlink  $cutlink
 $copylink  $copylink
 </span>  </span>
Line 2353  END Line 2354  END
  }   }
     }      }
   
     my $editlink;      my ($editlink,$extresform);
     my $orig_url = $url;      my $orig_url = $url;
     $orig_url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};      $orig_url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
     $url=~s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/};      $url=~s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/};
Line 2451  $form_common.' Line 2452  $form_common.'
         my $fileloc =           my $fileloc = 
             &Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url));              &Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url));
         if ($isexternal) {          if ($isexternal) {
             $editlink = '&nbsp;'.              ($editlink,$extresform) = 
                 &Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem);                  &Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem);
         } elsif (!$isfolder && !$ispage) {          } elsif (!$isfolder && !$ispage) {
             my ($cfile,$home,$switchserver,$forceedit,$forceview) =               my ($cfile,$home,$switchserver,$forceedit,$forceview) = 
Line 2465  $form_common.' Line 2466  $form_common.'
                                                             &escape($env{'form.folderpath'}),                                                              &escape($env{'form.folderpath'}),
                                                             $renametitle);                                                              $renametitle);
                 if ($jscall) {                  if ($jscall) {
                     $editlink = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:'.                      $editlink = '<a class="LC_docs_ext_edit" href="javascript:'.
                                 $jscall.'" >'.&mt('Edit').'</a>';                                  $jscall.'" >'.&mt('Edit').'</a>&nbsp;'."\n";
                 }                  }
             }              }
         }          }
Line 2477  $form_common.' Line 2478  $form_common.'
     } else {      } else {
         $reinit = &mt('(re-initialize course to access)');          $reinit = &mt('(re-initialize course to access)');
     }        }  
     $line.='<td>';      $line.='<td class="LC_docs_entry_commands" align="right" valign="top"><span class="LC_nobreak">'.$editlink.$renamelink;
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {      if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
        $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>';         $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>';
     } elsif ($url) {      } elsif ($url) {
Line 2486  $form_common.' Line 2487  $form_common.'
     } else {      } else {
        $line.='<img src="'.$icon.'" alt="" class="LC_icon" />';         $line.='<img src="'.$icon.'" alt="" class="LC_icon" />';
     }      }
     $line.='</td><td>';      $line.='</span></td><td width="80%">';
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {      if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
        $line.='<a href="'.$url.'">'.$title.'</a>';         $line.='<a href="'.$url.'">'.$title.'</a>';
     } elsif ($url) {      } elsif ($url) {
Line 2495  $form_common.' Line 2496  $form_common.'
     } else {      } else {
        $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';         $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';
     }      }
     $line.=$editlink."</td>";      $line.="$extresform</td>";
     $rand_pick_text = '&nbsp;' if ($rand_pick_text eq '');      $rand_pick_text = '&nbsp;' if ($rand_pick_text eq '');
     $rand_order_text = '&nbsp;' if ($rand_order_text eq '');      $rand_order_text = '&nbsp;' if ($rand_order_text eq '');
     if (($allowed) && ($folder!~/^supplemental/)) {      if (($allowed) && ($folder!~/^supplemental/)) {
Line 3292  sub handler { Line 3293  sub handler {
                if ($mapurl eq 'default') {                 if ($mapurl eq 'default') {
                    $maptitle = 'Main Course Documents';                     $maptitle = 'Main Course Documents';
                }                 }
                $path .= ($path ne '')? '&' : ''.                 $path .= (($path ne '')? '&' : '').
                     &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.                      &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
                     &Apache::lonhtmlcommon::entity_encode($maptitle).                      &Apache::lonhtmlcommon::entity_encode($maptitle).
                     ':'.$mapresobj->randompick().                      ':'.$mapresobj->randompick().
Line 3596  sub handler { Line 3597  sub handler {
                 'prev' => 'Preview',                  'prev' => 'Preview',
                 'lnk'  => 'Add Link',                   'lnk'  => 'Add Link', 
                 'parse' => 'Upload embedded images/multimedia files if HTML file',                  'parse' => 'Upload embedded images/multimedia files if HTML file',
  'nd' => 'Upload Document',  
  'pm' => 'Published Map',  
  'sd' => 'Special Document',  
  'mo' => 'More Options',  
   );    );
 # -----------------------------------------------------------------------------  # -----------------------------------------------------------------------------
  my $fileupload=(<<FIUP);   my $fileupload=(<<FIUP);
Line 3623  CHBO Line 3620  CHBO
         <a class="LC_menubuttons_link" href="javascript:toggleUpload('ims');">          <a class="LC_menubuttons_link" href="javascript:toggleUpload('ims');">
         $lt{'imsf'}</a> $help{'Importing_IMS_Course'}          $lt{'imsf'}</a> $help{'Importing_IMS_Course'}
         <form name="uploadims" action="/adm/imsimportdocs" method="post" enctype="multipart/form-data" target="IMSimport">          <form name="uploadims" action="/adm/imsimportdocs" method="post" enctype="multipart/form-data" target="IMSimport">
         <fieldset id="uploadimsform" style="display: none;" />          <fieldset id="uploadimsform" style="display: none;">
         <legend>$lt{'imsf'}</legend>          <legend>$lt{'imsf'}</legend>
         $fileupload          $fileupload
         <br />          <br />
Line 3648  IMSFORM Line 3645  IMSFORM
         <a class="LC_menubuttons_link" href="javascript:toggleUpload('doc');">          <a class="LC_menubuttons_link" href="javascript:toggleUpload('doc');">
         $lt{'upfi'}</a> $help{'Uploading_From_Harddrive'}          $lt{'upfi'}</a> $help{'Uploading_From_Harddrive'}
         <form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">          <form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
         <fieldset id="uploaddocform" style="display: none;" />          <fieldset id="uploaddocform" style="display: none;">
         <legend>$lt{'upfi'}</legend>          <legend>$lt{'upfi'}</legend>
  <input type="hidden" name="active" value="aa" />   <input type="hidden" name="active" value="aa" />
  $fileupload   $fileupload
Line 3668  IMSFORM Line 3665  IMSFORM
 FUFORM  FUFORM
   
  my $importpubform=(<<SEDFFORM);   my $importpubform=(<<SEDFFORM);
         <a class="LC_menubuttons_link" href="javascript:toggleMap();">          <a class="LC_menubuttons_link" href="javascript:toggleMap('map');">
         $lt{'impm'}</a>$help{'Load_Map'}          $lt{'impm'}</a>$help{'Load_Map'}
  <form action="/adm/coursedocs" method="post" name="mapimportform">   <form action="/adm/coursedocs" method="post" name="mapimportform">
         <fieldset id="importmapform" style="display: none;" />          <fieldset id="importmapform" style="display: none;">
         <legend>$lt{'impm'}</legend>          <legend>$lt{'impm'}</legend>
  <input type="hidden" name="active" value="bb" />   <input type="hidden" name="active" value="bb" />
         $lt{'copm'}<br />          $lt{'copm'}<br />
         <span class="LC_nobreak">          <span class="LC_nobreak">
         <input type="text" name="importmap" size="40" value=""           <input type="text" name="importmap" size="40" value="" 
         onfocus="this.blur();openbrowser('mapimportform','importmap','sequence,page','');" />          onfocus="this.blur();openbrowser('mapimportform','importmap','sequence,page','');" />
         &nbsp;<a href="javascript:openbrowser('mapimportform','importmap','sequence,page','');">$lt{'selm'}</a><br />          &nbsp;<a href="javascript:openbrowser('mapimportform','importmap','sequence,page','');">$lt{'selm'}</a></span><br />
         <input type="submit" name="loadmap" value="$lt{'load'}" />          <input type="submit" name="loadmap" value="$lt{'load'}" />
         </fieldset>          </fieldset>
         </form>          </form>
Line 3688  SEDFFORM Line 3685  SEDFFORM
  { '<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/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 }          { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap(\'map\');" />' => $importpubform }
  );   );
  $importpubform = &create_form_ul(&create_list_elements(@importpubforma));   $importpubform = &create_form_ul(&create_list_elements(@importpubforma));
         my $extresourcesform =          my $extresourcesform =
Line 3947  my %orderhash = ( Line 3944  my %orderhash = (
 unless ($env{'form.pagepath'}) {  unless ($env{'form.pagepath'}) {
     $orderhash{'00'} = ['Newfolder',$newfolderform];      $orderhash{'00'} = ['Newfolder',$newfolderform];
     $orderhash{'dd'} = ['Collaboration',$communityform];      $orderhash{'dd'} = ['Collaboration',$communityform];
     $orderhash{'ee'} = ['Special Documents',$specialdocumentsform];      $orderhash{'ee'} = ['Special Pages',$specialdocumentsform];
 }  }
   
  $hadchanges=0;   $hadchanges=0;
Line 3988  unless ($env{'form.pagepath'}) { Line 3985  unless ($env{'form.pagepath'}) {
         <a class="LC_menubuttons_link" href="javascript:toggleUpload('suppdoc');">          <a class="LC_menubuttons_link" href="javascript:toggleUpload('suppdoc');">
         $lt{'upfi'}</a> $help{'Uploading_From_Harddrive'}          $lt{'upfi'}</a> $help{'Uploading_From_Harddrive'}
  <form action="/adm/coursedocs" method="post" name="supuploaddocument" enctype="multipart/form-data">   <form action="/adm/coursedocs" method="post" name="supuploaddocument" enctype="multipart/form-data">
         <fieldset id="uploadsuppdocform" style="display: none;" />          <fieldset id="uploadsuppdocform" style="display: none;">
         <legend>$lt{'upfi'}</legend>          <legend>$lt{'upfi'}</legend>
  <input type="hidden" name="active" value="ee" />   <input type="hidden" name="active" value="ee" />
  $fileupload   $fileupload
Line 4051  my @specialdocs = ( Line 4048  my @specialdocs = (
             =>$supnewaboutmeform},              =>$supnewaboutmeform},
  );   );
 my @supimportdoc = (  my @supimportdoc = (
  {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleUpload(\'suppext\')" />'   {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:toggleUpload(\'suppext\')" />'
             =>$supextform},              =>$supextform},
                 {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />'                  {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />'
             =>$supupdocform},              =>$supupdocform},
Line 4061  $supupdocform =  &create_form_ul(&create Line 4058  $supupdocform =  &create_form_ul(&create
 my %suporderhash = (  my %suporderhash = (
  '00' => ['Supnewfolder', $supnewfolderform],   '00' => ['Supnewfolder', $supnewfolderform],
                 'ee' => ['Import Content',$supupdocform],                  'ee' => ['Import Content',$supupdocform],
                 'ff' => ['Special Documents',&create_form_ul(&create_list_elements(@specialdocs))]                  'ff' => ['Special Pages',&create_form_ul(&create_list_elements(@specialdocs))]
                 );                  );
         if ($supplementalflag) {          if ($supplementalflag) {
            my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,             my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
Line 4345  sub generate_edit_table { Line 4342  sub generate_edit_table {
         $activetab = $env{'form.active'};          $activetab = $env{'form.active'};
     }      }
     my $backicon = $iconpath.'clickhere.gif';      my $backicon = $iconpath.'clickhere.gif';
     my $backtext = &mt('To Overview');      my $backtext = &mt('Exit');
     $form = '<div class="LC_Box" style="margin:0;">'.      $form = '<div class="LC_Box" style="margin:0;">'.
             '<ul id="navigation'.$tid.'" class="LC_TabContent">'."\n".              '<ul id="navigation'.$tid.'" class="LC_TabContent">'."\n".
             '<li class="goback">'.              '<li class="goback">'.
Line 4555  function toggleUpload(caller) { Line 4552  function toggleUpload(caller) {
     return;      return;
 }  }
   
 function toggleMap() {  function toggleMap(caller) {
     var disp = 'none';      var disp = 'none';
     if (document.getElementById('importmapform')) {      if (document.getElementById('importmapform')) {
         var curr = document.getElementById('importmapform').style.display;          if (caller == 'map') {
         if (curr == 'none') {              var curr = document.getElementById('importmapform').style.display;
             disp='block';              if (curr == 'none') {
                   disp='block';
               }
         }          }
         document.getElementById('importmapform').style.display=disp;          document.getElementById('importmapform').style.display=disp;
         resize_scrollbox('contentscroll','1','1');          resize_scrollbox('contentscroll','1','1');
Removed from v.1.511  
changed lines
  Added in v.1.518

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