--- loncom/interface/londocs.pm 2009/10/04 13:58:02 1.389 +++ loncom/interface/londocs.pm 2009/10/07 19:57:12 1.390 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.389 2009/10/04 13:58:02 tempelho Exp $ +# $Id: londocs.pm,v 1.390 2009/10/07 19:57:12 tempelho Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3159,6 +3159,7 @@ NROSTFORM my $specialdocumentsform; my @specialdocumentsforma; my $newfolderform; +my $newfolderb; unless ($env{'form.pagepath'}) { my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); @@ -3172,7 +3173,8 @@ my $newfolderform; $help{'Adding_Pages'} NPFORM - + + $newfolderform=(< @@ -3181,12 +3183,6 @@ NPFORM $lt{'newf'}$help{'Adding_Folders'} NFFORM - my @newfolderforma= ( - { 'pic02' => "$newfolderform" } - ); - - - $newfolderform = create_form_ul(create_list_elements(@newfolderforma)); my $newsylform=(< @@ -3245,11 +3241,11 @@ my @tools = ( ); my %orderhash = ( - 'aa' => ['Upload Document',$fileuploadform.''.$newfolderform], + '00' => ['Newfolder',$newfolderform], + 'aa' => ['Upload Document',$fileuploadform], 'bb' => ['Published Resources',$simpleeditdefaultform], 'cc' => ['Special Documents',$specialdocumentsform], 'dd' => ['Tools', create_form_ul(create_list_elements(@tools)).&generate_admin_options($containertag,$uploadtag,\%help,\%env)], - 'zz' => ['Hide'], ); my $tid='1'; my $varcd = 'Main Course Documents'; @@ -3325,9 +3321,6 @@ SUPDOCFORM SNFFORM - my @supnewfolderforma = ({'pic28'=>$supnewfolderform}); - $supnewfolderform = create_form_ul(create_list_elements(@supnewfolderforma)); - my $supnewextform=(< @@ -3367,9 +3360,9 @@ my @specialdocs = ( {'pic31'=>$supnewaboutmeform}, ); my %suporderhash = ( - 'ee' => ['Upload Document',$supupdocform.' '.$supnewfolderform], - 'ff' => ['Special Documents',create_form_ul(create_list_elements(@specialdocs))], - 'zz' => ['Hide'], + '00' => ['Supnewfolder', $supnewfolderform], + 'ee' => ['Upload Document',$supupdocform], + 'ff' => ['Special Documents',create_form_ul(create_list_elements(@specialdocs))] ); my $tid='2'; @@ -3449,19 +3442,22 @@ sub generate_edit_table { $form = '
'; $form .= ''; $form .= '
'; foreach my $field (keys(%orderhash)){ - if($field ne 'zz'){ + if($field ne '00'){ if($activetab eq '' || $activetab ne $field){ $active = 'style="display: none;"'; }elsif($activetab eq $field){