--- loncom/interface/londocs.pm 2009/02/10 14:23:18 1.339
+++ loncom/interface/londocs.pm 2009/02/14 13:27:01 1.342
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.339 2009/02/10 14:23:18 ehlerst Exp $
+# $Id: londocs.pm,v 1.342 2009/02/14 13:27:01 ehlerst Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1899,6 +1899,7 @@ END
}
my $orig_url = $url;
+ $orig_url=~s{http(:|:)//https(:|:)//}{https$2//};
my $external = ($url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/});
if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) {
my $symb=&Apache::lonnet::symbclean(
@@ -2928,11 +2929,6 @@ HIDDENFORM
} else {
#$postexec='self.close();';
}
- $hadchanges=0;
- if ($hadchanges) {
- &mark_hash_old();
- }
- &changewarning($r,$postexec);
my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
'.sequence';
my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
@@ -3063,6 +3059,8 @@ NASOFORM
NROSTFORM
+my $specialdocumentsform;
+
unless ($env{'form.pagepath'}) {
my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
@@ -3114,23 +3112,16 @@ NSYLFORM
NGFFORM
-
- my $specialdocumentsform=(<
$newpageform
-
$newsylform
-
$newnavform
-
$newsmppageform
-
$newsmpproblemform
-
$newdropboxform
-
$newexuploadform
-
$newbulform
-
$newaboutmeform
-
$newaboutsomeoneform
-
$newgroupfileform
-
$newrosterform
-SPDOFORM
-
+ $specialdocumentsform="
$newfolderform
$newpageform
$newsylform
$newgroupfileform";
+ }
+ $specialdocumentsform.="
$newnavform
$newsmppageform
+
$newsmpproblemform
$newdropboxform
+
$newexuploadform
$newbulform
+
$newaboutmeform
$newaboutsomeoneform
+
$newrosterform";
+if($env{'form.pagepath'}) {
+ $specialdocumentsform="
$newsmpproblemform
$newexuploadform";
+}
my %orderhash = (
'aa' => 'New Document',
@@ -3149,13 +3140,18 @@ my $tid='1';
my $content='content';
my $navigation='navigation';
my $varcd = 'Main Course Documents';
-$r->print(&generate_edit_table($tid,$content,$navigation,$varcd,\%namehash,\%orderhash));
-my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
+$r->print(&generate_edit_table($tid,$content,$navigation,$varcd,\%namehash,\%orderhash));
+ $hadchanges=0;
+ my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
if ($error) {
$r->print('
'.$error.'
'); } + if ($hadchanges) { + &mark_hash_old(); + } + + &changewarning($r,''); $r->print(''); - } if ($env{'form.pagepath'}) { } } @@ -3166,7 +3162,6 @@ $r->print(''); $active = 'style="display: block;"'; } $r->print('