Diff for /loncom/interface/loncommon.pm between versions 1.1044 and 1.1048

version 1.1044, 2011/12/21 21:25:40 version 1.1048, 2011/12/27 20:14:32
Line 154  sub ssi_with_retries { Line 154  sub ssi_with_retries {
 # ----------------------------------------------- Filetypes/Languages/Copyright  # ----------------------------------------------- Filetypes/Languages/Copyright
 my %language;  my %language;
 my %supported_language;  my %supported_language;
   my %latex_language; # For choosing hyphenation in <transl..>
   my %latex_language_bykey; # for choosing hyphenation from metadata
 my %cprtag;  my %cprtag;
 my %scprtag;  my %scprtag;
 my %fe; my %fd; my %fm;  my %fe; my %fd; my %fm;
Line 186  BEGIN { Line 188  BEGIN {
             while (my $line = <$fh>) {              while (my $line = <$fh>) {
                 next if ($line=~/^\#/);                  next if ($line=~/^\#/);
                 chomp($line);                  chomp($line);
                 my ($key,$two,$country,$three,$enc,$val,$sup)=(split(/\t/,$line));                  my ($key,$two,$country,$three,$enc,$val,$sup,$latex)=(split(/\t/,$line));
                 $language{$key}=$val.' - '.$enc;                  $language{$key}=$val.' - '.$enc;
                 if ($sup) {                  if ($sup) {
                     $supported_language{$key}=$sup;                      $supported_language{$key}=$sup;
                 }                  }
    if ($latex) {
       $latex_language_bykey{$key} = $latex;
       $latex_language{$two} = $latex;
    }
             }              }
             close($fh);              close($fh);
         }          }
Line 3227  sub languagedescription { Line 3233  sub languagedescription {
     ($supported_language{$code}?' ('.&mt('interface available').')':'');      ($supported_language{$code}?' ('.&mt('interface available').')':'');
 }  }
   
   =pod
   
   =item * &plainlanguagedescription
   
   Returns both the plain language description (e.g. 'Creoles and Pidgins, English-based (Other)')
   and the language character encoding (e.g. ISO) separated by a ' - ' string.
   
   =cut
   
 sub plainlanguagedescription {  sub plainlanguagedescription {
     my $code=shift;      my $code=shift;
     return $language{$code};      return $language{$code};
 }  }
   
   =pod
   
   =item * &supportedlanguagecode
   
   Returns the supported language code (e.g. sptutf maps to pt) given a language
   code.
   
   =cut
   
 sub supportedlanguagecode {  sub supportedlanguagecode {
     my $code=shift;      my $code=shift;
     return $supported_language{$code};      return $supported_language{$code};
Line 3239  sub supportedlanguagecode { Line 3263  sub supportedlanguagecode {
   
 =pod  =pod
   
   =item * &latexlanguage()
   
   Given a language key code returns the correspondnig language to use
   to select the correct hyphenation on LaTeX printouts.  This is undef if there
   is no supported hyphenation for the language code.
   
   =cut
   
   sub latexlanguage {
       my $code = shift;
       return $latex_language{$code};
   }
   
   =pod
   
   =item * &latexhyphenation()
   
   Same as above but what's supplied is the language as it might be stored
   in the metadata.
   
   =cut
   
   sub latexhyphenation {
       my $key = shift;
       return $latex_language_bykey{$key};
   }
   
   =pod
   
 =item * &copyrightids()   =item * &copyrightids() 
   
 returns list of all copyrights  returns list of all copyrights
Line 6314  ul.LC_TabContent li.active a { Line 6367  ul.LC_TabContent li.active a {
   background:#FFFFFF;    background:#FFFFFF;
   outline: none;    outline: none;
 }  }
   
   ul.LC_TabContent li.goback {
     float: left;
     border-left: none;
   }
   
 #maincoursedoc {  #maincoursedoc {
   clear:both;    clear:both;
 }  }
Line 6973  sub end_page { Line 7032  sub end_page {
   
 sub wishlist_window {  sub wishlist_window {
     return(<<'ENDWISHLIST');      return(<<'ENDWISHLIST');
 <script type="text/javascript" lang="javascript">  <script type="text/javascript">
 // <![CDATA[  // <![CDATA[
 // <!-- BEGIN LON-CAPA Internal  // <!-- BEGIN LON-CAPA Internal
 function set_wishlistlink(title, path) {  function set_wishlistlink(title, path) {
Line 6995  ENDWISHLIST Line 7054  ENDWISHLIST
   
 sub modal_window {  sub modal_window {
     return(<<'ENDMODAL');      return(<<'ENDMODAL');
 <script type="text/javascript" lang="javascript">  <script type="text/javascript">
 // <![CDATA[  // <![CDATA[
 // <!-- BEGIN LON-CAPA Internal  // <!-- BEGIN LON-CAPA Internal
 var modalWindow = {  var modalWindow = {
Line 7050  sub modal_link { Line 7109  sub modal_link {
 sub modal_adhoc_script {  sub modal_adhoc_script {
     my ($funcname,$width,$height,$content)=@_;      my ($funcname,$width,$height,$content)=@_;
     return (<<ENDADHOC);      return (<<ENDADHOC);
 <script type="text/javascript" lang="javascript">  <script type="text/javascript">
 // <![CDATA[  // <![CDATA[
         var $funcname = function()          var $funcname = function()
         {          {
Line 7146  sub end_togglebox { Line 7205  sub end_togglebox {
 }  }
   
 sub LCprogressbar_script {  sub LCprogressbar_script {
      my ($id)=@_;
    return(<<ENDPROGRESS);     return(<<ENDPROGRESS);
 <script type="text/javascript">  <script type="text/javascript">
 // <![CDATA[  // <![CDATA[
 var LCprogressTxt='---';  \$('#progressbar$id').progressbar({
   
 \$('#progressbar').progressbar({  
   value: 0,    value: 0,
   change: function(event, ui) {    change: function(event, ui) {
     var newVal = \$(this).progressbar('option', 'value');      var newVal = \$(this).progressbar('option', 'value');
Line 7171  sub LCprogressbarUpdate_script { Line 7229  sub LCprogressbarUpdate_script {
 </style>  </style>
 <script type="text/javascript">  <script type="text/javascript">
 // <![CDATA[  // <![CDATA[
 function LCupdateProgress(percent,progresstext) {  var LCprogressTxt='---';
   
   function LCupdateProgress(percent,progresstext,id) {
    LCprogressTxt=progresstext;     LCprogressTxt=progresstext;
    \$('#progressbar').progressbar('value',percent);     \$('#progressbar'+id).progressbar('value',percent);
 }  }
 // ]]>  // ]]>
 </script>  </script>
Line 7181  ENDPROGRESSUPDATE Line 7241  ENDPROGRESSUPDATE
 }  }
   
 my $LClastpercent;  my $LClastpercent;
   my $LCidcnt;
   my $LCcurrentid;
   
 sub LCprogressbar {  sub LCprogressbar {
     my ($r)=(@_);      my ($r)=(@_);
     $LClastpercent=0;      $LClastpercent=0;
       $LCidcnt++;
       $LCcurrentid=$$.'_'.$LCidcnt;
     my $starting=&mt('Starting');      my $starting=&mt('Starting');
     my $content=(<<ENDPROGBAR);      my $content=(<<ENDPROGBAR);
 <p>  <p>
   <div id="progressbar">    <div id="progressbar$LCcurrentid">
     <span class="pblabel">$starting</span>      <span class="pblabel">$starting</span>
   </div>    </div>
 </p>  </p>
 ENDPROGBAR  ENDPROGBAR
     &r_print($r,$content.&LCprogressbar_script());      &r_print($r,$content.&LCprogressbar_script($LCcurrentid));
 }  }
   
 sub LCprogressbarUpdate {  sub LCprogressbarUpdate {
Line 7213  sub LCprogressbarUpdate { Line 7277  sub LCprogressbarUpdate {
     &r_print($r,<<ENDUPDATE);      &r_print($r,<<ENDUPDATE);
 <script type="text/javascript">  <script type="text/javascript">
 // <![CDATA[  // <![CDATA[
 LCupdateProgress($val,'$text');  LCupdateProgress($val,'$text','$LCcurrentid');
 // ]]>  // ]]>
 </script>  </script>
 ENDUPDATE  ENDUPDATE
Line 7225  sub LCprogressbarClose { Line 7289  sub LCprogressbarClose {
     &r_print($r,<<ENDCLOSE);      &r_print($r,<<ENDCLOSE);
 <script type="text/javascript">  <script type="text/javascript">
 // <![CDATA[  // <![CDATA[
 \$("#progressbar").hide('slow');   \$("#progressbar$LCcurrentid").hide('slow'); 
 // ]]>  // ]]>
 </script>  </script>
 ENDCLOSE  ENDCLOSE

Removed from v.1.1044  
changed lines
  Added in v.1.1048


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