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

Diff for /loncom/interface/lonmenu.pm between versions 1.378 and 1.379

version 1.378, 2012/05/28 13:09:16 version 1.379, 2012/05/28 19:00:58
Line 402  sub secondary_menu { Line 402  sub secondary_menu {
 sub create_submenu {  sub create_submenu {
     my ($link,$target,$title,$submenu) = @_;      my ($link,$target,$title,$submenu) = @_;
     return unless (ref($submenu) eq 'ARRAY');      return unless (ref($submenu) eq 'ARRAY');
       my $disptarget;
       if ($target ne '') {
           $disptarget = ' target="'.$target.'"';
       }
     my $menu = '<li class="LC_hoverable">'.      my $menu = '<li class="LC_hoverable">'.
                '<a href="'.$link.'" target="'.$target.'">'.                 '<a href="'.$link.'"'.$disptarget.'>'.
                '<span class="LC_nobreak">'.&mt($title).                 '<span class="LC_nobreak">'.&mt($title).
                '<span class="LC_fontsize_small" style="font-weight:normal;">'.                 '<span class="LC_fontsize_small" style="font-weight:normal;">'.
                ' &#9660;</span></span></a>'.                 ' &#9660;</span></span></a>'.
Line 1811  sub countdown_timer { Line 1815  sub countdown_timer {
         ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) {          ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) {
         my $duedate = &Apache::lonnet::EXT("resource.0.duedate");          my $duedate = &Apache::lonnet::EXT("resource.0.duedate");
         if ($duedate && $duedate > time) {          if ($duedate && $duedate > time) {
             my ($collapse,$expand,$title,$currdisp);              my ($collapse,$expand,$alttxt,$title,$currdisp);
             my @interval=&Apache::lonnet::EXT("resource.0.interval");              my @interval=&Apache::lonnet::EXT("resource.0.interval");
             if (@interval > 1) {              if (@interval > 1) {
                 $currdisp = 'inline';                  $currdisp = 'inline';
Line 1821  sub countdown_timer { Line 1825  sub countdown_timer {
                 $expand = '&#9668;&nbsp;';                  $expand = '&#9668;&nbsp;';
             }              }
             unless ($env{'environment.icons'} eq 'iconsonly') {              unless ($env{'environment.icons'} eq 'iconsonly') {
                 $title = &mt('Timer');                  $alttxt = &mt('Timer');
                   $title = $alttxt.'&nbsp;';
             }              }
             my $desc = &mt('Countdown to due date/time');              my $desc = &mt('Countdown to due date/time');
             return <<END;              return <<END;
Line 1829  sub countdown_timer { Line 1834  sub countdown_timer {
 <a href="javascript:toggleCountdown();" class="LC_menubuttons_link">  <a href="javascript:toggleCountdown();" class="LC_menubuttons_link">
 <span id="ddcountcollapse" class="LC_menubuttons_inline_text">  <span id="ddcountcollapse" class="LC_menubuttons_inline_text">
 $collapse  $collapse
 </a></span>  </span></a>
 <span id="duedatecountdown" class="LC_menubuttons_inline_text" style="display: $currdisp;"></span>  <span id="duedatecountdown" class="LC_menubuttons_inline_text" style="display: $currdisp;"></span>
 <a href="javascript:toggleCountdown();" class="LC_menubuttons_link">  <a href="javascript:toggleCountdown();" class="LC_menubuttons_link">
 <span id="ddcountexpand" class="LC_menubuttons_inline_text" >$expand</span>  <span id="ddcountexpand" class="LC_menubuttons_inline_text" >$expand</span>
 <img src="/res/adm/pages/timer.png" title="$desc" class="LC_icon"><span class="LC_menubuttons_inline_text">$title</span></a>  <img src="/res/adm/pages/timer.png" title="$desc" class="LC_icon" alt="$alttxt" /><span class="LC_menubuttons_inline_text">$title</span></a>
 END  END
         }          }
     }      }
Removed from v.1.378  
changed lines
  Added in v.1.379

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