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

Diff for /loncom/interface/loncommon.pm between versions 1.424 and 1.433

version 1.424, 2006/07/07 19:17:19 version 1.433, 2006/07/19 10:58:31
Line 706  sub helpLatexCheatsheet { Line 706  sub helpLatexCheatsheet {
  .'</td></tr></table>';   .'</td></tr></table>';
 }  }
   
   sub general_help {
       my $helptopic='Student_Intro';
       if ($env{'request.role'}=~/^(ca|au)/) {
    $helptopic='Authoring_Intro';
       } elsif ($env{'request.role'}=~/^cc/) {
    $helptopic='Course_Coordination_Intro';
       }
       return $helptopic;
   }
   
   sub update_help_link {
       my ($topic,$component_help,$faq,$bug,$stayOnPage) = @_;
       my $origurl = $ENV{'REQUEST_URI'};
       $origurl=~s|^/~|/priv/|;
       my $timestamp = time;
       foreach my $datum (\$topic,\$component_help,\$faq,\$bug,\$origurl) {
           $$datum = &escape($$datum);
       }
   
       my $banner_link = "/adm/helpmenu?page=banner&amp;topic=$topic&amp;component_help=$component_help&amp;faq=$faq&amp;bug=$bug&amp;origurl=$origurl&amp;stamp=$timestamp&amp;stayonpage=$stayOnPage";
       my $output .= <<"ENDOUTPUT";
   <script type="text/javascript">
   // <!-- BEGIN LON-CAPA Internal
   banner_link = '$banner_link';
   // END LON-CAPA Internal -->
   </script>
   ENDOUTPUT
       return $output;
   }
   
   # now just updates the help link and generates a blue icon
 sub help_open_menu {  sub help_open_menu {
     my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text) = @_;      my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text) 
    = @_;
       
       $stayOnPage = 0 if (not defined $stayOnPage);
       if ($env{'browser.interface'} eq 'textual' ||
    $env{'environment.remote'} eq 'off' ) {
    $stayOnPage=1;
       }
       my $output;
       if ($component_help) {
    if (!$text) {
       $output=&help_open_topic($component_help,undef,$stayOnPage,
          $width,$height);
    } else {
       my $help_text;
       $help_text=&unescape($topic);
       $output='<table><tr><td>'.
    &help_open_topic($component_help,$help_text,$stayOnPage,
    $width,$height).'</td></tr></table>';
    }
       }
       my $banner_link = &update_help_link($topic,$component_help,$faq,$bug,$stayOnPage);
       return $output.$banner_link;
   }
   
   sub top_nav_help {
       my ($text) = @_;
   
       my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height);
      
     $text = "" if (not defined $text);      $text = "" if (not defined $text);
     $stayOnPage = 0 if (not defined $stayOnPage);      $stayOnPage = 0 if (not defined $stayOnPage);
     if ($env{'browser.interface'} eq 'textual' ||      if ($env{'browser.interface'} eq 'textual' ||
Line 718  sub help_open_menu { Line 778  sub help_open_menu {
     $height = 600 if (not defined $height);      $height = 600 if (not defined $height);
     my $link='';      my $link='';
     my $title = &mt('Get help');      my $title = &mt('Get help');
     my $origurl = $ENV{'REQUEST_URI'};      if ($stayOnPage) {
     $origurl=~s|^/~|/priv/|;   $link = "javascript:helpMenu('display')";
     my $timestamp = time;  
     foreach my $datum (\$topic,\$component_help,\$faq,\$bug,\$origurl) {  
         $$datum = &escape($$datum);  
     }  
     if (!$stayOnPage) {  
          $link = "javascript:helpMenu('open')";  
     } else {      } else {
         $link = "javascript:helpMenu('display')";          $link = "javascript:helpMenu('open')";
     }      }
     my $banner_link = "/adm/helpmenu?page=banner&amp;topic=$topic&amp;component_help=$component_help&amp;faq=$faq&amp;bug=$bug&amp;origurl=$origurl&amp;stamp=$timestamp&amp;stayonpage=$stayOnPage";      my $helptopic=&general_help();
     my $details_link = "/adm/helpmenu?page=body&amp;topic=$topic&amp;component_help=$component_help&amp;faq=$faq&amp;bug=$bug&amp;origurl=$origurl&amp;stamp=$timestamp";      my $banner_link = &update_help_link($topic,$component_help,$faq,$bug,$stayOnPage);
       my $details_link = '/adm/help/'.$helptopic.'.hlp';
     my $template;      my $template;
     if ($text ne "") {  
  $template .=   
   "<table bgcolor='#CC3300' cellspacing='1' cellpadding='1' border='0'><tr>".  
   "<td bgcolor='#CC6600'><a href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";  
     }  
     my $nothing=&Apache::lonhtmlcommon::javascript_nothing();      my $nothing=&Apache::lonhtmlcommon::javascript_nothing();
     my $helpicon=&lonhttpdurl("/adm/lonIcons/helpgateway.gif");      my $helpicon=&lonhttpdurl("/adm/lonIcons/helpgateway.gif");
     my $start_page =      my $start_page =
Line 754  sub help_open_menu { Line 804  sub help_open_menu {
  <script type="text/javascript">   <script type="text/javascript">
 // <!-- BEGIN LON-CAPA Internal  // <!-- BEGIN LON-CAPA Internal
 // <![CDATA[  // <![CDATA[
   var banner_link = '';
 function helpMenu(target) {  function helpMenu(target) {
     var caller = this;      var caller = this;
     if (target == 'open') {      if (target == 'open') {
Line 773  function helpMenu(target) { Line 824  function helpMenu(target) {
     return;      return;
 }  }
 function writeHelp(caller) {  function writeHelp(caller) {
     caller.document.writeln('$start_page<frame name="bannerframe"  src="$banner_link" /><frame name="bodyframe" src="$details_link" /> $end_page')      caller.document.writeln('$start_page<frame name="bannerframe"  src="'+banner_link+'" /><frame name="bodyframe" src="$details_link" /> $end_page')
     caller.document.close()      caller.document.close()
     caller.focus()      caller.focus()
 }  }
 // ]]>  // ]]>
 // END LON-CAPA Internal -->  // END LON-CAPA Internal -->
  </script>   </script>
  <a href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help Menu)" /></a>  $banner_link
    <a href="$link" title="$title">$text</a>
 ENDTEMPLATE  ENDTEMPLATE
     if ($component_help) {  
  if (!$text) {  
     $template=&help_open_topic($component_help,undef,$stayOnPage,  
        $width,$height).' '.$template;  
  } else {  
     my $help_text;  
     $help_text=&unescape($topic);  
     $template='<table><tr><td>'.  
  &help_open_topic($component_help,$help_text,$stayOnPage,  
  $width,$height).'</td><td>'.$template.  
  '</td></tr></table>';  
  }  
     }  
     if ($text ne '') { $template.='</td></tr></table>' };  
     return $template;      return $template;
 }  }
   
Line 1918  sub get_related_words { Line 1956  sub get_related_words {
         return ();          return ();
     }       } 
     my @Words=();      my @Words=();
       my $count=0;
     if (exists($thesaurus_db{$keyword})) {      if (exists($thesaurus_db{$keyword})) {
  # The first element is the number of times   # The first element is the number of times
  # the word appears.  We do not need it now.   # the word appears.  We do not need it now.
  (undef,@Words) = (split(/:/,$thesaurus_db{$keyword}));   my (undef,@RelatedWords) = (split(/:/,$thesaurus_db{$keyword}));
         for (my $i=0;$i<=$#Words;$i++) {   my (undef,$mostfrequentcount)=split(/\,/,$RelatedWords[0]);
             ($Words[$i],undef)= split(/\,/,$Words[$i]);   my $threshold=$mostfrequentcount/10;
           foreach my $possibleword (@RelatedWords) {
               my ($word,$wordcount)=split(/\,/,$possibleword);
               if ($wordcount>$threshold) {
    push(@Words,$word);
                   $count++;
                   if ($count>10) { last; }
       }
         }          }
     }      }
     untie %thesaurus_db;      untie %thesaurus_db;
Line 2002  sub nickname { Line 2048  sub nickname {
   
 sub getnames {  sub getnames {
     my ($uname,$udom)=@_;      my ($uname,$udom)=@_;
       if ($udom eq 'public' && $uname eq 'public') {
    return ('lastname' => &mt('Public'));
       }
     my $id=$uname.':'.$udom;      my $id=$uname.':'.$udom;
     my ($names,$cached)=&Apache::lonnet::is_cached_new('namescache',$id);      my ($names,$cached)=&Apache::lonnet::is_cached_new('namescache',$id);
     if ($cached) {      if ($cached) {
Line 2839  sub bodytag { Line 2888  sub bodytag {
     } else {      } else {
         $role = &Apache::lonnet::plaintext($role);          $role = &Apache::lonnet::plaintext($role);
     }      }
   
     if (!$realm) { $realm='&nbsp;'; }      if (!$realm) { $realm='&nbsp;'; }
 # Set messages  # Set messages
     my $messages=&domainlogo($domain);      my $messages=&domainlogo($domain);
Line 2867  sub bodytag { Line 2917  sub bodytag {
     }      }
   
     my $name = &plainname($env{'user.name'},$env{'user.domain'});      my $name = &plainname($env{'user.name'},$env{'user.domain'});
       if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
    undef($role);
       }
           
     my $roleinfo=(<<ENDROLE);      my $roleinfo=(<<ENDROLE);
 <td class="LC_title_bar_who">  <td class="LC_title_bar_who">
Line 3125  sub standard_css { Line 3178  sub standard_css {
 h1, h2, h3, th { font-family: $sans }  h1, h2, h3, th { font-family: $sans }
 a:focus { color: red; background: yellow }   a:focus { color: red; background: yellow } 
 table.thinborder { border-collapse: collapse; }  table.thinborder { border-collapse: collapse; }
 table.thinborder tr th, table.thinborder tr td { border-style: solid; border-width: 1px}  table.thinborder tr th {  border-style: solid; border-width: 1px; background: $tabbg;}
   table.thinborder tr td { border-style: solid; border-width: 1px}
   
 form, .inline { display: inline; }  form, .inline { display: inline; }
 .center { text-align: center; }  .center { text-align: center; }
 .LC_filename {font-family: $mono;}  .LC_filename {font-family: $mono;}
Line 3176  table#LC_title_bar td { Line 3231  table#LC_title_bar td {
 table#LC_title_bar td.LC_title_bar_who {  table#LC_title_bar td.LC_title_bar_who {
   background: $tabbg;    background: $tabbg;
   color: $font;    color: $font;
   font: medium $sans;    font: small $sans;
   text-align: right;    text-align: right;
 }  }
 span.LC_title_bar_title {  span.LC_title_bar_title {
Line 3214  table#LC_top_nav td a, div#LC_top_nav a Line 3269  table#LC_top_nav td a, div#LC_top_nav a
 }  }
 table#LC_top_nav td.LC_top_nav_logo {  table#LC_top_nav td.LC_top_nav_logo {
   background: $tabbg;    background: $tabbg;
   text-align: right;    text-align: left;
   white-space: nowrap;    white-space: nowrap;
   font-weight: bold;    width: 31px;
 }  }
 table#LC_top_nav td.LC_top_nav_logo img {  table#LC_top_nav td.LC_top_nav_logo img {
   margin-left: 0.2em;    border: 0px;
   vertical-align: bottom;    vertical-align: bottom;
 }  }
   table#LC_top_nav td.LC_top_nav_exit,
   table#LC_top_nav td.LC_top_nav_help {
     width: 2.0em;
   }
 table.LC_breadcrumbs td, table.LC_docs_path td  {  table.LC_breadcrumbs td, table.LC_docs_path td  {
   background: $tabbg;    background: $tabbg;
   color: $font;    color: $font;
Line 3265  td.LC_menubuttons_img { Line 3324  td.LC_menubuttons_img {
 table.LC_data_table, table.LC_mail_list {  table.LC_data_table, table.LC_mail_list {
   border: 1px solid #000000;    border: 1px solid #000000;
   border-collapse: separate;    border-collapse: separate;
     border-spacing: 1px;
 }  }
 .LC_data_table_dense {  .LC_data_table_dense {
   font-size: small;    font-size: small;
Line 3276  table.LC_data_table tr th, table.LC_cale Line 3336  table.LC_data_table tr th, table.LC_cale
 }  }
 table.LC_data_table tr td {  table.LC_data_table tr td {
   background-color: $data_table_light;    background-color: $data_table_light;
   padding: 1px;    padding: 2px;
 }  }
 table.LC_data_table tr.LC_even_row td {  table.LC_data_table tr.LC_even_row td {
   background-color: $data_table_dark;    background-color: $data_table_dark;
 }  }
   table.LC_data_table tr.LC_data_table_highlight td {
     background-color: $data_table_darker;
   }
 table.LC_data_table tr.LC_empty_row td {  table.LC_data_table tr.LC_empty_row td {
   background-color: #FFFFFF;    background-color: #FFFFFF;
   font-weight: bold;    font-weight: bold;
Line 3960  sub simple_error_page { Line 4023  sub simple_error_page {
  my ($add_class) = @_;   my ($add_class) = @_;
  $row_count++;   $row_count++;
  my $css_class = ($row_count % 2)?'':'LC_even_row';   my $css_class = ($row_count % 2)?'':'LC_even_row';
  my $css_class = (join(' ',$css_class,$add_class));   $css_class = (join(' ',$css_class,$add_class));
  return  '<tr class="'.$css_class.'">'."\n";;   return  '<tr class="'.$css_class.'">'."\n";;
     }      }
   
Removed from v.1.424  
changed lines
  Added in v.1.433

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