version 1.445, 2010/12/08 02:08:21
|
version 1.448, 2011/01/16 13:29:50
|
Line 1521 sub editor {
|
Line 1521 sub editor {
|
$LONCAPA::map::resources[$idx]=''; |
$LONCAPA::map::resources[$idx]=''; |
} |
} |
|
|
my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order); |
my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) = |
if ($allowed) { |
|
($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) = |
|
&breadcrumbs($allowed,$crstype); |
&breadcrumbs($allowed,$crstype); |
$r->print($breadcrumbtrail); |
$r->print($breadcrumbtrail); |
} else { |
|
|
unless ($allowed) { |
$randompick = -1; |
$randompick = -1; |
} |
} |
|
|
Line 1653 sub editor {
|
Line 1652 sub editor {
|
&Apache::loncommon::end_data_table_count(); |
&Apache::loncommon::end_data_table_count(); |
|
|
if ($shown) { |
if ($shown) { |
$r->print(&Apache::loncommon::start_data_table()); |
$r->print(&Apache::loncommon::start_scrollbox('900px','880px','400px') |
|
.&Apache::loncommon::start_data_table()); |
if ($allowed) { |
if ($allowed) { |
$r->print(&Apache::loncommon::start_data_table_header_row() |
$r->print(&Apache::loncommon::start_data_table_header_row() |
.'<th colspan="2">'.&mt('Move').'</th>' |
.'<th colspan="2">'.&mt('Move').'</th>' |
Line 1666 sub editor {
|
Line 1666 sub editor {
|
} |
} |
$r->print($output |
$r->print($output |
.&Apache::loncommon::end_data_table() |
.&Apache::loncommon::end_data_table() |
|
.&Apache::loncommon::end_scrollbox() |
); |
); |
} else { |
} else { |
$r->print('<p class="LC_info">' |
$r->print('<p class="LC_info">' |
Line 2663 sub endContentScreen {
|
Line 2664 sub endContentScreen {
|
$r->print('</div></div></div>'); |
$r->print('</div></div></div>'); |
} |
} |
|
|
|
sub supplemental_base { |
|
return 'supplemental&'.&escape(&mt('Supplemental '.&Apache::loncommon::course_type().' Documents')); |
|
} |
|
|
sub handler { |
sub handler { |
my $r = shift; |
my $r = shift; |
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
Line 2759 sub handler {
|
Line 2764 sub handler {
|
&Apache::loncommon::restore_course_settings($stored_folderpath, |
&Apache::loncommon::restore_course_settings($stored_folderpath, |
{'folderpath' => 'scalar'}); |
{'folderpath' => 'scalar'}); |
} |
} |
|
|
|
# If we are not allowed to make changes, all we can see are supplemental docs |
if (!$allowed) { |
if (!$allowed) { |
unless($env{'form.folderpath'} =~ /^supplemental/) { |
$env{'form.pagepath'}=''; |
$env{'form.folderpath'} = ''; |
unless ($env{'form.folderpath'} =~ /^supplemental/) { |
|
$env{'form.folderpath'} = &supplemental_base(); |
} |
} |
} |
} |
|
# If we still not have a folderpath, see if we can resurrect at pagepath |
if (!$env{'form.folderpath'} && $allowed) { |
if (!$env{'form.folderpath'} && $allowed) { |
&Apache::loncommon::restore_course_settings($stored_folderpath, |
&Apache::loncommon::restore_course_settings($stored_folderpath, |
{'pagepath' => 'scalar'}); |
{'pagepath' => 'scalar'}); |
} |
} |
if ($env{'form.pagepath'}) { |
# Make the zeroth entry in supplemental docs page paths, so we can get to top level |
$env{'form.folderpath'}=''; |
|
} |
|
if ($env{'form.folderpath'} =~ /^supplemental_\d+/) { |
if ($env{'form.folderpath'} =~ /^supplemental_\d+/) { |
$env{'form.folderpath'} = 'supplemental&'. |
$env{'form.folderpath'} = &supplemental_base() |
&escape(&mt('Supplemental '.$crstype.' Documents')).'&'. |
.'&'. |
$env{'form.folderpath'}; |
$env{'form.folderpath'}; |
} |
} |
|
# If after all of this, we still don't have any paths, make them |
|
unless (($env{'form.pagepath'}) || ($env{'form.folderpath'})) { |
|
if ($supplementalflag) { |
|
$env{'form.folderpath'}=&supplemental_base(); |
|
} else { |
|
$env{'form.folderpath'}='default'; |
|
} |
|
} |
|
|
# Store this |
# Store this |
if ($allowed) { |
&Apache::loncommon::store_course_settings($stored_folderpath, |
&Apache::loncommon::store_course_settings($stored_folderpath, |
|
{'pagepath' => 'scalar', |
{'pagepath' => 'scalar', |
'folderpath' => 'scalar'}); |
'folderpath' => 'scalar'}); |
} |
|
if ($env{'form.folderpath'}) { |
if ($env{'form.folderpath'}) { |
my (@folderpath)=split('&',$env{'form.folderpath'}); |
my (@folderpath)=split('&',$env{'form.folderpath'}); |
$env{'form.foldername'}=&unescape(pop(@folderpath)); |
$env{'form.foldername'}=&unescape(pop(@folderpath)); |
Line 2846 sub handler {
|
Line 2861 sub handler {
|
|
|
# Breadcrumbs |
# Breadcrumbs |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
if ($allowed) { |
unless ($showdoc) { |
&Apache::lonhtmlcommon::add_breadcrumb({ |
&Apache::lonhtmlcommon::add_breadcrumb({ |
href=>"/adm/coursedocs",text=>"$crstype Editor"}); |
href=>"/adm/coursedocs",text=>"$crstype Contents"}); |
|
|
$r->print(&Apache::loncommon::start_page("$crstype Editor", $script, |
$r->print(&Apache::loncommon::start_page("$crstype Contents", $script, |
{'force_register' => $showdoc,}) |
{'force_register' => $showdoc,}) |
.&Apache::loncommon::help_open_menu('','',273,'RAT') |
.&Apache::loncommon::help_open_menu('','',273,'RAT') |
.&Apache::lonhtmlcommon::breadcrumbs( |
.&Apache::lonhtmlcommon::breadcrumbs( |
'Editing the Table of Contents for your '.$crstype, |
'Editing the Table of Contents for your '.$crstype, |
'Docs_Adding_Course_Doc') |
'Docs_Adding_Course_Doc') |
); |
); |
} elsif ($showdoc) { |
} else { |
$r->print(&Apache::loncommon::start_page("$crstype documents",undef, |
$r->print(&Apache::loncommon::start_page("$crstype documents",undef, |
{'force_register' => $showdoc,})); |
{'force_register' => $showdoc,})); |
} else { |
|
my $folder=$env{'form.folder'}; |
|
if ($folder eq '' || $folder eq 'supplemental') { |
|
$env{'form.folderpath'} = 'supplemental&'. |
|
&escape(&mt('Supplemental '.$crstype.' Documents')); |
|
} |
|
my ($breadcrumbtrail) = &breadcrumbs($allowed,$crstype); |
|
$r->print(&Apache::loncommon::start_page("Supplemental documents"). |
|
$breadcrumbtrail); |
|
} |
} |
|
|
my %allfiles = (); |
my %allfiles = (); |
Line 3310 unless($env{'form.pagepath'}) {
|
Line 3316 unless($env{'form.pagepath'}) {
|
} |
} |
if ($folder =~ /^supplemental$/ && |
if ($folder =~ /^supplemental$/ && |
(($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) { |
(($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) { |
$env{'form.folderpath'} = 'supplemental&'. |
$env{'form.folderpath'} = &supplemental_base(); |
&escape(&mt('Supplemental '.$crstype.' Documents')); |
|
} elsif ($allowed) { |
} elsif ($allowed) { |
$env{'form.folderpath'} = $savefolderpath; |
$env{'form.folderpath'} = $savefolderpath; |
} |
} |
Line 3594 sub editing_js {
|
Line 3599 sub editing_js {
|
} |
} |
} |
} |
my $toplevelmain = 'default&Main%20'.$crstype.'%20Documents'; |
my $toplevelmain = 'default&Main%20'.$crstype.'%20Documents'; |
my $toplevelsupp = 'supplemental&Supplemental%20'.$crstype.'%20Documents'; |
my $toplevelsupp = &supplemental_base(); |
|
|
return <<ENDNEWSCRIPT; |
return <<ENDNEWSCRIPT; |
function makenewfolder(targetform,folderseq) { |
function makenewfolder(targetform,folderseq) { |