dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #25500
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12671: (Tabular) Style fixes.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 12671 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-10-15 13:29:33 +0200
message:
(Tabular) Style fixes.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js
--
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 10:22:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js 2013-10-15 11:07:20 +0000
@@ -433,7 +433,7 @@
autoScroll: true,
overflowX: 'hidden',
overflowY: 'auto',
- width: TR.conf.layout.west_fieldset_width + 4
+ width: TR.conf.layout.west_fieldset_width - 15
};
Ext.getCmp(p).add(panel);
subPanel = Ext.getCmp(panelid);
@@ -449,7 +449,7 @@
id: 'filter_lb_' + fieldid,
text:name,
style: 'padding-left:2px',
- width:(TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor) / 2 - 73
+ width:(TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor) / 2 - 93
};
var opt = "";
@@ -4449,6 +4449,7 @@
cls: 'tr-combo',
name: TR.init.system.programs,
id: 'programCombobox',
+ style: 'margin-bottom:2px',
fieldLabel: TR.i18n.program,
labelStyle: 'font-weight:bold; margin-bottom:2px',
labelAlign: 'top',
@@ -4489,7 +4490,7 @@
xtype: 'combobox',
cls: 'tr-combo',
id:'programStageCombobox',
- style: 'margin-left:2px',
+ style: 'margin-left:2px; margin-bottom:2px',
fieldLabel: TR.i18n.program_stage,
labelStyle: 'font-weight:bold; margin-bottom:2px',
labelAlign: 'top',
@@ -4568,7 +4569,7 @@
xtype: 'datefield',
cls: 'tr-textfield-alt1',
id: 'startDate',
- style: 'margin-bottom:3px',
+ style: 'margin-bottom:2px',
fieldLabel: TR.i18n.start_date,
labelStyle: 'position:relative; top:3px',
labelWidth: 90,
@@ -5197,13 +5198,14 @@
{
xtype: 'panel',
layout: 'column',
- bodyStyle: 'border-style:none;magrin-left:2px;height:700px;',
+ bodyStyle: 'border-style:none;height:700px;',
items: [
{
xtype: 'toolbar',
id: 'avalableDEBar',
width: (TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor) / 2 + 14,
cls: 'tr-toolbar-multiselect-left',
+ style: 'border-bottom:0 none; border-radius: 0',
items: [
{
xtype: 'label',
@@ -5229,14 +5231,15 @@
TR.util.multiselect.filterSelector( TR.cmp.params.dataelement.available, Ext.getCmp('deFilterAvailable').getValue());
}
},
- ''
+ ' '
]
},
{
xtype: 'toolbar',
id: 'selectedDEBar',
width: (TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor) / 2 + 14,
- cls: 'tr-toolbar-multiselect-left',
+ cls: 'tr-toolbar-multiselect-right',
+ style: 'border-bottom:0 none; border-radius: 0',
items: [
' ',
{
@@ -5398,7 +5401,7 @@
xtype: 'toolbar',
width: (TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor) + 28,
cls: 'tr-toolbar-multiselect-left',
- style: 'margin-top:2px;',
+ style: 'margin-top:2px; border-bottom:0 none',
items: [
{
xtype: 'label',
@@ -5449,7 +5452,7 @@
xtype: 'panel',
layout: 'column',
id: 'filterPanel',
- bodyStyle: 'background-color:transparent; padding:2px 2px 2px 2px;overflow-x:hidden;overflow-y:auto;',
+ bodyStyle: 'background-color:transparent; padding:2px 2px 2px 2px;overflow-x:hidden;overflow-y:scroll;',
overflowX: 'hidden',
height: TR.conf.layout.west_dataelements_filter_panel,
width: (TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor) + 28,
