------------------------------------------------------------
revno: 8511
committer: Lars Helge Øverland <[email protected]>
branch nick: dhis2
timestamp: Fri 2012-10-12 17:18:04 +0200
message:
Added icons to read message screen
added:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/mail_small.png
modified:
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
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/mail_small.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/mail_small.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/mail_small.png 2012-10-12 15:18:04 +0000 differ
=== 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 2012-10-12 14:35:37 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm 2012-10-12 15:18:04 +0000
@@ -63,6 +63,7 @@
</div>
#foreach( $message in $conversation.messages )
+<div class="messageSymbol"><img src="../images/mail_small.png"></div>
<div class="messageDiv">
<a class="bold userLink" href="profile.action?id=${message.sender.uid}">$encoder.htmlEncode( $message.sender.name )</a>
<span class="grey">$format.formatDate( $message.lastUpdated )</span>
=== 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 2012-10-12 14:35:37 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css 2012-10-12 15:18:04 +0000
@@ -253,8 +253,9 @@
.messageDiv
{
width: 700px;
- border-bottom: 1px solid #cccccc;
- padding-top: 10px;
+ border-bottom: 1px solid #cccccc;
+ padding-left: 40px;
+ padding-top: 14px;
padding-bottom: 35px;
}
@@ -268,6 +269,12 @@
padding-bottom: 15px;
}
+.messageSymbol
+{
+ margin-top: 6px;
+ float: left;
+}
+
.replyArea
{
width: 495px;
@@ -319,7 +326,7 @@
.interpretation
{
- margin-left: 50px;
+ margin-left: 48px;
}
.interpretationSymbol
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
