version 1.68, 2007/02/27 22:16:02
|
version 1.71, 2007/05/02 01:33:49
|
Line 144 sub display_main_box {
|
Line 144 sub display_main_box {
|
my ($r,$command,$refpage,$checkallowed) = @_; |
my ($r,$command,$refpage,$checkallowed) = @_; |
my $domain=&Apache::loncommon::determinedomain(); |
my $domain=&Apache::loncommon::determinedomain(); |
my $function = &Apache::loncommon::get_users_function(); |
my $function = &Apache::loncommon::get_users_function(); |
my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain); |
|
my $lctype = lc(&Apache::loncommon::course_type()); |
my $lctype = lc(&Apache::loncommon::course_type()); |
$r->print('<table width="100%" border="0" cellpadding="5" cellspacing="0"><tr><td width="100%">'); |
$r->print('<table width="100%" border="0" cellpadding="5" cellspacing="0"><tr><td width="100%">'); |
|
|
Line 172 sub display_main_box {
|
Line 171 sub display_main_box {
|
|
|
if (($command eq 'chgthreshold') |
if (($command eq 'chgthreshold') |
&& $checkallowed->{'abovethreshold'}) { |
&& $checkallowed->{'abovethreshold'}) { |
&display_threshold_config($r,$refpage,$tabbg,\%threshold_titles, |
&display_threshold_config($r,$refpage,\%threshold_titles, |
$cdom,$crs); |
$cdom,$crs); |
} elsif (($command eq 'chginterval') |
} elsif (($command eq 'chginterval') |
&& $checkallowed->{'versionchanges'}) { |
&& $checkallowed->{'versionchanges'}) { |
Line 183 sub display_main_box {
|
Line 182 sub display_main_box {
|
} elsif ($command eq 'courseinit') { |
} elsif ($command eq 'courseinit') { |
&courseinit_config($r,$refpage,\%initpage); |
&courseinit_config($r,$refpage,\%initpage); |
} else { |
} else { |
&display_actions_box($r,$tabbg,$command,$refpage,\%threshold_titles, |
&display_actions_box($r,$command,$refpage,\%threshold_titles, |
\%interval_titles,\%initpage,$cdom,$crs,$checkallowed); |
\%interval_titles,\%initpage,$cdom,$crs,$checkallowed); |
} |
} |
my $end_page = &Apache::loncommon::end_page(); |
my $end_page = &Apache::loncommon::end_page(); |
Line 241 END
|
Line 240 END
|
#------------------------------- |
#------------------------------- |
|
|
sub display_actions_box { |
sub display_actions_box { |
my ($r,$tabbg,$command,$refpage,$threshold_titles,$interval_titles, |
my ($r,$command,$refpage,$threshold_titles,$interval_titles,$initpage, |
$initpage,$cdom,$crs,$checkallowed) = @_; |
$cdom,$crs,$checkallowed) = @_; |
my $udom = $env{'user.domain'}; |
my $udom = $env{'user.domain'}; |
my $uname = $env{'user.name'}; |
my $uname = $env{'user.name'}; |
my $cid = $env{'request.course.id'}; |
my $cid = $env{'request.course.id'}; |
Line 312 sub display_actions_box {
|
Line 311 sub display_actions_box {
|
$r->print(&mt('Page set to be displayed after you have selected a role in this '.$lctype). |
$r->print(&mt('Page set to be displayed after you have selected a role in this '.$lctype). |
'. <nobr>'.&mt('Currently: <i>[_1]</i>',$currinit).'. '. |
'. <nobr>'.&mt('Currently: <i>[_1]</i>',$currinit).'. '. |
&mt('<b>Change</b> for just <a href="/adm/whatsnew?command=courseinit&refpage=[_1]">this '.$lctype.'</a>',$refpage).' '. |
&mt('<b>Change</b> for just <a href="/adm/whatsnew?command=courseinit&refpage=[_1]">this '.$lctype.'</a>',$refpage).' '. |
&mt('or for all <a href="/adm/preferences?action=changecourseinit&refpage=[_1]">your courses</a>',$refpage).'</nobr><br /><hr />'); |
&mt('or for all <a href="/adm/preferences?action=changecourseinit&refpage=[_1]">your courses</a>.',$refpage).'</nobr><br /><hr />'); |
|
|
if ($command eq 'reset') { |
if ($command eq 'reset') { |
$result = &process_reset($cdom,$crs); |
$result = &process_reset($cdom,$crs); |
Line 327 sub display_actions_box {
|
Line 326 sub display_actions_box {
|
my $store_result=&store_display_settings($uname,$udom,$cid,$checkallowed); |
my $store_result=&store_display_settings($uname,$udom,$cid,$checkallowed); |
|
|
unless ($store_result eq 'ok') { |
unless ($store_result eq 'ok') { |
&Apache::lonnet::logthis('Error storing whatsnew settings: '. |
&Apache::lonnet::logthis('Error saving whatsnew settings: '. |
$store_result.' for '.'user '.$uname.':'.$udom.' in '.$lctype.' '.$cid); |
$store_result.' for '.'user '.$uname.':'.$udom.' in '.$lctype.' '.$cid); |
$result .= &mt('Unable to store visibility settings due to [_1]', |
$result .= &mt('Unable to save visibility settings due to [_1]', |
$store_result); |
$store_result); |
} |
} |
|
|
Line 429 sub display_actions_box {
|
Line 428 sub display_actions_box {
|
if ($displayed == $halfway) { |
if ($displayed == $halfway) { |
$r->print('</td><td width="6%"> </td><td align="left" valign="top" width="47%">'); |
$r->print('</td><td width="6%"> </td><td align="left" valign="top" width="47%">'); |
} |
} |
&display_launcher($r,$actionitem,$refpage,$checkallowed,$tabbg,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,$interval,$countunread); |
&display_launcher($r,$actionitem,$refpage,$checkallowed,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,$interval,$countunread); |
$displayed ++; |
$displayed ++; |
} |
} |
} |
} |
Line 451 sub display_actions_box {
|
Line 450 sub display_actions_box {
|
#------------------------------- |
#------------------------------- |
|
|
sub display_threshold_config { |
sub display_threshold_config { |
my ($r,$refpage,$tabbg,$threshold_titles,$cdom,$crs) = @_; |
my ($r,$refpage,$threshold_titles,$cdom,$crs) = @_; |
my $uname = $env{'user.name'}; |
my $uname = $env{'user.name'}; |
my $udom = $env{'user.dom'}; |
my $udom = $env{'user.dom'}; |
my $cid = $env{'request.course.id'}; |
my $cid = $env{'request.course.id'}; |
Line 471 sub display_threshold_config {
|
Line 470 sub display_threshold_config {
|
$r->print('<br /><form name="thresholdform" method="post" action="/adm/whatsnew">'. |
$r->print('<br /><form name="thresholdform" method="post" action="/adm/whatsnew">'. |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row(). |
&Apache::loncommon::start_data_table_header_row(). |
'<th>Threshold Name</th>'."\n". |
'<th>'.&mt('Threshold Name').'</th>'."\n". |
'<th>Current value</th>'."\n". |
'<th>'.&mt('Current value').'</th>'."\n". |
'<th>Change?</th>'."\n". |
'<th>'.&mt('Change?').'</th>'."\n". |
&Apache::loncommon::end_data_table_header_row()); |
&Apache::loncommon::end_data_table_header_row()); |
foreach my $type (@thresholditems) { |
foreach my $type (@thresholditems) { |
my $parameter = $env{'request.course.id'}.':threshold_'.$type; |
my $parameter = $env{'request.course.id'}.':threshold_'.$type; |
Line 522 sub display_interval_config {
|
Line 521 sub display_interval_config {
|
<select name="interval"> |
<select name="interval"> |
'); |
'); |
foreach my $key (reverse sort ({$a cmp $b} (keys(%{$interval_titles})))) { |
foreach my $key (reverse sort ({$a cmp $b} (keys(%{$interval_titles})))) { |
$r->print('<option value="'.$key.'">Version changes '.$$interval_titles{$key}. |
$r->print('<option value="'.$key.'">'.&mt('Version changes').' '.$$interval_titles{$key}. |
'</option>'."\n"); |
'</option>'."\n"); |
} |
} |
$r->print('</select> |
$r->print('</select> |
Line 557 function toggle_countunread(choice) {
|
Line 556 function toggle_countunread(choice) {
|
document.discussionswitch.submit(); |
document.discussionswitch.submit(); |
} |
} |
</script>'); |
</script>'); |
$r->print('<br />'.&mt('Choose whether or not to display a count of the number of new posts for each resource or bulletin board which has unread posts.').'<br />'.&mt('This can increase the time taken to gather data for the [_1] page by a few seconds.',"<i>What's New?</i>").' '.&mt('Currently set to [_1].','<b>'.$current.'</b>')); |
$r->print('<br />'.&mt('Choose whether or not to display a count of the number of new posts for each resource or bulletin board which has unread posts.').'<br />'.&mt("This can increase the time taken to gather data for the '<i>What's New?</i>' page by a few seconds.").' '.&mt("Currently set to <b>$current</b>.")); |
$r->print('<br /><br /> |
$r->print('<br /><br /> |
<form method="post" name="discussionswitch" action="/adm/whatsnew"> |
<form method="post" name="discussionswitch" action="/adm/whatsnew"> |
<input type="hidden" name="command" value="newdiscconf" /> |
<input type="hidden" name="command" value="newdiscconf" /> |
Line 654 sub curr_courseinit {
|
Line 653 sub curr_courseinit {
|
} |
} |
|
|
sub display_launcher { |
sub display_launcher { |
my ($r,$action,$refpage,$checkallowed,$tabbg,$show,$headings,$res_title, |
my ($r,$action,$refpage,$checkallowed,$show,$headings,$res_title, |
$tograde,$ungraded,$bombs,$bombed,$changed,$warnings,$triggered, |
$tograde,$ungraded,$bombs,$bombed,$changed,$warnings,$triggered, |
$newdiscussions,$unread,$msgcount,$newmsgs,$critmsgcount,$critmsgs, |
$newdiscussions,$unread,$msgcount,$newmsgs,$critmsgcount,$critmsgs, |
$interval,$countunread) = @_; |
$interval,$countunread) = @_; |
|
|
if ($$checkallowed{$action}) { |
if ($$checkallowed{$action}) { |
&start_box($r,$tabbg,$show,$headings,$action,$refpage,$action); |
&start_box($r,$show,$headings,$action,$refpage,$action); |
if ($$show{$action}) { |
if ($$show{$action}) { |
if ($action eq 'handgrading') { # UNGRADED ITEMS |
if ($action eq 'handgrading') { # UNGRADED ITEMS |
&display_handgrade($r,$tograde,$ungraded); |
&display_handgrade($r,$tograde,$ungraded); |
Line 1303 sub display_coursediscussion {
|
Line 1302 sub display_coursediscussion {
|
my $css_class = $rowNum%2?' class="LC_odd_row"':''; |
my $css_class = $rowNum%2?' class="LC_odd_row"':''; |
my $lastpost = &Apache::lonnavmaps::timeToHumanString( |
my $lastpost = &Apache::lonnavmaps::timeToHumanString( |
$$unread{$ressymb}{'lastpost'}); |
$$unread{$ressymb}{'lastpost'}); |
$r->print('<tr'.$css_class.'><td><a href="'.$disclink.'">'.$forum_title.'</a> </td><td>'.$type.' </td>'); |
$r->print('<tr'.$css_class.'><td><a href="'.$disclink.'">'.$forum_title.'</a> </td><td>'.&mt($type).' </td>'); |
if ($countunread eq 'on') { |
if ($countunread eq 'on') { |
my $unreadnum = $$unread{$ressymb}{'unreadcount'}; |
my $unreadnum = $$unread{$ressymb}{'unreadcount'}; |
$r->print('<td>'.$lastpost.'</td><td class="LC_right_item">'. |
$r->print('<td>'.$lastpost.'</td><td class="LC_right_item">'. |
Line 1425 sub store_interval_setting {
|
Line 1424 sub store_interval_setting {
|
|
|
} else { |
} else { |
my $lctype = lc(&Apache::loncommon::course_type()); |
my $lctype = lc(&Apache::loncommon::course_type()); |
&Apache::lonnet::logthis('Error storing whatsnew interval setting'. |
&Apache::lonnet::logthis('Error saving whatsnew interval setting'. |
' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid); |
' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid); |
$result = &mt('Unable to set interval to [_1] due to [_2].', |
$result = &mt('Unable to set interval to [_1] due to [_2].', |
'<b>'.$$interval_titles{$env{'form.interval'}}.'</b>', |
'<b>'.$$interval_titles{$env{'form.interval'}}.'</b>', |
Line 1449 sub store_discussion_setting {
|
Line 1448 sub store_discussion_setting {
|
|
|
} else { |
} else { |
my $lctype = lc(&Apache::loncommon::course_type()); |
my $lctype = lc(&Apache::loncommon::course_type()); |
&Apache::lonnet::logthis('Error storing whatsnew countunread setting'. |
&Apache::lonnet::logthis('Error saving whatsnew countunread setting'. |
' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid); |
' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid); |
$result = &mt('Unable to set "number unread posts display" to [_1]'. |
$result = &mt('Unable to set "number unread posts display" to [_1]'. |
' due to [_2].', |
' due to [_2].', |
Line 1487 sub store_courseinit_setting {
|
Line 1486 sub store_courseinit_setting {
|
$result = &mt('Page displayed after role selection in this '.$lctype.' set to <b>[_2]</b>',$lctype,$$initpage{$env{'form.courseinit_page'}}); |
$result = &mt('Page displayed after role selection in this '.$lctype.' set to <b>[_2]</b>',$lctype,$$initpage{$env{'form.courseinit_page'}}); |
} |
} |
} else { |
} else { |
&Apache::lonnet::logthis('Error storing whatsnew courseinit '. |
&Apache::lonnet::logthis('Error saving whatsnew courseinit '. |
'setting: '.$outcome.' for '.$uname. |
'setting: '.$outcome.' for '.$uname. |
':'.$udom.' in '.$lctype.' '.$cid); |
':'.$udom.' in '.$lctype.' '.$cid); |
if ($page_control eq 'global preferences') { |
if ($page_control eq 'global preferences') { |
Line 1506 sub store_courseinit_setting {
|
Line 1505 sub store_courseinit_setting {
|
} |
} |
|
|
sub start_box { |
sub start_box { |
my ($r,$tabbg,$show,$heading,$caller,$refpage) = @_; |
my ($r,$show,$heading,$caller,$refpage) = @_; |
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
chth => 'Change thresholds?', |
chth => 'Change thresholds?', |
chin => 'Change interval?', |
chin => 'Change interval?', |
Line 1515 sub start_box {
|
Line 1514 sub start_box {
|
my $showhide; |
my $showhide; |
if ($$show{$caller}) { |
if ($$show{$caller}) { |
$showhide = '<b><a href="javascript:change_display(document.visible.'. |
$showhide = '<b><a href="javascript:change_display(document.visible.'. |
'display_'.$caller.",'hide'".');">Hide</a></b>'; |
'display_'.$caller.",'hide'".');">'. |
|
&mt('Hide').'</a></b>'; |
|
|
} else { |
} else { |
$showhide = '<b><a href="javascript:change_display(document.visible.'. |
$showhide = '<b><a href="javascript:change_display(document.visible.'. |
'display_'.$caller.",'show'".');">Show</a></b>'; |
'display_'.$caller.",'show'".');">'. |
|
&mt('Show').'</a></b>'; |
} |
} |
|
|
$r->print(' |
$r->print(' |