dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3272
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-04-04 13:37:04 +0200
message:
  Improved css for messaging
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/struts.xml
  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/readMessage.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-03-29 09:40:17 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2011-04-04 11:37:04 +0000
@@ -26,6 +26,22 @@
   padding: 0px;
 }
 
+a
+{
+  text-decoration:none;
+  color:#3b73b8;
+}
+
+a:hover
+{
+  text-decoration:underline;
+}
+
+a:visited
+{
+  color:#3b73b8;
+}
+
 /*----------------------------------------------------------------------------*/
 /* Header                                                                     */
 /*----------------------------------------------------------------------------*/

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml	2011-04-01 19:47:09 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml	2011-04-04 11:37:04 +0000
@@ -62,6 +62,7 @@
       <param name="page">/dhis-web-dashboard-integration/message.vm</param>
       <param name="menu">/dhis-web-dashboard-integration/menu.vm</param>
       <param name="javascripts">javascript/message.js</param>
+      <param name="stylesheets">style/dashboard.css</param>
     </action>
     
     <action name="sendMessage" class="org.hisp.dhis.dashboard.message.action.SendMessageAction">
@@ -73,6 +74,7 @@
       <param name="page">/dhis-web-dashboard-integration/sendMessage.vm</param>
       <param name="menu">/dhis-web-dashboard-integration/menu.vm</param>
       <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/message.js</param>
+      <param name="stylesheets">style/dashboard.css</param>
     </action>
     
     <action name="readMessage" class="org.hisp.dhis.dashboard.message.action.ReadMessageAction">
@@ -80,6 +82,7 @@
       <param name="page">/dhis-web-dashboard-integration/readMessage.vm</param>
       <param name="menu">/dhis-web-dashboard-integration/menu.vm</param>
       <param name="javascripts">javascript/message.js</param>
+      <param name="stylesheets">style/dashboard.css</param>
     </action>
     
     <action name="unreadMessage" class="org.hisp.dhis.dashboard.message.action.UnreadMessageAction">

=== 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-04-01 19:47:09 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm	2011-04-04 11:37:04 +0000
@@ -3,7 +3,7 @@
 
 <div style="margin-bottom:15px"><input type="button" value="$i18n.getString( 'new_message' )" onclick="window.location.href='showSendMessage.action'"></div>
 
-<table style="width:75%">
+<table style="width:75%" class="plainList">
 	<tr>
 		<th>$i18n.getString( "sender" )</th>
 		<th>$i18n.getString( "date" )</th>
@@ -11,14 +11,14 @@
 		<th>$i18n.getString( "operations" )</th>
 	</tr>
 	#foreach( $message in $messages )
-	<tr id="tr${message.id}" style="#if( !$message.read )font-weight:bold;background-color:#ebf0f6;#end">
+	<tr id="tr${message.id}" #if( !$message.read )class="unread"#end>
 		<td>$encoder.htmlEncode( $message.message.sender.name )</td>
 		<td style="width:80px">$format.formatDate( $message.messageDate )</td>
 		<td><a href="readMessage.action?id=${message.id}">$encoder.htmlEncode( $message.message.subject )</a></td>
 		<td style="width:70px; text-align:center;">
 			<a href="readMessage.action?id=${message.id}"><img src="../images/read.png" title="$i18n.getString( 'read' )"></a>
 			<a href="javascript:removeMessage( '${message.id}' )"><img src="../images/delete.png" title="$i18n.getString( 'delete' )"></a>
-		</td>
+		</td>
 	</tr>
-	#end
-</table>
\ No newline at end of file
+	#end
+</table>

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm	2011-04-01 19:47:09 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm	2011-04-04 11:37:04 +0000
@@ -1,7 +1,8 @@
 
 <h3>$encoder.htmlEncode( $message.message.subject )</h3>
 
-<div style="margin-bottom:20px; width:50%; font-weight:bold;">$encoder.htmlEncode( $message.message.sender.name ) - $format.formatDate( $message.messageDate )</div>
+<div class="messageDiv"><span style="font-weight:bold;">$encoder.htmlEncode( $message.message.sender.name )</span>
+<span style="color:#606060">$format.formatDate( $message.messageDate )</span></div>
 
 <div style="margin-bottom:20px; width:50%;">$encoder.htmlEncode( $message.message.text )</div>
 

=== 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-01-28 09:52:07 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2011-04-04 11:37:04 +0000
@@ -1,4 +1,8 @@
 
+/*----------------------------------------------------------------------------*/
+/* Dashboard                                                                  */
+/*----------------------------------------------------------------------------*/
+
 .contentProviderTable
 {
   width:305px;
@@ -11,11 +15,6 @@
   border-bottom:1px solid #cad5e5;
 }
 
-.contentProviderTable a
-{
-  text-decoration:none;
-}
-
 .linkArea
 {
   border:1px solid #d0d0d0;
@@ -55,3 +54,45 @@
 {
   color:#808080;
 }
+
+/*----------------------------------------------------------------------------*/
+/* Message                                                                    */
+/*----------------------------------------------------------------------------*/
+
+.plainList
+{
+  border-collapse:collapse;
+}
+
+.plainList td
+{
+  border-bottom:1px solid #c0c0c0;
+}
+
+.unread td
+{
+  font-weight:bold;
+  background-color:#ebf0f6;
+}
+
+.messageDiv
+{
+  margin-bottom:20px;
+  width:50%;
+}
+
+a
+{
+  text-decoration:none;
+  color:#3567cd;
+}
+
+a:hover
+{
+  text-decoration:underline;
+}
+
+a:visited
+{
+  color:#3567cd;
+}