--- loncom/interface/londocs.pm 2009/02/18 07:06:15 1.346 +++ loncom/interface/londocs.pm 2009/04/01 14:22:11 1.360 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.346 2009/02/18 07:06:15 raeburn Exp $ +# $Id: londocs.pm,v 1.360 2009/04/01 14:22:11 amueller Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1012,7 +1012,7 @@ sub breadcrumbs { } $plain=~s/\>\;\s*$//; return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp', - 'LC_docs_path'),$randompick,$ishidden,$isencrypted,$plain,$is_random_order); + 'LC_docs_path', undef, 1 ),$randompick,$ishidden,$isencrypted,$plain,$is_random_order); } sub log_docs { @@ -1775,7 +1775,7 @@ sub entryline { ''; @@ -3030,7 +3030,7 @@ NBFORM value="$plainname=/adm/$udom/$uname/aboutme" /> - $help{'My Personal Homepage'} + $help{'My Personal Information Page'} NAMFORM @@ -3060,6 +3060,7 @@ NASOFORM NROSTFORM my $specialdocumentsform; +my $newfolderform; unless ($env{'form.pagepath'}) { my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); @@ -3076,7 +3077,7 @@ my $specialdocumentsform; NPFORM - my $newfolderform=(< @@ -3107,12 +3108,12 @@ NSYLFORM value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" /> - $help{'Group Files'} + $help{'Group Portfolio'} NGFFORM - $specialdocumentsform="
$newfolderform
$newpageform
$newsylform
$newgroupfileform"; + $specialdocumentsform="
$newpageform
$newsylform
$newgroupfileform"; } $specialdocumentsform.="
$newnavform
$newsmppageform
$newsmpproblemform
$newdropboxform @@ -3127,20 +3128,18 @@ my %orderhash = ( 'aa' => 'New Document', 'bb' => 'Published Documents', 'cc' => 'Special Documents', - 'dd' => 'More Options', + 'dd' => 'Tools', 'zz' => 'Hide all Options', ); my %namehash = ( - 'New Document' => $fileuploadform, + 'New Document' => $fileuploadform.'
'.$newfolderform, 'Published Documents' => $simpleeditdefaultform, 'Special Documents' => $specialdocumentsform, - 'More Options' => $extresourcesform.'
'.$imspform.'
'.$recoverform, + 'Tools' => $extresourcesform.'
'.$imspform.'
'.$recoverform.'
'.&generate_admin_options($containertag,$uploadtag,\%help,\%env), ); 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)); +$r->print(&generate_edit_table($tid,$varcd,\%namehash,\%orderhash)); $hadchanges=0; my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type); if ($error) { @@ -3154,9 +3153,7 @@ $r->print(&generate_edit_table($tid,$con $r->print(''); if ($env{'form.pagepath'}) { } - } # ----------------------------------------------------- Supplemental documents - if (!$forcestandard) { my $active = 'style="display: none;"'; if($activeClass == 1){ $active = 'style="display: block;"'; @@ -3170,6 +3167,8 @@ $r->print(''); (($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) { $env{'form.folderpath'} = 'supplemental&'. &escape(&mt('Supplemental '.$type.' Documents')); + }else{ + $env{'form.folderpath'} = $savefolderpath; } if ($allowed) { my $folderseq= @@ -3188,7 +3187,7 @@ $r->print('');

$lt{'comment'}:
-
@@ -3244,7 +3243,7 @@ SNSFORM value="$plainname=/adm/$udom/$uname/aboutme" /> - $help{'My Personal Homepage'} + $help{'My Personal Information Page'} SNAMFORM @@ -3258,26 +3257,20 @@ my %suporderhash = ( ); my %supnamehash = ( - 'New Document' => $supupdocform, - 'Special Documents' => $supnewfolderform.'
'.$supnewextform.'
'.$supnewsylform.'
'.$supnewaboutmeform, + 'New Document' => $supupdocform.'
'.$supnewfolderform, + 'Special Documents' => $supnewextform.'
'.$supnewsylform.'
'.$supnewaboutmeform, ); my $tid='2'; -my $content='content'; -my $navigation='navigation'; my $varscd = 'Supplemental Course Documents'; -$r->print(&generate_edit_table($tid,$content,$navigation,$varscd,\%supnamehash,\%suporderhash)); +$r->print(&generate_edit_table($tid,$varscd,\%supnamehash,\%suporderhash)); my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type); if ($error) { $r->print('

'.$error.'

'); } $r->print(''); } - } -$r->print(''); $r->print(''); if ($allowed) { $r->print(' @@ -3316,53 +3309,38 @@ sub generate_admin_options { my $exportbut=&exportbutton(); return (< - - ENDOPTIONFORM } sub generate_edit_table { - my ($tid,$content,$navigation,$varcd,$namehash_ref,$orderhash_ref) = @_; + my ($tid,$varcd,$namehash_ref,$orderhash_ref) = @_; my %namehash = %{$namehash_ref}; my %orderhash = %{$orderhash_ref}; my $form; $form = '

'.&mt($varcd).'

'; - $form .= '
    '; + $form .= ''; - $form .= '
    '; + $form .= '
    '; foreach my $field (keys(%namehash)){ - $form .= ''; + $form .= ''; } $form .= '
    '; @@ -3378,12 +3356,12 @@ sub editing_js { p_mnp => 'Name of New Page', t_mnp => 'New Page', p_mxu => 'Title for the Uploaded Score', - p_msp => 'Title for the Page', + p_msp => 'Name of Simple Course Page', p_msb => 'Title for the Problem', p_mdb => 'Title for the Drop Box', p_mbb => 'Title for the Discussion Board', - p_mab => "Enter user:domain for User's 'About Me' Page", - p_mab2 => "About [_99]", + p_mab => "Enter user:domain for User's Personal Information Page", + p_mab2 => 'Personal Information Page of ', p_mab_alrt1 => 'Not a valid user:domain', p_mab_alrt2 => 'Please enter both user and domain in the format user:domain', p_chn => 'New Title',