--- loncom/interface/londocs.pm 2009/07/27 20:35:40 1.382 +++ loncom/interface/londocs.pm 2009/09/02 16:24:28 1.385 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.382 2009/07/27 20:35:40 tempelho Exp $ +# $Id: londocs.pm,v 1.385 2009/09/02 16:24:28 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,6 +35,7 @@ use Apache::Constants qw(:common :http); use Apache::imsexport; use Apache::lonnet; use Apache::loncommon; +use Apache::lonhtmlcommon; use LONCAPA::map(); use Apache::lonratedt(); use Apache::lonxml; @@ -119,8 +120,8 @@ sub dumpbutton { my $type = &Apache::loncommon::course_type(); if ($home+$other==0) { return ''; } if ($home) { - return ''. + my $link = "".&mt('Dump '.$type.' DOCS to Construction Space').""; + return $link.' '. &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs').'
'; } else { return '
'. @@ -262,9 +263,7 @@ sub dumpcourse { sub exportbutton { my $type = &Apache::loncommon::course_type(); - return ''. + return "".&mt('IMS Export')."". &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'
'; } @@ -1643,7 +1642,8 @@ sub editor { .$output .&Apache::loncommon::end_data_table() ) - } else { + } + unless($shown) { $r->print('

' .&mt('Currently no documents.') .'

' @@ -1719,7 +1719,7 @@ sub process_file_upload { return 'failed'; } else { if ($parseaction eq 'parse') { - my $total_embedded = keys(%{$allfiles}); + my $total_embedded = scalar(keys(%{$allfiles})); if ($total_embedded > 0) { my $num = 0; my $state = ' @@ -2702,6 +2702,26 @@ sub handler { $allowed=0; } +# subroutine to list form elements +sub create_list_elements { + my @formarr = @_; + my $list = ''; + for my $button (@formarr){ + for my $picture(keys %$button) { + #my $link = Apache::lonhtmlcommon::htmltag('a' ,$button->{$picture}, {href => "test"}); + $list .= Apache::lonhtmlcommon::htmltag('li', $picture.' '.$button->{$picture}, {class => 'LC_menubuttons_inline_text'}); + } + } + return $list; +} + +# subroutine to create ul from list elements +sub create_form_ul { + my $list = shift; + my $ul = Apache::lonhtmlcommon::htmltag('ul',$list, {class => 'LC_ListStyleNormal'}); + return $ul; +} + # get course data my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'}; my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'}; @@ -2724,11 +2744,19 @@ sub handler { .$script."\n" .'// ]]>'."\n" .''."\n"; - my $brcrum = [{href=>"/adm/createuser",text=>"$type Documents"}]; + + # Breadcrumbs + &Apache::lonhtmlcommon::clear_breadcrumbs(); + &Apache::lonhtmlcommon::add_breadcrumb({ + href=>"/adm/createuser",text=>"$type Documents"}); + $r->print(&Apache::loncommon::start_page("$type Documents", $script, - {'force_register' => $showdoc, - 'bread_crumbs' => $brcrum}). - &Apache::loncommon::help_open_menu('','',273,'RAT')); + {'force_register' => $showdoc,}) + .&Apache::loncommon::help_open_menu('','',273,'RAT') + .&Apache::lonhtmlcommon::breadcrumbs( + 'Editing the Table of Contents for your '.$type, + 'Docs_Adding_Course_Doc') + ); my %allfiles = (); my %codebase = (); @@ -2871,6 +2899,9 @@ FIUP CHBO + my @fileuploada = ( + { pic01 => "$lt{'upld'} $help{'Uploading_From_Harddrive'}" }, + ); my $fileuploadform=(< @@ -2884,27 +2915,23 @@ CHBO $checkbox -
-
- - - $help{'Uploading_From_Harddrive'} - +FUFORM + $fileuploadform .= create_form_ul(create_list_elements(@fileuploada)); + $fileuploadform .= (< FUFORM my $simpleeditdefaultform=(< - $uploadtag - -
- - - $help{'Importing_LON-CAPA_Resource'} - -
- +SEDFFORM + my @simpleeditdefaultforma = ( + { pic03 => "$uploadtag$lt{'srch'}" }, + { pic04 => "$lt{'impo'}$help{'Importing_LON-CAPA_Resource'}" }, + { pic05 => "$lt{'book'}" }, + ); + $simpleeditdefaultform .= create_form_ul(create_list_elements(@simpleeditdefaultforma)); + $simpleeditdefaultform .=(<

$lt{'copm'}
@@ -2921,10 +2948,7 @@ SEDFFORM

$uploadtag - - $help{'Adding_External_Resource'} - + $lt{'extr'}$help{'Adding_External_Resource'}
ERFORM @@ -2964,8 +2988,10 @@ ERFORM HIDDENFORM } # --------------------------------------------------------- Main tab structure + my $activeClass = 1; my $active = ''; + $r->print('
'); my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); + my @supupdocform = ( + {pic27=>"$lt{'upld'}$help{'Uploading_From_Harddrive'}"}, + ); my $supupdocform=(< +
$fileupload
@@ -3279,30 +3307,25 @@ $r->print('');

$lt{'comment'}:
- +
- - - $help{'Uploading_From_Harddrive'} - -
SUPDOCFORM + $supupdocform .= create_form_ul(create_list_elements(@supupdocform)).""; my $supnewfolderform=(< - - $help{'Adding_Folders'} - + $lt{'newf'} + $help{'Adding_Folders'} SNFFORM + + my @supnewfolderforma = ({pic28=>$supnewfolderform}); + $supnewfolderform = create_form_ul(create_list_elements(@supnewfolderforma)); my $supnewextform=(< - - $help{'Adding_External_Resource'} - + $lt{'extr'} $help{'Adding_External_Resource'} SNEFORM @@ -3324,31 +3343,31 @@ SNEFORM - - + $lt{'syll'} $help{'Syllabus'} - SNSFORM my $supnewaboutmeform=(< +
- - + $lt{'mypi'} $help{'My Personal Information Page'} -
SNAMFORM - +my @specialdocs = ( + {pic29=>$supnewextform}, + {pic30=>$supnewsylform}, + {pic31=>$supnewaboutmeform}, + ); my %suporderhash = ( - 'ee' => ['Upload Document',$supupdocform.'
'.$supnewfolderform], - 'ff' => ['Special Documents',$supnewextform.'
'.$supnewsylform.'
'.$supnewaboutmeform], + 'ee' => ['Upload Document',$supupdocform.' '.$supnewfolderform], + 'ff' => ['Special Documents',create_form_ul(create_list_elements(@specialdocs))], 'zz' => ['Hide'], ); @@ -3356,13 +3375,16 @@ my $tid='2'; my $varscd = 'Supplemental Course Documents'; $r->print(&generate_edit_table($tid,$varscd,\%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('
@@ -3398,17 +3420,18 @@ sub generate_admin_options { my %env = %{$env_ref}; my $dumpbut=&dumpbutton(); my $exportbut=&exportbutton(); - return (< - $help{'Verify_Content'}
- $help{'Check_Resource_Versions'}
- $dumpbut - $exportbut - -
- - -ENDOPTIONFORM + my @list = ( + {pic21=>"$lt{'vc'}$help{'Verify_Content'}"}, + {pic22=>"$lt{'cv'}$help{'Check_Resource_Versions'}"}, + ); + if($dumpbut ne ''){ + push @list, {pic23=>$dumpbut}; + } + push @list, ({pic24=>$exportbut}, + {pic25=>"$lt{'ls'}"}, + {pic26=>"$lt{'sl'}"}, + ); + return '
'.create_form_ul(create_list_elements(@list)).'
'; } @@ -3691,7 +3714,7 @@ for (i = 0; i < currentDivs.length; i++) function openTabs(pageId) { tabnav = document.getElementById(pageId).getElementsByTagName('UL'); - if(tabnav.length > 0 ){ + if(tabnav.length > 2 ){ currentNav = document.getElementById(tabnav[0].id); currentLis = currentNav.getElementsByTagName('LI'); for(i = 0; i< currentLis.length; i++){ @@ -3715,6 +3738,13 @@ function showPage(current, pageId, nav, return false; } +function injectData(current, hiddenField, name, value) { + currentElement = document.getElementById(hiddenField); + currentElement.name = name; + currentElement.value = value; + current.submit(); +} + ENDNEWSCRIPT } 1;