=== 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-11-27 12:48:33 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2013-11-27 15:32:03 +0000 @@ -233,6 +233,11 @@ background-color : #eee; } +.contextMenuItemActive { + background-color: #276696; + color: #fff; +} + /*----------------------------------------------------------------------------*/ /* Left bar */ /*----------------------------------------------------------------------------*/ === 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-11-27 12:48:33 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css 2013-11-27 15:32:03 +0000 @@ -233,6 +233,11 @@ background-color : #eee; } +.contextMenuItemActive { + background-color: #276696; + color: #fff; +} + /*----------------------------------------------------------------------------*/ /* Left bar */ /*----------------------------------------------------------------------------*/ === 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-11-27 12:48:33 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2013-11-27 15:32:03 +0000 @@ -207,8 +207,8 @@ background-color : #f7f7f7; display : none; z-index : 10; - filter : alpha(opacity=94); - opacity : 0.94; + filter : alpha(opacity=98); + opacity : 0.98; border-bottom-left-radius : 3px; border-bottom-right-radius : 3px; box-shadow : #ccc 0px 1px 1px 0px; @@ -233,6 +233,11 @@ background-color : #eee; } +.contextMenuItemActive { + background-color: #276696; + color: #fff; +} + /*----------------------------------------------------------------------------*/ /* Left bar */ /*----------------------------------------------------------------------------*/ === 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-11-27 12:48:33 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css 2013-11-27 15:32:03 +0000 @@ -233,6 +233,11 @@ background-color : #eee; } +.contextMenuItemActive { + background-color: #276696; + color: #fff; +} + /*----------------------------------------------------------------------------*/ /* Left bar */ /*----------------------------------------------------------------------------*/ === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/concept.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/concept.js 2013-11-27 12:48:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/concept.js 2013-11-27 15:32:03 +0000 @@ -43,6 +43,10 @@ $contextMenu.css({left: e.pageX, top: e.pageY}); var $target = $(e.target); + + $list.find('td').removeClass('contextMenuItemActive'); + $target.addClass('contextMenuItemActive'); + $contextMenu.data('id', $target.data('id')); $contextMenu.data('uid', $target.data('uid')); $contextMenu.data('name', $target.data('name')); @@ -55,6 +59,8 @@ $contextMenu.hide(); } + $list.find('td').removeClass('contextMenuItemActive'); + $contextMenu.removeData('id'); }); }); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm 2013-11-27 12:48:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm 2013-11-27 15:32:03 +0000 @@ -33,9 +33,6 @@ $i18n.getString( "name" ) - @@ -43,15 +40,6 @@ #if( $concept.id != $defaultConcept.id ) $encoder.htmlEncode( $concept.name ) - - #end #end @@ -60,22 +48,25 @@

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


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

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


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

+
+ +