--- loncom/interface/londocs.pm 2009/01/30 10:02:46 1.331 +++ loncom/interface/londocs.pm 2009/02/03 14:16:39 1.334 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.331 2009/01/30 10:02:46 muellerd Exp $ +# $Id: londocs.pm,v 1.334 2009/02/03 14:16:39 muellerd Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2872,18 +2872,13 @@ ERFORM $containertag = ''; $uploadtag = ''; } - ##############alter hashaufruf + $r->print(&generate_admin_options($containertag,$uploadtag,\%lt,\%help,\%env)); $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc', &mt('Editing the Table of Contents for your '.$type))); } # --------------------------------------------------------- Standard documents - $r->print(''); - if (($standard) && ($allowed) && (!$forcesupplement)) { - $r->print(' - -'."\n". -'
'); -# '

'.&mt('Main Course Documents'). -# ($allowed?' '.$help{'Main_Course_Documents'}:'').'

'); my $folder=$env{'form.folder'}; if ($folder eq '' || $folder eq 'supplemental') { $folder='default'; @@ -3037,38 +3032,9 @@ NASOFORM NROSTFORM - $r->print(< - -
-$fileuploadform - -$simpleeditdefaultform -
-$recoverform -ENDFORM - unless ($env{'form.pagepath'}) { - $r->print(< -$extresourcesform -
-$imspform -ENDFORM - } - $r->print('		'); unless ($env{'form.pagepath'}) { my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); - - my $newpageform=(< @@ -3118,72 +3084,47 @@ NSYLFORM NGFFORM - my $specialdocumentsform=(< -$newfolderform -
-$newpageform -
-$newsylform -
-$newnavform -
-$newsmppageform -
-$newsmpproblemform -
-$newdropboxform -
-$newexuploadform -
-$newbulform -
-$newaboutmeform -
-$newaboutsomeoneform -
-$newgroupfileform -
-$newrosterform -ENDFORM + my $specialdocumentsform=(<$newfolderform +
$newpageform +
$newsylform +
$newnavform +
$newsmppageform +
$newsmpproblemform +
$newdropboxform +
$newexuploadform +
$newbulform +
$newaboutmeform +
$newaboutsomeoneform +
$newgroupfileform +
$newrosterform +SPDOFORM -$r->print($specialdocumentsform); my %orderhash = ( - 'aa_eins' => 'New Document', - 'bb_zwei' => 'Published Documents', - 'cc_drei' => 'Special Documents', - 'dd_vier' => 'More Options', - 'zz_hide' => 'Hide all Option', + 'aa' => 'New Document', + 'bb' => 'Published Documents', + 'cc' => 'Special Documents', + 'dd' => 'More Options', + 'zz' => 'Hide all Options', ); my %namehash = ( 'New Document' => $fileuploadform, 'Published Documents' => $simpleeditdefaultform, 'Special Documents' => $specialdocumentsform, 'More Options' => $extresourcesform.'
'.$imspform.'
'.$recoverform, - 'drei' => 'dr', ); -my $varcd = 'Course Documents'; -$r->print(&generate_edit_table($varcd,\%namehash,\%orderhash)); - +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)); } if ($env{'form.pagepath'}) { - $r->print(< -$newexuploadform -ENDBLOCK } - $r->print('
'); -#$r->print(&generate_edit_table(\%namehash,\%orderhash)); - $r->print(''); } # ----------------------------------------------------- Supplemental documents if (!$forcestandard) { - $r->print(''); -# '

'.&mt('Supplemental Course Documents'). -# ($allowed?' '.$help{'Supplemental'}:'').'

'); my $folder=$env{'form.folder'}; unless ($folder=~/^supplemental/) { $folder='supplemental'; @@ -3275,30 +3216,28 @@ SNSFORM SNAMFORM - $r->print(< -
  • $lt{'nd'}
    • -
  • $lt{'sd'}
    • -
  • $lt{'hao'}
    • - - - - -
    -$supupdocform - -$supnewfolderform -
    -$supnewextform -
    -$supnewsylform -
    -$supnewaboutmeform -
    -ENDSUPFORM - } - } - $r->print(''); + + +my %suporderhash = ( + 'ee' => 'New Document', + 'ff' => 'Special Documents', + 'zz' => 'Hide all Options', + ); + +my %supnamehash = ( + 'New Document' => $supupdocform, + 'Special Documents' => $supnewfolderform.'
    '.$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)); + + } + } if ($allowed) { $r->print('
    @@ -3308,7 +3247,6 @@ ENDSUPFORM
    '); } - } else { unless ($upload_result eq 'phasetwo') { # -------------------------------------------------------- This is showdoc mode @@ -3372,31 +3310,28 @@ ENDOPTIONFORM sub generate_edit_table { - my ($varcd,$namehash_ref,$orderhash_ref) = @_; - #my %optionhash = %{$optionhash_ref}; #id verlinkt mit inhalt - #my %tablehash = %{$tablehash_ref}; + my ($tid,$content,$navigation,$varcd,$namehash_ref,$orderhash_ref) = @_; my %namehash = %{$namehash_ref}; #name verlinkt mit id my %orderhash = %{$orderhash_ref}; #name mit kürzel verlinkt mit name - #my %tablehash = %{$tablehash_ref}; my $form; - #foreach my $id (keys(%tablehash)){ - $form = '

    '.&mt('Upload '.$varcd).'

    '; - $form .= '