Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.314 and 1.329

version 1.314, 2012/05/28 13:09:17 version 1.329, 2012/11/03 23:32:37
Line 95  sub direct_parm_link { Line 95  sub direct_parm_link {
     $filter=&entity_encode($filter);      $filter=&entity_encode($filter);
     $part=&entity_encode($part);      $part=&entity_encode($part);
     if (($symb) && (&Apache::lonnet::allowed('opa')) && ($target ne 'tex')) {      if (($symb) && (&Apache::lonnet::allowed('opa')) && ($target ne 'tex')) {
        return "<a target='_top' href='/adm/parmset?symb=$symb&filter=$filter&part=$part'><span class='LC_setting'>$linktext</span></a>";         return "<a target='_top' href='/adm/parmset?symb=$symb&amp;filter=$filter&amp;part=$part'><span class='LC_setting'>$linktext</span></a>";
     } else {      } else {
        return $linktext;         return $linktext;
     }      }
Line 209  dependencies for a web page uploaded dir Line 209  dependencies for a web page uploaded dir
 =cut  =cut
   
 sub dependencycheck_js {  sub dependencycheck_js {
     my ($symb,$title) = @_;      my ($symb,$title,$url) = @_;
     my $link = '/adm/dependencies?symb='.&HTML::Entities::encode($symb,'<>&"').      my $link = '/adm/dependencies?symb='.&HTML::Entities::encode($symb,'<>&"').
                '&title='.&HTML::Entities::encode($title,'<>&"');                 '&title='.&HTML::Entities::encode($title,'<>&"').
                  '&url='.&HTML::Entities::encode($url,'<>&"');
     return <<ENDJS;      return <<ENDJS;
                 <script type="text/javascript">                  <script type="text/javascript">
                 // <![CDATA[                  // <![CDATA[
Line 1100  sub Close_PrgWin { Line 1101  sub Close_PrgWin {
     undef(%$prog_state);      undef(%$prog_state);
 }  }
   
   
 # ------------------------------------------------------- Puts directory header  # ------------------------------------------------------- Puts directory header
   
 sub crumbs {  sub crumbs {
Line 1210  ENDEDITOR Line 1212  ENDEDITOR
 <link rel="stylesheet" type="text/css" href="/adm/jpicker/css/jPicker-1.1.6.min.css" />  <link rel="stylesheet" type="text/css" href="/adm/jpicker/css/jPicker-1.1.6.min.css" />
 <script type="text/javascript" src="/adm/countdown/js/jquery.countdown.js"></script>  <script type="text/javascript" src="/adm/countdown/js/jquery.countdown.js"></script>
 <link rel="stylesheet" type="text/css" href="/adm/countdown/css/jquery.countdown.css" />  <link rel="stylesheet" type="text/css" href="/adm/countdown/css/jquery.countdown.css" />
   
   <script type="text/javascript" src="/adm/spellchecker/js/jquery.spellchecker.min.js"></script>
   <link rel="stylesheet" type="text/css" href="/adm/spellchecker/css/spellchecker.css" />
   
 ENDJQUERY  ENDJQUERY
  return $s;   return $s;
 }  }
Line 1225  sub htmlarea_lang { Line 1231  sub htmlarea_lang {
     return $lang;      return $lang;
 }  }
   
   # return javacsript to activate elements of .colorchooser with jpicker:
   # Caller is responsible for enclosing this in <script> tags:
   #
   sub color_picker {
       return '
   $(document).ready(function(){
       $.fn.jPicker.defaults.images.clientPath="/adm/jpicker/images/";
       $(".colorchooser").jPicker({window: { position: {x: "screenCenter", y: "bottom"}}});
   });';
   }
   
 # ----------------------------------------- Script to activate only some fields  # ----------------------------------------- Script to activate only some fields
   
 sub htmlareaselectactive {  sub htmlareaselectactive {
Line 1338  sub htmlareaselectactive { Line 1355  sub htmlareaselectactive {
  $(this).before("<div><a href=\"#\" id=\"LC_rt_"+id+"\" title=\"Enable rich text formatting (bold, italic, etc.)\" class=\"LC_enable_rt\"><b>Rich formatting &raquo;</b></a></div>");   $(this).before("<div><a href=\"#\" id=\"LC_rt_"+id+"\" title=\"Enable rich text formatting (bold, italic, etc.)\" class=\"LC_enable_rt\"><b>Rich formatting &raquo;</b></a></div>");
  $("#LC_rt_"+id).click(editorHandler);   $("#LC_rt_"+id).click(editorHandler);
  });   });
                 $.fn.jPicker.defaults.images.clientPath="/adm/jpicker/images/";  
                 $(".colorchooser").jPicker();  
   
   
  });   });
 ';  ';
       $output .= &color_picker;
   
     # Code to put a due date countdown in 'duedatecountdown' span.      # Code to put a due date countdown in 'duedatecountdown' span.
     # This is currently located in the breadcrumb headers.      # This is currently located in the breadcrumb headers.
     # note that the dueDateLayout is internatinoalized below.      # note that the dueDateLayout is internatinoalized below.
Line 1397  sub htmlareaselectactive { Line 1414  sub htmlareaselectactive {
       });        });
    }     }
 });  });
   
       /* This code describes the spellcheck options that will be used for
          items with class 'spellchecked'.  It is necessary for those objects'
          to explicitly request checking (e.g. onblur is a nice event for that).
        */
        \$(document).ready(function() {
    \$(".spellchecked").spellchecker({
      url: "/ajax/spellcheck",
      lang: "en",                      
      engine: "pspell",
      suggestionBoxPosition: "below",
      innerDocument: true
     });
    \$("textarea.spellchecked").spellchecker({
      url: "/ajax/spellcheck",
      lang: "en",                      
      engine: "pspell",
      suggestionBoxPosition: "below",
      innerDocument: true
     });
   
    });
   
       /* the muli colored editor can generate spellcheck with language 'none'
          to disable spellcheck as well
       */
       function doSpellcheck(element, lang) {
    if (lang != 'none') {
        \$(element).spellchecker('option', {lang: lang});
       \$(element).spellchecker('check');
           }
       }
   
   
 JAVASCRIPT  JAVASCRIPT
     if ($dragmath_prefix ne '') {      if ($dragmath_prefix ne '') {
         $output .= '          $output .= '
Line 1453  sub show_return_link { Line 1504  sub show_return_link {
   
     unless ($env{'request.course.id'}) { return 0; }      unless ($env{'request.course.id'}) { return 0; }
     if ($env{'request.noversionuri'}=~m{^/priv/} ||      if ($env{'request.noversionuri'}=~m{^/priv/} ||
         $env{'request.uri'}=~m{^/~}) { return 1; }          $env{'request.uri'}=~m{^/priv/}) { return 1; }
   
     if (($env{'request.noversionuri'} =~ m{^/adm/(viewclasslist|navmaps)($|\?)})      if (($env{'request.noversionuri'} =~ m{^/adm/(viewclasslist|navmaps)($|\?)})
         || ($env{'request.noversionuri'} =~ m{^/adm/.*/aboutme($|\?)})) {          || ($env{'request.noversionuri'} =~ m{^/adm/.*/aboutme($|\?)})) {
Line 1492  sub set_due_date { Line 1543  sub set_due_date {
     # The code should correct for gross differences between the server      # The code should correct for gross differences between the server
     # and client's time setting      # and client's time setting
   
     my $js = "       return <<"END";
 <script type='text/javascript'>  
   <script type="text/javascript">
   //<![CDATA[    //<![CDATA[
 var serverDueDate = $duems;  var serverDueDate = $duems;
 var serverTime    = $now;  var serverTime    = $now;
Line 1502  var dueDate       = new Date(serverDueDa Line 1554  var dueDate       = new Date(serverDueDa
   
   //]]>    //]]>
 </script>  </script>
 ";  
   
     return $js;  END
 }  }
 ##  ##
 # Sets the time at which the problem finished computing.  # Sets the time at which the problem finished computing.
Line 1516  var dueDate       = new Date(serverDueDa Line 1567  var dueDate       = new Date(serverDueDa
 sub set_compute_end_time {  sub set_compute_end_time {
   
     my $now = time()*1000; # Javascript times are in ms.      my $now = time()*1000; # Javascript times are in ms.
     my $js = "      return <<"END";
 <script type='text/javascript'>  
   <script type="text/javascript">
 //<![CDATA[  //<![CDATA[
 serverTime = $now;  serverTime = $now;
 clientTime = (new Date()).getTime();  clientTime = (new Date()).getTime();
 //]]>  //]]>
 </script>  </script>
   
 ";  END
     return $js;  
       
 }  }
   
 ############################################################  ############################################################
Line 1618  returns: nothing Line 1668  returns: nothing
         my $links;          my $links;
         if ((&show_return_link) && (!$CourseBreadcrumbs)) {          if ((&show_return_link) && (!$CourseBreadcrumbs)) {
             my $alttext = &mt('Go Back');              my $alttext = &mt('Go Back');
             $links=&htmltag( 'a',"<img src='/res/adm/pages/reload.png' border='0' style='vertical-align:middle;' alt='$alttext' />",              $links=&htmltag( 'a','<img src="/res/adm/pages/tolastloc.png" alt="'.$alttext.'" class="LC_icon" />',
                             { href => '/adm/flip?postdata=return:',                              { href => '/adm/flip?postdata=return:',
                               title => &mt("Back to most recent content resource") });                                title => &mt('Back to most recent content resource'),
                                 class => 'LC_menubuttons_link',
                               });
             $links=&htmltag('li',$links);              $links=&htmltag('li',$links);
         }          }
         $links.= join "",           $links.= join "", 
Line 2873  PARAMSONE Line 2925  PARAMSONE
         if (itemid.offsetWidth != itemwstart) {          if (itemid.offsetWidth != itemwstart) {
             listwchange = 1;              listwchange = 1;
         }          }
 THIRD  
     if ($context eq 'docs') {  
         $output .= <<"DOCSTWO";  
         if (activeTab == 'cc1') {  
             if (document.getElementById('cc_hrule') != null) {  
                 document.getElementById('cc_hrule').style.width=actabw+"px";  
             }  
         } else {  
             if (activeTab == 'bb1') {  
                 if (document.getElementById('bb_hrule') != null) {  
                     document.getElementById('bb_hrule').style.width=actabw+"px";  
                 }  
             } else {  
                 if (activeTab == 'ee2') {  
                     if (document.getElementById('ee_hrule') != null) {  
                         document.getElementById('ee_hrule').style.width=actabw+"px";  
                     }  
                 }  
             }  
         }  
 DOCSTWO  
     }  
     $output .= <<"FOURTH";  
     }      }
     if ((chkh == 1) || (listwchange)) {      if ((chkh == 1) || (listwchange)) {
         var primaryheight = document.getElementById('LC_nav_bar').offsetHeight;          var primaryheight = document.getElementById('LC_nav_bar').offsetHeight;
Line 2955  function callResize() { Line 2984  function callResize() {
     timer=setTimeout('resize_scrollbox("$names{'scroll'}","1","1")',500);      timer=setTimeout('resize_scrollbox("$names{'scroll'}","1","1")',500);
 }  }
   
 FOURTH  THIRD
     return $output;      return $output;
 }  }
   
   ##############################################
   ##############################################
   
   sub javascript_jumpto_resource {
       my $confirm_switch = &mt("Editing requires switching to the resource's home server.").'\n'.
                            &mt('Switch server?');
       return (<<ENDUTILITY)
   
   function go(url) {
      if (url!='' && url!= null) {
          currentURL = null;
          currentSymb= null;
          window.location.href=url;
      }
   }
   
   function need_switchserver(url) {
       if (url!='' && url!= null) {
           if (confirm("$confirm_switch")) {
               go(url);
           }
       }
       return;
   }
   
   ENDUTILITY
   
   }
   
   sub jump_to_editres {
       my ($cfile,$home,$switchserver,$uploaded,$symb) = @_;
       my $jscall;
       if ($switchserver) {
           if ($symb && $home) {
               $cfile = '/adm/switchserver?otherserver='.$home.'&amp;role='.
                        &HTML::Entities::encode($env{'request.role'},'"<>&').'&amp;'.
                       'symb='.&HTML::Entities::encode($env{'request.symb'},'"<>&');
               if ($uploaded) {
                   $cfile .= '&amp;forceedit=1';
               }
               $jscall = "need_switchserver('$cfile');";
           }
       } else {
           if ($uploaded) {
               $cfile .= '?forceedit=1';
           }
           $jscall = "go('$cfile')";
       }
       return $jscall;
   }
   
 ##############################################  ##############################################
 ##############################################  ##############################################

Removed from v.1.314  
changed lines
  Added in v.1.329


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