dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8423
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-10-07 22:27:56 +0200
message:
  Made the dashboard button css reusable
added:
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/images/
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/images/profile_cover.jpg
modified:
  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/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 directory 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/images'
=== added file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/images/profile_cover.jpg'
Binary files dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/images/profile_cover.jpg	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/images/profile_cover.jpg	2012-10-07 20:27:56 +0000 differ
=== 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	2012-10-06 12:30:22 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm	2012-10-07 20:27:56 +0000
@@ -12,11 +12,11 @@
 #else<span id="shareHelpLink" onclick="showShareHelp()">$i18n.getString( "share_interpretation" )</span>#end
 </h3>
 
-<div id="subMenu">
+<div id="dashboardMenu" class="horizontalMenu">
 	<ul>
-        <li><a href="profile.action?id=${currentUser.uid}">$i18n.getString( "profile" )</a></li>
-		<li><a href="message.action">$i18n.getString( "messages" )</a></li>
-		<li><a href="interpretation.action">$i18n.getString( "interpretations" )</a></li>
+        <li><span class="greyButtonLink"><a href="profile.action?id=${currentUser.uid}">$i18n.getString( "profile" )</a></span></li>
+		<li><span class="greyButtonLink"><a href="message.action">$i18n.getString( "messages" )</a></span></li>
+		<li><span class="greyButtonLink"><a href="interpretation.action">$i18n.getString( "interpretations" )</a></span></li>
 	</ul>
 </div>
 

=== 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	2012-06-09 20:22:59 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm	2012-10-07 20:27:56 +0000
@@ -1,11 +1,14 @@
 
 <h3>$i18n.getString( "messages" ) #openHelp( "dashboard_messages" )</h3>
 
-<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>
+<div class="horizontalMenu" style="padding: 8px 0 36px 0;">
+    <ul>
+    	#if( $auth.hasAccess( "dhis-web-dashboard-integration", "sendMessage" ) )
+        <li><span class="greyButtonLink"><a href="showSendMessage.action">$i18n.getString( 'write_message' )</a></span></li>
+        #end
+        <li><span class="greyButtonLink"><a href="showSendFeedback.action">$i18n.getString( "write_feedback" )</a></span></li>
+    </ul>
+</div>
 
 <table style="width:90%" class="plainList">
 	<tr>

=== 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-07 20:10:20 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-10-07 20:27:56 +0000
@@ -67,24 +67,24 @@
   padding: 3px;
 }
 
-#subMenu
+#dashboardMenu
 {  
   position: absolute; 
   margin-top: 6px;
 }
 
-#subMenu ul
+.horizontalMenu ul
 {
   list-style-type: none;
   margin: 0;
 }
 
-#subMenu li
+.horizontalMenu li
 {
   float: left;
 }
 
-#subMenu a
+.greyButtonLink a
 {
   padding: 6px 12px;
   height: 25px;
@@ -97,7 +97,7 @@
   background-color: #f3f3f3;
 }
 
-#subMenu a:hover
+.horizontalMenu a:hover
 {
   text-decoration: none;
   background-color: #f8f8f8;