=== 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 2013-12-04 10:20:53 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2013-12-04 11:47:33 +0000 @@ -265,7 +265,7 @@ overflow-y : auto; background-color : #f7f7f7; display : none; - z-index : 10; + z-index : 9; filter : alpha(opacity=94); opacity : 0.94; border-bottom-left-radius : 3px; @@ -293,8 +293,8 @@ } .contextMenuItemActive { - background-color: #668cb9; - color: #fff; + background-color: #668cb9 !important; + color: #fff !important; } /*----------------------------------------------------------------------------*/ === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css 2013-12-04 10:20:53 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css 2013-12-04 11:47:33 +0000 @@ -265,7 +265,7 @@ overflow-y : auto; background-color : #f7f7f7; display : none; - z-index : 10; + z-index : 9; filter : alpha(opacity=94); opacity : 0.94; border-bottom-left-radius : 3px; @@ -293,8 +293,8 @@ } .contextMenuItemActive { - background-color: #668cb9; - color: #fff; + background-color: #668cb9 !important; + color: #fff !important; } /*----------------------------------------------------------------------------*/ === 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 2013-12-04 10:20:53 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2013-12-04 11:47:33 +0000 @@ -265,7 +265,7 @@ overflow-y : auto; background-color : #f7f7f7; display : none; - z-index : 10; + z-index : 9; filter : alpha(opacity=98); opacity : 0.98; border-bottom-left-radius : 3px; @@ -293,8 +293,8 @@ } .contextMenuItemActive { - background-color: #668cb9; - color: #fff; + background-color: #668cb9 !important; + color: #fff !important; } /*----------------------------------------------------------------------------*/ === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css 2013-12-04 10:20:53 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css 2013-12-04 11:47:33 +0000 @@ -265,7 +265,7 @@ overflow-y : auto; background-color : #f7f7f7; display : none; - z-index : 10; + z-index : 9; filter : alpha(opacity=94); opacity : 0.94; border-bottom-left-radius : 3px; @@ -293,8 +293,8 @@ } .contextMenuItemActive { - background-color: #668cb9; - color: #fff; + background-color: #668cb9 !important; + color: #fff !important; } /*----------------------------------------------------------------------------*/ === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.contextmenu.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.contextmenu.js 2013-12-03 09:49:28 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.contextmenu.js 2013-12-04 11:47:33 +0000 @@ -85,7 +85,7 @@ return false; }); - $list.on('click.context', 'td', function( e ) { + $list.on('click.context', 'tr', function( e ) { if(dhis2.contextmenu.disable()) { return false; } @@ -95,6 +95,10 @@ var $target = $(e.target); + if( $target.data('id') === undefined ) { + $target = $target.closest('tr'); + } + $target.addClass(config.menuItemActiveClass); $.each(config.listItemProps, function( idx, val ) { @@ -120,6 +124,8 @@ var config = dhis2.contextmenu.config; var $list = $('#' + config.listId); var $menu = $('#' + config.menuId); + + $list.find('tr').removeClass(config.menuItemActiveClass); $list.find('td').removeClass(config.menuItemActiveClass); if( $menu.is(":visible") ) { === 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-08-16 19:33:48 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm 2013-12-04 11:47:33 +0000 @@ -4,18 +4,32 @@

$i18n.getString( "dataset_management" ) #openHelp( "dataSet" )

+
+ +
+
@@ -28,80 +42,29 @@
- - - - - - - - - - - #foreach( $dataSet in $dataSets ) - - - - - #end - - - -
$i18n.getString( "name" )$i18n.getString( "operations" )
$encoder.htmlEncode( $dataSet.displayName ) - #if( $security.canUpdate( $dataSet ) ) - $i18n.getString( 'define_associations' ) - #else - - #end - - #if ( $security.canManage( $dataSet ) ) - $i18n.getString( 'sharing_settings' ) - #else - - #end - - #if( $security.canUpdate( $dataSet ) ) - $i18n.getString( 'edit' ) - #else - - #end - - #if( $security.canUpdate( $dataSet ) ) - $i18n.getString( 'translation_translate' ) - #else - - #end - - #if( $security.canUpdate( $dataSet ) ) - $i18n.getString( 'design_data_entry_form' ) - #else - - #end - - $i18n.getString( 'pdf_data_entry_form' ) - - #if( $security.canWrite( $dataSet ) ) - $i18n.getString( 'edit_compulsory_data_elements' ) - #else - - #end - - #if( $security.canDelete( $dataSet ) ) - $i18n.getString( 'remove' ) - #else - - #end - - $i18n.getString( 'show_details' ) -
-

+ + + + + + + + + #foreach( $dataSet in $dataSets ) + + + + #end + + +
$i18n.getString( "name" )
$encoder.htmlEncode( $!dataSet.displayName )
+

#parse( "/dhis-web-commons/paging/paging.vm" ) - -
-
+
+
$i18n.getString( 'hide_details' )


@@ -111,12 +74,12 @@


-
-
- $i18n.getString( 'hide_warning' ) -
-

-
+
+
+ $i18n.getString( 'hide_warning' ) +
+

+
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js 2012-03-06 03:17:52 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js 2013-12-04 11:47:33 +0000 @@ -1,41 +1,52 @@ +var tmpDataSetId; +var tmpSource; + // ----------------------------------------------------------------------------- // DataSet details form // ----------------------------------------------------------------------------- -function showDataSetDetails( dataSetId ) -{ - jQuery.get( '../dhis-web-commons-ajax-json/getDataSet.action', { - id : dataSetId - }, function( json ) - { - setInnerHTML( 'nameField', json.dataSet.name ); - setInnerHTML( 'descriptionField', json.dataSet.description ); - setInnerHTML( 'frequencyField', json.dataSet.frequency ); - setInnerHTML( 'dataElementCountField', json.dataSet.dataElementCount ); - setInnerHTML( 'dataEntryFormField', json.dataSet.dataentryform ); +function showDataSetDetails( context ) { + jQuery.get('../dhis-web-commons-ajax-json/getDataSet.action', { + id: context.id + }, function( json ) { + setInnerHTML('nameField', json.dataSet.name); + setInnerHTML('descriptionField', json.dataSet.description); + setInnerHTML('frequencyField', json.dataSet.frequency); + setInnerHTML('dataElementCountField', json.dataSet.dataElementCount); + setInnerHTML('dataEntryFormField', json.dataSet.dataentryform); - showDetails(); - } ); + showDetails(); + }); } // ----------------------------------------------------------------------------- // Delete DataSet // ----------------------------------------------------------------------------- -var tmpDataSetId; - -var tmpSource; - -function removeDataSet( dataSetId, dataSetName ) -{ - removeItem( dataSetId, dataSetName, i18n_confirm_delete, 'delDataSet.action' ); +function removeDataSet( context ) { + removeItem(context.id, context.name, i18n_confirm_delete, 'delDataSet.action'); } // ---------------------------------------------------------------------- // DataEntryForm // ---------------------------------------------------------------------- -function viewDataEntryForm( dataSetId ) -{ - window.location.href = 'viewDataEntryForm.action?dataSetId=' + dataSetId; +function viewDataEntryForm( context ) { + window.location.href = 'viewDataEntryForm.action?dataSetId=' + context.id; +} + +function displayCompulsoryDataElementsForm( context ) { + location.href = 'displayCompulsoryDataElementsForm.action?id=' + context.id; +} + +function exportPdfDataSet( context ) { + location.href = '../api/pdfForm/dataSet/' + context.uid; +} + +function editDataSetForm( context ) { + location.href = 'editDataSetForm.action?dataSetId=' + context.id; +} + +function defineDataSetAssociationsForm( context ) { + location.href = 'defineDataSetAssociationsForm.action?dataSetId=' + context.id; } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/section.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/section.js 2013-06-25 13:58:55 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/section.js 2013-12-04 11:47:33 +0000 @@ -2,9 +2,17 @@ // Section details form // ----------------------------------------------------------------------------- -function showSectionDetails( sectionId ) +function editSectionShow( context ) { + location.href = 'editSection.action?sectionId=' + context.id; +} + +function greySectionShow( context ) { + location.href = 'greySection.action?sectionId=' + context.id; +} + +function showSectionDetails( context ) { - jQuery.get( 'getSection.action', { sectionId: sectionId }, function ( json ) { + jQuery.get( 'getSection.action', { sectionId: context.id }, function ( json ) { setInnerHTML( 'nameField', json.section.name ); setInnerHTML( 'dataSetField', json.section.dataSet ); setInnerHTML( 'categoryComboField', json.section.categoryCombo ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm 2013-09-18 15:34:38 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm 2013-12-04 11:47:33 +0000 @@ -1,4 +1,11 @@