dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #26546
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13138: context-menus in orgUnit module
------------------------------------------------------------
revno: 13138
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-12-04 14:26:57 +0100
message:
context-menus in orgUnit module
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroup.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroupSet.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroup.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSet.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-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js 2012-03-06 03:17:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js 2013-12-04 13:26:57 +0000
@@ -29,10 +29,13 @@
// View details
// -----------------------------------------------------------------------------
-function showOrganisationUnitDetails( unitId )
-{
+function showUpdateOrganisationUnitForm( context ) {
+ location.href = 'showUpdateOrganisationUnitForm.action?id=' + context.id;
+}
+
+function showOrganisationUnitDetails( context ) {
jQuery.post( '../dhis-web-commons-ajax-json/getOrganisationUnit.action',
- { id: unitId }, function ( json ) {
+ { id: context.id }, function ( json ) {
setInnerHTML( 'nameField', json.organisationUnit.name );
setInnerHTML( 'shortNameField', json.organisationUnit.shortName );
setInnerHTML( 'descriptionField', json.organisationUnit.description );
@@ -64,7 +67,7 @@
// Remove organisation unit
// -----------------------------------------------------------------------------
-function removeOrganisationUnit( unitId, unitName )
+function removeOrganisationUnit( context )
{
- removeItem( unitId, unitName, confirm_to_delete_org_unit, 'removeOrganisationUnit.action', subtree.refreshTree );
+ removeItem( context.id, context.name, confirm_to_delete_org_unit, 'removeOrganisationUnit.action', subtree.refreshTree );
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroup.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroup.js 2013-11-20 14:12:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroup.js 2013-12-04 13:26:57 +0000
@@ -1,26 +1,27 @@
-
// -----------------------------------------------------------------------------
// View details
// -----------------------------------------------------------------------------
-function showOrganisationUnitGroupDetails( unitId )
-{
- jQuery.post( 'getOrganisationUnitGroup.action', { id: unitId },
- function ( json ) {
- setInnerHTML( 'nameField', json.organisationUnitGroup.name );
- setInnerHTML( 'shortNameField', json.organisationUnitGroup.shortName );
- setInnerHTML( 'codeField', json.organisationUnitGroup.code );
- setInnerHTML( 'memberCountField', json.organisationUnitGroup.memberCount );
-
- showDetails();
- });
+function showOrganisationUnitGroupDetails( context ) {
+ jQuery.post('getOrganisationUnitGroup.action', { id: context.id },
+ function( json ) {
+ setInnerHTML('nameField', json.organisationUnitGroup.name);
+ setInnerHTML('shortNameField', json.organisationUnitGroup.shortName);
+ setInnerHTML('codeField', json.organisationUnitGroup.code);
+ setInnerHTML('memberCountField', json.organisationUnitGroup.memberCount);
+
+ showDetails();
+ });
}
// -----------------------------------------------------------------------------
// Remove organisation unit group
// -----------------------------------------------------------------------------
-function removeOrganisationUnitGroup( unitGroupId, unitGroupName )
-{
- removeItem( unitGroupId, unitGroupName, confirm_to_delete_org_unit_group, 'removeOrganisationUnitGroup.action' );
+function removeOrganisationUnitGroup( context ) {
+ removeItem(context.id, context.name, confirm_to_delete_org_unit_group, 'removeOrganisationUnitGroup.action');
+}
+
+function openUpdateOrganisationUnitGroupForm( context ) {
+ location.href = 'openUpdateOrganisationUnitGroup.action?id=' + context.id;
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroupSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroupSet.js 2011-09-27 08:37:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroupSet.js 2013-12-04 13:26:57 +0000
@@ -6,9 +6,9 @@
// View details
// -----------------------------------------------------------------------------
-function showOrganisationUnitGroupSetDetails( groupSetId )
+function showOrganisationUnitGroupSetDetails( context )
{
- jQuery.post( 'getOrganisationUnitGroupSet.action', { id: groupSetId },
+ jQuery.post( 'getOrganisationUnitGroupSet.action', { id: context.id },
function ( json ) {
setInnerHTML( 'nameField', json.organisationUnitGroupSet.name );
setInnerHTML( 'descriptionField', json.organisationUnitGroupSet.description );
@@ -22,13 +22,17 @@
});
}
+function showUpdateOrganisationUnitGroupSetForm( context ) {
+ location.href = 'showUpdateOrganisationUnitGroupSetForm.action?id=' + context.id;
+}
+
// -----------------------------------------------------------------------------
// Remove organisation unit group set
// -----------------------------------------------------------------------------
-function removeOrganisationUnitGroupSet( groupSetId, groupSetName )
+function removeOrganisationUnitGroupSet( context )
{
- removeItem( groupSetId, groupSetName, confirm_to_delete_org_unit_group_set, 'removeOrganisationUnitGroupSet.action' );
+ removeItem( context.id, context.name, confirm_to_delete_org_unit_group_set, 'removeOrganisationUnitGroupSet.action' );
}
function changeCompulsory( value )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm 2013-10-13 16:15:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm 2013-12-04 13:26:57 +0000
@@ -1,6 +1,11 @@
<script type="text/javascript">
jQuery(document).ready(function(){
tableSorter( 'listTable' );
+
+ dhis2.contextmenu.makeContextMenu({
+ menuId: 'contextMenu',
+ menuItemActiveClass: 'contextMenuItemActive'
+ });
});
var none = '$encoder.jsEscape( $i18n.getString( "none" ) , "'" )';
@@ -11,6 +16,14 @@
<h3>$i18n.getString( "org_unit_management" ) #openHelp( "orgunit" )</h3>
+<div id="contextMenu" class="contextMenu">
+ <ul id="contextMenuItems" class="contextMenuItems">
+ <li><a data-target-fn="showUpdateOrganisationUnitForm"><i class="fa fa-edit"></i> $i18n.getString( "edit" )</a></li>
+ <li data-enabled="canDelete"><a data-target-fn="removeOrganisationUnit"><i class="fa fa-trash-o"></i> $i18n.getString( "remove" )</a></li>
+ <li><a data-target-fn="showOrganisationUnitDetails"><i class="fa fa-info-circle"></i> $i18n.getString( "show_details" )</a></li>
+ </ul>
+</div>
+
<table class="mainPageTable">
<tr>
<td style="vertical-align:top">
@@ -24,29 +37,18 @@
</table>
<table class="listTable" id="listTable">
<col/>
- <col width="96px"/>
- <thead>
+ <thead>
<tr>
<th>$i18n.getString( "name" )</th>
- <th class="{sorter: false}">$i18n.getString( "operations" )</th>
</tr>
- </thead>
+ </thead>
<tbody id="list">
#foreach( $organisationUnit in $organisationUnits )
- <tr id="tr${organisationUnit.id}">
- <td onclick="showOrganisationUnitDetails( $organisationUnit.id )">$encoder.htmlEncode( $organisationUnit.name )</td>
- <td style="text-align:right">
-
- <a href="showUpdateOrganisationUnitForm.action?id=$organisationUnit.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>
-
- #if( $organisationUnit.children.size() == 0 && $auth.hasAccess( "dhis-web-maintenance-organisationunit", "removeOrganisationUnit" ) )
- <a href="javascript:removeOrganisationUnit( $organisationUnit.id, '$encoder.jsEncode( $organisationUnit.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
- #else
- <img src="../images/delete-denied.png" alt="$i18n.getString( 'remove' )"/>
- #end
-
- <a href="javascript:showOrganisationUnitDetails( $organisationUnit.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"/></a>
- </td>
+ <tr id="tr${organisationUnit.id}" data-id="$!organisationUnit.id" data-uid="$!organisationUnit.uid" data-type="OrganisationUnit" data-name="$encoder.htmlEncode( $!organisationUnit.displayName )"
+ data-can-manage="$security.canManage( $organisationUnit )"
+ data-can-update="$security.canUpdate( $organisationUnit )"
+ data-can-delete="#if($organisationUnit.children.size() == 0 && $auth.hasAccess( "dhis-web-maintenance-organisationunit", "removeOrganisationUnit" ))true#{else}false#end">
+ <td>$encoder.htmlEncode( $!organisationUnit.displayName )</td>
</tr>
#end
</tbody>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroup.vm 2013-11-28 13:52:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroup.vm 2013-12-04 13:26:57 +0000
@@ -4,6 +4,11 @@
<script type="text/javascript">
jQuery(document).ready(function(){
tableSorter( 'listTable' );
+
+ dhis2.contextmenu.makeContextMenu({
+ menuId: 'contextMenu',
+ menuItemActiveClass: 'contextMenuItemActive'
+ });
});
var confirm_to_delete_org_unit_group = '$encoder.jsEscape( $i18n.getString( "confirm_to_delete_org_unit_group" ) , "'" )';
@@ -11,6 +16,16 @@
<h3>$i18n.getString( "org_unit_group_management" ) #openHelp( "ou_groups" )</h3>
+<div id="contextMenu" class="contextMenu">
+ <ul id="contextMenuItems" class="contextMenuItems">
+ <li data-enabled="canManage"><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i> $i18n.getString( "sharing_settings" )</a></li>
+ <li data-enabled="canUpdate"><a data-target-fn="openUpdateOrganisationUnitGroupForm"><i class="fa fa-edit"></i> $i18n.getString( "edit" )</a></li>
+ <li data-enabled="canUpdate"><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i> $i18n.getString( "translation_translate" )</a></li>
+ <li data-enabled="canDelete"><a data-target-fn="removeOrganisationUnitGroup"><i class="fa fa-trash-o"></i> $i18n.getString( "remove" )</a></li>
+ <li><a data-target-fn="showOrganisationUnitGroupDetails"><i class="fa fa-info-circle"></i> $i18n.getString( "show_details" )</a></li>
+ </ul>
+</div>
+
<table class="mainPageTable">
<tr>
<td style="vertical-align:top">
@@ -22,46 +37,19 @@
</table>
<table class="listTable" id="listTable">
<col/>
- <col width="145px"/>
<thead>
<tr>
<th>$i18n.getString( "name" )</th>
- <th class="{sorter: false}">$i18n.getString( "operations" )</th>
</tr>
</thead>
<tbody id="list">
#foreach( $organisationUnitGroup in $organisationUnitGroups )
- <tr id="tr${organisationUnitGroup.id}">
- <td onclick="showOrganisationUnitGroupDetails( $organisationUnitGroup.id )">$encoder.htmlEncode( $organisationUnitGroup.displayName )</td>
- <td style="text-align:right">
-
- #if ( $security.canManage( $organisationUnitGroup ) )
- <a href="javascript:showSharingDialog('organisationUnitGroup', '$organisationUnitGroup.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
-
- #if( $security.canUpdate( $organisationUnitGroup ) )
- <a href="openUpdateOrganisationUnitGroup.action?id=$organisationUnitGroup.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>
- #else
- <img src="../images/edit-denied.png">
- #end
-
- #if( $security.canUpdate( $organisationUnitGroup ) )
- <a href="javascript:translate( 'OrganisationUnitGroup', '$organisationUnitGroup.id' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a>
- #else
- <img src="../images/edit-denied.png">
- #end
-
- #if( $security.canDelete( $organisationUnitGroup ) )
- <a href="javascript:removeOrganisationUnitGroup( $organisationUnitGroup.id, '$encoder.jsEncode( $organisationUnitGroup.displayName )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
- #else
- <img src="../images/delete-denied.png">
- #end
-
- <a href="javascript:showOrganisationUnitGroupDetails( $organisationUnitGroup.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"/></a>
- </td>
- </tr>
+ <tr id="tr${organisationUnitGroup.id}" data-id="$!organisationUnitGroup.id" data-uid="$!organisationUnitGroup.uid" data-type="OrganisationUnitGroup" data-name="$encoder.htmlEncode( $!organisationUnitGroup.displayName )"
+ data-can-manage="$security.canManage( $organisationUnitGroup )"
+ data-can-update="$security.canUpdate( $organisationUnitGroup )"
+ data-can-delete="$security.canDelete( $organisationUnitGroup )">
+ <td>$encoder.htmlEncode( $!organisationUnitGroup.displayName )</td>
+ </tr>
#end
</tbody>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSet.vm 2013-06-29 14:16:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSet.vm 2013-12-04 13:26:57 +0000
@@ -1,6 +1,11 @@
<script type="text/javascript">
jQuery(document).ready(function(){
tableSorter( 'listTable' );
+
+ dhis2.contextmenu.makeContextMenu({
+ menuId: 'contextMenu',
+ menuItemActiveClass: 'contextMenuItemActive'
+ });
});
var confirm_to_delete_org_unit_group_set = '$encoder.jsEscape( $i18n.getString( "confirm_to_delete_org_unit_group_set" ) , "'" )';
@@ -10,6 +15,15 @@
<h3>$i18n.getString( "org_unit_group_set_management" ) #openHelp( "ou_groupsets" )</h3>
+<div id="contextMenu" class="contextMenu">
+ <ul id="contextMenuItems" class="contextMenuItems">
+ <li><a data-target-fn="showUpdateOrganisationUnitGroupSetForm"><i class="fa fa-edit"></i> $i18n.getString( "edit" )</a></li>
+ <li><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i> $i18n.getString( "translation_translate" )</a></li>
+ <li><a data-target-fn="removeOrganisationUnitGroupSet"><i class="fa fa-trash-o"></i> $i18n.getString( "remove" )</a></li>
+ <li><a data-target-fn="showOrganisationUnitGroupSetDetails"><i class="fa fa-info-circle"></i> $i18n.getString( "show_details" )</a></li>
+ </ul>
+</div>
+
<table class="mainPageTable">
<tr>
<td style="vertical-align:top">
@@ -21,26 +35,18 @@
</table>
<table class="listTable" id="listTable">
<col/>
- <col width="120px"/>
- <thead>
-
- <tr>
- <th>$i18n.getString( "name" )</th>
- <th class="{sorter: false}">$i18n.getString( "operations" )</th>
- </tr>
- </thead>
+ <thead>
+ <tr>
+ <th>$i18n.getString( "name" )</th>
+ </tr>
+ </thead>
<tbody id="list">
#foreach( $organisationUnitGroupSet in $organisationUnitGroupSets )
- <tr id="tr${organisationUnitGroupSet.id}">
- <td onclick="showOrganisationUnitGroupSetDetails( $organisationUnitGroupSet.id )">$encoder.htmlEncode( $organisationUnitGroupSet.displayName )</td>
- <td style="text-align:right">
- <a href="showUpdateOrganisationUnitGroupSetForm.action?id=$organisationUnitGroupSet.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>
- <a href="javascript:translate( 'OrganisationUnitGroupSet', '$organisationUnitGroupSet.id' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a>
- #if( $auth.hasAccess( "dhis-web-maintenance-organisationunit", "removeOrganisationUnitGroupSet" ) )
- <a href="javascript:removeOrganisationUnitGroupSet( $organisationUnitGroupSet.id, '$encoder.jsEncode( $organisationUnitGroupSet.displayName )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
- #else <img src="../images/delete-denied.png" alt="$i18n.getString( 'remove' )"/> #end
- <a href="javascript:showOrganisationUnitGroupSetDetails( $organisationUnitGroupSet.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"/></a>
- </td>
+ <tr id="tr${organisationUnitGroupSet.id}" data-id="$!organisationUnitGroupSet.id" data-uid="$!organisationUnitGroupSet.uid" data-type="OrganisationUnitGroupSet" data-name="$encoder.htmlEncode( $!organisationUnitGroupSet.displayName )"
+ data-can-manage="$security.canManage( $organisationUnitGroupSet )"
+ data-can-update="$security.canUpdate( $organisationUnitGroupSet )"
+ data-can-delete="$security.canDelete( $organisationUnitGroupSet )">
+ <td>$encoder.htmlEncode( $!organisationUnitGroupSet.displayName )</td>
</tr>
#end
</tbody>
@@ -50,24 +56,23 @@
</td>
<td id="detailsData">
-
- <div id="detailsArea">
- <div id="hideDetailsArea">
- <a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
- </div>
- <p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
- <p><label>$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
- <p><label>$i18n.getString( "compulsory" ):</label><br><span id="compulsoryField"></span></p>
- <p><label>$i18n.getString( "number_of_members" ):</label><br><span id="memberCountField"></span></p>
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
+ <a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
+ </div>
+ <p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
+ <p><label>$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
+ <p><label>$i18n.getString( "compulsory" ):</label><br><span id="compulsoryField"></span></p>
+ <p><label>$i18n.getString( "number_of_members" ):</label><br><span id="memberCountField"></span></p>
</div>
- <div id="warningArea">
- <div id="hideDetailsArea">
- <a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
- </div>
- <p><span id="warningField"></span></p>
- </div>
-
+ <div id="warningArea">
+ <div id="hideDetailsArea">
+ <a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
+ </div>
+ <p><span id="warningField"></span></p>
+ </div>
+
</td>
</tr>
</table>
