dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8954
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-11-08 22:17:16 +0300
message:
  Link to profile in user module
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm


--
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-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2012-11-08 12:35:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2012-11-08 19:17:16 +0000
@@ -266,6 +266,7 @@
 intro_user=Create, modify, delete and view all users. A user is associated with user roles and an organisation unit.
 intro_user_by_orgunit=Create, modify, view and delete users which are assigned to a given organisation unit.
 intro_user_role=Create, modify, view and delete user roles. A user role has a set of authorities in the system.
+intro_self_registered_user=View and manage users who have self-registered for a personal user account in the system.
 intro_change_password=Change the password for users.
 user_use_group=There are users used this role
 can_not_remove_last_super_user=Can not remove the last super user.

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm	2012-11-08 12:35:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm	2012-11-08 19:17:16 +0000
@@ -53,7 +53,7 @@
 				#set( $mark = false )
 				#foreach( $userCredentials in $userCredentialsList )
 				<tr id="tr${userCredentials.id}" #alternate( $mark )>
-					<td>$encoder.htmlEncode( $userCredentials.username )</td>
+					<td><a href="../dhis-web-dashboard-integration/profile.action?id=${userCredentials.user.uid}">$encoder.htmlEncode( $userCredentials.username )</a></td>
 					<td>$encoder.htmlEncode( $userCredentials.user.surname ), $encoder.htmlEncode( $userCredentials.user.firstName )</td>
 					<td style="text-align:right">
 					<a href="showUpdateUserForm.action?id=$userCredentials.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm	2012-05-13 13:32:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm	2012-11-08 19:17:16 +0000
@@ -10,6 +10,7 @@
 <ul class="introList">
     #introListImgItem( "user.action" "user_by_orgunit" "user" )
     #introListImgItem( "alluser.action" "user" "user" )
+    #introListImgItem( "alluser.action?selfRegistered=true" "self_registered_user" "user" )
     #introListImgItem( "allRole.action" "user_role" "user" )
     #introListImgItem( "getAllUserGroups.action" "user_group" "user" )
 </ul>