dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 14762 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-04-09 19:56:38 +0200
message:
  ER, agg/case button style, options window fixes.
modified:
  dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/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-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js	2014-04-09 13:35:52 +0000
+++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js	2014-04-09 17:53:41 +0000
@@ -805,7 +805,7 @@
 
                 this.sortOrderCmp = Ext.create('Ext.form.field.ComboBox', {
                     cls: 'ns-combo',
-                    style: 'margin-bottom:3px',
+                    style: 'margin-bottom:2px',
                     width: 70,
                     queryMode: 'local',
                     valueField: 'id',
@@ -822,7 +822,7 @@
 
                 this.topLimitCmp = Ext.create('Ext.form.field.Number', {
                     width: 56,
-                    style: 'margin-left:1px',
+                    style: 'margin-bottom:2px; margin-left:1px',
                     minValue: 1,
                     maxValue: 10000,
                     value: container.topLimit,
@@ -1567,7 +1567,7 @@
 
 		displayDensity = Ext.create('Ext.form.field.ComboBox', {
 			cls: 'ns-combo',
-			style: 'margin-bottom:3px',
+			style: 'margin-bottom:2px',
 			width: comboboxWidth,
 			labelWidth: 130,
 			fieldLabel: NS.i18n.display_density,
@@ -1588,7 +1588,7 @@
 
 		fontSize = Ext.create('Ext.form.field.ComboBox', {
 			cls: 'ns-combo',
-			style: 'margin-bottom:3px',
+			style: 'margin-bottom:2px',
 			width: comboboxWidth,
 			labelWidth: 130,
 			fieldLabel: NS.i18n.font_size,
@@ -1610,7 +1610,7 @@
 		digitGroupSeparator = Ext.create('Ext.form.field.ComboBox', {
 			labelStyle: 'color:#333',
 			cls: 'ns-combo',
-			style: 'margin-bottom:3px',
+			style: 'margin-bottom:2px',
 			width: comboboxWidth,
 			labelWidth: 130,
 			fieldLabel: NS.i18n.digit_group_separator,
@@ -1674,7 +1674,7 @@
 
 		window = Ext.create('Ext.window.Window', {
 			title: NS.i18n.table_options,
-			bodyStyle: 'background-color:#fff; padding:5px',
+			bodyStyle: 'background-color:#fff; padding:5px 5px 3px',
 			closeAction: 'hide',
 			autoShow: true,
 			modal: true,
@@ -1721,7 +1721,7 @@
 				},
 				data,
 				{
-					bodyStyle: 'border:0 none; padding:7px'
+					bodyStyle: 'border:0 none; padding:5px'
 				},
 				{
 					bodyStyle: 'border:0 none; color:#222; font-size:12px; font-weight:bold',
@@ -1730,7 +1730,7 @@
 				},
 				organisationUnits,
 				{
-					bodyStyle: 'border:0 none; padding:7px'
+					bodyStyle: 'border:0 none; padding:5px'
 				},
 				{
 					bodyStyle: 'border:0 none; color:#222; font-size:12px; font-weight:bold',
@@ -3436,8 +3436,8 @@
             store: {
                 fields: ['id', 'name'],
                 data: [
-                    {id: 'periods', name: 'Select fixed and relative periods'},
-                    {id: 'dates', name: 'Select start/end dates'}
+                    {id: 'periods', name: 'Fixed and relative periods'},
+                    {id: 'dates', name: 'Start/end dates'}
                 ]
             },
             reset: function() {
@@ -5511,7 +5511,6 @@
 		// viewport
 
         aggregateButton = Ext.create('Ext.button.Button', {
-			//flex: 1,
             width: 223,
 			param: 'aggregated_values',
             text: '<b>Aggregated values</b><br/>Show aggregated event report',
@@ -5526,7 +5525,6 @@
         paramButtonMap[aggregateButton.param] = aggregateButton;
 
 		caseButton = Ext.create('Ext.button.Button', {
-			//flex: 1,'
             width: 224,
 			param: 'individual_cases',
             text: '<b>Individual cases</b><br/>Show case-based event report',
@@ -5557,7 +5555,7 @@
                 toggleGroup: 'mode',
 				cls: 'x-btn-default-toolbar-small-over',
                 handler: function(b) {
-					onTypeClick(b.param);
+					onTypeClick(b);
 				}
 			},
 			items: [
@@ -5571,9 +5569,7 @@
 			}
 		});
 
-		onTypeClick = function(param) {
-			var button = paramButtonMap[param];
-
+		onTypeClick = function(button) {
 			if (!button.pressed) {
 				button.toggle();
 			}

=== modified file 'dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/styles/style.css'
--- dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/styles/style.css	2014-03-27 14:27:41 +0000
+++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/styles/style.css	2014-04-09 17:53:41 +0000
@@ -183,6 +183,7 @@
     background: #fff;
 }
 
+
 /*----------------------------------------------------------------------------
  * Pivot
  *--------------------------------------------------------------------------*/
@@ -698,6 +699,18 @@
 	border-color: #bbb;
 }
 
+.x-btn-default-toolbar-small-over {
+	background-image: none;
+    background-color: #f3f3f3;
+    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f1f1f1), color-stop(100%, #f6f6f6));
+    background-image: -webkit-linear-gradient(top, #f1f1f1,#f6f6f6);
+    background-image: -moz-linear-gradient(top, #f1f1f1,#f6f6f6);
+    background-image: -o-linear-gradient(top, #f1f1f1,#f6f6f6);
+    background-image: -ms-linear-gradient(top, #f1f1f1,#f6f6f6);
+    background-image: linear-gradient(top, #f1f1f1,#f6f6f6);
+}
+
+
 	/* Chart image */
 .x-btn-default-toolbar-small-icon button {
     width: 32px !important;
@@ -712,15 +725,15 @@
 }
 
 .x-btn-default-toolbar-small-pressed {
-	border-color: #bbb;
+	border-color: #aaa;
     background-image: none;
     background-color: #d6d6d6;
-    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #d1d1d1), color-stop(100%, #e5e5e5));
-    background-image: -webkit-linear-gradient(top, #d1d1d1,#e5e5e5);
-    background-image: -moz-linear-gradient(top, #d1d1d1,#e5e5e5);
-    background-image: -o-linear-gradient(top, #d1d1d1,#e5e5e5);
-    background-image: -ms-linear-gradient(top, #d1d1d1,#e5e5e5);
-    background-image: linear-gradient(top, #d1d1d1,#e5e5e5);
+    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #cccccc), color-stop(100%, #e5e5e5));
+    background-image: -webkit-linear-gradient(top, #cccccc,#e5e5e5);
+    background-image: -moz-linear-gradient(top, #cccccc,#e5e5e5);
+    background-image: -o-linear-gradient(top, #cccccc,#e5e5e5);
+    background-image: -ms-linear-gradient(top, #cccccc,#e5e5e5);
+    background-image: linear-gradient(top, #cccccc,#e5e5e5);
 }
 
 /*----------------------------------------------------------------------------