--- loncom/interface/londocs.pm 2009/02/04 14:45:51 1.337 +++ loncom/interface/londocs.pm 2009/02/12 15:45:38 1.341 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.337 2009/02/04 14:45:51 ehlerst Exp $ +# $Id: londocs.pm,v 1.341 2009/02/12 15:45:38 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( @@ -2888,7 +2889,7 @@ HIDDENFORM } # --------------------------------------------------------- Main tab structure my $activeClass = 1; - $r->print('
'); # --------------------------------------------------------- Standard documents if (($standard) && ($allowed) && (!$forcesupplement)) { my $active = 'style="display: none;"'; @@ -2928,11 +2929,16 @@ HIDDENFORM } else { #$postexec='self.close();'; } - $hadchanges=0; - if ($hadchanges) { - &mark_hash_old(); - } - &changewarning($r,$postexec); +# $hadchanges=0; +# my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type); +# if ($error) { +# $r->print('

'.$error.'

'); +# } +# if ($hadchanges) { +# &mark_hash_old(); +# } +# +# &changewarning($r,$postexec); my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. '.sequence'; my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. @@ -3150,10 +3156,16 @@ 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); + $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'}) { @@ -3365,6 +3377,7 @@ sub generate_edit_table { $form .= '
  • '.&mt($orderhash{$name}).'
  • '; } } + $form .= ''; $form .= '
    '; foreach my $field (keys(%namehash)){ $form .= '';