[LON-CAPA-cvs] cvs: loncom /localize/localize de.pm zh.pm /publisher loncfile.pm lonupload.pm testbankimport.pm

[bisitz]

bisitz		Thu Mar 26 16:50:16 2009 EDT

  Modified files:              
    /loncom/publisher	loncfile.pm lonupload.pm testbankimport.pm 
    /loncom/localize/localize	de.pm zh.pm 
  Log:
  Optimized Co-Author warnings:
  - Replaced error style by warning style which fits much better here
  - Don't use headline tag anymore as style to highlight message
  - Optimized &mt usage
  - Consistent/standard output of username:domain
  
  
Index: loncom/publisher/loncfile.pm
diff -u loncom/publisher/loncfile.pm:1.93 loncom/publisher/loncfile.pm:1.94
--- loncom/publisher/loncfile.pm:1.93	Thu Jan 29 11:50:32 2009
+++ loncom/publisher/loncfile.pm	Thu Mar 26 16:50:12 2009
@@ -9,7 +9,7 @@
 #  and displays a page showing the results of the action.
 #
 #
-# $Id: loncfile.pm,v 1.93 2009/01/29 11:50:32 bisitz Exp $
+# $Id: loncfile.pm,v 1.94 2009/03/26 16:50:12 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1364,8 +1364,10 @@
     $r->print('<h3>'.&mt('Location').': '.&display($fn).'</h3>');
   
     if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
-	$r->print('<h3><span class="LC_error">'.&mt('Co-Author').': '.$uname.' at '.$udom.
-		  '</span></h3>');
+        $r->print('<p class="LC_warning">'
+                 .&mt('Co-Author [_1]:[_2]',$uname,$udom)
+                 .'</p>'
+        );
     }
 
 
Index: loncom/publisher/lonupload.pm
diff -u loncom/publisher/lonupload.pm:1.43 loncom/publisher/lonupload.pm:1.44
--- loncom/publisher/lonupload.pm:1.43	Fri Dec 19 03:57:24 2008
+++ loncom/publisher/lonupload.pm	Thu Mar 26 16:50:12 2009
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Handler to upload files into construction space
 #
-# $Id: lonupload.pm,v 1.43 2008/12/19 03:57:24 raeburn Exp $
+# $Id: lonupload.pm,v 1.44 2009/03/26 16:50:12 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -444,8 +444,10 @@
 					     $javascript));
   
     if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
-	$r->print('<h3><span class="LC_error">'.&mt('Co-Author').': '.$uname.
-		  &mt(' at ').$udom.'</span></h3>');
+        $r->print('<p class="LC_warning">'
+                 .&mt('Co-Author [_1]:[_2]',$uname,$udom)
+                 .'</p>'
+        );
     }
 
     if ($env{'form.phase'} eq 'three') {
Index: loncom/publisher/testbankimport.pm
diff -u loncom/publisher/testbankimport.pm:1.19 loncom/publisher/testbankimport.pm:1.20
--- loncom/publisher/testbankimport.pm:1.19	Fri Dec 19 03:53:00 2008
+++ loncom/publisher/testbankimport.pm	Thu Mar 26 16:50:12 2009
@@ -1,5 +1,5 @@
 # Handler for parsing text upload problem descriptions into .problems
-# $Id: testbankimport.pm,v 1.19 2008/12/19 03:53:00 raeburn Exp $
+# $Id: testbankimport.pm,v 1.20 2009/03/26 16:50:12 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1773,8 +1773,9 @@
     my $output = &Apache::loncommon::start_page($title,$javascript,
                                              {'add_entries' => $loadentries});
     if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
-        $output .= '<h3><span class="LC_error">'.&mt('Co-Author').': '.$uname.
-                   &mt(' at ').$udom.'</span></h3>';
+        $output .= '<p class="LC_warning">'
+                 .&mt('Co-Author [_1]:[_2]',$uname,$udom)
+                 .'</p>';
     }
     return $output;
 }
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.263 loncom/localize/localize/de.pm:1.264
--- loncom/localize/localize/de.pm:1.263	Thu Mar 26 16:31:01 2009
+++ loncom/localize/localize/de.pm	Thu Mar 26 16:50:16 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.263 2009/03/26 16:31:01 bisitz Exp $
+# $Id: de.pm,v 1.264 2009/03/26 16:50:16 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -270,6 +270,9 @@
    'Co-Author'
 => 'Co-Autor',
 
+   'Co-Author [_1]:[_2]'
+=> 'Co-Autor [_1]:[_2]',
+
    'Communication and Messages'
 => 'Kommunikation und Nachrichten',
 
Index: loncom/localize/localize/zh.pm
diff -u loncom/localize/localize/zh.pm:1.33 loncom/localize/localize/zh.pm:1.34
--- loncom/localize/localize/zh.pm:1.33	Thu Mar 26 16:31:01 2009
+++ loncom/localize/localize/zh.pm	Thu Mar 26 16:50:16 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Chinese Simplified Localization Lexicon
 #
-# $Id: zh.pm,v 1.33 2009/03/26 16:31:01 bisitz Exp $
+# $Id: zh.pm,v 1.34 2009/03/26 16:50:16 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -258,6 +258,9 @@
    'Co-Author'
 => '合著者',
 
+   'Co-Author [_1]:[_2]'
+=> '合著者 [_1]:[_2]',
+
    'Communication and Messages'
 => '通信与信息',