[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /interface londocs.pm

[raeburn]

raeburn		Fri Jan 22 01:07:08 2010 EDT

  Modified files:              (Branch: version_2_9_X)
    /loncom/interface	londocs.pm 
  Log:
  - Backport 1.377.
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.325.2.3 loncom/interface/londocs.pm:1.325.2.4
--- loncom/interface/londocs.pm:1.325.2.3	Fri Jan 22 00:49:08 2010
+++ loncom/interface/londocs.pm	Fri Jan 22 01:07:08 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.325.2.3 2010/01/22 00:49:08 raeburn Exp $
+# $Id: londocs.pm,v 1.325.2.4 2010/01/22 01:07:08 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -265,10 +265,10 @@
 
 sub exportbutton {
     my $type = &Apache::loncommon::course_type();
-    return '<div>'.
-            '<input type="submit" name="exportcourse" value="'.
-            &mt('Export '.$type.' to IMS').'" />'.
-    &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'</div>';
+    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 />';
 }
 
 
@@ -281,7 +281,7 @@
     my $numdisc = keys(%discussiontime);
     my $navmap = Apache::lonnavmaps::navmap->new();
     if (!defined($navmap)) {
-        $r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package').
+        $r->print(&Apache::loncommon::start_page('Export '.$type.' to IMS Package').
                   '<h2>'.&mt('IMS Export Failed').'</h2>'.
                   '<div class="LC_error">');
         if ($crstype eq 'Community') {
@@ -312,7 +312,17 @@
         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;
@@ -346,11 +356,19 @@
                                .'</p>';
                 }
             } else {
-                $outcome = '<br />'.&mt('Unfortunately you will not be able to retrieve an IMS archive of your course 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 {
@@ -500,13 +518,13 @@
 // ]]>
 </script>
         |;
-	$r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package',
-						 $scripttag));
+        $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($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>');
     }
 }
 
@@ -2595,7 +2613,7 @@
       &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?
@@ -2807,7 +2825,8 @@
                 'grpo' => 'Group Portfolios',
                 'rost' => 'Course Roster',
 		'abou' => 'About User',
-                'imsf' => 'Import IMS package',
+                'imsf' => 'IMS Import',
+                'imsl' => 'Import IMS package',
                 'file' =>  'File',
                 'title' => 'Title',
                 'comment' => 'Comment',
@@ -2990,7 +3009,7 @@
 </form>
 <br /><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>
 ENDFORM
        }