--- loncom/interface/loncommon.pm 2010/12/05 16:38:37 1.925.2.21 +++ loncom/interface/loncommon.pm 2010/02/28 22:56:23 1.945 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.925.2.21 2010/12/05 16:38:37 raeburn Exp $ +# $Id: loncommon.pm,v 1.945 2010/02/28 22:56:23 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -483,9 +483,9 @@ ENDAUTHORBRW sub coursebrowser_javascript { my ($domainfilter,$sec_element,$formname,$role_element,$crstype) = @_; - my $wintitle = &mt('Course Browser'); - if ($crstype ne '') { - $wintitle = &mt($crstype); + my $wintitle = 'Course_Browser'; + if ($crstype eq 'Community') { + $wintitle = 'Community_Browser'; } my $id_functions = &javascript_index_functions(); my $output = ' @@ -1127,7 +1127,7 @@ sub help_open_topic { $template.=' ' .''.&mt('Help: [_1]',$topic).''; if ($text ne "") { $template.=''; @@ -1719,10 +1719,13 @@ sub create_workbook { my $workbook = Spreadsheet::WriteExcel->new('/home/httpd'.$filename); if (! defined($workbook)) { $r->log_error("Error creating excel spreadsheet $filename: $!"); - $r->print('

'.&mt("Unable to create new Excel file. ". - "This error has been logged. ". - "Please alert your LON-CAPA administrator"). - '

'); + $r->print( + '

' + .&mt('Problems occurred in creating the new Excel file.') + .' '.&mt('This error has been logged.') + .' '.&mt('Please alert your LON-CAPA administrator.') + .'

' + ); return (undef); } # @@ -1762,9 +1765,13 @@ sub create_text_file { $fh = Apache::File->new('>/home/httpd'.$filename); if (! defined($fh)) { $r->log_error("Couldn't open $filename for output $!"); - $r->print(&mt('Problems occurred in creating the output file. ' - .'This error has been logged. ' - .'Please alert your LON-CAPA administrator.')); + $r->print( + '

' + .&mt('Problems occurred in creating the output file.') + .' '.&mt('This error has been logged.') + .' '.&mt('Please alert your LON-CAPA administrator.') + .'

' + ); } return ($fh,$filename) } @@ -1978,16 +1985,7 @@ sub select_dom_form { ($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom; if ($showdomdesc) { if ($dom ne '') { - my $domdesc; - if ($name eq 'srchdomain') { - if ($dom =~ /^\w+ci$/) { - $domdesc = 'Faculty'; - } else { - $domdesc = 'Students'; - } - } else { - $domdesc = &Apache::lonnet::domain($dom,'description'); - } + my $domdesc = &Apache::lonnet::domain($dom,'description'); if ($domdesc ne '') { $selectdomain .= ' ('.$domdesc.')'; } @@ -2478,11 +2476,9 @@ sub authform_internal{ } $autharg = ''; - my $authtext = '[_1] Internally authenticated (with initial password [_2])'; - if ($in{'caller'} eq 'requestcrs') { - $authtext = "[_1] Students' password, if none in the uploaded file: [_2]"; - } - $result = &mt($authtext,''.$autharg); + $result = &mt + ('[_1] Internally authenticated (with initial password [_2])', + ''.$autharg); $result.="'; return $result; } @@ -3416,12 +3412,22 @@ sub get_previous_attempt { } $prevattempts=&start_data_table().&start_data_table_header_row(); $prevattempts.=''.&mt('History').''; + my %typeparts; + my $showsurv=&Apache::lonnet::allowed('vas',$env{'request.course.id'}); foreach my $key (sort(keys(%lasthash))) { my ($ign,@parts) = split(/\./,$key); if ($#parts > 0) { my $data=$parts[-1]; pop(@parts); - $prevattempts.=''.&mt('Part ').join('.',@parts).'
'.$data.' '; + if ($data eq 'type') { + unless ($showsurv) { + my $id = join(',',@parts); + $typeparts{$ign.'.'.$id} = $lasthash{$key}; + } + delete($lasthash{$key}); + } else { + $prevattempts.=''.&mt('Part ').join('.',@parts).'
'.$data.' '; + } } else { if ($#parts == 0) { $prevattempts.=''.$parts[0].''; @@ -3431,23 +3437,98 @@ sub get_previous_attempt { } } $prevattempts.=&end_data_table_header_row(); + my %lasthidden; if ($getattempt eq '') { for ($version=1;$version<=$returnhash{'version'};$version++) { - $prevattempts.=&start_data_table_row(). - ''.&mt('Transaction [_1]',$version).''; - foreach my $key (sort(keys(%lasthash))) { - my $value = &format_previous_attempt_value($key, - $returnhash{$version.':'.$key}); - $prevattempts.=''.$value.' '; - } - $prevattempts.=&end_data_table_row(); + my @hidden; + if (%typeparts) { + foreach my $id (keys(%typeparts)) { + if (($returnhash{$version.':'.$id.'.type'} eq 'anonsurvey') || ($returnhash{$version.':'.$id.'.type'} eq 'anonsurveycred')) { + push(@hidden,$id); + $lasthidden{$id} = 1; + } elsif ($lasthidden{$id}) { + if (exists($returnhash{$version.':'.$id.'.award'})) { + delete($lasthidden{$id}); + } + } + } + } + $prevattempts.=&start_data_table_row(). + ''.&mt('Transaction [_1]',$version).''; + if (@hidden) { + foreach my $key (sort(keys(%lasthash))) { + my $hide; + foreach my $id (@hidden) { + if ($key =~ /^\Q$id\E/) { + $hide = 1; + last; + } + } + if ($hide) { + my ($id,$data) = ($key =~ /^(.+)\.([^.]+)$/); + if (($data eq 'award') || ($data eq 'awarddetail')) { + my $value = &format_previous_attempt_value($key, + $returnhash{$version.':'.$key}); + $prevattempts.=''.$value.' '; + } else { + $prevattempts.=' '; + } + } else { + if ($key =~ /\./) { + my $value = &format_previous_attempt_value($key, + $returnhash{$version.':'.$key}); + $prevattempts.=''.$value.' '; + } else { + $prevattempts.=' '; + } + } + } + } else { + foreach my $key (sort(keys(%lasthash))) { + my $value = &format_previous_attempt_value($key, + $returnhash{$version.':'.$key}); + $prevattempts.=''.$value.' '; + } + } + $prevattempts.=&end_data_table_row(); } } + my @currhidden = keys(%lasthidden); $prevattempts.=&start_data_table_row().''.&mt('Current').''; foreach my $key (sort(keys(%lasthash))) { - my $value = &format_previous_attempt_value($key,$lasthash{$key}); - if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)} - $prevattempts.=''.$value.' '; + if (%typeparts) { + my $hidden; + foreach my $id (@currhidden) { + if ($key =~ /^\Q$id\E/) { + $hidden = 1; + last; + } + } + if ($hidden) { + my ($id,$data) = ($key =~ /^(.+)\.([^.]+)$/); + if (($data eq 'award') || ($data eq 'awarddetail')) { + my $value = &format_previous_attempt_value($key,$lasthash{$key}); + if ($key =~/$regexp$/ && (defined &$gradesub)) { + $value = &$gradesub($value); + } + $prevattempts.=''.$value.' '; + } else { + $prevattempts.=' '; + } + } else { + my $value = &format_previous_attempt_value($key,$lasthash{$key}); + if ($key =~/$regexp$/ && (defined &$gradesub)) { + $value = &$gradesub($value); + } + $prevattempts.=''.$value.' '; + } + } else { + my $value = &format_previous_attempt_value($key,$lasthash{$key}); + if ($key =~/$regexp$/ && (defined &$gradesub)) { + $value = &$gradesub($value); + } + $prevattempts.=''.$value.' '; + } } $prevattempts.= &end_data_table_row().&end_data_table(); } else { @@ -4463,11 +4544,6 @@ sub bodytag { my ($title,$function,$addentries,$bodyonly,$domain,$forcereg, $no_nav_bar,$bgcolor,$no_inline_link,$args)=@_; - my $public; - if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) - || ($env{'user.name'} eq '') && ($env{'user.domain'} eq '')) { - $public = 1; - } if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); } $function = &get_users_function() if (!$function); @@ -4483,10 +4559,6 @@ sub bodytag { 'link' => &designparm($function.'.link',$domain),); @design{keys(%$addentries)} = @$addentries{keys(%$addentries)}; - my $custommenu; - if ($env{'environment.remote'} eq 'off') { - $custommenu = &needs_gci_custom(); - } # role and realm my ($role,$realm) = split(/\./,$env{'request.role'},2); if ($role eq 'ca') { @@ -4496,26 +4568,14 @@ sub bodytag { # realm if ($env{'request.course.id'}) { if ($env{'request.role'} !~ /^cr/) { - if (($custommenu) && (($role eq 'cm') || ($env{'form.context'} eq 'requestcrs'))) { - undef($role); - } else { - $role = &Apache::lonnet::plaintext($role,&course_type()); - } + $role = &Apache::lonnet::plaintext($role,&course_type()); } - if (defined($role) && $env{'request.course.sec'}) { + if ($env{'request.course.sec'}) { $role .= (' 'x2).'- '.&mt('section:').' '.$env{'request.course.sec'}; - } - if ($env{'form.context'} eq 'requestcrs') { - undef($realm); - } else { - $realm = $env{'course.'.$env{'request.course.id'}.'.description'}; - } + } + $realm = $env{'course.'.$env{'request.course.id'}.'.description'}; } else { - if (($custommenu) && ($role eq 'cm')) { - undef($role); - } else { - $role = &Apache::lonnet::plaintext($role); - } + $role = &Apache::lonnet::plaintext($role); } if (!$realm) { $realm=' '; } @@ -4533,7 +4593,7 @@ sub bodytag { } my $name = &plainname($env{'user.name'},$env{'user.domain'}); - if ($public) { + if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') { undef($role); } else { $name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'}); @@ -4554,7 +4614,7 @@ sub bodytag { $role = '('.$role.')' if $role; &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']); - if ($env{'environment.remote'} ne 'on') { + if ($env{'environment.remote'} eq 'off') { # No Remote if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') { return $bodytag; @@ -4566,72 +4626,7 @@ sub bodytag { # $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls # } - my $role_selector; - if (($custommenu) && !($env{'form.context'} eq 'requestcrs') && - ($env{'request.course.id'}) && - ($env{'course.'.$env{'request.course.id'}.'.domain'} =~ /^\w+citest$/)) { - $role_selector = &Apache::lonmenu::roles_selector( - $env{'course.' . $env{'request.course.id'} . '.domain'}, - $env{'course.' . $env{'request.course.id'} . '.num'} ); - if ($role_selector) { - $role_selector = '
'.$role_selector; - } - } - my $cid = $env{'request.course.id'}; - my %cicourses; - my $udom = $env{'user.domain'}; - my %allnums = &get_faculty_cnums(); - if ($udom ne '' && ref($allnums{$udom} eq 'HASH') { - foreach my $key (%{$allnums{$udom}}) { - $cicourses{$udom.'_'.$key} = $allnums{$udom}->{$key}; - } - } - if (($custommenu && $cid && !$cicourses{$cid}) && - !($env{'form.context'} eq 'requestcrs') || - ($env{'user.domain'} =~ /^\w+citest$/)) { - my $role = 'st'; - if ($custommenu) { - $role = 'cc'; - } - my ($switcher_js,$switcher,$formname); - $formname = 'pickrole'; - my %courses = &existing_gcitest_courses($role); - my $numcourses = keys(%courses); - my $reqdcount = 0; - if ($cid) { - if ($courses{$cid}) { - $reqdcount = 1; - } - } - if ($numcourses > $reqdcount) { - $switcher = &gcitest_switcher($role,$formname,%courses); - my $current; - if ($cid) { - $current = $role.'./'.$env{'course.'.$cid.'.domain'}. - '/'.$env{'course.'.$cid.'.num'}; - } - $switcher_js = &gcitest_switcher_js($current,$numcourses,$formname); - if ($switcher_js) { - $switcher_js= <<"ENDSCRIPT"; - -ENDSCRIPT - } - } - if ($switcher) { - $switcher = $switcher_js.$switcher; - if ($role_selector) { - $role_selector .= '   '.$switcher; - } else { - $role_selector .= '
'.$switcher; - } - } - } if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { if ($dc_info) { @@ -4641,19 +4636,13 @@ ENDSCRIPT $realm $dc_info|; return $bodytag; } - if ($env{'request.noversionuri'} eq '/adm/navmaps' && - $env{'environment.remotenavmap'} eq 'on') { - return $bodytag; - } - if ($cid && $cicourses{$cid} eq 'tutorial') { - $bodytag .= '
'; + unless ($env{'request.symb'} =~ m/\.page___\d+___/) { + $bodytag .= qq|
$name $role
|; } - - $bodytag .= qq|
$name $role $role_selector
|; $bodytag .= Apache::lonhtmlcommon::scripttag( - Apache::lonmenu::utilityfunctions('',$custommenu), 'start'); + Apache::lonmenu::utilityfunctions(), 'start'); $bodytag .= Apache::lonmenu::primary_menu(); @@ -4661,18 +4650,10 @@ ENDSCRIPT $dc_info = &dc_courseid_toggle($dc_info); } $bodytag .= qq|
$realm $dc_info
|; - if ($cid && $cicourses{$cid} eq 'tutorial') { - $bodytag .= '
'; - } #don't show menus for public users - if(!$public){ - if (($custommenu) && - ($env{'request.role'} !~ m{^st\./(\w+)citest/$match_courseid})) { - $bodytag .= &Apache::lonmenu::gci_secondary_menu(); - } elsif ($env{'request.role'} ne 'cm' || &check_for_gci_dc()) { - $bodytag .= Apache::lonmenu::secondary_menu(); - } + if($env{'user.name'} ne 'public' && $env{'user.domain'} ne 'public'){ + $bodytag .= Apache::lonmenu::secondary_menu(); $bodytag .= Apache::lonmenu::serverform(); $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end'); if ($env{'request.state'} eq 'construct') { @@ -4680,28 +4661,6 @@ ENDSCRIPT $args->{'bread_crumbs'}); } elsif ($forcereg) { $bodytag .= &Apache::lonmenu::innerregister($forcereg); - } elsif ($custommenu && $env{'request.course.id'} && - &Apache::lonnet::allowed('mdc', $env{'request.course.id'})) { - if ((($env{'request.noversionuri'} eq '/adm/navmaps') && - ($env{'request.noversionuri'} ne 'on')) || - (($env{'request.noversionuri'} eq '/adm/coursedocs') && - (!($env{'form.context'} eq 'requestcrs'))) || - (($env{'request.noversionuri'} eq '/adm/createuser') && - (!($env{'form.context'} eq 'requestcrs'))) || - ($env{'request.noversionuri'} eq '/adm/whatsnew') || - ($env{'request.noversionuri'} eq '/cgi-bin/printout.pl') || - ($env{'request.noversionuri'} eq '/adm/printout') || - ($env{'request.noversionuri'} eq '/adm/statistics')) { - - my @advtools = &concept_test_manager(); - &Apache::lonhtmlcommon::clear_breadcrumbs(); - &Apache::lonhtmlcommon::add_breadcrumb_tool( - 'advtools',@advtools); - my $advlinks; - my $legendtext = ''.&mt('Management').''; - &Apache::lonhtmlcommon::render_advtools(\$advlinks,$legendtext); - $bodytag .= $advlinks; - } } }else{ # this is to seperate menu from content when there's no secondary @@ -4747,52 +4706,6 @@ $bodytag ENDBODY } -sub concept_test_manager { - my @advtools; - my %items = ( - docs => { - desc => 'Edit Test', - action => "go('/adm/coursedocs')", - tooltip => 'Assemble or modify Concept Test' - }, - cprv => { - desc => 'Enrollment/Activity', - action => "go('/adm/createuser')", - tooltip => 'Enrollment and student activity', - }, - new => { - desc => "What's New?", - action => "go('/adm/whatsnew')", - tooltip => 'Recent events/action items in Concept Test' , - }, - prnt => { - desc => 'Print Test', - action => "go('/adm/printout');", - tooltip => 'Prepare printable Concept Test', - }, - chrt => { - desc => 'Test Statistics', - action => "go('/adm/statistics');", - tooltip => 'Concept Test Statistics', - }, - rcrs => { - desc => 'Create New Test', - action => "switchpage('createtest');", - tooltip => 'Create new Concept Test', - }, - ); - my @ordered = ('docs','cprv','new','prnt','chrt','rcrs'); - foreach my $item (@ordered) { - push(@advtools, - ''. - ''.$items{$item}{tooltip}. - ''. - ''.$items{$item}{desc}.''); - } - return @advtools; -} - sub dc_courseid_toggle { my ($dc_info) = @_; return ' '. @@ -4964,11 +4877,9 @@ form, .inline { vertical-align:middle; } -/* just for tests */ .LC_400Box { width:400px; } -/* end */ .LC_filename { font-family: $mono; @@ -5082,7 +4993,7 @@ table#LC_title_bar { } table#LC_title_bar, -table.LC_breadcrumbs, +table.LC_breadcrumbs, /* obsolete? */ table#LC_title_bar.LC_with_remote { width: 100%; border-color: $pgbg; @@ -5116,50 +5027,6 @@ ul.LC_breadcrumb_tools_outerlist li { float: right; } -div.LC_GCI_Menu { - width:900px; -} - -div.LC_GCI_Menu:after { - content:''; - display:block; - clear:both; -} - -div.LC_GCI_Menu_left { - float:left; - width:400px; -} - -div.LC_GCI_Menu_right { - float:left; - width:400px;; -} - -dl.LC_GCI_Menu { - width:300px; - float:left; - margin-right:2em; -} - -dl.LC_GCI_Menu dt { - font-weight: bold; - font-size:0.9em; - margin-bottom:0.7em; -} - -dl.LC_GCI_Menu dt a { - color: $font; -} - -dl.LC_GCI_Menu dd { - font-size:0.8em; - margin:0 0 2em 0; - padding-left:4.5em; - line-height:1.5em; - background:none no-repeat left top; -} - table#LC_title_bar td { background: $tabbg; } @@ -5170,7 +5037,7 @@ table#LC_menubuttons img { .LC_breadcrumbs_component { float: right; - margin: 0.25em 1em; + margin: 0 1em; } .LC_breadcrumbs_component img { vertical-align: middle; @@ -5192,7 +5059,6 @@ td.LC_table_cell_checkbox { overflow: hidden; margin: 0; padding: 0; - text-align: left; } /* Preliminary fix to hide breadcrumbs inside remote control window */ @@ -5204,7 +5070,7 @@ td.LC_table_cell_checkbox { clear:both; background: #F8F8F8; /* $sidebg; */ border: 1px solid $sidebg; - margin: 0 0 0 0; + margin: 0 0 10px 0; } .LC_fontsize_medium { @@ -5221,6 +5087,10 @@ td.LC_table_cell_checkbox { padding-left:3px; } +.LC_menubuttons_inline_text img{ + vertical-align: middle; +} + .LC_menubuttons_link { text-decoration: none; } @@ -5240,8 +5110,7 @@ td.LC_menubuttons_text { background: $tabbg; } -table.LC_data_table, -table.LC_mail_list { +table.LC_data_table { border: 1px solid #000000; border-collapse: separate; border-spacing: 1px; @@ -5267,9 +5136,16 @@ table.LC_nested { width: 100%; } +.ui-accordion, +.ui-accordion table.LC_data_table, +.ui-accordion table.LC_nested_outer{ + border: 0px; + border-spacing: 0px; + margin: 3px; +} + table.LC_data_table tr th, table.LC_calendar tr th, -table.LC_mail_list tr th, table.LC_prior_tries tr th, table.LC_innerpickbox tr th { font-weight: bold; @@ -5322,13 +5198,20 @@ table.LC_data_table tr td.LC_leftcol_hea table.LC_data_table tr.LC_empty_row td, table.LC_nested tr.LC_empty_row td { - background-color: #FFFFFF; font-weight: bold; font-style: italic; text-align: center; padding: 8px; } +table.LC_data_table tr.LC_empty_row td { + background-color: $sidebg; +} + +table.LC_nested tr.LC_empty_row td { + background-color: #FFFFFF; +} + table.LC_caption { } @@ -5376,6 +5259,22 @@ table.LC_nested tr td.LC_right_item { text-align: right; } +.ui-accordion table.LC_nested tr.LC_odd_row td.LC_left_item, +.ui-accordion table.LC_nested tr.LC_even_row td.LC_left_item { + text-align: right; + width: 40%; + padding-right:10px; + vertical-align: top; + padding: 5px; +} + +.ui-accordion table.LC_nested tr.LC_odd_row td.LC_right_item, +.ui-accordion table.LC_nested tr.LC_even_row td.LC_right_item { + text-align: left; + width: 60%; + padding: 2px 4px; +} + table.LC_nested tr.LC_odd_row td { background-color: #EEEEEE; } @@ -5417,37 +5316,43 @@ table.LC_calendar tr td.LC_calendar_day_ background-color: $data_table_highlight; } -table.LC_mail_list tr.LC_mail_new { +table.LC_data_table tr td.LC_mail_new { background-color: $mail_new; } -table.LC_mail_list tr.LC_mail_new:hover { +table.LC_data_table tr.LC_mail_new:hover { background-color: $mail_new_hover; } -table.LC_mail_list tr.LC_mail_read { +table.LC_data_table tr td.LC_mail_read { background-color: $mail_read; } -table.LC_mail_list tr.LC_mail_read:hover { +/* +table.LC_data_table tr.LC_mail_read:hover { background-color: $mail_read_hover; } +*/ -table.LC_mail_list tr.LC_mail_replied { +table.LC_data_table tr td.LC_mail_replied { background-color: $mail_replied; } -table.LC_mail_list tr.LC_mail_replied:hover { +/* +table.LC_data_table tr.LC_mail_replied:hover { background-color: $mail_replied_hover; } +*/ -table.LC_mail_list tr.LC_mail_other { +table.LC_data_table tr td.LC_mail_other { background-color: $mail_other; } -table.LC_mail_list tr.LC_mail_other:hover { +/* +table.LC_data_table tr.LC_mail_other:hover { background-color: $mail_other_hover; } +*/ table.LC_data_table tr > td.LC_browser_file, table.LC_data_table tr > td.LC_browser_file_published { @@ -5477,23 +5382,23 @@ table.LC_data_table tr > td.LC_roles_is } table.LC_data_table tr > td.LC_roles_future { - background: #FFFF77; + border-right: 8px solid #FFFF77; } table.LC_data_table tr > td.LC_roles_will { - background: #FFAA77; + border-right: 8px solid #FFAA77; } table.LC_data_table tr > td.LC_roles_expired { - background: #FF7777; + border-right: 8px solid #FF7777; } table.LC_data_table tr > td.LC_roles_will_not { - background: #AAFF77; + border-right: 8px solid #AAFF77; } table.LC_data_table tr > td.LC_roles_selected { - background: #11CC55; + border-right: 8px solid #11CC55; } span.LC_current_location { @@ -5717,10 +5622,6 @@ table.LC_notify_front_page td { font-size: 1.2em; } -.LC_topic_bar img { - vertical-align: bottom; -} - table.LC_course_group_status { margin: 20px; } @@ -5959,56 +5860,41 @@ div.LC_clear_float_footer { } div.LC_grade_show_user { - margin-top: 20px; - border: 1px solid black; +/* border-left: 5px solid $sidebg; */ + border-top: 5px solid #000000; + margin: 50px 0 0 0; + padding: 15px 0 5px 10px; } -div.LC_grade_user_name { - background: #DDDDEE; - border-bottom: 1px solid black; - font-weight: bold; - font-size: large; +div.LC_grade_show_user_odd_row { +/* border-left: 5px solid #000000; */ } -div.LC_grade_show_user_odd_row div.LC_grade_user_name { - background: #DDEEDD; +div.LC_grade_show_user div.LC_Box { + margin-right: 50px; } -div.LC_grade_show_problem, div.LC_grade_submissions, div.LC_grade_message_center, -div.LC_grade_info_links, -div.LC_grade_assign { +div.LC_grade_info_links { margin: 5px; width: 99%; background: #FFFFFF; } -div.LC_grade_show_problem_header, div.LC_grade_submissions_header, -div.LC_grade_message_center_header, -div.LC_grade_assign_header { +div.LC_grade_message_center_header { font-weight: bold; font-size: large; } -div.LC_grade_show_problem_problem, div.LC_grade_submissions_body, -div.LC_grade_message_center_body, -div.LC_grade_assign_body { +div.LC_grade_message_center_body { border: 1px solid black; width: 99%; background: #FFFFFF; } -span.LC_grade_check_note { - font-weight: normal; - font-size: medium; - display: inline; - position: absolute; - right: 1em; -} - table.LC_scantron_action { width: 100%; } @@ -6042,15 +5928,8 @@ div.LC_edit_problem_header_title { } table.LC_edit_problem_header_title { - font-size: larger; - font-weight: bold; width: 100%; - border-color: $pgbg; - border-style: solid; - border-width: $border; background: $tabbg; - border-collapse: collapse; - padding: 0; } div.LC_edit_problem_discards { @@ -6083,13 +5962,6 @@ div.LC_createcourse { display:none; } -/* ---- Remove when done ---- -# The following styles is part of the redesign of LON-CAPA and are -# subject to change during this project. -# Don't rely on their current functionality as they might be -# changed or removed. -# --------------------------*/ - a:hover, ol.LC_primary_menu a:hover, ol#LC_MenuBreadcrumbs a:hover, @@ -6162,14 +6034,9 @@ fieldset > legend { padding: 0 5px 0 5px; } -div.LC_page_header { - background-color: $pgbg_or_bgcolor; - margin: 0 0 1.0em 0; -} - #LC_nav_bar { float: left; - margin: 0.2em 0 0 0; + margin: 0; } #LC_realm { @@ -6186,7 +6053,12 @@ div.LC_page_header { ol.LC_primary_menu { float: right; - margin: 0.2em 0 0 0; + margin: 0; +} + +span.LC_new_message{ + font-weight:bold; + color: darkred; } ol#LC_PathBreadcrumbs { @@ -6201,19 +6073,14 @@ ol.LC_primary_menu li { ol.LC_primary_menu li img { vertical-align: bottom; + height: 1.1em; } ol.LC_primary_menu a { - font-size: 90%; color: RGB(80, 80, 80); text-decoration: none; } -ol.LC_primary_menu a.LC_new_message { - font-weight:bold; - color: darkred; -} - ul#LC_secondary_menu { clear: both; color: $fontmenu; @@ -6347,7 +6214,6 @@ ol#LC_MenuBreadcrumbs, ol#LC_PathBreadcrumbs { padding-left: 10px; margin: 0; - margin: 0; height: 2.5em; /* equal to #LC_breadcrumbs line-height */ } @@ -6355,7 +6221,7 @@ ol#LC_MenuBreadcrumbs li, ol#LC_PathBreadcrumbs li, ul.LC_CourseBreadcrumbs li { display: inline; - white-space: normal; + white-space: normal; } ol#LC_MenuBreadcrumbs li a, @@ -6364,14 +6230,6 @@ ul.LC_CourseBreadcrumbs li a { font-size:90%; } -ol#LC_MenuBreadcrumbs h1 { - display: inline; - font-size: 90%; - line-height: 2.5em; - margin: 0; - padding: 0; -} - ol#LC_PathBreadcrumbs li a { text-decoration:none; font-size:100%; @@ -6577,10 +6435,6 @@ a#LC_content_toolbar_changefolder_toggle background-image:url(/res/adm/pages/open-all-folders.gif); } -a#LC_content_toolbar_management { - background-image:url(/res/adm/pages/navtomenu.png); -} - ul#LC_toolbar li a:hover { background-position: bottom center; } @@ -6621,7 +6475,7 @@ ul.LC_funclist { } ul.LC_funclist > li:first-child { - font-weight:bold; + font-weight:bold; margin-left:0.8em; } @@ -6645,36 +6499,10 @@ ul.LC_funclist li { line-height: 150%; } -#gciheader { - float:left; - width:100%; - background:#DAE0D2 url("/gcimenu_bg.gif") repeat-x bottom; - font-size:93%; - line-height:normal; - margin: 0.5em 0 0.5em 0; -} -#gciheader ul { - margin:0; - padding:10px 10px 0; - list-style:none; -} -#gciheader li { - float:left; - background:url("/gcimenu_left.gif") no-repeat left top; - margin:0; - padding:0 0 0 9px; -} -#gciheader a { - display:block; - background:url("/gcimenu_right.gif") no-repeat right top; - padding:5px 15px 4px 6px; -} -#gciheader #current { - background-image:url("/gcimenu_left_on.gif"); -} -#gciheader #current a { - background-image:url("/gcimenu_right_on.gif"); - padding-bottom:5px; +.ui-accordion .LC_advanced_toggle { + float: right; + font-size: 90%; + padding: 0px 4px } END @@ -6970,10 +6798,8 @@ sub start_page { #if bread_crumbs_component exists show it as headline else show only the breadcrumbs if(exists($args->{'bread_crumbs_component'})){ $result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'}); - } elsif (exists($args->{'bread_crumbs_menulink'})) { - $result .= &Apache::lonhtmlcommon::breadcrumbs('','',$args->{'bread_crumbs_menulink'}); - } else { - $result .= &Apache::lonhtmlcommon::breadcrumbs(); + }else{ + $result .= &Apache::lonhtmlcommon::breadcrumbs(); } } return $result; @@ -7904,9 +7730,9 @@ sub user_picker { 'whse' => "When searching by last,first you must include at least one character in the first name.", 'thfo' => "The following need to be corrected before the search can be run:", ); - my $domform = &select_dom_form($currdom,'srchdomain',undef,1); + my $domform = &select_dom_form($currdom,'srchdomain',1,1); my $srchinsel = ' \n"; @@ -7966,9 +7791,9 @@ sub user_picker { ); $new_user_create = '

' .&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.") - .'
' - .&mt('Enter a valid e-mail address as the username for the new user.').' '.&mt('Please contact the [_1]helpdesk[_2] for assistance.' - ,'','') + .' ' + .&mt('Please contact the [_1]helpdesk[_2] for assistance.' + ,'','') .'


'; } } @@ -10293,8 +10118,10 @@ sub check_clone { 'userroles',['active'],[$ccrole], [$args->{'clonedomain'}]); if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':'.$ccrole}) || (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) { - $can_clone = 1; - } else { + $can_clone = 1; + } elsif (&Apache::lonnet::is_course_owner($args->{'clonedomain'},$args->{'clonecourse'},$args->{'ccuname'},$args->{'ccdomain'})) { + $can_clone = 1; + } else { if ($args->{'crstype'} eq 'Community') { $clonemsg = &mt('No new community created.').$linefeed.&mt('The new community could not be cloned from the existing community because the new community owner ([_1]) does not have cloning rights in the existing community ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'}); } else { @@ -10354,11 +10181,19 @@ sub construct_course { # if anyone ever decides to not show this, and Utils::Course::new # will need to be suitably modified. $outcome .= &mt('New LON-CAPA [_1] ID: [_2]',$crstype,$$courseid).$linefeed; + if ($$courseid =~ /^error:/) { + return (0,$outcome); + } + # # Check if created correctly # ($$crsudom,$$crsunum)= &LONCAPA::split_courseid($$courseid); my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom); + if ($crsuhome eq 'no_host') { + $outcome .= &mt('Course creation failed, unrecognized course home server.').$linefeed; + return (0,$outcome); + } $outcome .= &mt('Created on').': '.$crsuhome.$linefeed; # @@ -10634,21 +10469,6 @@ sub construct_course { $outcome .= ($fatal?$errtext:'write ok').$linefeed; } - if ($args->{'cloneroster'}) { - my ($numadded,$clisterror) = &Apache::lonclonecourse::copyroster($cloneid,$$courseid,$args->{'startaccess'},$args->{'endaccess'}); - if ($clisterror) { - $outcome .= "\0".&mt('An error occurred when copying the student roster from the old course to the new course; the error was: [_1].',$clisterror).$linefeed; - if ($numadded) { - $outcome .= &mt('Although [quant,_1,student] have received roles in the new course the roster does not report this. It is ').$linefeed; - } - } else { - if ($numadded) { - $outcome .= "\0".&mt('[quant,_1,student] copied from roster for old course to roster for new course.',$numadded).$linefeed; - } else { - $outcome .= "\0".&mt('No students have been enrolled in the new Concept Test.').' '.&mt('This is because either (a) an error occurred, or (b) there were no students with either current access or access which ended on/after the current default end date set for access to the old course.').$linefeed; - } - } - } return (1,$outcome); } @@ -10915,60 +10735,6 @@ sub _add_to_env { } } -sub new_roles_update { - my $rolecount = 0; - foreach my $envkey (keys(%env)) { - next unless ($envkey =~ /^user\.role\./); - $rolecount ++; - } - my $newrolecount = 0; - if (!$rolecount) { - my %userenv; - foreach my $crstype ('official','unofficial','community') { - $userenv{'canrequest.'.$crstype} = - &Apache::lonnet::usertools_access($env{'user.name'}, - $env{'user.domain'},$crstype,'reload','requestcourses'); - } - my $then=$env{'user.login.time'}; - my $refresh=time; - my (%userroles,%allroles,%allgroups,@newroles); - my %roleshash = - &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles',['active','future','previous'],undef,undef,1); - foreach my $item (keys(%roleshash)) { - my ($uname,$udom,$role,$section) = split(':',$item); - my $where = '/'.$udom.'/'.$uname; - my ($tstart,$tend) = split(':',$roleshash{$item}); - if ($section ne '') { - $where .= '/'.$section; - } - my $spec = $role.'.'.$where; - &Apache::lonnet::set_arearole($role,$where,$tstart,$tend, - $env{'user.domain'},$env{'user.name'}); - $userroles{'user.role.'.$spec} = $tstart.'.'.$tend; - $newrolecount ++; - unless (grep(/^\Q$role\E$/,@newroles)) { - push(@newroles,$role); - } - my $status = - &Apache::lonnet::curr_role_status($tstart,$tend,$refresh,$then); - if ($status eq 'active') { - &Apache::lonnet::gather_roleprivs(\%allroles,\%allgroups,\%userroles, - $where,$role,$tstart,$tend); - } - } - if (@newroles) { - my ($author,$adv) = &Apache::lonnet::set_userprivs(\%userroles,\%allroles, - \%allgroups); - &Apache::lonnet::appenv(\%userroles,[@newroles,'cm']); - $userenv{'user.adv'} = $adv; - $userenv{'user.author'} = $author; - $userenv{'user.refresh.time'} = $refresh; - } - &Apache::lonnet::appenv(\%userenv); - } - return $newrolecount; -} - # --- Get the symbolic name of a problem and the url sub get_symb { my ($request,$silent) = @_; @@ -11010,176 +10776,6 @@ sub clean_symb { return ($symb,$enc); } -sub needs_gci_custom { - my $custommenu; - my $numdc = &check_for_gci_dc(); - my $udom = $env{'user.domain'}; - return if ($udom eq ''); - unless ($numdc) { - my $then=$env{'user.login.time'}; - my $now = time; - my %allnums = &get_faculty_cnums(); - my $cnums = $allnums{$udom}; - return unless (ref($cnums) eq 'HASH'); - if ($env{'user.role.st./\Q$udom\E/'.$cnums->{'review'}}) { - my ($start,$end) = - split('.',$env{'user.role.st./\Q$udom\E/'.$cnums->{'review'}}); - if (((!$start) || ($start && $start <= $now)) && - ((!$end) || ($end > $now))) { - $custommenu = 1; - if ($env{'user.role.cc./\Q$udom\E/'.$cnums->{'review'}}) { - my ($ccstart,$ccend) = - split('.',$env{'user.role.cc./\Q$udom\E/'.$cnums->{'review'}}); - if (((!$start) || ($start && $start <= $now)) && - ((!$end) || ($end > $now))) { - $custommenu = ''; - } - } - } - } - } - return $custommenu; -} - -sub check_for_gci_dc { - my $then=$env{'user.login.time'}; - my $numdc = 0; - my @doms = &Apache::lonnet::current_machine_domains(); - foreach my $dom (@doms) { - if ($env{'user.role.dc./'.$dom.'/'}) { - my $livedc = 1; - my ($tstart,$tend)=split(/\./,$env{'user.role.dc./'.$dom.'/'}); - if ($tstart && $tstart>$then) { $livedc = 0; } - if ($tend && $tend <$then) { $livedc = 0; } - if ($livedc) { - $numdc++; - } - } - } - return $numdc; -} - -sub get_faculty_cnums { - my %cnums = ( - gci => { - review => '9615072b469884921gcil1', - submit => '1H96711d710194bfegcil1', - tutorial' => '5422913620b814c90gcil1', - }, - slci => { - review => '', - submit => '', - tutorial' => '', - } - ); - return %cnums; -} - -sub existing_gcitest_courses { - my ($role) = @_; - my %courses; - my $cdom = $env{'user.domain'}.'test'; - my $now = time; - foreach my $envkey (keys(%env)) { - my $cnum; - if ($envkey =~ m{^user\.role\.\Q$role\E\./\Q$cdom\E/($match_courseid)$}) { - $cnum = $1; - } else { - next; - } - my ($tstart,$tend) = split(/\./,$env{$envkey}); - if (((!$tstart) || ($tstart < $now)) && ((!$tend) || ($tend > $now))) { - my $descr = $env{'course.'.$cdom.'_'.$cnum.'.description'}; - if ($descr ne '') { - $courses{$cdom.'_'.$cnum}{'description'} = $descr; - } - } - } - return %courses; -} - -sub gcitest_switcher { - my ($role,$formname,%courses) = @_; - my $output; - my %Sortby; - foreach my $course (sort(keys(%courses))) { - next unless (ref($courses{$course}) eq 'HASH'); - my $clean_title = $courses{$course}{'description'}; - $clean_title =~ s/\W+//g; - if ($clean_title eq '') { - $clean_title = $courses{$course}{'description'}; - } - push(@{$Sortby{$clean_title}},$course); - } - my @sorted_courses = sort { lc($a) cmp lc($b) } (keys(%Sortby)); - my $default; - if (@sorted_courses > 1) { - if (($env{'request.course.id'}) && ($courses{$env{'request.course.id'}})) { - $default = &mt('Switch concept test ...'); - } else { - $default = &mt('Select a concept test ...'); - } - } else { - unless (($env{'request.course.id'}) && ($courses{$env{'request.course.id'}})) { - $default = &mt('Select concept test ...'); - } - } - if ($default) { - $output = '
'. - '
'; - } - return $output; -} - -sub gcitest_switcher_js { - my ($current,$numcourses,$formname) = @_; - my $output = <<"ENDJS"; - -function courseswitcher(caller) { - var numcourses = $numcourses; - var current = '$current'; - var choice = document.$formname.newrole.options[document.$formname.newrole.selectedIndex].value; - if (choice == '') { - if (caller == 'icon') { - alert('No Concept Test selected'); - } - document.$formname.selectrole.value = ''; - return; - } - if (choice == current) { - if ((caller != 'icon') && (numcourses > 1)) { - alert('You have selected the current course.\\nPlease select a different Concept Test course'); - } - document.$formname.newrole.selectedIndex = 0; - document.$formname.selectrole.value = ''; - return; - } - document.$formname.selectrole.value = '1'; - document.$formname.submit(); - return; -} - -ENDJS - return $output; -} - -sub get_citest_map { - my ($cdom) = @_; - my %questionnaires = ( - gcitest => 'default_1261144274.sequence', - slcitest => 'default_1261144274.sequence', - ); - return $questionnaires{$cdom}; -} - =pod =back