version 1.443, 2010/12/07 17:33:36
|
version 1.449, 2011/01/17 20:18:02
|
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 2636 sub startContentScreen {
|
Line 2637 sub startContentScreen {
|
$r->print('<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b> '.&mt('Content Overview').' </b></a></li>'); |
$r->print('<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b> '.&mt('Content Overview').' </b></a></li>'); |
|
|
my $active = ''; |
my $active = ''; |
# does this user have privileges to modify docs |
# does this user have privileges to modify docs? |
my $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'}); |
my $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'}); |
|
|
my $onclick; |
my $onclick; |
my $href; |
my $href; |
|
|
if ($allowed) { |
if ($allowed) { |
# if (($mode eq 'navmaps') || ($mode eq 'tools')) { |
$r->print('<li '.(($mode eq 'docs')?' class="active"':''). |
$href="/adm/coursedocs?forcestandard=1"; |
'><a href="/adm/coursedocs?forcestandard=1"><b> '.&mt('Content Editor').' </b></a></li>'); |
$onclick=''; |
} |
# } else { |
$r->print('<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b> '.&mt('Content Search').' </b></a></li>'); |
# $href='#'; |
$r->print('<li '.(($mode eq 'supdocs')?' class="active"':''). |
# $onclick=' onclick="javascript:showPage(this,\'mainCourseDocuments\',\'mainnav\',\'maincoursedoc\');"'; |
'><a href="/adm/coursedocs?forcesupplement=1"><b>'.&mt('Supplemental Documents').'</b></a></li>'); |
# } |
|
$r->print('<li '.(($mode eq 'docs')?' class="active"':'').$onclick. |
|
'><a href="'.$href.'"><b> '.&mt('Content Editor').' </b></a></li>'); |
|
} |
|
# if (($mode eq 'navmaps') || ($mode eq 'tools')) { |
|
$href="/adm/coursedocs?forcesupplement=1"; |
|
$onclick=''; |
|
# } else { |
|
# $href='#'; |
|
# $onclick=' onclick="javascript:showPage(this,\'mainCourseDocuments\',\'mainnav\',\'maincoursedoc\');"'; |
|
# } |
|
|
|
$r->print('<li '.(($mode eq 'supdocs')?' class="active"':'').$onclick. |
|
'><a href="'.$href.'"><b>'.&mt('Supplemental Documents').'</b></a></li>'); |
|
$r->print('</ul>'); |
$r->print('</ul>'); |
$r->print('<div class="LC_Box" style="clear:both;margin:0;">' |
$r->print('<div class="LC_Box" style="clear:both;margin:0;">' |
.'<div id="maincoursedoc" style="margin:0 0;padding:0 0;">'); |
.'<div id="maincoursedoc" style="margin:0 0;padding:0 0;">'); |
Line 2678 sub endContentScreen {
|
Line 2665 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 2730 sub handler {
|
Line 2721 sub handler {
|
&init_breadcrumbs('exportcourse','IMS Export'); |
&init_breadcrumbs('exportcourse','IMS Export'); |
&exportcourse($r); |
&exportcourse($r); |
} else { |
} else { |
# is this a standard course? |
# |
|
# Done catching special calls |
|
# The whole rest is for course and supplemental documents |
|
# Get the parameters that may be needed |
|
# |
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
|
['folderpath','pagepath', |
|
'pagesymb','forcesupplement','forcestandard']); |
|
|
|
# standard=1: this is a "new-style" course with an uploaded map as top level |
|
# standard=2: this is a "old-style" course, and there is nothing we can do |
|
|
my $standard=($env{'request.course.uri'}=~/^\/uploaded\//); |
my $standard=($env{'request.course.uri'}=~/^\/uploaded\//); |
my $forcestandard = 0; |
|
my $forcesupplement; |
# Decide whether this should display supplemental or main content |
|
# supplementalflag=1: show supplemental documents |
|
# supplementalflag=0: show standard documents |
|
|
|
|
|
my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/); |
|
if (($env{'form.folderpath'}=~/^default/) || $env{'form.folderpath'} eq "" || ($env{'form.pagepath'})) { |
|
$supplementalflag=0; |
|
} |
|
if ($env{'form.forcesupplement'}) { $supplementalflag=1; } |
|
if ($env{'form.forcestandard'}) { $supplementalflag=0; } |
|
unless ($allowed) { $supplementalflag=1; } |
|
unless ($standard) { $supplementalflag=1; } |
|
|
my $script=''; |
my $script=''; |
my $showdoc=0; |
my $showdoc=0; |
my $containertag; |
my $containertag; |
my $uploadtag; |
my $uploadtag; |
|
|
|
# Where do we store these for when we come back? |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
my $stored_folderpath='docs_folderpath'; |
['folderpath','pagepath', |
if ($supplementalflag) { |
'pagesymb','forcesupplement','forcestandard']); |
$stored_folderpath='docs_sup_folderpath'; |
|
} |
|
|
# No folderpath, no pagepath, see if we have something stored |
# No folderpath, no pagepath, see if we have something stored |
if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) { |
if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) { |
&Apache::loncommon::restore_course_settings('docs_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('docs_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'}; |
} |
} |
&Apache::loncommon::store_course_settings('docs_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 |
|
&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 2802 sub handler {
|
Line 2831 sub handler {
|
if ($showdoc) { # got called in sequence from course |
if ($showdoc) { # got called in sequence from course |
$allowed=0; |
$allowed=0; |
} else { |
} else { |
if (($env{'form.folder'}=~/^(?:group|default)_/) || |
|
($env{'form.folder'} =~ m:^\d+/(pages|sequences)/:)) { |
|
$forcestandard = 1; |
|
} |
|
$forcesupplement=($env{'form.folder'}=~/^supplemental_/); |
|
|
|
if ($allowed) { |
if ($allowed) { |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']); |
$script=&Apache::lonratedt::editscript('simple'); |
$script=&Apache::lonratedt::editscript('simple'); |
Line 2839 sub handler {
|
Line 2862 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 2977 CHBO
|
Line 2991 CHBO
|
$checkbox |
$checkbox |
</span> |
</span> |
FUFORM |
FUFORM |
#$list .= Apache::lonhtmlcommon::htmltag('li', $picture.' '.$button->{$picture}, {class => 'LC_menubuttons_inline_text'}); |
|
#$fileuploadform .= create_form_ul(create_list_elements(@fileuploada)); |
|
$fileuploadform .= &create_form_ul(&Apache::lonhtmlcommon::htmltag('li',$fileuploada,{class => 'LC_menubuttons_inline_text'})).'</form>'; |
$fileuploadform .= &create_form_ul(&Apache::lonhtmlcommon::htmltag('li',$fileuploada,{class => 'LC_menubuttons_inline_text'})).'</form>'; |
|
|
my $simpleeditdefaultform=(<<SEDFFORM); |
my $simpleeditdefaultform=(<<SEDFFORM); |
Line 3037 ERFORM
|
Line 3049 ERFORM
|
HIDDENFORM |
HIDDENFORM |
} |
} |
|
|
# |
|
# Decide whether this should display supplemental or main content |
|
# supplementalflag=1: show supplemental documents |
|
# supplementalflag=0: show standard documents |
|
|
|
my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/); |
|
if (($standard) && ($allowed) && (($env{'form.folderpath'}=~/^default/) || $env{'form.folderpath'} eq "" || ($env{'form.pagepath'}))) { |
|
$supplementalflag=0; |
|
} |
|
if ($env{'form.forcesupplement'}) { $supplementalflag=1; } |
|
if ($env{'form.forcestandard'}) { $supplementalflag=0; } |
|
|
|
# Generate the tabs |
# Generate the tabs |
&startContentScreen($r,($supplementalflag?'supdocs':'docs')); |
&startContentScreen($r,($supplementalflag?'supdocs':'docs')); |
|
|
Line 3317 unless($env{'form.pagepath'}) {
|
Line 3317 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 3601 sub editing_js {
|
Line 3600 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) { |