← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #12583

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3906: Minor improvement to messages

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 3906
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-06-14 21:13:54 +0200
message:
  Minor improvement to messages
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendFeedback.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2011-06-14 15:51:21 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2011-06-14 19:13:54 +0000
@@ -58,7 +58,8 @@
 	font-size: 11px;
 }
 
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button {
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button 
+{
 	font-family: LiberationSansRegular, arial, sans-serif !important;
 	font-size: 11px;
 }
@@ -438,7 +439,7 @@
   background-color: #dfe9f4;
 }
 
-.bold
+.bold, .bold td
 {
   font-family: LiberationSansBold, arial;
 }

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties	2011-06-08 22:04:42 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties	2011-06-14 19:13:54 +0000
@@ -20,10 +20,10 @@
 date = Date
 subject = Subject
 remove = Remove
-new_message = New message
-new_feedback = New feedback
-create_new_message = Create new message
-create_new_feedback = Create new feedback
+write_message = Write message
+write_feedback = Write feedback
+write_new_message = Write new message
+write_new_feedback = Write new feedback
 details = Details
 recipients = Recipients
 mark_unread = Mark as unread

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm	2011-06-14 08:01:50 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm	2011-06-14 19:13:54 +0000
@@ -41,8 +41,9 @@
 </div>
 #end
 
-<h3>$i18n.getString( "dashboard" ) 
-#if( $messageCount > 0 )<a href="message.action">$messageCount #if( $messageCount > 1 )$i18n.getString( "unread_messages" )#else$i18n.getString( "unread_message" )#end</a> #end</h3>
+<h3>$i18n.getString( "dashboard" )
+&#8226; <a href="showSendFeedback.action">$i18n.getString( "write_feedback" )</a>
+#if( $messageCount > 0 )&#8226; <a href="message.action">$messageCount #if( $messageCount > 1 )$i18n.getString( "unread_messages" )#else$i18n.getString( "unread_message" )#end!</a> #end</h3>
 
 <table cellspacing="0" cellpadding="0" style="width:960px">
 <tr>

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm	2011-06-08 22:04:42 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm	2011-06-14 19:13:54 +0000
@@ -4,8 +4,11 @@
 
 <h3>$i18n.getString( "messages" )</h3>
 
-<div style="margin-bottom:15px"><input type="button" value="$i18n.getString( 'new_message' )" onclick="window.location.href='showSendMessage.action'">
-<br><input type="button" value="$i18n.getString( 'new_feedback' )" onclick="window.location.href='showSendFeedback.action'"></div>
+<div style="margin-bottom:15px">
+#if( $auth.hasAccess( "dhis-web-dashboard-integration", "sendMessage" ) )
+<input type="button" style="width:130px" value="$i18n.getString( 'write_message' )" onclick="window.location.href='showSendMessage.action'"><br>
+#end
+<input type="button" style="width:130px" value="$i18n.getString( 'write_feedback' )" onclick="window.location.href='showSendFeedback.action'"></div>
 
 <table style="width:90%" class="plainList">
 	<tr>
@@ -15,7 +18,7 @@
 		<th>$i18n.getString( "operations" )</th>
 	</tr>
 	#foreach( $message in $messages )
-	<tr id="tr${message.id}" #if( !$message.read )class="unread"#end>
+	<tr id="tr${message.id}" #if( !$message.read )class="unread bold"#end>
 		<td style="width:200px" onclick="read( '${message.id}' )">$encoder.htmlEncode( $message.message.sender.name )</td>
 		<td onclick="read( '${message.id}' )">$encoder.htmlEncode( $message.message.subject )</td>
 		<td onclick="read( '${message.id}' )" style="width:80px">$format.formatDate( $message.messageDate )</td>

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendFeedback.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendFeedback.vm	2011-06-08 22:04:42 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendFeedback.vm	2011-06-14 19:13:54 +0000
@@ -1,5 +1,5 @@
 
-<h3>$i18n.getString( "create_new_feedback" )</h3>
+<h3>$i18n.getString( "write_new_feedback" )</h3>
 
 <form action="sendFeedback.action" method="post">
 

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm	2011-04-04 17:12:01 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm	2011-06-14 19:13:54 +0000
@@ -1,5 +1,5 @@
 
-<h3>$i18n.getString( "create_new_message" )</h3>
+<h3>$i18n.getString( "write_new_message" )</h3>
 
 <form action="sendMessage.action" method="post">
 

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2011-06-01 08:39:55 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2011-06-14 19:13:54 +0000
@@ -72,7 +72,6 @@
 
 .unread td
 {
-  font-weight:bold;
   background-color:#ebf0f6;
 }
  Thread Previous • Date Previous • • Thread Next