dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #21486
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10175: Added titles for sharing settings links. Renamed read only/read and write to can view/can edit an...
------------------------------------------------------------
revno: 10175
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-03-13 12:47:27 +0100
message:
Added titles for sharing settings links. Renamed read only/read and write to can view/can edit and view
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.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-commons-resources/src/main/webapp/macros.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm 2013-03-11 15:31:37 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm 2013-03-13 11:47:27 +0000
@@ -322,7 +322,7 @@
</tr>
<tr>
- <td><input style="width: 100%;" id="sharingFindUserGroup" placeholder="Search for user groups"/></td>
+ <td><input style="width: 100%;" id="sharingFindUserGroup" placeholder="$i18n.getString( 'search_for_user_groups' )"/></td>
<td style="width: 24px;"><button id="addUserGroupAccess" disabled="disabled" style="width: 24px; text-align: center;">+</button></td>
</tr>
</tbody>
@@ -335,8 +335,8 @@
<td>
<select id="sharingPublicAccess" style="width: 150px;">
<option selected="selected" value="--------">$i18n.getString( "none" )</option>
- <option value="r-------">$i18n.getString( "read_only" )</option>
- <option value="rw------">$i18n.getString( "read_write" )</option>
+ <option value="r-------">$i18n.getString( "can_view" )</option>
+ <option value="rw------">$i18n.getString( "can_edit_and_view" )</option>
</select>
</td>
<td style="width: 25px; text-align: center;"></td>
@@ -350,8 +350,8 @@
<td class="sharingGroupName" style="width: 300px;"><%= label %></td>
<td>
<select class="sharingGroupAccess" style="width: 150px;">
- <option value="r-------" <% if(access == 'r-------') { %>selected<% } %>>$i18n.getString( "read_only" )</option>
- <option value="rw------" <% if(access == 'rw------') { %>selected<% } %>>$i18n.getString( "read_write" )</option>
+ <option value="r-------" <% if(access == 'r-------') { %>selected<% } %>>$i18n.getString( "can_view" )</option>
+ <option value="rw------" <% if(access == 'rw------') { %>selected<% } %>>$i18n.getString( "can_edit_and_view" )</option>
</select>
</td>
<td style="width: 25px; text-align: center;"><a href="" class="removeUserGroupAccess">X</a></td>
=== 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 2013-03-13 09:57:42 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2013-03-13 11:47:27 +0000
@@ -613,15 +613,16 @@
#-- Sharing ------------------------------------------------------------------#
-public_access=Public Access
-user_group_access=User Group Access
-group_name=Group Name
-sharing_settings=Sharing Settings
+public_access=Public access
+user_group_access=User group access
+group_name=Group name
+sharing_settings=Sharing settings
no_access=None
-read_access=Read
-read_write_access=Read / Write
read_only=Read only
read_write=Read and write
+can_edit_and_view=Can edit and view
+can_view=Can view
+search_for_user_groups=Search for user groups
#-- Countries / flags ---------------------------------------------------------#
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml 2013-03-13 09:57:42 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml 2013-03-13 11:47:27 +0000
@@ -190,7 +190,6 @@
<param name="page">/dhis-web-dashboard-integration/userGroupList.vm</param>
<param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
<param name="javascripts">javascript/usergroup.js</param>
- <param name="requiredAuthorities">F_USERGROUP_LIST</param>
</action>
<action name="getUserGroup"
@@ -205,28 +204,26 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-dashboard-integration/addUserGroupForm.vm</param>
<param name="javascripts">javascript/usergroup.js</param>
- <param name="anyAuthorities">F_USERGROUP_PUBLIC_ADD, F_USERGROUP_PRIVATE_ADD</param>
+ <param name="anyAuthorities">F_USERGROUP_PUBLIC_ADD</param>
</action>
<action name="addUserGroup"
class="org.hisp.dhis.dashboard.usergroup.action.AddUserGroupAction">
<param name="javascripts">javascript/usergroup.js</param>
<result name="success" type="redirect">getAllUserGroups.action</result>
- <param name="anyAuthorities">F_USERGROUP_PUBLIC_ADD, F_USERGROUP_PRIVATE_ADD</param>
+ <param name="anyAuthorities">F_USERGROUP_PUBLIC_ADD</param>
</action>
<action name="editUserGroupForm"
class="org.hisp.dhis.dashboard.usergroup.action.EditUserGroupFormAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-dashboard-integration/updateUserGroupForm.vm</param>
- <param name="requiredAuthorities">F_USERGROUP_UPDATE</param>
</action>
<action name="updateUserGroup"
class="org.hisp.dhis.dashboard.usergroup.action.UpdateUserGroupAction">
<result name="success" type="redirect">getAllUserGroups.action?currentPage=${keyCurrentPage}
</result>
- <param name="requiredAuthorities">F_USERGROUP_UPDATE</param>
</action>
<action name="removeUserGroup"
@@ -235,7 +232,6 @@
</result>
<result name="error" type="velocity">/dhis-web-commons/ajax/jsonResponseError.vm
</result>
- <param name="requiredAuthorities">F_USERGROUP_DELETE</param>
</action>
<action name="validateUserGroup"
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm 2013-01-22 12:09:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm 2013-03-13 11:47:27 +0000
@@ -40,7 +40,7 @@
<td style="text-align:right">
#if ( $security.canManage( $dataDictionary ) )
- <a href="javascript:showSharingDialog('dataDictionary', '$dataDictionary.uid');"><img src="../images/relationship.png" alt="$i18n.getString( 'sharing_settings' )"></a>
+ <a href="javascript:showSharingDialog('dataDictionary', '$dataDictionary.uid');" title="$i18n.getString( 'sharing_settings' )"><img src="../images/relationship.png" alt="$i18n.getString( 'sharing_settings' )"></a>
#else
<img src="../images/relationship-denied.png">
#end
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm 2013-01-30 03:20:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm 2013-03-13 11:47:27 +0000
@@ -60,7 +60,7 @@
<td style="text-align:right">
#if ( $security.canManage( $indicator ) )
- <a href="javascript:showSharingDialog('indicator', '$indicator.uid');"><img src="../images/relationship.png" alt="$i18n.getString( 'sharing_settings' )"></a>
+ <a href="javascript:showSharingDialog('indicator', '$indicator.uid');" title="$i18n.getString( 'sharing_settings' )"><img src="../images/relationship.png" alt="$i18n.getString( 'sharing_settings' )"></a>
#else
<img src="../images/relationship-denied.png">
#end
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm 2013-01-22 15:07:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm 2013-03-13 11:47:27 +0000
@@ -39,7 +39,7 @@
<td style="text-align:right">
#if ( $security.canManage( $indicatorGroup ) )
- <a href="javascript:showSharingDialog('indicatorGroup', '$indicatorGroup.uid');"><img src="../images/relationship.png" alt="$i18n.getString( 'sharing_settings' )"></a>
+ <a href="javascript:showSharingDialog('indicatorGroup', '$indicatorGroup.uid');" title="$i18n.getString( 'sharing_settings' )"><img src="../images/relationship.png" alt="$i18n.getString( 'sharing_settings' )"></a>
#else
<img src="../images/relationship-denied.png">
#end
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm 2013-01-22 15:07:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm 2013-03-13 11:47:27 +0000
@@ -39,7 +39,7 @@
<td style="text-align:right">
#if ( $security.canManage( $indicatorGroupSet ) )
- <a href="javascript:showSharingDialog('indicatorGroupSet', '$indicatorGroupSet.uid');"><img src="../images/relationship.png" alt="$i18n.getString( 'sharing_settings' )"></a>
+ <a href="javascript:showSharingDialog('indicatorGroupSet', '$indicatorGroupSet.uid');" title="$i18n.getString( 'sharing_settings' )"><img src="../images/relationship.png" alt="$i18n.getString( 'sharing_settings' )"></a>
#else
<img src="../images/relationship-denied.png">
#end
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm 2013-01-21 14:03:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm 2013-03-13 11:47:27 +0000
@@ -50,7 +50,7 @@
#end
#if ( $security.canManage( $dataSet ) )
- <a href="javascript:showSharingDialog('dataSet', '$dataSet.uid');"><img src="../images/relationship.png" alt="$i18n.getString( 'sharing_settings' )"></a>
+ <a href="javascript:showSharingDialog('dataSet', '$dataSet.uid');" title="$i18n.getString( 'sharing_settings' )"><img src="../images/relationship.png" alt="$i18n.getString( 'sharing_settings' )"></a>
#else
<img src="../images/relationship-denied.png">
#end
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm 2013-01-16 10:31:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm 2013-03-13 11:47:27 +0000
@@ -48,7 +48,7 @@
<img src="../images/start_process.png" alt="$i18n.getString( 'view_report' )"></a>
#if ( $security.canManage( $document ) )
- <a href="javascript:showSharingDialog('document', '$document.uid');"><img src="../images/relationship.png" alt="$i18n.getString( 'sharing_settings' )"></a>
+ <a href="javascript:showSharingDialog('document', '$document.uid');" title="$i18n.getString( 'sharing_settings' )"><img src="../images/relationship.png" alt="$i18n.getString( 'sharing_settings' )"></a>
#else
<img src="../images/relationship-denied.png">
#end
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm 2013-01-25 15:24:37 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm 2013-03-13 11:47:27 +0000
@@ -46,7 +46,7 @@
<img src="../images/start_process.png" alt="$i18n.getString( 'create' )"></a>
#if ( $security.canManage( $report ) )
- <a href="javascript:showSharingDialog('report', '$report.uid');"><img src="../images/relationship.png" alt="$i18n.getString( 'sharing_settings' )"></a>
+ <a href="javascript:showSharingDialog('report', '$report.uid');" title="$i18n.getString( 'sharing_settings' )"><img src="../images/relationship.png" alt="$i18n.getString( 'sharing_settings' )"></a>
#else
<img src="../images/relationship-denied.png">
#end
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm 2013-01-17 15:31:26 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm 2013-03-13 11:47:27 +0000
@@ -44,7 +44,7 @@
<a href="getReportParams.action?uid=${table.uid}&mode=table" title="$i18n.getString( "create" )"><img src="../images/start_process.png" alt="$i18n.getString( "create" )"></a>
#if ( $security.canManage( $table ) )
- <a href="javascript:showSharingDialog('reportTable', '$table.uid');"><img src="../images/relationship.png" alt="$i18n.getString( 'sharing_settings' )"></a>
+ <a href="javascript:showSharingDialog('reportTable', '$table.uid');" title="$i18n.getString( 'sharing_settings' )"><img src="../images/relationship.png" alt="$i18n.getString( 'sharing_settings' )"></a>
#else
<img src="../images/relationship-denied.png">
#end
