=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js 2012-05-04 10:10:43 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js 2012-05-07 04:34:16 +0000 @@ -1823,7 +1823,7 @@ xtype: 'textfield', emptyText: TR.i18n.filter, id: 'deFilterAvailable', - width: (TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor) / 2 - 4, + width: (TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor) / 2 - 64, listeners: { specialkey: function( textfield, e, eOpts ){ if ( e.keyCode == e.ENTER ) @@ -1832,6 +1832,29 @@ } } } + }, + { + xtype: 'button', + icon: 'images/filter.png', + tooltip: TR.i18n.filter, + width: 24, + handler: function() { + TR.util.multiselect.filterSelector( TR.cmp.params.dataelement.available, Ext.getCmp('deFilterAvailable').getValue()); + } + }, + { + xtype: 'image', + src: 'images/grid-split.gif' + }, + { + xtype: 'button', + icon: 'images/clear-filter.png', + tooltip: TR.i18n.clear, + width: 24, + handler: function() { + Ext.getCmp('deFilterAvailable').setValue(''); + TR.util.multiselect.filterSelector( TR.cmp.params.dataelement.available, Ext.getCmp('deFilterAvailable').getValue()); + } } ], listeners: { @@ -1862,7 +1885,7 @@ xtype: 'textfield', emptyText: TR.i18n.filter, id: 'deFilterSelected', - width: (TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor) / 2 - 4, + width: (TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor) / 2 - 64, listeners: { specialkey: function( textfield, e, eOpts ){ if ( e.keyCode == e.ENTER ) @@ -1871,6 +1894,29 @@ } } } + }, + { + xtype: 'button', + icon: 'images/filter.png', + tooltip: TR.i18n.filter, + width: 24, + handler: function() { + TR.util.multiselect.filterSelector( TR.cmp.params.dataelement.selected, Ext.getCmp('deFilterSelected').getValue()); + } + }, + { + xtype: 'image', + src: 'images/grid-split.gif' + }, + { + xtype: 'button', + icon: 'images/clear-filter.png', + tooltip: TR.i18n.clear, + width: 24, + handler: function() { + Ext.getCmp('deFilterSelected').setValue(''); + TR.util.multiselect.filterSelector( TR.cmp.params.dataelement.selected, Ext.getCmp('deFilterSelected').getValue()); + } } ], listeners: { === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/style.css' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/style.css 2012-05-04 08:50:53 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/style.css 2012-05-07 04:34:16 +0000 @@ -716,15 +716,4 @@ .tr-menu-item-desc { background-image:url('../images/hmenu-desc.gif'); -} - - -.tr-multiselect-filter { - - -o-border-top-right-radius: 2px; - -icab-border-top-right-radius: 2px; - -khtml-border-top-right-radius: 2px; - -moz-border-radius-topright: 2px; - -webkit-border-top-right-radius: 2px; - border-top-right-radius: 2px; -} +} \ No newline at end of file === added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/images/clear-filter.png' Binary files dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/images/clear-filter.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/images/clear-filter.png 2012-05-07 04:34:16 +0000 differ === added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/images/filter.png' Binary files dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/images/filter.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/images/filter.png 2012-05-07 04:34:16 +0000 differ