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

Diff for /loncom/interface/lonextresedit.pm between versions 1.8.2.1 and 1.8.2.2

version 1.8.2.1, 2016/11/29 16:28:16 version 1.8.2.2, 2017/03/14 21:09:20
Line 229  sub extedit_form { Line 229  sub extedit_form {
         $fieldsetstyle,$action,$hiddenelem,$form);          $fieldsetstyle,$action,$hiddenelem,$form);
     $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 252  sub extedit_form { Line 253  sub extedit_form {
         $urlid = "exturl_$residx";          $urlid = "exturl_$residx";
         $srcclass = ' class="LC_nobreak"';          $srcclass = ' class="LC_nobreak"';
         $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'};
     } else {      } else {
Line 263  sub extedit_form { Line 264  sub extedit_form {
         $residx = 0;          $residx = 0;
         $orig_url = 'http://';          $orig_url = 'http://';
         $orig_title = $lt{'ex'};          $orig_title = $lt{'ex'};
         $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'};
         $pathitem .= '<br />';          $pathitem .= '<br />';
     }      }
Line 374  function editext(residx) { Line 375  function editext(residx) {
     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.8.2.1  
changed lines
  Added in v.1.8.2.2

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