dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 4806 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-10-03 13:52:04 +0200
message:
  Fieldset titles now toggle their panel.
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-09-30 16:49:14 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2011-10-03 11:50:55 +0000
@@ -119,6 +119,18 @@
                         DV.util.getCmp('fieldset[name="' + DV.conf.finals.dimension[p].value + '"]').collapse();
                     }
                 }
+            },
+            toggleIndicator: function() {
+                DV.util.getCmp('fieldset[name="' + DV.conf.finals.dimension.indicator.value + '"]').toggle();
+            },
+            toggleDataElement: function() {
+                DV.util.getCmp('fieldset[name="' + DV.conf.finals.dimension.dataelement.value + '"]').toggle();
+            },
+            togglePeriod: function() {
+                DV.util.getCmp('fieldset[name="' + DV.conf.finals.dimension.period.value + '"]').toggle();
+            },
+            toggleOrganisationUnit: function() {
+                DV.util.getCmp('fieldset[name="' + DV.conf.finals.dimension.organisationunit.value + '"]').toggle();
             }
         },
         button: {
@@ -722,7 +734,7 @@
                             {
                                 xtype: 'fieldset',
                                 name: DV.conf.finals.dimension.indicator.value,
-                                title: 'Indicators',
+                                title: '<a href="javascript:DV.util.fieldset.toggleIndicator();" class="dv-fieldset-title-link">Indicators</a>',
                                 collapsible: true,
                                 items: [
                                     {
@@ -863,7 +875,7 @@
                             {
                                 xtype: 'fieldset',
                                 name: DV.conf.finals.dimension.dataelement.value,
-                                title: 'Data elements',
+                                title: '<a href="javascript:DV.util.fieldset.toggleDataElement();" class="dv-fieldset-title-link">Data elements</a>',
                                 collapsed: true,
                                 collapsible: true,
                                 items: [
@@ -1005,7 +1017,7 @@
                             {
                                 xtype: 'fieldset',
                                 name: DV.conf.finals.dimension.period.value,
-                                title: 'Periods',
+                                title: '<a href="javascript:DV.util.fieldset.togglePeriod();" class="dv-fieldset-title-link">Periods</a>',
                                 collapsed: true,
                                 collapsible: true,
                                 cmp: [],
@@ -1138,7 +1150,7 @@
                             {
                                 xtype: 'fieldset',
                                 name: DV.conf.finals.dimension.organisationunit.value,
-                                title: 'Organisation units',
+                                title: '<a href="javascript:DV.util.fieldset.toggleOrganisationUnit();" class="dv-fieldset-title-link">Organisation units</a>',
                                 collapsed: true,
                                 collapsible: true,
                                 items: [

=== 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-09-30 16:00:19 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2011-10-03 11:50:55 +0000
@@ -170,22 +170,9 @@
     border-top-right-radius: 3px;
 }
 
-/* Button icon */
-.visualizer-chart-button-icon {
-    background: transparent url('../images/column.png') no-repeat center center;
-    width: 38px;
-    height: 38px;
+.dv-fieldset-title-link {
+    color:#000;
+    text-decoration:none;
 }
 
 
-
-
-
-
-
-
-
-
-
-
-