dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8421
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-10-07 21:07:53 +0200
message:
  Linking from intepretations and messages to profile
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java
  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/light_blue/light_blue.css
  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/interpretationFeed.vm
  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/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-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 @@
     </div>
     <div class="interpretation">
 	    <div class="interpretationName">
-	        <span class="bold" style="cursor:pointer" onclick="showUserInfo( '${ip.user.id}' )">${ip.user.name}</span>&nbsp;
+	        <a class="bold userLink" href="profile.action?id=${ip.user.uid}">${encoder.htmlEncode( $ip.user.name )}</a>&nbsp;
 	        <span class="grey">${format.formatDate( $ip.created )}</span>
 	    </div>
 	    <div class="interpretationText">

=== 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 11:11:09 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/profile.vm	2012-10-07 19:07:53 +0000
@@ -1,5 +1,5 @@
 
-<h3>$encoder.htmlEncode( $user.firstName ) $encoder.htmlEncode( $user.surname  )</h3>
+<h3>$!encoder.htmlEncode( $user.firstName ) $!encoder.htmlEncode( $user.surname  )</h3>
 
 <div class="userRow"><div class="userLabel">$i18n.getString( "introduction" )</div><div class="userInfo">$!encoder.htmlEncode( $user.introduction )</div></div>
 <div class="userRow"><div class="userLabel">$i18n.getString( "works_as" )</div><div class="userInfo">$!encoder.htmlEncode( $user.jobTitle )</div></div>
@@ -12,3 +12,5 @@
 <div class="userRow"><div class="userLabel">$i18n.getString( "nationality" )</div><div class="userInfo">$!encoder.htmlEncode( $user.nationality )</div></div>
 <div class="userRow"><div class="userLabel">$i18n.getString( "email" )</div><div class="userInfo">$!encoder.htmlEncode( $user.email )</div></div>
 <div class="userRow"><div class="userLabel">$i18n.getString( "phone_number" )</div><div class="userInfo">$!encoder.htmlEncode( $user.phoneNumber )</div></div>
+<div class="userRow"><div class="userLabel">$i18n.getString( "org_units" )</div><div class="userInfo">$!encoder.htmlEncode( $user.getOrganisationUnitsName() )</div></div>
+<div class="userRow"><div class="userLabel">$i18n.getString( "user_roles" )</div><div class="userInfo">$!encoder.htmlEncode( $user.getOrganisationUnitsName() )</div></div>

=== 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-03 16:07:42 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm	2012-10-07 19:07:53 +0000
@@ -57,7 +57,7 @@
 
 #foreach( $message in $conversation.messages )
 <div class="messageDiv">
-<span class="bold" style="cursor:pointer" onclick="showSenderInfo( ${message.id}, ${message.sender.id} )">$encoder.htmlEncode( $message.sender.name )</span>&nbsp;
+<a class="bold userLink" href="profile.action?id=${message.sender.uid}">$encoder.htmlEncode( $message.sender.name )</a>&nbsp;&nbsp;
 <span class="grey">$format.formatDate( $message.lastUpdated )</span>
 
 <p>$!dhisTextUtils.htmlify( $encoder.htmlEncode( $message.text ) )</p>

=== 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 11:11:09 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-10-07 19:07:53 +0000
@@ -267,6 +267,11 @@
   color: #555;
 }
 
+.userLink
+{
+  font-size: 10pt;
+}
+
 /*----------------------------------------------------------------------------*/
 /* Interpretation                                                             */
 /*----------------------------------------------------------------------------*/