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

Diff for /loncom/interface/loncommon.pm between versions 1.729 and 1.756

version 1.729, 2008/12/31 23:15:42 version 1.756, 2009/02/25 14:09:03
Line 923  sub help_open_topic { Line 923  sub help_open_topic {
     }      }
   
     # Add the text      # Add the text
     if ($text ne "") {      if ($text ne "") {
  $template .=    $template.="<a style=\"background-color:#3333AA;\" target=\"_top\" href=\"$link\"><span style=\"color:#FFFFFF;\">$text</span></a>";
             "<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>".  
             "<td bgcolor='#5555FF'><a target=\"_top\" href=\"$link\"><span style=\"color:#FFFFFF;font-size:10pt;\">$text</span></a>";  
     }      }
   
     # Add the graphic      # Add the graphic
Line 935  sub help_open_topic { Line 933  sub help_open_topic {
     $template .= <<"ENDTEMPLATE";      $template .= <<"ENDTEMPLATE";
  <a target="_top" href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a>   <a target="_top" href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a>
 ENDTEMPLATE  ENDTEMPLATE
     if ($text ne '') { $template.='</td></tr></table>' };      
     return $template;      return $template;
   
 }  }
Line 943  ENDTEMPLATE Line 941  ENDTEMPLATE
 # This is a quicky function for Latex cheatsheet editing, since it   # This is a quicky function for Latex cheatsheet editing, since it 
 # appears in at least four places  # appears in at least four places
 sub helpLatexCheatsheet {  sub helpLatexCheatsheet {
     my $other = shift;      my ($topic,$text,$not_author) = @_;
       my $out;
     my $addOther = '';      my $addOther = '';
     if ($other) {      if ($topic) {
  $addOther = Apache::loncommon::help_open_topic($other, shift,   $addOther = &Apache::loncommon::help_open_topic($topic,$text,
        undef, undef, 600) .         undef, undef, 600).
    '</td><td>';     '</td><td>';
     }      }
     return '<table><tr><td>'.      $out = '<table><tr><td>'.
  $addOther .     $addOther .
  &Apache::loncommon::help_open_topic("Greek_Symbols",&mt('Greek Symbols'),     &Apache::loncommon::help_open_topic("Greek_Symbols",&mt('Greek Symbols'),
     undef,undef,600)         undef,undef,600).
  .'</td><td>'.     '</td><td>'.
  &Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'),     &Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'),
     undef,undef,600)         undef,undef,600).
  .'</td><td>'.     '</td>';
  &Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'),      unless ($not_author) {
                                     undef,undef,600)          $out .= '<td>'.
  .'</td></tr></table>';          &Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'),
                                               undef,undef,600).
           '</td>';
       }
       $out .= '</tr></table>';
       return $out;
 }  }
   
 sub general_help {  sub general_help {
Line 1629  sub multiple_select_form { Line 1633  sub multiple_select_form {
             $size = scalar(keys(%$hash));              $size = scalar(keys(%$hash));
         }          }
     }      }
     $output.="\n<select name='$name' size='$size' multiple='1'>";      $output.="\n".'<select name="'.$name.'" size="'.$size.'" multiple="multiple">';
     my @order;      my @order;
     if (ref($order) eq 'ARRAY')  {      if (ref($order) eq 'ARRAY')  {
         @order = @{$order};          @order = @{$order};
Line 1740  sub select_level_form { Line 1744  sub select_level_form {
   
 =pod  =pod
   
 =item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc)  =item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$autosubmit)
   
 Returns a string containing a <select name='$name' size='1'> form to   Returns a string containing a <select name='$name' size='1'> form to 
 allow a user to select the domain to preform an operation in.    allow a user to select the domain to preform an operation in.  
Line 1749  See loncreateuser.pm for an example invo Line 1753  See loncreateuser.pm for an example invo
 If the $includeempty flag is set, it also includes an empty choice ("no domain  If the $includeempty flag is set, it also includes an empty choice ("no domain
 selected");  selected");
   
 If the $showdomdesc flag is set, the domain name is followed by the domain description.   If the $showdomdesc flag is set, the domain name is followed by the domain description.
   
   If the $autosubmit flag is set, the form containing the domain selector will be auto-submitted by an onchange action.  
   
 =cut  =cut
   
 #-------------------------------------------  #-------------------------------------------
 sub select_dom_form {  sub select_dom_form {
     my ($defdom,$name,$includeempty,$showdomdesc) = @_;      my ($defdom,$name,$includeempty,$showdomdesc,$autosubmit) = @_;
       my $onchange;
       if ($autosubmit) {
           $onchange = ' onchange="this.form.submit()"';
       }
     my @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());      my @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());
     if ($includeempty) { @domains=('',@domains); }      if ($includeempty) { @domains=('',@domains); }
     my $selectdomain = "<select name=\"$name\" size=\"1\">\n";      my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange>\n";
     foreach my $dom (@domains) {      foreach my $dom (@domains) {
         $selectdomain.="<option value=\"$dom\" ".          $selectdomain.="<option value=\"$dom\" ".
             ($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom;              ($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom;
Line 2798  sub aboutmewrapper { Line 2808  sub aboutmewrapper {
         return;          return;
     }      }
     return '<a href="/adm/'.$domain.'/'.$username.'/aboutme"'.      return '<a href="/adm/'.$domain.'/'.$username.'/aboutme"'.
  ($target?' target="$target"':'').' title="'.&mt("View this user's personal page").'">'.$link.'</a>';   ($target?' target="$target"':'').' title="'.&mt("View this user's personal information page").'">'.$link.'</a>';
 }  }
   
 # ------------------------------------------------------------ Syllabus Wrapper  # ------------------------------------------------------------ Syllabus Wrapper
Line 3067  sub languages { Line 3077  sub languages {
     return $preferred_possibilities[0];      return $preferred_possibilities[0];
 }  }
   
   sub user_lang {
       my ($touname,$toudom,$fromcid) = @_;
       my @userlangs;
       if (($fromcid ne '') && ($env{'course.'.$fromcid.'.languages'} ne '')) {
           @userlangs=(@userlangs,split(/\s*(\,|\;|\:)\s*/,
                       $env{'course.'.$fromcid.'.languages'}));
       } else {
           my %langhash = &getlangs($touname,$toudom);
           if ($langhash{'languages'} ne '') {
               @userlangs = split(/\s*(\,|\;|\:)\s*/,$langhash{'languages'});
           } else {
               my %domdefs = &Apache::lonnet::get_domain_defaults($toudom);
               if ($domdefs{'lang_def'} ne '') {
                   @userlangs = ($domdefs{'lang_def'});
               }
           }
       }
       my @languages=&Apache::lonlocal::get_genlanguages(@userlangs);
       my $user_lh = Apache::localize->get_handle(@languages);
       return $user_lh;
   }
   
   
 ###############################################################  ###############################################################
 ##               Student Answer Attempts                     ##  ##               Student Answer Attempts                     ##
 ###############################################################  ###############################################################
Line 4490  form, .inline { display: inline; } Line 4523  form, .inline { display: inline; }
   
 /* just for tests */  /* just for tests */
 .LC_300Box { width:300px; }  .LC_300Box { width:300px; }
 .LC_200Box {width:200px; }  .LC_400Box {width:400px; }
 .LC_500Box {width:500px; }  .LC_500Box {width:500px; }
 .LC_600Box {width:600px; }  .LC_600Box {width:600px; }
   .LC_800Box {width:800px;}
 /* end */  /* end */
   
 .LC_filename {font-family: $mono; white-space:pre;}  .LC_filename {font-family: $mono; white-space:pre;}
Line 4502  form, .inline { display: inline; } Line 4536  form, .inline { display: inline; }
 }  }
 .LC_warning,  .LC_warning,
 .LC_diff_removed {  .LC_diff_removed {
       color: red;
 }  }
   
 .LC_info,  .LC_info,
Line 4528  form, .inline { display: inline; } Line 4562  form, .inline { display: inline; }
 }  }
   
 .LC_internal_info {  .LC_internal_info {
   color: #999;    color: #999999;
 }  }
   
 table.LC_pastsubmission {  table.LC_pastsubmission {
Line 4750  table.LC_prior_tries tr th { Line 4784  table.LC_prior_tries tr th {
   font-size:90%;    font-size:90%;
 }  }
 table.LC_data_table tr.LC_info_row > td {  table.LC_data_table tr.LC_info_row > td {
   background-color: #CCC;    background-color: #CCCCCC;
   font-weight: bold;    font-weight: bold;
   text-align: left;    text-align: left;
 }  }
Line 4798  table.LC_nested_outer tr td.LC_subheader Line 4832  table.LC_nested_outer tr td.LC_subheader
   text-align: right;    text-align: right;
 }  }
 table.LC_nested tr.LC_info_row td {  table.LC_nested tr.LC_info_row td {
   background-color: #CCC;    background-color: #CCCCCC;
   font-weight: bold;    font-weight: bold;
   font-size: small;    font-size: small;
   text-align: center;    text-align: center;
Line 4808  table.LC_nested_outer tr th.LC_left_item Line 4842  table.LC_nested_outer tr th.LC_left_item
   text-align: left;    text-align: left;
 }  }
 table.LC_nested td {  table.LC_nested td {
   background-color: #FFF;    background-color: #FFFFFF;
   font-size: small;    font-size: small;
 }  }
 table.LC_nested_outer tr th.LC_right_item,  table.LC_nested_outer tr th.LC_right_item,
Line 4819  table.LC_nested tr td.LC_right_item { Line 4853  table.LC_nested tr td.LC_right_item {
 }  }
   
 table.LC_nested tr.LC_odd_row td {  table.LC_nested tr.LC_odd_row td {
   background-color: #EEE;    background-color: #EEEEEE;
 }  }
   
 table.LC_createuser {  table.LC_createuser {
Line 4830  table.LC_createuser tr.LC_section_row td Line 4864  table.LC_createuser tr.LC_section_row td
 }  }
   
 table.LC_createuser tr.LC_info_row td  {  table.LC_createuser tr.LC_info_row td  {
   background-color: #CCC;    background-color: #CCCCCC;
   font-weight: bold;    font-weight: bold;
   text-align: center;    text-align: center;
 }  }
Line 5020  table.LC_pick_box td.LC_pick_box_title { Line 5054  table.LC_pick_box td.LC_pick_box_title {
   background: $tabbg;    background: $tabbg;
   font-weight: bold;    font-weight: bold;
   text-align: right;    text-align: right;
     vertical-align: top;
   width: 184px;    width: 184px;
   padding: 8px;    padding: 8px;
 }  }
Line 5261  table.LC_docs_documents td.LC_docs_docum Line 5296  table.LC_docs_documents td.LC_docs_docum
   padding: 4px;    padding: 4px;
 }  }
   
 .LC_docs_course_commands div {  
   float: left;  
   border: 4px solid #AAAAAA;  
   padding: 4px;  
   background: #DDDDCC;  
 }  
   
 .LC_docs_entry_move {  .LC_docs_entry_move {
   border: 0px;    border: 0px;
   border-collapse: collapse;    border-collapse: collapse;
Line 5538  h2,h3,h4,h5,h6 Line 5566  h2,h3,h4,h5,h6
 }  }
   
 .LC_bgLightGrey{  .LC_bgLightGrey{
  background:URL(/adm/lonIcons/lightGreyBG.png) repeat-x left top;    background:URL(/adm/lonIcons/lightGreyBG.png) repeat-x left bottom;
 }  
 .LC_bgLightGreyYellow {  
  background-color:#EFECE0;  
 }  }
   
   
 /* Main Header with discription of Person, Course, etc. */  /* Main Header with discription of Person, Course, etc. */
 .LC_HeadRight {  .LC_HeadRight {
  text-align: right;   text-align: right;
Line 5560  p, .LC_ContentBox { Line 5586  p, .LC_ContentBox {
   
 }  }
 .LC_FormSectionClearButton input {  .LC_FormSectionClearButton input {
                  background-color:transparent;        
         border:0px;          border:0px;
         cursor:pointer;          cursor:pointer;
         text-decoration:underline;          text-decoration:underline;
Line 5590  ol.LC_smallMenu a { Line 5616  ol.LC_smallMenu a {
  color: RGB(80, 80, 80);   color: RGB(80, 80, 80);
  text-decoration: none;   text-decoration: none;
 }  }
   ol#LC_TabMainMenueContent, ul.LC_TabContent ,
 ol#LC_TabMainMenuContent {  ul.LC_TabContentBigger {
  display:block;   display:block;
  list-style:none;   list-style:none;
  margin: 0px 0px 10px 0px;   margin: 0px;
  padding: 0px;   padding: 0px;
 }  }
   
 ol#LC_TabMainMenuContent li {  ol#LC_TabMainMenuContent li, ul.LC_TabContent li,
   ul.LC_TabContentBigger li{
  display: inline;   display: inline;
    border-right: solid 1px $lg_border_color;
    float:left;
    line-height:140%;
    white-space:nowrap;
   }
   ol#LC_TabMainMenuContent li{
  vertical-align: bottom;   vertical-align: bottom;
  border-bottom: solid 1px RGB(175, 175, 175);   border-bottom: solid 1px RGB(175, 175, 175);
  border-right: solid 1px RGB(175, 175, 175);  
  padding: 5px 10px 5px 10px;   padding: 5px 10px 5px 10px;
  margin-right:3px;   margin-right:5px;
  line-height: 140%;   margin-bottom:3px;
  font-weight: bold;   font-weight: bold;
  white-space:nowrap;  
  background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;   background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
 }  }
   
Line 5616  ol#LC_TabMainMenuContent li a{ Line 5647  ol#LC_TabMainMenuContent li a{
  text-decoration: none;   text-decoration: none;
 }  }
 ul.LC_TabContent {  ul.LC_TabContent {
  margin:0px;   min-height:1.6em;
  padding:0px;  
  display:block;  
  list-style:none;  
  min-height:1.5em;  
 }  }
 ul.LC_TabContent li{  ul.LC_TabContent li{
  display:inline;   vertical-align:middle;
  vertical-align:top;   padding:0px 10px 0px 10px;
    background-color:$tabbg;
  border-bottom:solid 1px $lg_border_color;   border-bottom:solid 1px $lg_border_color;
  border-right:solid 1px $lg_border_color;  
  padding:5px 10px 5px 10px;  
  margin-right:2px;  
  background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;  
 }  }
 ul.LC_TabContent li a, ul.LC_TabContent li{  ul.LC_TabContent li a, ul.LC_TabContent li{ 
  color:rgb(47,47,47);   color:rgb(47,47,47);
  text-decoration:none;   text-decoration:none;
  font-size:95%;   font-size:95%;
  font-weight:bold;   font-weight:bold;
  white-space:nowrap;  
 }  }
   ul.LC_TabContent li:hover, ul.LC_TabContent li.active{
    background-color:#FFFFFF;
    border-bottom:solid 1px #FFFFFF;
   }
   ul.LC_TabContentBigger li{
    vertical-align:bottom;
    border-top:solid 1px $lg_border_color;
    border-left:solid 1px $lg_border_color;
    padding:5px 10px 5px 10px;
    margin-left:2px;
    background:url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
   }
   ul.LC_TabContentBigger li:hover, ul.LC_TabContentBigger li.active{
    background:url(/adm/lonIcons/lightGreyBG.png) repeat-x right bottom;
   }
   ul.LC_TabContentBigger li, ul.LC_TabContentBigger li a{
    font-size:110%;
    font-weight:bold;
   }
   #LC_CourseDocuments, #LC_SupplementalCourseDocuments
   {
    margin:0px;
   }
   
 .LC_hideThis  .LC_hideThis
 {  {
  display:none;   display:none;
Line 5656  ol#LC_MenuBreadcrumbs, ol#LC_PathBreadcr Line 5703  ol#LC_MenuBreadcrumbs, ol#LC_PathBreadcr
 }  }
   
 ol#LC_MenuBreadcrumbs li, ol#LC_PathBreadcrumbs li {  ol#LC_MenuBreadcrumbs li, ol#LC_PathBreadcrumbs li {
   /*
  background: url(/adm/lonIcons/arrow_white.png) no-repeat left center;   background: url(/adm/lonIcons/arrow_white.png) no-repeat left center;
   */
  display: inline;   display: inline;
  padding: 0px 0px 0px 10px;   padding: 0px 0px 0px 10px;
  vertical-align: bottom;   vertical-align: bottom;
Line 5676  ol#LC_PathBreadcrumbs li a{ Line 5725  ol#LC_PathBreadcrumbs li a{
 {  {
  border: solid 1px $lg_border_color;   border: solid 1px $lg_border_color;
 }  }
 .LC_PopUp  .LC_ContentBoxSpecialContactInfo
 {  {
  padding:10px;   border: solid 1px $lg_border_color;
  border-left:solid 1px $lg_border_color;   max-width:25%;
   border-top:solid 1px $lg_border_color;   min-width:25%;
  border-bottom:outset 1px $lg_border_color;  }
  border-right:outset 1px $lg_border_color;  .LC_AboutMe_Image
  display:none;  {
  position:absolute;   float:left;
  right:0;   margin-right:10px;
  background-color:white;  }
  z-index:5;  .LC_Clear_AboutMe_Image
   {
    clear:left;
 }  }
   
 dl.LC_ListStyleClean dt {  dl.LC_ListStyleClean dt {
  padding-right: 5px;   padding-right: 5px;
  display: table-header-group;   display: table-header-group;
Line 5765  div.LC_columnSection { Line 5815  div.LC_columnSection {
 div.LC_columnSection>* {  div.LC_columnSection>* {
  float: left;   float: left;
  margin: 10px 20px 10px 0px;   margin: 10px 20px 10px 0px;
  overflow:hidden;   overflow:hidden;
 }  
 div.LC_columnSection > .LC_ContentBox,  
 div.LC_columnSection > .LC_ContentBoxSpecial  
  {  
  width: 400px;  
 }  }
   
 .ContentBoxSpecialTemplate  .ContentBoxSpecialTemplate
Line 5785  div.LC_columnSection > .ContentBoxTempla Line 5830  div.LC_columnSection > .ContentBoxTempla
 div.LC_columnSection > .ContentBoxSpecialTemplate  div.LC_columnSection > .ContentBoxSpecialTemplate
         {          {
         width: 600px;          width: 600px;
   
 }  }
   
 .clear{  .clear{
Line 5836  div.LC_columnSection > .ContentBoxSpecia Line 5880  div.LC_columnSection > .ContentBoxSpecia
 }  }
   
 .LC_loginpage_space {  .LC_loginpage_space {
  clear:both;   clear: both;
  margin-bottom:20px;   margin-bottom: 20px;
  border-bottom: 1px solid #CCCCCC;   border-bottom: 1px solid #CCCCCC;
 }  }
   
 .LC_loginpage_fieldset{  table em{
  border: 1px solid #CCCCCC;   font-weight: bold;
  margin: 0 auto;   font-style: normal;
 }  }
   
 .LC_loginpage_legend{  table#LC_tableOfContent{
  padding: 2px;   border-collapse: collapse;
  margin: 0px;   border-spacing: 0;
  font-size:14px;   padding: 3px;
  font-weight:bold;   border: 0;
    background-color: #FFFFFF;
    font-size: 90%;
   }
   table#LC_tableOfContent a {
    text-decoration: none;
 }  }
   
   table#LC_tableOfContent tr.LC_trOdd{
    background-color: #EEEEEE;
   }
   
   table#LC_tableOfContent img{
    border: none;
    height: 1.3em;
    vertical-align: text-bottom;
    margin-right: 0.3em;
   }
 END  END
 }  }
   
Line 9934  sub get_annotation { Line 9992  sub get_annotation {
 }  }
   
 sub clean_symb {  sub clean_symb {
     my ($symb) = @_;      my ($symb,$delete_enc) = @_;
   
     &Apache::lonenc::check_decrypt(\$symb);      &Apache::lonenc::check_decrypt(\$symb);
     my $enc = $env{'request.enc'};      my $enc = $env{'request.enc'};
     delete($env{'request.enc'});      if ($delete_enc) {
           delete($env{'request.enc'});
       }
   
     return ($symb,$enc);      return ($symb,$enc);
 }  }
Removed from v.1.729  
changed lines
  Added in v.1.756

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