dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #24489
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12008: (PT, DV) Orgunit selection mode menu interface improved.
------------------------------------------------------------
revno: 12008
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-09-10 14:22:22 +0300
message:
(PT, DV) Orgunit selection mode menu interface improved.
added:
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/check-un.png
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/check-un.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
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/check.png
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/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/check-un.png'
Binary files dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/check-un.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/check-un.png 2013-09-10 11:22:22 +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 2013-09-09 15:57:35 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2013-09-10 11:22:22 +0000
@@ -3525,16 +3525,22 @@
showSeparator: false,
menuValue: 'orgunit',
clickHandler: function(param) {
+ if (!param) {
+ return;
+ }
+
var items = this.items.items;
this.menuValue = param;
// Menu item icon cls
for (var i = 0; i < items.length; i++) {
- if (items[i].param === param) {
- items[i].setIconCls('pt-menu-item-selected');
- }
- else {
- items[i].setIconCls('');
+ if (items[i].setIconCls) {
+ if (items[i].param === param) {
+ items[i].setIconCls('pt-menu-item-selected');
+ }
+ else {
+ items[i].setIconCls('pt-menu-item-unselected');
+ }
}
}
@@ -3569,17 +3575,24 @@
},
items: [
{
+ xtype: 'label',
+ text: 'Selection mode',
+ style: 'padding:7px 5px 5px 7px; font-weight:bold; border:0 none'
+ },
+ {
text: PT.i18n.select_organisation_units + ' ',
param: 'orgunit',
iconCls: 'pt-menu-item-selected'
},
{
- text: PT.i18n.select_boundaries_and_levels + ' ',
- param: 'level'
+ text: 'Select levels' + ' ',
+ param: 'level',
+ iconCls: 'pt-menu-item-unselected'
},
{
- text: PT.i18n.select_boundaries_and_groups + ' ',
- param: 'group'
+ text: 'Select groups' + ' ',
+ param: 'group',
+ iconCls: 'pt-menu-item-unselected'
}
],
listeners: {
@@ -4072,7 +4085,7 @@
{
xtype: 'label',
text: PT.i18n.table_layout,
- style: 'padding:7px 5px 5px 7px; font-weight:bold'
+ style: 'padding:7px 5px 5px 7px; font-weight:bold; border:0 none'
},
{
text: 'Microsoft Excel (.xls)',
=== 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 2013-07-22 15:03:42 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css 2013-09-10 11:22:22 +0000
@@ -488,6 +488,9 @@
.x-menu-body {
padding: 0;
}
+.x-menu-body .x-box-inner {
+ background-color: #fafafa;
+}
/* Menu item */
.x-menu-item-link {
@@ -524,6 +527,11 @@
background-image:url('../images/check.png');
padding-left: 18px;
}
+.pt-menu-item-unselected {
+ background-image:url('../images/check-un.png');
+ padding-left: 18px;
+}
+
/* Menu align */
.pt-btn-menu {
=== added file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/check-un.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/check-un.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/check-un.png 2013-09-10 11:22:22 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/check.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/check.png 2013-06-26 12:18:21 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/check.png 2013-09-10 11:22:22 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2013-09-09 15:57:35 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2013-09-10 11:22:22 +0000
@@ -3641,16 +3641,22 @@
showSeparator: false,
menuValue: 'orgunit',
clickHandler: function(param) {
+ if (!param) {
+ return;
+ }
+
var items = this.items.items;
this.menuValue = param;
// Menu item icon cls
for (var i = 0; i < items.length; i++) {
- if (items[i].param === param) {
- items[i].setIconCls('dv-menu-item-selected');
- }
- else {
- items[i].setIconCls('');
+ if (items[i].setIconCls) {
+ if (items[i].param === param) {
+ items[i].setIconCls('dv-menu-item-selected');
+ }
+ else {
+ items[i].setIconCls('dv-menu-item-unselected');
+ }
}
}
@@ -3685,17 +3691,24 @@
},
items: [
{
+ xtype: 'label',
+ text: 'Selection mode',
+ style: 'padding:7px 5px 5px 7px; font-weight:bold; border:0 none'
+ },
+ {
text: DV.i18n.select_organisation_units + ' ',
param: 'orgunit',
iconCls: 'dv-menu-item-selected'
},
{
- text: DV.i18n.select_boundaries_and_levels + ' ',
- param: 'level'
+ text: 'Select levels' + ' ',
+ param: 'level',
+ iconCls: 'dv-menu-item-unselected'
},
{
- text: DV.i18n.select_boundaries_and_groups + ' ',
- param: 'group'
+ text: 'Select groups' + ' ',
+ param: 'group',
+ iconCls: 'dv-menu-item-unselected'
}
],
listeners: {
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/styles/style.css'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/styles/style.css 2013-07-22 15:03:42 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/styles/style.css 2013-09-10 11:22:22 +0000
@@ -404,6 +404,10 @@
background-image:url('../images/check.png');
padding-left: 18px;
}
+.dv-menu-item-unselected {
+ background-image:url('../images/check-un.png');
+ padding-left: 18px;
+}
/* Menu align */
.dv-btn-menu {
