dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 13737 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-01-15 13:29:49 +0100
message:
  PT, filtering fixes.
modified:
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css


--
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-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2014-01-14 16:36:47 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2014-01-15 12:28:19 +0000
@@ -2881,6 +2881,8 @@
         indicatorSearch = Ext.create('Ext.button.Button', {
             width: 22,
             height: 22,
+            cls: 'ns-button-icon',
+            disabled: true,
             style: 'background: url(images/search_14.png) 3px 3px no-repeat',
             showFilter: function() {
                 indicatorLabel.hide();
@@ -2962,42 +2964,10 @@
 			listeners: {
 				select: function(cb) {
 					cb.loadAvailable(true);
+
+                    indicatorSearch.enable();
 				}
 			}
-
-
-            //listeners: {
-                //select: function(cb) {
-                    //var store = indicatorAvailableStore,
-                        //id = cb.getValue();
-
-                    //store.parent = id;
-
-                    //if (ns.core.support.prototype.object.hasObject(store.storage, 'parent', id)) {
-                        //ns.core.web.storage.internal.load(store);
-                        //ns.core.web.multiSelect.filterAvailable(indicatorAvailable, indicatorSelected);
-                    //}
-                    //else {
-                        //var options = {
-                            //params: {
-                                //page: 1
-                            //},
-                            //callback: function(rec, operation, isSuccess) {
-                                //indicatorAvailableToolbar.setPageCount(operation.resultSet.total);
-                            //}
-                        //};
-
-                        //if (id === 0) {
-                            //store.proxy.url = ns.core.init.contextPath + '/api/indicators.json?links=false';
-                            //store.load(options);
-                        //}
-                        //else {
-                            //store.proxy.url = ns.core.init.contextPath + '/api/indicatorGroups/' + id + '/members.json?links=false';
-                            //store.load(options);
-                        //}
-                    //}
-                //}
-            //}
         });
 
 		indicatorAvailable = Ext.create('Ext.ux.form.MultiSelect', {
@@ -3145,6 +3115,8 @@
         dataElementSearch = Ext.create('Ext.button.Button', {
             width: 22,
             height: 22,
+            cls: 'ns-button-icon',
+            disabled: true,
             style: 'background: url(images/search_14.png) 3px 3px no-repeat',
             showFilter: function() {
                 dataElementLabel.hide();

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css	2014-01-14 16:38:23 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css	2014-01-15 12:28:19 +0000
@@ -682,6 +682,11 @@
 	width: 18px !important;
 }
 
+.ns-button-icon.x-btn-default-toolbar-small-disabled {
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=25)";
+    opacity: 0.25;
+}
+
 
 /*----------------------------------------------------------------------------
  * Tooltip