Diff for /loncom/interface/loncommon.pm between versions 1.1047 and 1.1052

version 1.1047, 2011/12/25 20:41:53 version 1.1052, 2012/01/09 19:56:28
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 4980  body { Line 5033  body {
 a:focus,  a:focus,
 a:focus img {  a:focus img {
   color: red;    color: red;
   background: yellow;  
 }  }
   
 form, .inline {  form, .inline {
Line 5075  div.LC_confirm_box .LC_success img { Line 5127  div.LC_confirm_box .LC_success img {
 }  }
   
 .LC_discussion {  .LC_discussion {
   background: $tabbg;    background: $data_table_dark;
   border: 1px solid black;    border: 1px solid black;
   margin: 2px;    margin: 2px;
 }  }
   
 .LC_disc_action_links_bar {  
   background: $tabbg;  
   border: none;  
   margin: 4px;  
 }  
   
 .LC_disc_action_left {  .LC_disc_action_left {
     background: $sidebg;
   text-align: left;    text-align: left;
     padding: 4px;
     margin: 2px;
 }  }
   
 .LC_disc_action_right {  .LC_disc_action_right {
     background: $sidebg;
   text-align: right;    text-align: right;
     padding: 4px;
     margin: 2px;
 }  }
   
 .LC_disc_new_item {  .LC_disc_new_item {
   background: white;    background: white;
   border: 2px solid red;    border: 2px solid red;
   margin: 2px;    margin: 4px;
     padding: 4px;
 }  }
   
 .LC_disc_old_item {  .LC_disc_old_item {
   background: white;    background: white;
   border: 1px solid black;    margin: 4px;
   margin: 2px;    padding: 4px;
 }  }
   
 table.LC_pastsubmission {  table.LC_pastsubmission {
Line 5225  td.LC_table_cell_checkbox { Line 5278  td.LC_table_cell_checkbox {
   vertical-align: middle;    vertical-align: middle;
 }  }
   
 li.LC_menubuttons_inline_text img,a {  li.LC_menubuttons_inline_text img {
   cursor:pointer;    cursor:pointer;
   text-decoration: none;    text-decoration: none;
 }  }
Line 6080  div.LC_createcourse { Line 6133  div.LC_createcourse {
   display:none;    display:none;
 }  }
   
 a:hover,  
 ol.LC_primary_menu a:hover,  ol.LC_primary_menu a:hover,
 ol#LC_MenuBreadcrumbs a:hover,  ol#LC_MenuBreadcrumbs a:hover,
 ol#LC_PathBreadcrumbs a:hover,  ol#LC_PathBreadcrumbs a:hover,
Line 7045  ENDMODAL Line 7097  ENDMODAL
 }  }
   
 sub modal_link {  sub modal_link {
     my ($link,$linktext,$width,$height,$target,$scrolling)=@_;      my ($link,$linktext,$width,$height,$target,$scrolling,$title)=@_;
     unless ($width) { $width=480; }      unless ($width) { $width=480; }
     unless ($height) { $height=400; }      unless ($height) { $height=400; }
     unless ($scrolling) { $scrolling='yes'; }      unless ($scrolling) { $scrolling='yes'; }
     return '<a href="'.$link.'" target="'.$target.'" onclick="openMyModal(\''.$link.'\','.$width.','.$height.',\''.$scrolling.'\'); return false;">'.      return '<a href="'.$link.'" target="'.$target.'" title="'.$title.'" onclick="openMyModal(\''.$link.'\','.$width.','.$height.',\''.$scrolling.'\'); return false;">'.
            $linktext.'</a>';             $linktext.'</a>';
 }  }
   

Removed from v.1.1047  
changed lines
  Added in v.1.1052


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