=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java 2012-09-03 19:53:34 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java 2012-10-07 19:07:53 +0000 @@ -35,6 +35,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import org.hisp.dhis.common.BaseIdentifiableObject; import org.hisp.dhis.common.Dxf2Namespace; +import org.hisp.dhis.common.IdentifiableObjectUtils; import org.hisp.dhis.common.view.DetailedView; import org.hisp.dhis.common.view.ExportView; import org.hisp.dhis.dataset.DataSet; @@ -83,6 +84,15 @@ // ------------------------------------------------------------------------- /** + * Returns a concatenated String of the display names of all user authority + * groups for this user credentials. + */ + public String getUserAuthorityGroupsName() + { + return IdentifiableObjectUtils.join( userAuthorityGroups ); + } + + /** * Returns a set of the aggregated authorities for all user authority groups * of this user credentials. */ === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2012-10-03 14:08:20 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2012-10-07 19:07:53 +0000 @@ -238,8 +238,8 @@ top: 44px; left: 0px; padding-top: 6px; - border-right: 1px solid #3f5841; - border-bottom: 1px solid #3f5841; + border-right: 1px solid #ccc; + border-bottom: 1px solid #ccc; filter: alpha(opacity=90); opacity: 0.90; border-bottom-right-radius: 5px; === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2012-10-03 10:33:08 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2012-10-07 19:07:53 +0000 @@ -239,8 +239,8 @@ top: 44px; left: 0px; padding-top: 6px; - border-right: 1px solid #10375f; - border-bottom: 1px solid #10375f; + border-right: 1px solid #bbb; + border-bottom: 1px solid #bbb; filter: alpha(opacity=90); opacity: 0.90; border-bottom-right-radius: 5px; === 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 2012-10-07 11:11:09 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties 2012-10-07 19:07:53 +0000 @@ -77,3 +77,4 @@ nationality=Nationality email=Email phone_number=Phone number +org_units=Org units \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm 2012-10-04 10:34:08 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm 2012-10-07 19:07:53 +0000 @@ -13,7 +13,7 @@