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

Diff for /loncom/interface/lonextresedit.pm between versions 1.11 and 1.14

version 1.11, 2016/11/22 00:43:12 version 1.14, 2017/02/19 00:15:51
Line 347  sub extedit_form { Line 347  sub extedit_form {
         $fieldsetstyle,$action,$hiddenelem,$form,$width,$height,$tooltarget,%chkstate);          $fieldsetstyle,$action,$hiddenelem,$form,$width,$height,$tooltarget,%chkstate);
     $fieldsetstyle = 'display: none;';      $fieldsetstyle = 'display: none;';
     $action = '/adm/coursedocs';      $action = '/adm/coursedocs';
       my $protocol = ($ENV{'SERVER_PORT'} == 443?'https':'http');
     if ($residx) {      if ($residx) {
         if ($caller eq 'direct') {          if ($caller eq 'direct') {
             $fieldsetstyle = 'display: block;';              $fieldsetstyle = 'display: block;';
Line 377  sub extedit_form { Line 378  sub extedit_form {
         $srcclass = ' class="LC_nobreak"';          $srcclass = ' class="LC_nobreak"';
         if ($type eq 'ext') {          if ($type eq 'ext') {
             $extsrc = '<span class="LC_docs_ext_edit">'.$lt{'ul'}.'&nbsp;</span>';              $extsrc = '<span class="LC_docs_ext_edit">'.$lt{'ul'}.'&nbsp;</span>';
             $preview = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:extUrlPreview('."'$urlid'".');">'.$lt{'pr'}.'</a>';              $preview = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:extUrlPreview('."'$urlid','$protocol'".');">'.$lt{'pr'}.'</a>';
         }          }
         $title = '<span class="LC_docs_ext_edit">'.$lt{'ti'}.'&nbsp;</span>';          $title = '<span class="LC_docs_ext_edit">'.$lt{'ti'}.'&nbsp;</span>';
         $save = $lt{'sv'};          $save = $lt{'sv'};
Line 399  sub extedit_form { Line 400  sub extedit_form {
             $orig_url = 'http://';              $orig_url = 'http://';
             $orig_title = $lt{'ex'};              $orig_title = $lt{'ex'};
             $extsrc = $lt{'ul'}.':<br />';              $extsrc = $lt{'ul'}.':<br />';
             $preview = '<input type="button" name="view" value="'.$lt{'pr'}.'" onclick="javascript:extUrlPreview('."'$urlid'".');"'.$disabled.' />';              $preview = '<input type="button" name="view" value="'.$lt{'pr'}.'" onclick="javascript:extUrlPreview('."'$urlid','$protocol'".');"'.$disabled.' />';
             $save = $lt{'al'};              $save = $lt{'al'};
         } else {          } else {
             $orig_title = $lt{'et'};              $orig_title = $lt{'et'};
Line 528  $title Line 529  $title
 <input type="hidden" name="importdetail" value="" />  <input type="hidden" name="importdetail" value="" />
 $pathitem  $pathitem
 $hiddenelem  $hiddenelem
 <input type="button" value="$save" onclick="javascript:setExternal(this.form,'$residx','$type','$orig_url','$supplementalflag');"'.$disabled.' />  <input type="button" value="$save" onclick="javascript:setExternal(this.form,'$residx','$type','$orig_url','$supplementalflag');" $disabled />
 </span>  </span>
 </div>  </div>
 </fieldset>  </fieldset>
Line 543  ENDFORM Line 544  ENDFORM
   
 sub display_editor {  sub display_editor {
     my ($url,$folderpath,$symb,$idx,$type,$cdom,$cnum) = @_;      my ($url,$folderpath,$symb,$idx,$type,$cdom,$cnum) = @_;
     my ($residx,$supplementalflag,$title,$pathitem,$output,$js);      my ($residx,$supplementalflag,$title,$pathitem,$output,$js,$navmap);
     if ($folderpath =~ /^supplemental/) {      if ($folderpath =~ /^supplemental/) {
         $supplementalflag = 1;          $supplementalflag = 1;
         $residx = $idx;          $residx = $idx;
Line 553  sub display_editor { Line 554  sub display_editor {
         (my $map,$residx,my $res) =          (my $map,$residx,my $res) =
             &Apache::lonnet::decode_symb($symb);              &Apache::lonnet::decode_symb($symb);
         $title = &Apache::lonnet::gettitle($symb);          $title = &Apache::lonnet::gettitle($symb);
         my $path = &Apache::loncommon::symb_to_docspath($symb);          my $path = &Apache::loncommon::symb_to_docspath($symb,\$navmap);
         $pathitem = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($path,'<>&"').'" />';          $pathitem = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($path,'<>&"').'" />';
     }      }
     my %ltitools;      my %ltitools;
Line 733  function editext(residx,type) { Line 734  function editext(residx,type) {
     return;      return;
 }  }
   
 function extUrlPreview(caller) {  function extUrlPreview(caller,protocol) {
     if (document.getElementById(caller)) {      if (document.getElementById(caller)) {
         var url = document.getElementById(caller).value;          var url = document.getElementById(caller).value;
         if (regexp.test(url)) {          if (regexp.test(url)) {
             openMyModal(url,500,400,'yes');              var http_regex = /^http\:\/\//gi;
               if ((protocol == 'https') && (http_regex.test(url))) {
                   window.open(url,"externalpreview","height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1");
               } else {
                   openMyModal(url,500,400,'yes');
               }
         } else {          } else {
             alert("$js_lt{'invurl'}");              alert("$js_lt{'invurl'}");
         }          }
Removed from v.1.11  
changed lines
  Added in v.1.14

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