=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2012-10-08 07:10:08 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2012-10-08 07:13:57 +0000
@@ -117,6 +117,9 @@
update=Update
delete=Delete
close=Close
+gender_male=Male
+gender_female=Female
+gender_other=Other
#-- PeriodTypes ----------------------------------------------------------------#
=== 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-07 20:28:43 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm 2012-10-08 07:13:57 +0000
@@ -15,8 +15,8 @@
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/profile.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/profile.vm 2012-10-07 20:10:20 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/profile.vm 2012-10-08 07:13:57 +0000
@@ -6,6 +6,7 @@
+
=== 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:27:56 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css 2012-10-08 07:13:57 +0000
@@ -97,12 +97,31 @@
background-color: #f3f3f3;
}
-.horizontalMenu a:hover
+.greyButtonLink a:hover
{
text-decoration: none;
background-color: #f8f8f8;
}
+.blueButtonLink a
+{
+ padding: 6px 12px;
+ height: 25px;
+ border: 1px solid #2f73d8;
+ border-radius: 3px;
+ margin-right: 4px;
+ font-family: LiberationSansBold, arial;
+ font-size: 13px;
+ color: #fff;
+ background-color: #4685dd;
+}
+
+.blueButtonLink a:hover
+{
+ text-decoration: none;
+ background-color: #3f7fd3;
+}
+
#searchDiv
{
position: absolute;
@@ -358,12 +377,21 @@
#userHeader
{
+ display: inline-block;
margin-left: 36px;
font-size: 14pt;
color: #303030;
padding: 3px 0 15px 0;
}
+#userProfileLink
+{
+ position: relative;
+ top: -3px;
+ display: inline-block;
+ margin-left: 200px;
+}
+
#userCover
{
border-top: 1px solid #ccc;