← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12663: (Tabular) Style fixes.

 

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 12663 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-10-15 12:24:19 +0200
message:
  (Tabular) Style fixes.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/style.css
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css
  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-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2013-10-15 00:46:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2013-10-15 10:22:17 +0000
@@ -433,7 +433,7 @@
 						autoScroll: true,
 						overflowX: 'hidden',
 						overflowY: 'auto',
-						width: TR.conf.layout.west_fieldset_width - 10
+						width: TR.conf.layout.west_fieldset_width + 4
 					};
 					Ext.getCmp(p).add(panel);
 					subPanel = Ext.getCmp(panelid);
@@ -448,7 +448,8 @@
 					xtype: 'label',
 					id: 'filter_lb_' + fieldid,
 					text:name,
-					width:(TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor) / 2 - 100
+					style: 'padding-left:2px',
+					width:(TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor) / 2 - 73
 				};
 				
 				var opt = "";
@@ -486,6 +487,7 @@
 				params.valueField = 'value';
 				params.displayField = 'name';
 				params.editable = false;
+				params.style = 'margin-bottom:2px';
 				valueType = valueType.split('_')[0];
 				if( filterOperator != undefined || filterOperator!= '')
 				{
@@ -552,6 +554,7 @@
 				params.xtype = xtype;
 				params.id = 'filter_' + id;
 				params.cls = 'tr-textfield-alt1';
+				params.style = 'margin-bottom:2px';
 				params.emptyText = TR.i18n.filter_value;
 				params.width = (TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor) / 2 - 50;
 				xtype = xtype.toLowerCase();
@@ -654,6 +657,7 @@
 				var params = {};
 				params.xtype = 'button';
 				params.text = "+";
+				params.style = 'margin-bottom:2px';
 				params.tooltip = TR.i18n.add,
 				params.handler = function() {
 					TR.util.multiselect.addFilterField(p, id, name, valueType);
@@ -666,6 +670,7 @@
 				params.xtype = 'button';
 				params.id = 'filter_rmv_' + id;	
 				params.text = "-";
+				params.style = 'margin-bottom:2px';
 				params.tooltip = TR.i18n.remove,
 				params.handler = function() {
 					var e1 = Ext.getCmp( 'filter_' + id );
@@ -687,6 +692,7 @@
 				params.queryMode = 'local';
 				params.valueField = 'value';
 				params.displayField = 'name';
+				params.style = 'margin-bottom:2px';
 				params.editable = false;
 				params.store = new Ext.data.ArrayStore({
 						fields: ['value','name'],
@@ -4363,17 +4369,15 @@
                 items: [
 					{
 						xtype: 'toolbar',
-						style: 'padding-top:1px; border-style:none;',
-						width: TR.conf.layout.west_fieldset_width + 50,
-						bodyStyle: 'border-style:none; background-color:transparent; padding:4px 0 0 8px',
+						width: TR.conf.layout.west_fieldset_width + 20,
+						style: 'padding:2px 0 0 2px; border:0 none; border-bottom:1px solid #ccc; background-color:transparent',
 						items: [
 						{
 							xtype: 'panel',
-							bodyStyle: 'border-style:none; background-color:transparent; padding:10px 0 0 8px',
+							bodyStyle: 'border-style:none; background-color:transparent; padding:2px',
 							items: [
 								Ext.create('Ext.form.Panel', {
 								bodyStyle: 'border-style:none; background-color:transparent; padding:3px 30px 0 8px',
-                                width: TR.conf.layout.west_fieldset_width + 50,
 								items: [
 								{
 									xtype: 'radiogroup',
@@ -4446,14 +4450,14 @@
 									name: TR.init.system.programs,
 									id: 'programCombobox',
 									fieldLabel: TR.i18n.program,
-									labelStyle: 'font-weight:bold',
+									labelStyle: 'font-weight:bold; margin-bottom:2px',
 									labelAlign: 'top',
 									emptyText: TR.i18n.please_select,
 									queryMode: 'local',
 									editable: false,
 									valueField: 'id',
 									displayField: 'name',
-									width: TR.conf.layout.west_fieldset_width / 2 - 10,
+									width: TR.conf.layout.west_fieldset_width / 2 - 3,
 									store: TR.store.program,
 									listeners: {
 										added: function() {
@@ -4482,22 +4486,19 @@
 									}
 								},
 								{
-									xtyle:'label',
-									text: ''
-								},
-								{
 									xtype: 'combobox',
 									cls: 'tr-combo',
 									id:'programStageCombobox',
+									style: 'margin-left:2px',
 									fieldLabel: TR.i18n.program_stage,
-									labelStyle: 'font-weight:bold',
+									labelStyle: 'font-weight:bold; margin-bottom:2px',
 									labelAlign: 'top',
 									emptyText: TR.i18n.please_select,
 									queryMode: 'local',
 									editable: false,
 									valueField: 'id',
 									displayField: 'name',
-									width:  TR.conf.layout.west_fieldset_width / 2 - 10,
+									width:  TR.conf.layout.west_fieldset_width / 2 - 3,
 									store: TR.store.programStage,
 									listeners: {
 										added: function() {
@@ -4544,15 +4545,14 @@
 					},                            
 					{
 						xtype: 'panel',
-                        bodyStyle: 'border-style:none; border-top:2px groove #eee; padding:2px 2px 0 2px;magrin-left:32px;',
-                        layout: 'fit',
+                        bodyStyle: 'border:0 none; padding:2px 2px 0',
                         items: [
 							{
 								xtype: 'panel',
 								layout: 'accordion',
-								bodyStyle: 'border-style:none;',
 								activeOnTop: true,
 								cls: 'tr-accordion',
+								bodyStyle: 'border:0 none; margin-bottom:2px',
 								height: 554,
 								items: [
 							
@@ -4562,18 +4562,20 @@
 										id: 'dateRangeDiv',
 										hideCollapseTool: true,
 										autoScroll: true,
+										bodyStyle: 'padding:3px 4px',
 										items: [
 											{
 												xtype: 'datefield',
 												cls: 'tr-textfield-alt1',
 												id: 'startDate',
+												style: 'margin-bottom:3px',
 												fieldLabel: TR.i18n.start_date,
+												labelStyle: 'position:relative; top:3px',
 												labelWidth: 90,
 												editable: true,
 												allowBlank:true,
 												invalidText: TR.i18n.the_date_is_not_valid,
-												style: 'margin-right:8px',
-												width: TR.conf.layout.west_fieldset_width - 20,
+												width: TR.conf.layout.west_fieldset_width + 7,
 												format: TR.i18n.format_date,
 												value: new Date((new Date()).setMonth((new Date()).getMonth()-3)),
 												maxValue: new Date(),
@@ -4592,11 +4594,12 @@
 												cls: 'tr-textfield-alt1',
 												id: 'endDate',
 												fieldLabel: TR.i18n.end_date,
+												labelStyle: 'position:relative; top:3px',
 												labelWidth: 90,
 												editable: true,
 												allowBlank:true,
 												invalidText: TR.i18n.the_date_is_not_valid,
-												width: TR.conf.layout.west_fieldset_width - 20,
+												width: TR.conf.layout.west_fieldset_width + 7,
 												format: TR.i18n.format_date,
 												value: new Date(),
 												minValue: new Date((new Date()).setMonth((new Date()).getMonth()-3)),
@@ -4627,7 +4630,7 @@
 													{
 														xtype: 'panel',
 														columnWidth: 0.32,
-														bodyStyle: 'border-style:none; padding:0 0 0 8px',
+														bodyStyle: 'border-style:none; padding:0 0 0 6px',
 														defaults: {
 															labelSeparator: '',
 															style: 'margin-bottom:2px',
@@ -4673,6 +4676,7 @@
 														columnWidth: 0.32,
 														bodyStyle: 'border-style:none; padding:0 0 0 10px',
 														defaults: {
+															style: 'margin-bottom:2px',
 															labelSeparator: '',
 															listeners: {
 																added: function(chb) {
@@ -4721,6 +4725,7 @@
 														columnWidth: 0.32,
 														bodyStyle: 'border-style:none; padding:0 0 0 10px',
 														defaults: {
+															style: 'margin-bottom:2px',
 															labelSeparator: '',
 															listeners: {
 																added: function(chb) {
@@ -4763,12 +4768,12 @@
 											{
 												xtype: 'panel',
 												layout: 'column',
-												bodyStyle: 'border-style:none',
+												bodyStyle: 'border-style:none; padding-top:6px',
 												items: [
 												{
 													xtype: 'panel',
 													columnWidth: 0.32,
-													bodyStyle: 'border-style:none; padding:0 0 0 2px',
+													bodyStyle: 'border-style:none; padding:0 0 0 6px',
 													defaults: {
 														labelSeparator: '',
 														style: 'margin-bottom:2px',
@@ -4850,9 +4855,10 @@
 														{
 															xtype: 'panel',
 															layout: 'anchor',
-															bodyStyle: 'border-style:none; padding:5px 0 0 5px',
+															bodyStyle: 'border-style:none; padding:0 0 0 5px',
 															defaults: {
 																labelSeparator: '',
+																style: 'margin-bottom:2px',
 																listeners: {
 																	added: function(chb) {
 																		if (chb.xtype === 'checkbox') {
@@ -4926,7 +4932,8 @@
 											},
 											{
 												layout: 'column',
-												bodyStyle: 'border:0 none; padding-bottom:4px',
+												bodyStyle: 'border:0 none; padding-bottom:3px',
+												style: 'margin-top:2px; margin-left:2px',
 												items: [
 													{
 														xtype: 'checkbox',
@@ -4969,91 +4976,6 @@
 												]
 											},
 											{
-												xtype: 'toolbar',
-												id: 'organisationunit_t',
-												style: 'margin-bottom: 5px',
-												width: TR.conf.layout.west_fieldset_width + 10,
-												xable: function(checked, value) {
-													if (checked || value) {
-														this.disable();
-													}
-													else {
-														this.enable();
-													}
-												},
-												defaults: {
-													height: 24
-												},
-												items: [
-													{
-														xtype: 'label',
-														text: TR.i18n.auto_select_orgunit_by,
-														style: 'padding-left:8px; color:#666; line-height:24px'
-													},
-													'->',
-													{
-														text: 'Group..',
-														handler: function() {},
-														listeners: {
-															added: function() {
-																this.menu = Ext.create('Ext.menu.Menu', {
-																	shadow: false,
-																	showSeparator: false,
-																	width: TR.conf.layout.treepanel_toolbar_menu_width_group,
-																	items: [
-																		{
-																			xtype: 'grid',
-																			cls: 'tr-menugrid',
-																			width: TR.conf.layout.treepanel_toolbar_menu_width_group,
-																			scroll: 'vertical',
-																			columns: [
-																				{
-																					dataIndex: 'name',
-																					width: TR.conf.layout.treepanel_toolbar_menu_width_group,
-																					style: 'display:none'
-																				}
-																			],
-																			setHeightInMenu: function(store) {
-																				var h = store.getCount() * 16,
-																					sh = TR.util.viewport.getSize().y * 0.4;
-																				this.setHeight(h > sh ? sh : h);
-																				this.doLayout();
-																				this.up('menu').doLayout();
-																			},
-																			store: TR.store.orgunitGroup,
-																			listeners: {
-																				itemclick: function(g, r) {
-																					g.getSelectionModel().select([], false);
-																					this.up('menu').hide();
-																					TR.cmp.params.organisationunit.treepanel.selectByGroup(r.data.id);
-																				}
-																			}
-																		}
-																	],
-																	listeners: {
-																		show: function() {
-																			if (!TR.store.orgunitGroup.isloaded) {
-																				TR.store.orgunitGroup.load({scope: this, callback: function() {
-																					this.down('grid').setHeightInMenu(TR.store.orgunitGroup);
-																				}});
-																			}
-																			else {
-																				this.down('grid').setHeightInMenu(TR.store.orgunitGroup);
-																			}
-																		}
-																	}
-																});
-															}
-														}
-													}
-												],
-												listeners: {
-													added: function() {
-														TR.cmp.params.organisationunit.toolbar = this;
-													}
-												}
-											},
-											{
 												xtype: 'treepanel',
 												id: 'treeOrg',
 												cls: 'tr-tree',
@@ -5231,19 +5153,21 @@
 									{
 										title: '<div id="dataElementTabTitle" style="height:17px;background-image:url(images/data.png); background-repeat:no-repeat; padding-left:20px;">' + TR.i18n.data_items + '</div>',
 										hideCollapseTool: true,
+										cls: 'tr-accordion-last',
 										items: [
 											{
 												xtype: 'combobox',
 												cls: 'tr-combo',
 												id: 'sectionCombobox',
-												style: 'magrin-left:2px;',
+												style: 'margin:0 2px 2px;',
 												fieldLabel: TR.i18n.section,
+												labelStyle: 'padding-left:2px',
 												emptyText: TR.i18n.please_select,
 												queryMode: 'local',
 												editable: false,
 												valueField: 'id',
 												displayField: 'name',
-												width: TR.conf.layout.west_fieldset_width - 10,
+												width: TR.conf.layout.west_fieldset_width + 8,
 												store: TR.store.programStageSection,
 												listeners: {
 													added: function() {

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/style.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/style.css	2013-10-14 15:55:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/style.css	2013-10-15 09:37:42 +0000
@@ -513,22 +513,16 @@
 /* Textfield */
 .tr-textfield .x-form-field, .tr-textfield-alt1 .x-form-field {  
     height: 22px;
-    padding-left: 4px;
-    -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-radius: 1px;
     font-size: 11px;
     color: #333;
 }
 .tr-textfield .x-form-item-label {
-    padding-left: 5px;
+    padding-left: 3px;
     line-height: 17px;
 }
 .tr-textfield-alt1 .x-form-item-label {
-    padding-left: 5px;
+    padding-left: 3px;
     line-height: 8px;
 }
 
@@ -620,6 +614,7 @@
 	-webkit-border-top-right-radius: 1px;
 	border-top-right-radius: 1px;
 }
+
 .tr-accordion .x-accordion-item .x-accordion-hd { /* accordion title dock, default */
     background-image: none;
     background-color: #e0e0e0;
@@ -645,18 +640,7 @@
 }
 
 .tr-accordion .x-accordion-item, .tr-accordion-options .x-accordion-item { /* accordion title dock outer, shared */
-    -o-border-top-left-radius: 2px;
-	-icab-border-top-left-radius: 2px;
-	-khtml-border-top-left-radius: 2px;
-    -moz-border-radius-topleft: 2px;
-	-webkit-border-top-left-radius: 2px;
-	border-top-left-radius: 2px;
-    -o-border-top-right-radius: 2px;
-	-icab-border-top-right-radius: 2px;
-	-khtml-border-top-right-radius: 2px;
-    -moz-border-radius-topright: 2px;
-	-webkit-border-top-right-radius: 2px;
-	border-top-right-radius: 2px;
+	border-radius: 1px;
 }
 .tr-accordion .x-accordion-item { /* accordion title dock outer, default */
 	border: 1px solid #c5c5c5;
@@ -664,6 +648,9 @@
 }
 .tr-accordion .tr-accordion-options { /* accordion title dock outer, options */
 	border: 1px solid #c0c0c0;
+}	
+.tr-accordion .tr-accordion-last { /* accordion title dock outer, last */
+	border: 1px solid #c5c5c5;
 }
 
 .tr-accordion .x-accordion-hd .x-panel-header-text { /* accordion title dock text, shared */
@@ -672,9 +659,8 @@
 }
 
 .tr-accordion .x-accordion-body { /* accordion item body */
-	padding: 8px 2px 2px 2px;
+	padding: 2px 2px 0px;
 	border-top: 1px solid #c5c5c5 !important;
-	border-bottom: 1px solid #C5C5C5 !important;
 }
 
 .tr-accordion .x-accordion-hd-sibling-expanded {
@@ -690,7 +676,7 @@
 
 .tr-accordion .tr-combo .x-form-text, .tr-accordion .tr-combo .x-form-trigger { /* accordion combo box */
 	height: 24px;
-	padding-top: 2px;
+	padding-top: 1px;
 }
 .tr-accordion .tr-combo .x-form-item-label { /* accordion combo box label */
 	padding: 4px 0 0;

=== 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	2013-10-07 15:45:20 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css	2013-10-14 15:18:45 +0000
@@ -413,6 +413,8 @@
     padding-left: 1px;
     font-size: 11px;
     color: #333;
+    position: relative;
+	top: -1px;
 }
 
 	/* Icons */
@@ -520,7 +522,7 @@
 .pt-menu-item-noicon .x-menu-item-link {
 	padding-left: 10px;
 }
-	
+
 .pt-menu-item-image {
     background-image:url('../images/dl_image.png');
     padding-left: 18px;
@@ -542,7 +544,7 @@
     background-image:url('../images/check-un.png');
     padding-left: 18px;
 }
-	
+
 
 	/* Menu align */
 .pt-btn-menu {

=== 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-09-10 11:22:22 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/styles/style.css	2013-10-15 09:25:54 +0000
@@ -2,26 +2,26 @@
  *
  * Panel
  * DV Panel
- * 
+ *
  * Combobox
  * DV Combobox
- * 
+ *
  * MultiSelect
  * DV MultiSelect
- * 
+ *
  * Checkbox
  * DV Checkbox
- * 
+ *
  * Toolbar
  * DV Toolbar
- * 
+ *
  * Menu
  * DV Menu
- * 
+ *
  * Button
  * Tooltip
  * LoadMask
- * 
+ *
  * DV Grid
  * DV Window
  * DV Label
@@ -390,7 +390,7 @@
 .dv-menu-item-noicon .x-menu-item-link {
 	padding-left: 10px;
 }
-	
+
 .dv-menu-item-image {
     background-image:url('../images/dl_image.png');
     padding-left: 18px;