dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 14308 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-03-20 09:19:09 +0100
message:
  PT, gui fixes.
modified:
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/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-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2014-03-19 17:54:19 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2014-03-20 08:17:36 +0000
@@ -2967,7 +2967,7 @@
 
         indicatorGroup = Ext.create('Ext.form.field.ComboBox', {
             cls: 'ns-combo',
-            style: 'margin-bottom:2px; margin-top:0px',
+            style: 'margin-bottom:1px; margin-top:0px',
             width: ns.core.conf.layout.west_fieldset_width - ns.core.conf.layout.west_width_padding,
             valueField: 'id',
             displayField: 'name',
@@ -3288,7 +3288,7 @@
 
 		dataElementGroup = Ext.create('Ext.form.field.ComboBox', {
 			cls: 'ns-combo',
-			style: 'margin:0 2px 2px 0',
+			style: 'margin:0 1px 1px 0',
 			width: ns.core.conf.layout.west_fieldset_width - ns.core.conf.layout.west_width_padding - 90,
 			valueField: 'id',
 			displayField: 'name',
@@ -3318,13 +3318,13 @@
 
 		dataElementDetailLevel = Ext.create('Ext.form.field.ComboBox', {
 			cls: 'ns-combo',
-			style: 'margin-bottom:2px',
+			style: 'margin-bottom:1px',
 			baseBodyCls: 'small',
 			queryMode: 'local',
 			editable: false,
 			valueField: 'id',
 			displayField: 'text',
-			width: 90 - 2,
+			width: 90 - 1,
 			value: dimConf.dataElement.objectName,
 			store: {
 				fields: ['id', 'text'],
@@ -4013,8 +4013,8 @@
 						{
 							xtype: 'combobox',
 							cls: 'ns-combo',
-							style: 'margin-bottom:2px',
-							width: ns.core.conf.layout.west_fieldset_width - ns.core.conf.layout.west_width_padding - 62 - 62 - 4,
+							style: 'margin-bottom:1px',
+							width: ns.core.conf.layout.west_fieldset_width - ns.core.conf.layout.west_width_padding - 62 - 62 - 2,
 							valueField: 'id',
 							displayField: 'name',
 							emptyText: NS.i18n.select_period_type,
@@ -4042,7 +4042,7 @@
 						{
 							xtype: 'button',
 							text: NS.i18n.prev_year,
-							style: 'margin-left:2px; border-radius:2px',
+							style: 'margin-left:1px; border-radius:2px',
 							height: 24,
 							handler: function() {
 								var cb = this.up('panel').down('combobox');
@@ -4055,7 +4055,7 @@
 						{
 							xtype: 'button',
 							text: NS.i18n.next_year,
-							style: 'margin-left:2px; border-radius:2px',
+							style: 'margin-left:1px; border-radius:2px',
 							height: 24,
 							handler: function() {
 								var cb = this.up('panel').down('combobox');
@@ -4439,7 +4439,7 @@
 		organisationUnit = {
 			xtype: 'panel',
 			title: '<div class="ns-panel-title-organisationunit">' + NS.i18n.organisation_units + '</div>',
-			bodyStyle: 'padding:2px',
+			bodyStyle: 'padding:1px',
 			hideCollapseTool: true,
 			collapsed: false,
 			getDimension: function() {
@@ -4523,7 +4523,7 @@
                 {
                     layout: 'column',
                     bodyStyle: 'border:0 none',
-                    style: 'padding-bottom:2px',
+                    style: 'padding-bottom:1px',
                     items: [
                         toolPanel,
                         {
@@ -4835,7 +4835,7 @@
 		});
 
 		accordion = Ext.create('Ext.panel.Panel', {
-			bodyStyle: 'border-style:none; padding:2px; padding-bottom:0; overflow-y:scroll;',
+			bodyStyle: 'border-style:none; padding:1px; padding-bottom:0; overflow-y:scroll;',
 			items: accordionBody,
 			panels: accordionPanels,
 			setThisHeight: function(mx) {

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js	2014-03-19 17:54:19 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js	2014-03-20 08:17:36 +0000
@@ -128,14 +128,14 @@
 
 			conf.layout = {
 				west_width: 424,
-				west_fieldset_width: 416,
-				west_width_padding: 4,
+				west_fieldset_width: 418,
+				west_width_padding: 2,
 				west_fill: 2,
-				west_fill_accordion_indicator: 59,
+				west_fill_accordion_indicator: 56,
 				west_fill_accordion_dataelement: 59,
-				west_fill_accordion_dataset: 33,
-				west_fill_accordion_period: 296,
-				west_fill_accordion_organisationunit: 62,
+				west_fill_accordion_dataset: 31,
+				west_fill_accordion_period: 293,
+				west_fill_accordion_organisationunit: 58,
 				west_maxheight_accordion_indicator: 400,
 				west_maxheight_accordion_dataelement: 400,
 				west_maxheight_accordion_dataset: 400,

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css	2014-01-15 12:28:19 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css	2014-03-20 08:17:36 +0000
@@ -992,6 +992,7 @@
 	/* accordion item body */
 .ns-accordion .x-accordion-body {
 	padding: 2px 2px 0px;
+	padding: 1px;
 	border-top: 1px solid #c5c5c5 !important;
 }