Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 13730 [merge]
committer: Jan Henrik Overland <janhenrik.overl...@gmail.com>
branch nick: dhis2
timestamp: Tue 2014-01-14 17:38:45 +0100
message:
PT, filtering improved.
added:
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/clear-over_20.png
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/clear_20.png
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
=== added file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/clear-over_20.png'
Binary files dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/clear-over_20.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/clear-over_20.png 2014-01-14 16:32:17 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/clear_20.png'
Binary files dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/clear_20.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/clear_20.png 2014-01-14 16:32:17 +0000 differ
=== 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 10:09:57 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-01-14 16:36:47 +0000
@@ -2899,25 +2899,41 @@
}
});
- indicatorFilter = Ext.create('Ext.form.field.Text', {
+ indicatorFilter = Ext.create('Ext.form.field.Trigger', {
+ cls: 'ns-trigger-filter',
emptyText: 'Filter available..',
height: 22,
hidden: true,
enableKeyEvents: true,
+ fieldStyle: 'height:22px; border-right:0 none',
+ style: 'height:22px',
+ onTriggerClick: function() {
+ this.reset();
+ this.onKeyUp();
+ },
+ onKeyUp: function() {
+ var value = indicatorGroup.getValue(),
+ store = indicatorAvailableStore;
+
+ if (Ext.isString(value) || Ext.isNumber(value)) {
+ store.loadPage(null, this.getValue(), false);
+ }
+ },
listeners: {
keyup: {
fn: function(cmp) {
- var value = indicatorGroup.getValue(),
- store = indicatorAvailableStore;
-
- if (Ext.isString(value) || Ext.isNumber(value)) {
- store.loadPage(null, cmp.getValue(), false);
- }
+ cmp.onKeyUp();
},
buffer: 100
},
show: function(cmp) {
cmp.focus(false, 50);
+ },
+ focus: function(cmp) {
+ cmp.addCls('ns-trigger-filter-focused');
+ },
+ blur: function(cmp) {
+ cmp.removeCls('ns-trigger-filter-focused');
}
}
});
@@ -3147,25 +3163,41 @@
}
});
- dataElementFilter = Ext.create('Ext.form.field.Text', {
+ dataElementFilter = Ext.create('Ext.form.field.Trigger', {
+ cls: 'ns-trigger-filter',
emptyText: 'Filter available..',
height: 22,
hidden: true,
enableKeyEvents: true,
+ fieldStyle: 'height:22px; border-right:0 none',
+ style: 'height:22px',
+ onTriggerClick: function() {
+ this.reset();
+ this.onKeyUp();
+ },
+ onKeyUp: function() {
+ var value = dataElementGroup.getValue(),
+ store = dataElementAvailableStore;
+
+ if (Ext.isString(value) || Ext.isNumber(value)) {
+ store.loadPage(null, this.getValue(), false);
+ }
+ },
listeners: {
keyup: {
fn: function(cmp) {
- var value = dataElementGroup.getValue(),
- store = dataElementAvailableStore;
-
- if (Ext.isString(value) || Ext.isNumber(value)) {
- store.loadPage(null, cmp.getValue(), false);
- }
+ cmp.onKeyUp();
},
buffer: 100
},
show: function(cmp) {
cmp.focus(false, 50);
+ },
+ focus: function(cmp) {
+ cmp.addCls('ns-trigger-filter-focused');
+ },
+ blur: function(cmp) {
+ cmp.removeCls('ns-trigger-filter-focused');
}
}
});
@@ -3281,6 +3313,8 @@
listeners: {
select: function(cb) {
cb.loadAvailable(true);
+
+ dataElementSearch.enable();
}
}
});
=== 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-09 12:18:37 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css 2014-01-14 16:38:23 +0000
@@ -362,6 +362,28 @@
/*----------------------------------------------------------------------------
+ * PT Trigger
+ *--------------------------------------------------------------------------*/
+
+ /* field default > trigger */
+.ns-trigger-filter .x-form-trigger {
+ height: 22px !important;
+ background: url(../images/clear_20.png) 0 0 no-repeat;
+ border-top: 1px solid #b5b8c8;
+ border-right: 1px solid #b5b8c8;
+}
+ /* field focused > trigger */
+.ns-trigger-filter-focused .x-form-trigger {
+ border: 1px solid #a1a1a1;
+ border-left: 0 none;
+}
+ /* field over > trigger */
+.ns-trigger-filter .x-form-trigger-over {
+ background: url(../images/clear-over_20.png) 0 0 no-repeat;
+}
+
+
+/*----------------------------------------------------------------------------
* Multiselect
*--------------------------------------------------------------------------*/
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
