dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 4878 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-10-07 12:34:44 +0200
message:
  (DV) Comestic fixed + Treepanel context menu bug fixed.
modified:
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/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-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2011-10-05 15:04:54 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2011-10-07 10:33:31 +0000
@@ -1318,9 +1318,15 @@
                                         }),
                                         listeners: {
                                             itemcontextmenu: function(v, r, h, i, e) {
-                                                var menu = Ext.create('Ext.menu.Menu');
+                                                if (v.menu) {
+                                                    v.menu.destroy();
+                                                }
+                                                v.menu = Ext.create('Ext.menu.Menu', {
+                                                    id: 'treepanel-contextmenu',
+                                                });
                                                 if (!r.data.leaf) {
-                                                    menu.add({
+                                                    v.menu.add({
+                                                        id: 'treepanel-contextmenu-item',
                                                         text: 'Select all children',
                                                         icon: 'images/node-select-child.png',
                                                         handler: function() {
@@ -1335,7 +1341,7 @@
                                                     return;
                                                 }
                                                 
-                                                menu.showAt(e.xy);
+                                                v.menu.showAt(e.xy);
                                             }
                                         }
                                     }

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2011-10-04 12:31:54 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2011-10-07 10:33:31 +0000
@@ -217,11 +217,39 @@
 	border-top-right-radius: 2px;
 }
 
+/* Treepanel contextmenu */
+#treepanel-contextmenu {
+    -moz-border-radius: 2px 2px 2px 2px;
+    -webkit-border-radius: 2px 2px 2px 2px;
+    -o-border-radius: 2px 2px 2px 2px;
+    -ms-border-radius: 2px 2px 2px 2px;
+    -khtml-border-radius: 2px 2px 2px 2px;
+    border-radius: 2px 2px 2px 2px;
+    border-width: 1px;
+    border-style: solid;
+    border-color: #aaa;
+}
+
+.x-menu-item-active .x-menu-item-link {
+    -moz-border-radius: 2px 2px 2px 2px;
+    -webkit-border-radius: 2px 2px 2px 2px;
+    -o-border-radius: 2px 2px 2px 2px;
+    -ms-border-radius: 2px 2px 2px 2px;
+    -khtml-border-radius: 2px 2px 2px 2px;
+    border-radius: 2px 2px 2px 2px;
+    border-width: 1px;
+    border-style: solid;
+    border-color: #aaa;
+}
+
+/* Fieldset */
 .dv-fieldset-title-link {
     color:#000;
     text-decoration:none;
 }
 
+/* Multiselect */
 .dv-multiselect {
     color: #111;
 }
+