dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 12677 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-10-15 14:41:48 +0200
message:
  Experimental code removed.
modified:
  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

=== 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-10-08 17:18:30 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2013-10-15 12:40:49 +0000
@@ -747,10 +747,6 @@
 			domainAxisTitle,
 			rangeAxisTitle,
 
-            hideCategoryLabels,
-            categoryLabelRotation,
-            categoryLabelSize,
-
 			data,
 			style,
 
@@ -876,75 +872,6 @@
 		});
 		dv.viewport.rangeAxisTitle = rangeAxisTitle;
 
-		hideCategoryLabels = Ext.create('Ext.form.field.Checkbox', {
-			boxLabel: DV.i18n.hide_category_labels,
-			style: 'margin-bottom:7px',
-			listeners: {
-				change: function() {
-					categoryLabelRotation.xable();
-                    categoryLabelSize.xable();
-				}
-			}
-		});
-		dv.viewport.hideCategoryLabels = hideCategoryLabels;
-
-		categoryLabelRotation = Ext.create('Ext.form.field.ComboBox', {
-			cls: 'dv-combo',
-			style: 'margin-bottom:3px',
-			width: 250,
-			labelWidth: 130,
-			fieldLabel: DV.i18n.category_label_rotation,
-			labelStyle: 'color:#333',
-			queryMode: 'local',
-			valueField: 'id',
-			editable: false,
-			value: 'normal',
-			xable: function() {
-				this.setDisabled(hideCategoryLabels.getValue());
-			},
-			store: Ext.create('Ext.data.Store', {
-				fields: ['id', 'text'],
-				data: [
-					{id: 'Vertical', text: DV.i18n.vertical},
-					{id: '10 degrees', text: 10 + ' ' + DV.i18n.degrees},
-					{id: '20 degrees', text: 20 + ' ' + DV.i18n.degrees},
-					{id: '30 degrees', text: 30 + ' ' + DV.i18n.degrees},
-					{id: '40 degrees', text: 40 + ' ' + DV.i18n.degrees},
-					{id: '50 degrees', text: 50 + ' ' + DV.i18n.degrees},
-					{id: '60 degrees', text: 60 + ' ' + DV.i18n.degrees},
-					{id: '70 degrees', text: 70 + ' ' + DV.i18n.degrees},
-					{id: '80 degrees', text: 80 + ' ' + DV.i18n.degrees},
-                    {id: 'Horizontal', text: DV.i18n.horizontal}
-				]
-			})
-		});
-		dv.viewport.categoryLabelRotation = categoryLabelRotation;
-
-		categoryLabelSize = Ext.create('Ext.form.field.ComboBox', {
-			cls: 'dv-combo',
-			style: 'margin-bottom:3px',
-			width: 250,
-			labelWidth: 130,
-			fieldLabel: DV.i18n.category_label_size,
-			labelStyle: 'color:#333',
-			queryMode: 'local',
-			valueField: 'id',
-			editable: false,
-			value: 'normal',
-			xable: function() {
-				this.setDisabled(hideCategoryLabels.getValue());
-			},
-			store: Ext.create('Ext.data.Store', {
-				fields: ['id', 'text'],
-				data: [
-					{id: 'large', text: DV.i18n.large},
-					{id: 'normal', text: DV.i18n.normal},
-					{id: 'small', text: DV.i18n.small_}
-				]
-			})
-		});
-		dv.viewport.categoryLabelSize = categoryLabelSize;
-
         data = {
 			xtype: 'container',
 			bodyStyle: 'border:0 none',
@@ -992,15 +919,12 @@
 				title,
 				domainAxisTitle,
 				rangeAxisTitle,
-                hideCategoryLabels,
-                categoryLabelRotation,
-                categoryLabelSize
 			]
 		};
 
 		window = Ext.create('Ext.window.Window', {
 			title: DV.i18n.table_options,
-			bodyStyle: 'background-color:#fff; padding:8px 8px 8px',
+			bodyStyle: 'background-color:#fff; padding:8px 8px 6px',
 			closeAction: 'hide',
 			autoShow: true,
 			modal: true,

=== 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-10-15 09:25:54 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/styles/style.css	2013-10-15 12:40:49 +0000
@@ -287,6 +287,8 @@
     padding-left: 1px;
     font-size: 11px;
     color: #333;
+	position: relative;
+	top: -1px;
 }
 
 	/* Icons */