dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8508
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-10-12 16:20:49 +0200
message:
  Updated buttons in read message screen
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

=== 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 12:49:44 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm	2012-10-12 14:20:49 +0000
@@ -49,11 +49,13 @@
 
 <input type="hidden" id="conversationId" value="${conversation.id}"/>
 
-<div class="messageDiv">
-<input type="button" value="$i18n.getString( 'mark_unread' )" onclick="window.location.href='unreadMessage.action?id=${conversation.id}'" style="width:120px">
-<input type="button" value="$i18n.getString( 'remove' )" onclick="window.location.href='removeMessageRedirect.action?id=${conversation.id}'" style="width:120px">
-<input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='message.action?currentPage=${keyCurrentPage}'" style="width:120px">
-<input type="button" value="$i18n.getString( 'scroll_down' )" onclick="scrollToBottom()" style="width:120px" class="scrollButton">
+<div class="messageDiv horizontalMenu" style="padding:10px 0 40px 0">
+<ul>
+<li><a class="greyButtonLink" href="unreadMessage.action?id=${conversation.id}">$i18n.getString( 'mark_unread' )</a></li>
+<li><a class="greyButtonLink" href="removeMessageRedirect.action?id=${conversation.id}">$i18n.getString( 'remove' )</a></li>
+<li><a class="greyButtonLink" href="message.action?currentPage=${keyCurrentPage}">$i18n.getString( 'back' )</a></li>
+<li class="scrollButton"><a class="greyButtonLink" href="javascript:scrollToBottom()">$i18n.getString( 'scroll_down' )</a></li>
+</ul>
 </div>
 
 <div>
@@ -70,14 +72,14 @@
 </div>
 #end
 
-<div>
-<textarea id="text" name="text" class="replyArea"></textarea><br>
-<input type="button" id="replyButton" value="$i18n.getString( 'reply' )" onclick="sendReply()" style="width:120px">
-</div>
+<textarea id="text" name="text" class="replyArea"></textarea>
+<div style="margin-top:10px"><a class="blueButtonLink" href="javascript:sendReply()">$i18n.getString( 'reply' )</a></div>
 
-<div class="messageBottomDiv">
-<input type="button" value="$i18n.getString( 'mark_unread' )" onclick="window.location.href='unreadMessage.action?id=${conversation.id}'" style="width:120px">
-<input type="button" value="$i18n.getString( 'remove' )" onclick="window.location.href='removeMessageRedirect.action?id=${conversation.id}'" style="width:120px">
-<input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='message.action'" style="width:120px">
-<input type="button" value="$i18n.getString( 'scroll_up' )" onclick="scrollToTop()" style="width:120px" class="scrollButton">
+<div class="messageBottomDiv horizontalMenu">
+<ul>
+<li><a class="greyButtonLink" href="unreadMessage.action?id=${conversation.id}">$i18n.getString( 'mark_unread' )</a></li>
+<li><a class="greyButtonLink" href="removeMessageRedirect.action?id=${conversation.id}">$i18n.getString( 'remove' )</a></li>
+<li><a class="greyButtonLink" href="message.action?currentPage=${keyCurrentPage}">$i18n.getString( 'back' )</a></li>
+<li class="scrollButton"><a class="greyButtonLink" href="javascript:scrollToTop()">$i18n.getString( 'scroll_up' )</a></li>
+</ul>
 </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	2012-10-11 16:02:00 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-10-12 14:20:49 +0000
@@ -108,7 +108,7 @@
 {
   padding: 6px 12px;
   height: 25px;
-  border: 1px solid #3F79B4;
+  border: 1px solid #3D77B3;
   border-radius: 3px;
   margin-right: 4px;
   font-family: LiberationSansBold, arial;