Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.183 and 1.195

version 1.183, 2008/11/11 20:12:17 version 1.195, 2008/12/12 07:28:09
Line 467  document.$formname.$dname\_year.value, Line 467  document.$formname.$dname\_year.value,
     }      }
 </script>  </script>
 ENDJS  ENDJS
     $result .= '  <span style="white-space: nowrap;">';      $result .= '  <span class="LC_nobreak">';
     my $monthselector = qq{<select name="$dname\_month" $special $state onchange="javascript:$dname\_checkday()" >};      my $monthselector = qq{<select name="$dname\_month" $special $state onchange="javascript:$dname\_checkday()" >};
     # Month      # Month
     my @Months = qw/January February  March     April   May      June       my @Months = qw/January February  March     April   May      June 
Line 1306  returns: nothing Line 1306  returns: nothing
         my ($component,$component_help,$menulink,$helplink,$css_class) = @_;          my ($component,$component_help,$menulink,$helplink,$css_class) = @_;
         #          #
  $css_class ||= 'LC_breadcrumbs';   $css_class ||= 'LC_breadcrumbs';
         my $Str = "\n".'<table class="'.$css_class.'"><tr><td>';          my $Str = "\n".'<table class="'.$css_class.'"><tr><td><ol id="MenuBreadcrumbs">';
         #          #
         # Make the faq and bug data cascade          # Make the faq and bug data cascade
         my $faq = '';          my $faq = '';
Line 1342  returns: nothing Line 1342  returns: nothing
                      $faq = $_->{'faq'} if (exists($_->{'faq'}));                       $faq = $_->{'faq'} if (exists($_->{'faq'}));
                      $bug = $_->{'bug'} if (exists($_->{'bug'}));                       $bug = $_->{'bug'} if (exists($_->{'bug'}));
                      $help = $_->{'help'} if (exists($_->{'help'}));                       $help = $_->{'help'} if (exists($_->{'help'}));
                      my $result = '<a href="'.$_->{'href'}.'" ';                       my $result = '<li><a href="'.$_->{'href'}.'" ';
                      if (defined($_->{'target'}) && $_->{'target'} ne '') {                       if (defined($_->{'target'}) && $_->{'target'} ne '') {
                          $result .= 'target="'.$_->{'target'}.'" ';                           $result .= 'target="'.$_->{'target'}.'" ';
                      }                       }
      if ($_->{'no_mt'}) {       if ($_->{'no_mt'}) {
  $result .='title="'.$_->{'title'}.'">'.   $result .='title="'.$_->{'title'}.'">'.
      $_->{'text'}.'</a>';       $_->{'text'}.'</a></li>';
      } else {       } else {
  $result .='title="'.&mt($_->{'title'}).'">'.   $result .='title="'.&mt($_->{'title'}).'">'.
      &mt($_->{'text'}).'</a>';       &mt($_->{'text'}).'</a></li>';
      }       }
                      $result;                       $result;
                      } @Crumbs                       } @Crumbs
                  );                   );
         $links .= $crumbsymbol if ($links ne '');          $links .= $crumbsymbol if ($links ne '');
  if ($last->{'no_mt'}) {   if ($last->{'no_mt'}) {
     $links .= '<b>'.$last->{'text'}.'</b>';      $links .= '<li><b>'.$last->{'text'}.'</b></li>';
  } else {   } else {
     $links .= '<b>'.&mt($last->{'text'}).'</b>';      $links .= '<li><b>'.&mt($last->{'text'}).'</b></li>';
  }   }
         #          #
         my $icons = '';          my $icons = '';
Line 1380  returns: nothing Line 1380  returns: nothing
  $faq,$bug);   $faq,$bug);
  }   }
         #          #
         $Str .= $links.'</td>';          $Str .= $links.'</ol></td>';
         #          #
         if (defined($component)) {          if (defined($component)) {
             $Str .= '<td class="'.$css_class.'_component">'.              $Str .= '<td class="'.$css_class.'_component">'.
Line 1465  returns: nothing Line 1465  returns: nothing
 # routines, but can also be called directly to start and end rows which have   # routines, but can also be called directly to start and end rows which have 
 # needs that are not accommodated by the *_select_row() routines.      # needs that are not accommodated by the *_select_row() routines.    
   
   { # Start: row_count block for pick_box
   my @row_count;
   
 sub start_pick_box {  sub start_pick_box {
     my ($css_class) = @_;      my ($css_class) = @_;
     if (defined($css_class)) {      if (defined($css_class)) {
Line 1472  sub start_pick_box { Line 1475  sub start_pick_box {
     } else {      } else {
  $css_class= 'class="LC_pick_box"';   $css_class= 'class="LC_pick_box"';
     }      }
       unshift(@row_count,0);
     my $output = <<"END";      my $output = <<"END";
  <table $css_class>   <table $css_class>
 END  END
Line 1479  END Line 1483  END
 }  }
   
 sub end_pick_box {  sub end_pick_box {
       shift(@row_count);
     my $output = <<"END";      my $output = <<"END";
        </table>         </table>
 END  END
Line 1493  END Line 1498  END
 }  }
   
 sub row_title {  sub row_title {
       $row_count[0]++;
       my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';
     my ($title,$css_title_class,$css_value_class) = @_;      my ($title,$css_title_class,$css_value_class) = @_;
     $css_title_class ||= 'LC_pick_box_title';      $css_title_class ||= 'LC_pick_box_title';
     $css_title_class = 'class="'.$css_title_class.'"';      $css_title_class = 'class="'.$css_title_class.'"';
   
     $css_value_class ||= 'LC_pick_box_value';      $css_value_class ||= 'LC_pick_box_value';
     $css_value_class = 'class="'.$css_value_class.'"';  
   
     if ($title ne '') {      if ($title ne '') {
         $title .= ':';          $title .= ':';
Line 1508  sub row_title { Line 1514  sub row_title {
             <td $css_title_class>              <td $css_title_class>
        $title         $title
             </td>              </td>
             <td $css_value_class>              <td class="$css_value_class $css_class">
 ENDONE  ENDONE
     return $output;      return $output;
 }  }
Line 1530  ENDTWO Line 1536  ENDTWO
     return $output;      return $output;
 }  }
   
   } # End: row_count block for pick_box
   
   
 sub role_select_row {  sub role_select_row {
     my ($roles,$title,$css_class,$show_separate_custom,$cdom,$cnum) = @_;      my ($roles,$title,$css_class,$show_separate_custom,$cdom,$cnum) = @_;
     my $output;      my $output;
Line 1708  sub email_default_row { Line 1717  sub email_default_row {
   
 sub submit_row {  sub submit_row {
     my ($title,$cmd,$submit_text,$css_class) = @_;      my ($title,$cmd,$submit_text,$css_class) = @_;
       $submit_text = &mt($submit_text);
     my $output = &row_title($title,$css_class,'LC_pick_box_submit');      my $output = &row_title($title,$css_class,'LC_pick_box_submit');
     $output .= qq|      $output .= qq|
              <br />               <br />
Line 2019  END Line 2029  END
 # url    => 'URL the link is pointing to, i.e. /adm/site?action=dosomething',  # url    => 'URL the link is pointing to, i.e. /adm/site?action=dosomething',
 # permission  => 'Contains permissions as returned from lonnet::allowed(),  # permission  => 'Contains permissions as returned from lonnet::allowed(),
 # must evaluate to true in order to activate the link',  # must evaluate to true in order to activate the link',
   # icon        =>  'icon filename',
   # alttext    => 'alt text for the icon',
 # help    => 'Name of the corresponding helpfile',  # help    => 'Name of the corresponding helpfile',
 # linktitle   => 'Description of the link (used for title tag)'  # linktitle   => 'Description of the link (used for title tag)'
 #    },  #    },
Line 2035  END Line 2047  END
 # subject to change during this project.  # subject to change during this project.
 # Don't rely on its current functionality as it might be   # Don't rely on its current functionality as it might be 
 # changed or removed.  # changed or removed.
   # TODO:
   # check for empty values
 # --------------------------  # --------------------------
   
 sub generate_menu {  sub generate_menu {
     my @menu = @_;      my @menu = @_;
     my $menu_html = '';      my $menu_html = qq|<div class="columnSection">|;
   
     foreach my $category (@menu) { #FIXME: insert appropriate classnames for styles when they're finished.      foreach my $category (@menu) { #FIXME: insert appropriate classnames for styles when they're finished.
  $menu_html .='<div class=""><h3 class="">'.$category->{'categorytitle'}.'</h3><ul class="">';   $menu_html .='<div class="ContentBoxSpecial">
  foreach my $item (@{ $category->{items} }) {   <h3 class="hcell">'.mt($category->{'categorytitle'}).'</h3>
     next if (! $item->{'permission'});   <ul class="ListStyleNormal">';
     $menu_html .= '<li class="">'.   foreach my $item ( @{ $category->{items} } ) {
     qq{<a href="$item->{'url'}" title="$item->{'linktitle'}">}.      next unless $item->{'permission'};
     &mt($item->{'linktext'}).'</a>';      $menu_html .= qq|<li class="LC_menubuttons_inline_text"><a href="$item->{'url'}" title="|.mt($item->{'linktitle'}).'">';
               if($item->{'icon'}){
                   $menu_html .= qq|<img class ="noBorder middle" src="/res/adm/pages/$item->{'icon'}" alt="|;
    if($item->{'alttext'}){
       $menu_html .= $item->{'alttext'}.'"/></a>';
    } else { #use linktext as alt text for the icon
       $menu_html .= qq|$item->{'linktext'}"/></a>|;
                   } 
               }
       $menu_html .= qq|<a href="$item->{'url'}" title="|.mt($item->{'linktitle'}).'">';
               $menu_html .= mt($item->{'linktext'}).'</a>';
     if (exists($item->{'help'})) {      if (exists($item->{'help'})) {
  $menu_html .= &Apache::loncommon::help_open_topic($item->{'help'});   $menu_html .= Apache::loncommon::help_open_topic($item->{'help'});
     }      }
     $menu_html .= '</li>';      $menu_html .= '</li>';
  }   }
  $menu_html .= '</div>';   $menu_html .= '</ul></div>';
     }      }
       $menu_html .= qq|</div>|;
     return $menu_html;      return $menu_html;
 }  }
   

Removed from v.1.183  
changed lines
  Added in v.1.195


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