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

Diff for /loncom/interface/loncommon.pm between versions 1.876 and 1.884

version 1.876, 2009/08/04 19:53:42 version 1.884, 2009/08/14 23:54:34
Line 602  sub userbrowser_javascript { Line 602  sub userbrowser_javascript {
     my $id_functions = &javascript_index_functions();      my $id_functions = &javascript_index_functions();
     return <<"ENDUSERBRW";      return <<"ENDUSERBRW";
   
 function openuserbrowser(formname,uname,udom,ulast,ufirst,uemail,hideudom) {  function openuserbrowser(formname,uname,udom,ulast,ufirst,uemail,hideudom,crsdom) {
     var url = '/adm/pickuser?';      var url = '/adm/pickuser?';
     var userdom = getDomainFromSelectbox(formname,udom);      var userdom = getDomainFromSelectbox(formname,udom);
     if (userdom != null) {      if (userdom != null) {
Line 615  function openuserbrowser(formname,uname, Line 615  function openuserbrowser(formname,uname,
                                 '&ulastelement='+ulast+                                  '&ulastelement='+ulast+
                                 '&ufirstelement='+ufirst+                                  '&ufirstelement='+ufirst+
                                 '&uemailelement='+uemail+                                  '&uemailelement='+uemail+
                                 '&hideudomelement='+hideudom;                                  '&hideudomelement='+hideudom+
                                   '&coursedom='+crsdom;
     var title = 'User_Browser';      var title = 'User_Browser';
     var options = 'scrollbars=1,resizable=1,menubar=0';      var options = 'scrollbars=1,resizable=1,menubar=0';
     options += ',width=700,height=600';      options += ',width=700,height=600';
Line 713  sub selectauthor_link { Line 714  sub selectauthor_link {
 }  }
   
 sub selectuser_link {  sub selectuser_link {
     my ($form,$unameelem,$domelem,$lastelem,$firstelem,$emailelem,$hdomelem,$linktext) = @_;      my ($form,$unameelem,$domelem,$lastelem,$firstelem,$emailelem,$hdomelem,
           $coursedom,$linktext) = @_;
     return '<a href="javascript:openuserbrowser('."'$form','$unameelem','$domelem',".      return '<a href="javascript:openuserbrowser('."'$form','$unameelem','$domelem',".
            "'$lastelem','$firstelem','$emailelem','$hdomelem'".');">'.$linktext.'</a>';             "'$lastelem','$firstelem','$emailelem','$hdomelem','$coursedom'".
              ');">'.$linktext.'</a>';
 }  }
   
 sub check_uncheck_jscript {  sub check_uncheck_jscript {
Line 1194  sub help_menu_js { Line 1197  sub help_menu_js {
   
     my $template .= <<"ENDTEMPLATE";      my $template .= <<"ENDTEMPLATE";
 <script type="text/javascript">  <script type="text/javascript">
 // <!-- BEGIN LON-CAPA Internal  
 // <![CDATA[  // <![CDATA[
   // <!-- BEGIN LON-CAPA Internal
 var banner_link = '';  var banner_link = '';
 function helpMenu(target) {  function helpMenu(target) {
     var caller = this;      var caller = this;
Line 1220  function writeHelp(caller) { Line 1223  function writeHelp(caller) {
     caller.document.close()      caller.document.close()
     caller.focus()      caller.focus()
 }  }
 // ]]>  
 // END LON-CAPA Internal -->  // END LON-CAPA Internal -->
   // ]]>
 </script>  </script>
 ENDTEMPLATE  ENDTEMPLATE
     return $template;      return $template;
Line 4465  sub bodytag { Line 4468  sub bodytag {
   
     # Explicit link to get inline menu      # Explicit link to get inline menu
     my $menu= ($no_inline_link?''      my $menu= ($no_inline_link?''
        :'<a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>');         :'<a href="/adm/remote?action=collapse" target="_top">'.&mt('Switch to Inline Menu Mode').'</a>');
     $bodytag .= qq|<div id="LC_nav_bar">$name $role      $bodytag .= qq|<div id="LC_nav_bar">$name $role
             <em>$realm</em> $dc_info </div>              <em>$realm</em> $dc_info </div>
             <ol class="LC_smallMenu LC_right">              <ol class="LC_smallMenu LC_right">
Line 4912  td.LC_menubuttons_text { Line 4915  td.LC_menubuttons_text {
   font-weight: bold;    font-weight: bold;
 }  }
   
 .LC_roleslog_note {  
   font-size: small;  
 }  
   
 table.LC_data_table,  table.LC_data_table,
 table.LC_mail_list {  table.LC_mail_list {
   border: 1px solid #000000;    border: 1px solid #000000;
Line 4935  table.LC_nested_outer { Line 4934  table.LC_nested_outer {
   width: 100%;    width: 100%;
 }  }
   
   table.LC_innerpickbox,
 table.LC_nested {  table.LC_nested {
   border: none;    border: none;
   border-collapse: collapse;    border-collapse: collapse;
Line 4945  table.LC_nested { Line 4945  table.LC_nested {
 table.LC_data_table tr th,   table.LC_data_table tr th, 
 table.LC_calendar tr th,   table.LC_calendar tr th, 
 table.LC_mail_list tr th,  table.LC_mail_list tr th,
 table.LC_prior_tries tr th {  table.LC_prior_tries tr th,
   table.LC_innerpickbox tr th {
   font-weight: bold;    font-weight: bold;
   background-color: $data_table_head;    background-color: $data_table_head;
   color:$fontmenu;    color:$fontmenu;
   font-size:90%;    font-size:90%;
 }  }
   
   table.LC_innerpickbox tr th,
   table.LC_innerpickbox tr td {
     vertical-align: top;
   }
   
 table.LC_data_table tr.LC_info_row > td {  table.LC_data_table tr.LC_info_row > td {
   background-color: #CCCCCC;    background-color: #CCCCCC;
   font-weight: bold;    font-weight: bold;
Line 7529  sub user_picker { Line 7535  sub user_picker {
         #       loncreateuser::print_user_query_page()          #       loncreateuser::print_user_query_page()
         #       has been completed.          #       has been completed.
         next if ($option eq 'alc');          next if ($option eq 'alc');
           next if (($option eq 'crs') && ($env{'form.form'} eq 'requestcrs'));  
         next if ($option eq 'crs' && !$env{'request.course.id'});          next if ($option eq 'crs' && !$env{'request.course.id'});
         if ($curr_selected{'srchin'} eq $option) {          if ($curr_selected{'srchin'} eq $option) {
             $srchinsel .= '               $srchinsel .= ' 
Line 9277  sub restore_settings { Line 9284  sub restore_settings {
   
 =item * &build_recipient_list()  =item * &build_recipient_list()
   
 Build recipient lists for four types of e-mail:  Build recipient lists for five types of e-mail:
 (a) Error Reports, (b) Package Updates, (c) lonstatus warnings/errors  (a) Error Reports, (b) Package Updates, (c) lonstatus warnings/errors
 (d) Help requests, generated by  (d) Help requests, (e) Course requests needing approval,  generated by
 lonerrorhandler.pm, CHECKRPMS, loncron, and lonsupportreq.pm respectively.  lonerrorhandler.pm, CHECKRPMS, loncron, lonsupportreq.pm and
   loncoursequeueadmin.pm respectively.
   
 Inputs:  Inputs:
 defmail (scalar - email address of default recipient),   defmail (scalar - email address of default recipient), 
Line 9853  sub check_clone { Line 9861  sub check_clone {
         $clonemsg = &mt('No new course created.').$linefeed.&mt('A new course could not be cloned from the specified original - [_1] - because it is a non-existent course.',$args->{'clonecourse'}.':'.$args->{'clonedomain'});               $clonemsg = &mt('No new course created.').$linefeed.&mt('A new course could not be cloned from the specified original - [_1] - because it is a non-existent course.',$args->{'clonecourse'}.':'.$args->{'clonedomain'});     
     } else {      } else {
  my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1});   my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1});
  if ($env{'request.role.domain'} eq $args->{'clonedomain'}) {   if (($env{'request.role.domain'} eq $args->{'clonedomain'}) && 
               (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'}))) {
     $can_clone = 1;      $can_clone = 1;
  } else {   } else {
     my %clonehash = &Apache::lonnet::get('environment',['cloners'],      my %clonehash = &Apache::lonnet::get('environment',['cloners'],
Line 9881  sub check_clone { Line 9890  sub check_clone {
 }  }
   
 sub construct_course {  sub construct_course {
     my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context) = @_;      my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context,$cnum) = @_;
     my $outcome;      my $outcome;
     my $linefeed =  '<br />'."\n";      my $linefeed =  '<br />'."\n";
     if ($context eq 'auto') {      if ($context eq 'auto') {
Line 9919  sub construct_course { Line 9928  sub construct_course {
                                              $args->{'crscode'},                                               $args->{'crscode'},
                                              $args->{'ccuname'}.':'.                                               $args->{'ccuname'}.':'.
                                              $args->{'ccdomain'},                                               $args->{'ccdomain'},
                                              $args->{'crstype'});                                               $args->{'crstype'},
                                                $cnum);
   
     # Note: The testing routines depend on this being output; see       # Note: The testing routines depend on this being output; see 
     # Utils::Course. This needs to at least be output as a comment      # Utils::Course. This needs to at least be output as a comment
Removed from v.1.876  
changed lines
  Added in v.1.884

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