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

Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.230 and 1.233

version 1.230, 2009/08/10 16:27:39 version 1.233, 2009/08/13 14:54:52
Line 82  sub confirm_success { Line 82  sub confirm_success {
             .'</span>'."\n";              .'</span>'."\n";
    } else {     } else {
       return '<span class="LC_success">'."\n"        return '<span class="LC_success">'."\n"
             .'<img src="/adm/lonIcons/navmap.correct.gif" alt="'.&mt('Ok').'" /> '."\n"              .'<img src="/adm/lonIcons/navmap.correct.gif" alt="'.&mt('OK').'" /> '."\n"
             .$message."\n"              .$message."\n"
             .'</span>'."\n";              .'</span>'."\n";
    }     }
Line 160  sub authorbombs { Line 160  sub authorbombs {
     $url=&Apache::lonnet::declutter($url);      $url=&Apache::lonnet::declutter($url);
     my ($udom,$uname)=($url=~m{^($LONCAPA::domain_re)/($LONCAPA::username_re)/});      my ($udom,$uname)=($url=~m{^($LONCAPA::domain_re)/($LONCAPA::username_re)/});
     my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);      my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
     foreach (keys %bombs) {      foreach my $bomb (keys(%bombs)) {
  if ($_=~/^$udom\/$uname\//) {   if ($bomb =~ /^$udom\/$uname\//) {
     return '<a href="/adm/bombs/'.$url.      return '<a href="/adm/bombs/'.$url.
  '"><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/bomb.gif').'" alt="'.&mt('Bomb').'" border="0" /></a>'.   '"><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/bomb.gif').'" alt="'.&mt('Bomb').'" border="0" /></a>'.
  &Apache::loncommon::help_open_topic('About_Bombs');   &Apache::loncommon::help_open_topic('About_Bombs');
Line 239  sub get_recent { Line 239  sub get_recent {
 # Begin filling return_hash with any 'always_include' option  # Begin filling return_hash with any 'always_include' option
     my %time_hash = ();      my %time_hash = ();
     my %return_hash = ();      my %return_hash = ();
     foreach my $item (keys %recent) {      foreach my $item (keys(%recent)) {
         my ($thistime,$thisvalue)=(split(/\&/,$recent{$item}));          my ($thistime,$thisvalue)=(split(/\&/,$recent{$item}));
         if ($thistime eq 'always_include') {          if ($thistime eq 'always_include') {
             $return_hash{$item} = &unescape($thisvalue);              $return_hash{$item} = &unescape($thisvalue);
Line 1453  returns: nothing Line 1453  returns: nothing
     }      }
   
     sub add_breadcrumb {      sub add_breadcrumb {
         push (@Crumbs,@_);          push(@Crumbs,@_);
     }      }
   
 } # End of scope for @Crumbs  } # End of scope for @Crumbs
Line 2109  sub inittags { Line 2109  sub inittags {
 }  }
   
   
 # USAGE: scripttag(scriptcode, true/false);  # USAGE: scripttag(scriptcode, [start|end|both]);
 #  #
 # EXAMPLES:   # EXAMPLES: 
 #  - scripttag("alert('Hello World!')")   #  - scripttag("alert('Hello World!')", 'both') 
   #    returns:
   #    <script type="text/javascript">
   #    // BEGIN LON-CAPA Internal
   #    alert(Hello World!')
   #    // END LON-CAPA Internal
   #    </script>
 #  #
 # NOTES:  # NOTES:
 # - works currently only for javascripts  # - works currently only for javascripts
 #  #
 # OUTPUT: Scriptcode properly enclosed in <script> and CDATA tags (and LC  # OUTPUT: 
 # Internal markers if 2nd argument evaluates to true)  # Scriptcode properly enclosed in <script> and CDATA tags (and LC
   # Internal markers if 2nd argument is given)
 sub scripttag {  sub scripttag {
     my ($content, $internal) = @_;      my ( $content, $marker ) = @_;
     $content = "// BEGIN LON-CAPA Internal\n$content\n// END LON-CAPA Internal" if $internal;      return unless defined $content;
   
       my $begin = "\n// BEGIN LON-CAPA Internal\n";
       my $end   = "\n// END LON-CAPA Internal\n";
   
       if ($marker) {
           $content  = $begin . $content if $marker eq 'start' or $marker eq 'both';
           $content .= $end              if $marker eq 'end'   or $marker eq 'both';
       }
   
     $content = "\n// <![CDATA[\n$content\n// ]]>\n";      $content = "\n// <![CDATA[\n$content\n// ]]>\n";
     htmltag("script", $content, {type => "text/javascript"});  
     return htmltag("script", $content, {type => "text/javascript"});      return htmltag('script', $content, {type => 'text/javascript'});
 };  };
   
   
Line 2178  sub generate_menu { Line 2194  sub generate_menu {
             # create the markup for the current $link and push it into @links.              # create the markup for the current $link and push it into @links.
             # each entry consists of an image and a text optionally followed               # each entry consists of an image and a text optionally followed 
             # by a help link.              # by a help link.
             push @links, $li->(              push(@links,$li->(
                         $a->(                          $a->(
                             $img->("", {                              $img->("", {
                                 class => "LC_noBorder LC_middle",                                  class => "LC_noBorder LC_middle",
Line 2196  sub generate_menu { Line 2212  sub generate_menu {
                             }).                              }).
                          (defined($$link{help}) ?                            (defined($$link{help}) ? 
                          Apache::loncommon::help_open_topic($$link{help}) : ''),                           Apache::loncommon::help_open_topic($$link{help}) : ''),
                          {class => "LC_menubuttons_inline_text"});                           {class => "LC_menubuttons_inline_text"}));
         }          }
   
         # wrap categorytitle in <h3>, concatenate with           # wrap categorytitle in <h3>, concatenate with 
Line 2206  sub generate_menu { Line 2222  sub generate_menu {
         # such that each element looks like:          # such that each element looks like:
         # <div><h3>title</h3><ul><li>...</li>...</ul></div>          # <div><h3>title</h3><ul><li>...</li>...</ul></div>
         # the category won't be added if there aren't any links          # the category won't be added if there aren't any links
         push @categories,           push(@categories, 
             $div->($h3->(mt($$category{categorytitle}), {class=>"LC_hcell"}).              $div->($h3->(mt($$category{categorytitle}), {class=>"LC_hcell"}).
             $ul->(join('' ,@links),  {class =>"LC_ListStyleNormal" }),              $ul->(join('' ,@links),  {class =>"LC_ListStyleNormal" }),
             {class=>"LC_Box LC_400Box"}) if scalar(@links);              {class=>"LC_Box LC_400Box"})) if scalar(@links);
     }      }
   
     # wrap the joined @categories in another <div> (column layout)      # wrap the joined @categories in another <div> (column layout)
Removed from v.1.230  
changed lines
  Added in v.1.233

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