[LON-CAPA-cvs] cvs: loncom /html/adm/help/tex Sending_Email.tex /interface loncommunicate.pm lonfeedback.pm lontemplate.pm /localize/localize de.pm

bisitz bisitz@source.lon-capa.org
Thu, 07 May 2009 11:12:54 -0000


bisitz		Thu May  7 11:12:54 2009 EDT

  Modified files:              
    /loncom/html/adm/help/tex	Sending_Email.tex 
    /loncom/interface	loncommunicate.pm lonfeedback.pm lontemplate.pm 
    /loncom/localize/localize	de.pm 
  Log:
  Communication, Messages, Feedback:
  Optimized and consistent wording and icons
  
  
Index: loncom/html/adm/help/tex/Sending_Email.tex
diff -u loncom/html/adm/help/tex/Sending_Email.tex:1.4 loncom/html/adm/help/tex/Sending_Email.tex:1.5
--- loncom/html/adm/help/tex/Sending_Email.tex:1.4	Mon Aug  7 18:05:54 2006
+++ loncom/html/adm/help/tex/Sending_Email.tex	Thu May  7 11:12:39 2009
@@ -5,8 +5,8 @@
 \begin{enumerate}
 
 \item Click \textbf{COM} on the remote control.
-\item At the \textbf{Communication and Message} screen, select \textbf{Send Message to User(s)}.
-\item Type the "username" you want to send email to.
+\item At the \textbf{Communication and Message} screen, select \textbf{New Message}.
+\item Type the "username" you want to send the message to.
  
 \textbf{Note}: If you don't know the user name, click on the Select User link. 
 Another screen will open and you can select a user from the list.
Index: loncom/interface/loncommunicate.pm
diff -u loncom/interface/loncommunicate.pm:1.44 loncom/interface/loncommunicate.pm:1.45
--- loncom/interface/loncommunicate.pm:1.44	Wed Dec 10 14:36:36 2008
+++ loncom/interface/loncommunicate.pm	Thu May  7 11:12:47 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Communicate
 #
-# $Id: loncommunicate.pm,v 1.44 2008/12/10 14:36:36 diwert Exp $
+# $Id: loncommunicate.pm,v 1.45 2009/05/07 11:12:47 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -73,7 +73,7 @@
          items => [
             {url => '/adm/email?compose=individual',
 			 permission => 'F',
-			 icon => 'mail-reply-sender.png',
+			 icon => 'mail-message-new.png',
              linktext => 'New Message',
              linktitle => 'Send a message to users.'},
        
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.271 loncom/interface/lonfeedback.pm:1.272
--- loncom/interface/lonfeedback.pm:1.271	Wed May  6 13:37:56 2009
+++ loncom/interface/lonfeedback.pm	Thu May  7 11:12:47 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.271 2009/05/06 13:37:56 bisitz Exp $
+# $Id: lonfeedback.pm,v 1.272 2009/05/07 11:12:47 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -767,7 +767,7 @@
                  '  <a href="/adm/feedback?sendmessageonly=1&amp;symb='.
                  &escape($ressymb).'"><img alt="" src="'.
                  &Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').
-                 '" border="0" />'.&mt('Send Message').'</a></span>';
+                 '" border="0" />'.&mt('Send Feedback').'</a></span>';
     return $output;
 }
 
@@ -2609,9 +2609,16 @@
             }
         }
     }
-    if ($msgoptions) { $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').'" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
+    if ($msgoptions) {
+        $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').'" />'
+                   .' '.&mt('Send Feedback').'</h2>'
+                   .$msgoptions;
+    }
     if ($discussoptions) { 
-	$discussoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" />'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
+	$discussoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" />'
+                        .' '.&mt('Discussion Contributions').'</h2>'
+                        .$discussoptions;
+    }
     return $msgoptions.$discussoptions;
 }
 
Index: loncom/interface/lontemplate.pm
diff -u loncom/interface/lontemplate.pm:1.31 loncom/interface/lontemplate.pm:1.32
--- loncom/interface/lontemplate.pm:1.31	Wed Apr 15 10:49:30 2009
+++ loncom/interface/lontemplate.pm	Thu May  7 11:12:47 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "Template" Functions to generate html output
 #
-# $Id: lontemplate.pm,v 1.31 2009/04/15 10:49:30 bisitz Exp $
+# $Id: lontemplate.pm,v 1.32 2009/05/07 11:12:47 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -111,7 +111,7 @@
 sub send_message{
 	my ($r,$cnum,$cdom) = @_;
 	my $s;
-	my $image = qq{<img name="Send message" src="/res/adm/pages/com.png" border="none" align="middle" />};
+	my $image = qq{<img name="Send message" src="/res/adm/pages/mail-message-new.png" border="none" align="middle" />};
 	$s=&Apache::loncommon::messagewrapper($image,$cnum,$cdom).' '.&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom);
 	return $s;
 }
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.287 loncom/localize/localize/de.pm:1.288
--- loncom/localize/localize/de.pm:1.287	Tue May  5 16:01:56 2009
+++ loncom/localize/localize/de.pm	Thu May  7 11:12:53 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.287 2009/05/05 16:01:56 bisitz Exp $
+# $Id: de.pm,v 1.288 2009/05/07 11:12:53 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1509,9 +1509,6 @@
    'Search Complete'
 => 'Suche beendet',
 
-   'Send Message to User(s)'
-=> 'Nachricht senden', # 'Nachricht an einzelne(n) Benutzer senden',
-
    'Show Metadata'
 => 'Metadaten', # long version: 'Metadaten anzeigen',
 
@@ -5412,9 +5409,6 @@
    'Select a Course to Enter'
 => 'Wählen Sie den gewünschten Kurs aus',
 
-   'Sending Messages'
-=> 'Sende Nachricht',
-
    'Show Me My First Homework Problem'
 => 'Zeige erste Übungsaufgabe',
 
@@ -6231,6 +6225,9 @@
    'Send Message'
 => 'Nachricht senden',
 
+   'Send Feedback'
+=> 'Feedback geben',
+
    'Show all'
 => 'Alle anzeigen',