← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10172: Included link to user groups on dashboard

 

------------------------------------------------------------
revno: 10172
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-03-13 11:08:45 +0100
message:
  Included link to user groups on dashboard
modified:
  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/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/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	2013-03-12 06:51:28 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties	2013-03-13 10:08:45 +0000
@@ -101,4 +101,5 @@
 group_members=Group members
 add_user_group=Add user group
 no_of_Users=Number of users
-user_group=User Group
\ No newline at end of file
+user_group=User Group
+groups=Groups
\ No newline at end of file

=== 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-12-13 08:41:16 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm	2013-03-13 10:08:45 +0000
@@ -18,6 +18,7 @@
         <li><a class="greyButtonLink" href="profile.action">$i18n.getString( "profile" )</a></li>
 		<li><a class="greyButtonLink" href="message.action">$i18n.getString( "messages" )</a></li>
 		<li><a class="greyButtonLink" href="interpretation.action">$i18n.getString( "interpretations" )</a></li>
+		<li><a class="greyButtonLink" href="getAllUserGroups.action">$i18n.getString( "groups" )</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-12-05 15:11:32 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2013-03-13 10:08:45 +0000
@@ -89,7 +89,7 @@
 #searchDiv
 {
   position: absolute;
-  left: 331px;
+  left: 411px;
   height: 22px;
   width: 335px;
   border: 1px solid #bbb;