--- loncom/interface/londocs.pm	2009/07/10 15:05:28	1.376
+++ loncom/interface/londocs.pm	2009/07/10 17:05:05	1.377
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.376 2009/07/10 15:05:28 bisitz Exp $
+# $Id: londocs.pm,v 1.377 2009/07/10 17:05:05 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -262,8 +262,9 @@ sub dumpcourse {
 
 sub exportbutton {
     my $type = &Apache::loncommon::course_type();
-    return '<input type="submit" name="exportcourse" value="'.
-            &mt('Export '.$type.' to IMS').'" />'.
+    return '<input type="submit" name="exportcourse"'
+          .' value="'.&mt('IMS Export').'"'
+          .' title="'.&mt('Export '.$type.' to IMS Package').'" />'.
     &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'<br />';
 }
 
@@ -277,7 +278,7 @@ sub exportcourse {
     my $numdisc = keys(%discussiontime);
     my $navmap = Apache::lonnavmaps::navmap->new();
     if (!defined($navmap)) {
-        $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package').
+        $r->print(&Apache::loncommon::start_page('Export '.$type.' to IMS Package').
                   '<h2>'.&mt('IMS Export Failed').'</h2>'.
                   '<div class="LC_error">'.
                   &mt('Unable to retrieve information about course contents').
@@ -298,7 +299,17 @@ sub exportcourse {
         my @exportitems = &Apache::loncommon::get_env_multiple('form.archive');
         my @discussions = &Apache::loncommon::get_env_multiple('form.discussion');
         if (@exportitems == 0 && @discussions == 0) {
-            $outcome = '<br />As you did not select any content items or discussions for export, an IMS package has not been created.  Please <a href="javascript:history.go(-1)">go back</a> to select either content items or discussions for export';
+            $outcome = 
+                '<p class="LC_warning">'
+               .&mt('As you did not select any content items or discussions'
+                   .' for export, an IMS package has not been created.')
+               .'</p>'
+               .'<p>'
+               .&mt('Please [_1]go back[_2] to select either content items'
+                   .' or discussions for export.'
+                       ,'<a href="javascript:history.go(-1)">'
+                       ,'</a>')
+               .'</p>';
         } else {
             my $now = time;
             my %symbs;
@@ -321,22 +332,30 @@ sub exportcourse {
                 open(OUTPUT, "zip -r $imszip *  2> /dev/null |");
                 close(OUTPUT);
                 chdir $cwd;
-                $outcome .= '<p>'
-                           .&mt('Download the zip file from [_1]IMS '.lc($type).' archive[_2]'
-                               ,'<a href="'.$imszipfile.'">','</a>')
-                           .'</p>';
                 if ($copyresult) {
                     $outcome .= '<p class="LC_error">'
                                .&mt('The following errors occurred during export - [_1]'
                                    ,$copyresult)
                                .'</p>';
                 }
+                $outcome .= '<p>'
+                           .&mt('[_1]Your IMS package[_2] is ready for download.'
+                               ,'<a href="'.$imszipfile.'">','</a>')
+                           .'</p>';
             } else {
-                $outcome = '<br />'.&mt('Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.').'<br />';
+                $outcome = '<p class="LC_error">'
+                          .&mt('Unfortunately you will not be able to retrieve'
+                              .' an IMS archive of this posts at this time,'
+                              .' because there was a problem creating a'
+                              .' manifest file.')
+                          .'</p>'
+                          .'<p><a href="javascript:history.go(-1)">'
+                          .&mt('Go Back')
+                          .'</a></p>';
             }
         }
-        $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package'));
-	$r->print(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($type).' to IMS content package'));
+        $r->print(&Apache::loncommon::start_page('Export '.$type.' to IMS Package'));
+	$r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export'));
         $r->print($outcome);
         $r->print(&Apache::loncommon::end_page());
     } else {
@@ -489,13 +508,13 @@ function containerCheck(item) {
 // ]]>
 </script>
         |;
-	$r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package',
+	$r->print(&Apache::loncommon::start_page('Export '.$type.' to IMS Package',
 						 $scripttag));
-	$r->print(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($type).' to IMS content package'));
+	$r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export'));
 	$r->print($display.
                   '<p><input type="hidden" name="finishexport" value="1" />'.
                   '<input type="submit" name="exportcourse" value="'.
-                  &mt('Export '.$type.' DOCS').'" /></p></form>');
+                  &mt('Export').'" /></p></form>');
     }
 }
 
@@ -2583,7 +2602,7 @@ sub handler {
       &init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' DOCS to Construction Space');
       &dumpcourse($r);
   } elsif ($allowed && $env{'form.exportcourse'}) {
-      &init_breadcrumbs('exportcourse','Export '.&Apache::loncommon::course_type().' to IMS');
+      &init_breadcrumbs('exportcourse','IMS Export');
       &exportcourse($r);
   } else {
 # is this a standard course?
@@ -2773,7 +2792,6 @@ sub handler {
                 'uplm' => 'Upload a new main '.lc($type).' document',
                 'upls' => 'Upload a new supplemental '.lc($type).' document',
                 'impp' => 'Import a document',
-                'pubd' => 'Published Documents',
 		'copm' => 'All documents out of a published map into this folder',
                 'upld' => 'Upload Document',
                 'srch' => 'Search',
@@ -2796,7 +2814,8 @@ sub handler {
                 'grpo' => 'Group Portfolio',
                 'rost' => 'Course Roster',
 				'abou' => 'Personal Information Page for a User',
-                'imsf' => 'Import IMS package',
+                'imsf' => 'IMS Import',
+                'imsl' => 'Import IMS package',
                 'file' =>  'File',
                 'title' => 'Title',
                 'comment' => 'Comment',
@@ -2805,7 +2824,6 @@ sub handler {
 		'pm' => 'Published Map',
 		'sd' => 'Special Document',
 		'mo' => 'More Options',
-		'hao' => 'Hide all Options'
 					  );
 # -----------------------------------------------------------------------------
 	my $fileupload=(<<FIUP);
@@ -2847,7 +2865,6 @@ FUFORM
 	my $simpleeditdefaultform=(<<SEDFFORM);
 	<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
 	<input type="hidden" name="active" value="bb" />
-	$lt{'pubd'}<br />
 	$uploadtag
 	<input type="button" onclick="javascript:groupsearch()" value="$lt{'srch'}" />
 	<br />
@@ -2983,7 +3000,7 @@ RFORM
 	my $imspform=(<<IMSPFORM);
 	<form action="/adm/imsimportdocs" method="post" name="ims">
 	<input type="hidden" name="folder" value="$folder" />
-	<input name="imsimport" type="button" value="$lt{'imsf'}" onclick="javascript:makeims();" />
+	<input name="imsimport" type="button" value="$lt{'imsf'}" title="$lt{imsl}"  onclick="javascript:makeims();" />
 	</form>
 IMSPFORM
 
@@ -3172,10 +3189,10 @@ if($env{'form.pagepath'}) {
 
 my %orderhash = (
                 'aa' => ['Upload Document',$fileuploadform.'<br />'.$newfolderform],
-                'bb' => ['Published Documents',$simpleeditdefaultform],
+                'bb' => ['Published Resources',$simpleeditdefaultform],
                 'cc' => ['Special Documents',$specialdocumentsform],
 		'dd' => ['Tools',$extresourcesform.'<br />'.$imspform.'<br />'.$recoverform.'<br />'.&generate_admin_options($containertag,$uploadtag,\%help,\%env)],
-                'zz' => ['Hide all Options'],
+                'zz' => ['Hide'],
                 );
 my $tid='1';
 my $varcd = 'Main Course Documents';
@@ -3301,7 +3318,7 @@ SNAMFORM
 my %suporderhash = (
                 'ee' => ['Upload Document',$supupdocform.'<br />'.$supnewfolderform],
                 'ff' => ['Special Documents',$supnewextform.'<br />'.$supnewsylform.'<br />'.$supnewaboutmeform],
-                'zz' => ['Hide all Options'],
+                'zz' => ['Hide'],
                 );
 
 my $tid='2';