[LON-CAPA-cvs] cvs: loncom /interface londocs.pm
www
www@source.lon-capa.org
Tue, 07 Dec 2010 17:33:36 -0000
This is a MIME encoded message
--www1291743216
Content-Type: text/plain
www Tue Dec 7 17:33:36 2010 EDT
Modified files:
/loncom/interface londocs.pm
Log:
Saving my work on content screens. Lots more cleanup needed, londocs is a mess.
--www1291743216
Content-Type: text/plain
Content-Disposition: attachment; filename="www-20101207173336.txt"
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.442 loncom/interface/londocs.pm:1.443
--- loncom/interface/londocs.pm:1.442 Tue Dec 7 01:15:39 2010
+++ loncom/interface/londocs.pm Tue Dec 7 17:33:36 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.442 2010/12/07 01:15:39 www Exp $
+# $Id: londocs.pm,v 1.443 2010/12/07 17:33:36 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2643,23 +2643,23 @@
my $href;
if ($allowed) {
- if (($mode eq 'navmaps') || ($mode eq 'tools')) {
- $href="/adm/coursedocs";
+# if (($mode eq 'navmaps') || ($mode eq 'tools')) {
+ $href="/adm/coursedocs?forcestandard=1";
$onclick='';
- } else {
- $href='#';
- $onclick=' onclick="javascript:showPage(this,\'mainCourseDocuments\',\'mainnav\',\'maincoursedoc\');"';
- }
+# } else {
+# $href='#';
+# $onclick=' onclick="javascript:showPage(this,\'mainCourseDocuments\',\'mainnav\',\'maincoursedoc\');"';
+# }
$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";
+# if (($mode eq 'navmaps') || ($mode eq 'tools')) {
+ $href="/adm/coursedocs?forcesupplement=1";
$onclick='';
- } else {
- $href='#';
- $onclick=' onclick="javascript:showPage(this,\'mainCourseDocuments\',\'mainnav\',\'maincoursedoc\');"';
- }
+# } 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>');
@@ -2685,7 +2685,7 @@
return OK if $r->header_only;
my $crstype = &Apache::loncommon::course_type();
-
+#
# --------------------------------------------- Initialize help topics for this
foreach my $topic ('Adding_Course_Doc','Main_Course_Documents',
'Adding_External_Resource','Navigate_Content',
@@ -2743,7 +2743,7 @@
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['folderpath','pagepath',
- 'pagesymb']);
+ 'pagesymb','forcesupplement','forcestandard']);
# No folderpath, no pagepath, see if we have something stored
if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) {
&Apache::loncommon::restore_course_settings('docs_folderpath',
@@ -2979,10 +2979,7 @@
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'}));
- $fileuploadform .= (<<FUFORM);
- </form>
-FUFORM
+ $fileuploadform .= &create_form_ul(&Apache::lonhtmlcommon::htmltag('li',$fileuploada,{class => 'LC_menubuttons_inline_text'})).'</form>';
my $simpleeditdefaultform=(<<SEDFFORM);
<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
@@ -2993,7 +2990,7 @@
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'" onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{wish}.'" onclick="javascript:open_Wishlist_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_Wishlist_Import();'>$lt{'wish'}</a>" },
);
- $simpleeditdefaultform .= create_form_ul(create_list_elements(@simpleeditdefaultforma));
+ $simpleeditdefaultform .= &create_form_ul(&create_list_elements(@simpleeditdefaultforma));
$simpleeditdefaultform .=(<<SEDFFORM);
<hr />
<p>
@@ -3040,15 +3037,29 @@
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
- &startContentScreen($r,'docs');
+ &startContentScreen($r,($supplementalflag?'supdocs':'docs'));
+
+
#
my $savefolderpath;
if ($allowed) {
my $folder=$env{'form.folder'};
- if ($folder eq '' || $folder=~/^supplemental/) {
+ if ($folder eq '' || $supplementalflag) {
$folder='default';
$savefolderpath = $env{'form.folderpath'};
$env{'form.folderpath'}='default&'.&escape(&mt('Content'));
@@ -3242,7 +3253,7 @@
my @importdoc = (
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'newext\');" />'=>$extresourcesform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:makeims();" />'=>$imspform},);
- $fileuploadform = create_form_ul(create_list_elements(@importdoc)) . '<hr/>' . $fileuploadform;
+ $fileuploadform = &create_form_ul(&create_list_elements(@importdoc)) . '<hr/>' . $fileuploadform;
push @specialdocumentsforma, ({'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="document.newnav.submit()" />'=>$newnavform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simple.png" alt="'.$lt{sipa}.'" onclick="javascript:makesmppage();" />'=>$newsmppageform},
@@ -3254,7 +3265,7 @@
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/aboutme.png" alt="'.$lt{abou}.'" onclick="javascript:makeabout();" />'=>$newaboutsomeoneform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/clst.png" alt="'.$lt{rost}.'" onclick="document.newroster.submit()" />'=>$newrosterform},);
- $specialdocumentsform = create_form_ul(create_list_elements(@specialdocumentsforma));
+ $specialdocumentsform = &create_form_ul(&create_list_elements(@specialdocumentsforma));
}
if($env{'form.pagepath'}) {
@@ -3263,7 +3274,7 @@
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.&mt('Simple Problem').'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.&mt('Score Upload Form').'" onclick="javascript:makeexamupload();" />'=>$newexuploadform}
);
- $specialdocumentsform= create_form_ul(create_list_elements(@specialdocumentsforma));
+ $specialdocumentsform= &create_form_ul(&create_list_elements(@specialdocumentsforma));
}
my @tools = (
@@ -3276,30 +3287,32 @@
'aa' => ['Import Documents',$fileuploadform],
'bb' => ['Published Resources',$simpleeditdefaultform],
'cc' => ['Special Documents',$specialdocumentsform],
- 'dd' => ['Tools', create_form_ul(create_list_elements(@tools)).&generate_admin_options(\%help,\%env)],
+ 'dd' => ['Tools', &create_form_ul(&create_list_elements(@tools)).&generate_admin_options(\%help,\%env)],
);
unless($env{'form.pagepath'}) {
$orderhash{'00'} = ['Newfolder',$newfolderform];
}
-my $tid='1';
$hadchanges=0;
- my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
- if ($error) {
- $r->print('<p><span class="LC_error">'.$error.'</span></p>');
- }
- if ($hadchanges) {
- &mark_hash_old();
- }
+ unless ($supplementalflag) {
+ my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
+ if ($error) {
+ $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+ }
+ if ($hadchanges) {
+ &mark_hash_old();
+ }
- &changewarning($r,'');
-$r->print(&generate_edit_table($tid,\%orderhash));
+ &changewarning($r,'');
+ $r->print(&generate_edit_table('1',\%orderhash));
+ }
-$r->print('</div>');
}
+# Supplemental documents start here
+
my $folder=$env{'form.folder'};
- unless ($folder=~/^supplemental/) {
+ unless ($supplementalflag) {
$folder='supplemental';
}
if ($folder =~ /^supplemental$/ &&
@@ -3334,7 +3347,7 @@
<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="cmd" value="upload_supplemental" />
SUPDOCFORM
- $supupdocform .= create_form_ul(Apache::lonhtmlcommon::htmltag('li',$supupdocformbtn,{class => 'LC_menubuttons_inline_text'}))."</form>";
+ $supupdocform .= &create_form_ul(&Apache::lonhtmlcommon::htmltag('li',$supupdocformbtn,{class => 'LC_menubuttons_inline_text'}))."</form>";
my $supnewfolderform=(<<SNFFORM);
<form action="/adm/coursedocs" method="post" name="supnewfolder">
@@ -3389,20 +3402,20 @@
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'supnewext\');" />'
=>$supnewextform},
);
-$supupdocform = create_form_ul(create_list_elements(@supimportdoc)) . '<hr/>' . $supupdocform;
+$supupdocform = &create_form_ul(&create_list_elements(@supimportdoc)) . '<hr/>' . $supupdocform;
my %suporderhash = (
'00' => ['Supnewfolder', $supnewfolderform],
'ee' => ['Import Documents',$supupdocform],
- 'ff' => ['Special Documents',create_form_ul(create_list_elements(@specialdocs))]
+ 'ff' => ['Special Documents',&create_form_ul(&create_list_elements(@specialdocs))]
);
-
- my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
- if ($error) {
- $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+ if ($supplementalflag) {
+ my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
+ if ($error) {
+ $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+ }
+ $r->print(&generate_edit_table('2',\%suporderhash));
}
- my $tid='2';
- $r->print(&generate_edit_table($tid,\%suporderhash));
- } else {
+ } elsif ($supplementalflag) {
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
if ($error) {
$r->print('<p><span class="LC_error">'.$error.'</span></p>');
@@ -3500,7 +3513,7 @@
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/document-properties.png" alt="'.$lt{sl}.'" onclick=\'javascript:injectData(document.courseverify, "dummy", "docslog", "'.$lt{'sl'}.'")\' />'
=>"<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"docslog\", \"$lt{'sl'}\")'>$lt{'sl'}</a>"},
);
- return '<form action="/adm/coursedocs" method="post" name="courseverify"><input type="hidden" id="dummy" />'.create_form_ul(create_list_elements(@list)).'</form>';
+ return '<form action="/adm/coursedocs" method="post" name="courseverify"><input type="hidden" id="dummy" />'.&create_form_ul(&create_list_elements(@list)).'</form>';
}
--www1291743216--