dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 12506 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-10-08 16:07:05 +0200
message:
  Minor fix.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/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-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2013-10-08 11:41:57 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2013-10-08 14:06:23 +0000
@@ -3544,13 +3544,11 @@
 						v.menu.destroy();
 					}
 					v.menu = Ext.create('Ext.menu.Menu', {
-						id: 'treepanel-contextmenu',
 						showSeparator: false,
 						shadow: false
 					});
 					if (!r.data.leaf) {
 						v.menu.add({
-							id: 'treepanel-contextmenu-item',
 							text: GIS.i18n.select_all_children,
 							icon: 'images/node-select-child.png',
 							handler: function() {
@@ -4839,13 +4837,11 @@
 						v.menu.destroy();
 					}
 					v.menu = Ext.create('Ext.menu.Menu', {
-						id: 'treepanel-contextmenu',
 						showSeparator: false,
 						shadow: false
 					});
 					if (!r.data.leaf) {
 						v.menu.add({
-							id: 'treepanel-contextmenu-item',
 							text: GIS.i18n.select_all_children,
 							icon: 'images/node-select-child.png',
 							handler: function() {
@@ -5651,13 +5647,11 @@
 						v.menu.destroy();
 					}
 					v.menu = Ext.create('Ext.menu.Menu', {
-						id: 'treepanel-contextmenu',
 						showSeparator: false,
 						shadow: false
 					});
 					if (!r.data.leaf) {
 						v.menu.add({
-							id: 'treepanel-contextmenu-item',
 							text: GIS.i18n.select_all_children,
 							icon: 'images/node-select-child.png',
 							handler: function() {

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css	2013-09-25 13:07:30 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css	2013-10-08 14:06:23 +0000
@@ -17,7 +17,7 @@
  * GIS Menu
  *
  * GIS Treepanel
- * 
+ *
  * Colorpicker
  *
  * GIS Window
@@ -597,14 +597,6 @@
     border-radius: 2px 2px 2px 2px;
 }
 
-	/* Treepanel contextmenu */
-#treepanel-contextmenu {
-    border-radius: 3px;
-    border-width: 1px;
-    border-style: solid;
-    border-color: #ddd;
-}
-
 
 /*----------------------------------------------------------------------------
  * Color picker