dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #36129
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18492: Apps, i18n and style fixes.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 18492 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-03-05 18:36:57 +0100
message:
Apps, i18n and style fixes.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/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-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties 2015-03-03 15:19:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties 2015-03-05 16:18:25 +0000
@@ -16,8 +16,6 @@
organisation_units=Organisation units
parent_organisation_unit=Parent organisation unit
user_organisation_unit=User org unit
-user_organisation_unit_children=Org unit children
-user_organisation_unit_grandchildren=Org unit grand children
table_options=Table options
create=Create
update=Update
@@ -191,3 +189,5 @@
duplicate=Duplicate
remove=Remove
select=Select
+user_sub_units=User sub-units
+user_sub_x2_units=User sub-x2-units
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-03-05 15:37:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-03-05 17:32:21 +0000
@@ -5471,8 +5471,8 @@
});
userOrganisationUnit = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.28,
- style: 'padding-top:2px; padding-left:3px; margin-bottom:0',
+ columnWidth: 0.25,
+ style: 'padding-top: 3px; padding-left: 5px; margin-bottom: 0',
boxLabel: 'User org unit',
labelWidth: ns.core.conf.layout.form_label_width,
handler: function(chb, checked) {
@@ -5481,9 +5481,9 @@
});
userOrganisationUnitChildren = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.34,
- style: 'padding-top:2px; margin-bottom:0',
- boxLabel: 'User OU children',
+ columnWidth: 0.26,
+ style: 'padding-top: 3px; margin-bottom: 0',
+ boxLabel: NS.i18n.user_sub_units,
labelWidth: ns.core.conf.layout.form_label_width,
handler: function(chb, checked) {
treePanel.xable([checked, userOrganisationUnit.getValue(), userOrganisationUnitGrandChildren.getValue()]);
@@ -5491,9 +5491,9 @@
});
userOrganisationUnitGrandChildren = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.38,
- style: 'padding-top:2px; margin-bottom:0',
- boxLabel: 'User OU grand children',
+ columnWidth: 0.4,
+ style: 'padding-top: 3px; margin-bottom: 0',
+ boxLabel: NS.i18n.user_sub_x2_units,
labelWidth: ns.core.conf.layout.form_label_width,
handler: function(chb, checked) {
treePanel.xable([checked, userOrganisationUnit.getValue(), userOrganisationUnitChildren.getValue()]);
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties 2015-02-25 14:51:26 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties 2015-03-05 17:32:21 +0000
@@ -16,8 +16,6 @@
organisation_units=Organisation units
parent_organisation_unit=Parent organisation unit
user_organisation_unit=User org unit
-user_organisation_unit_children=Org unit children
-user_organisation_unit_grandchildren=Org unit grand children
table_options=Table options
create=Create
update=Update
@@ -213,3 +211,5 @@
max=Max
number_of_events=Number of events
this_financial_year=This financial year
+user_sub_units=User sub-units
+user_sub_x2_units=User sub-x2-units
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2015-02-25 14:51:26 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2015-03-05 17:32:21 +0000
@@ -4832,9 +4832,9 @@
});
userOrganisationUnit = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.28,
- style: 'padding-top:2px; padding-left:3px; margin-bottom:0',
- boxLabel: 'User org unit',
+ columnWidth: 0.25,
+ style: 'padding-top: 3px; padding-left: 5px; margin-bottom: 0',
+ boxLabel: NS.i18n.user_organisation_unit,
labelWidth: ns.core.conf.layout.form_label_width,
handler: function(chb, checked) {
treePanel.xable([checked, userOrganisationUnitChildren.getValue(), userOrganisationUnitGrandChildren.getValue()]);
@@ -4842,9 +4842,9 @@
});
userOrganisationUnitChildren = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.34,
- style: 'padding-top:2px; margin-bottom:0',
- boxLabel: 'User OU children',
+ columnWidth: 0.26,
+ style: 'padding-top: 3px; margin-bottom: 0',
+ boxLabel: NS.i18n.user_sub_units,
labelWidth: ns.core.conf.layout.form_label_width,
handler: function(chb, checked) {
treePanel.xable([checked, userOrganisationUnit.getValue(), userOrganisationUnitGrandChildren.getValue()]);
@@ -4852,9 +4852,9 @@
});
userOrganisationUnitGrandChildren = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.38,
- style: 'padding-top:2px; margin-bottom:0',
- boxLabel: 'User OU grand children',
+ columnWidth: 0.4,
+ style: 'padding-top: 3px; margin-bottom: 0',
+ boxLabel: NS.i18n.user_sub_x2_units,
labelWidth: ns.core.conf.layout.form_label_width,
handler: function(chb, checked) {
treePanel.xable([checked, userOrganisationUnit.getValue(), userOrganisationUnitChildren.getValue()]);
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties 2015-03-03 10:09:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties 2015-03-05 17:32:21 +0000
@@ -382,8 +382,6 @@
select_boundaries_and_groups=Select boundaries and groups
select_organisation_unit_groups=Select organisation unit groups
user_organisation_unit=User org unit
-user_organisation_unit_children=Org unit children
-user_organisation_unit_grandchildren=Org unit grand children
user_organisation_units=User organisation units
dataset=Data set
select_all_children=Select all children
@@ -421,3 +419,5 @@
yes=Yes
no=No
this_financial_year=This financial year
+user_sub_units=User sub-units
+user_sub_x2_units=User sub-x2-units
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2015-03-03 10:09:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2015-03-05 17:32:21 +0000
@@ -4919,10 +4919,10 @@
});
userOrganisationUnit = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.28,
- style: 'padding-top:2px; padding-left:3px; margin-bottom:0',
+ columnWidth: 0.25,
+ style: 'padding-top: 2px; padding-left: 5px; margin-bottom: 0',
boxLabelCls: 'x-form-cb-label-alt1',
- boxLabel: 'User org unit',
+ boxLabel: GIS.i18n.user_organisation_unit,
labelWidth: gis.conf.layout.form_label_width,
handler: function(chb, checked) {
treePanel.xable([checked, userOrganisationUnitChildren.getValue(), userOrganisationUnitGrandChildren.getValue()]);
@@ -4930,10 +4930,10 @@
});
userOrganisationUnitChildren = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.34,
- style: 'padding-top:2px; margin-bottom:0',
+ columnWidth: 0.26,
+ style: 'padding-top: 2px; margin-bottom: 0',
boxLabelCls: 'x-form-cb-label-alt1',
- boxLabel: 'User OU children',
+ boxLabel: GIS.i18n.user_sub_units,
labelWidth: gis.conf.layout.form_label_width,
handler: function(chb, checked) {
treePanel.xable([checked, userOrganisationUnit.getValue(), userOrganisationUnitGrandChildren.getValue()]);
@@ -4941,10 +4941,10 @@
});
userOrganisationUnitGrandChildren = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.38,
- style: 'padding-top:2px; margin-bottom:0',
+ columnWidth: 0.4,
+ style: 'padding-top: 2px; margin-bottom: 0',
boxLabelCls: 'x-form-cb-label-alt1',
- boxLabel: 'User OU grand children',
+ boxLabel: GIS.i18n.user_sub_x2_units,
labelWidth: gis.conf.layout.form_label_width,
handler: function(chb, checked) {
treePanel.xable([checked, userOrganisationUnit.getValue(), userOrganisationUnitChildren.getValue()]);
@@ -5367,7 +5367,7 @@
treePanel = Ext.create('Ext.tree.Panel', {
cls: 'gis-tree',
- height: 247,
+ height: 307,
style: 'border-top: 1px solid #ddd; padding-top: 1px',
displayField: 'name',
width: gis.conf.layout.widget.item_width,
@@ -5631,8 +5631,8 @@
});
userOrganisationUnit = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.30,
- style: 'padding-top:2px; padding-left:3px; margin-bottom:0',
+ columnWidth: 0.3,
+ style: 'padding-top: 2px; padding-left: 3px; margin-bottom: 0',
boxLabelCls: 'x-form-cb-label-alt1',
boxLabel: 'User OU',
labelWidth: gis.conf.layout.form_label_width,
@@ -5642,10 +5642,10 @@
});
userOrganisationUnitChildren = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.30,
- style: 'padding-top:2px; margin-bottom:0',
+ columnWidth: 0.33,
+ style: 'padding-top: 2px; margin-bottom: 0',
boxLabelCls: 'x-form-cb-label-alt1',
- boxLabel: 'Children',
+ boxLabel: 'Sub-units',
labelWidth: gis.conf.layout.form_label_width,
handler: function(chb, checked) {
treePanel.xable([checked, userOrganisationUnit.getValue(), userOrganisationUnitGrandChildren.getValue()]);
@@ -5653,10 +5653,10 @@
});
userOrganisationUnitGrandChildren = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.40,
- style: 'padding-top:2px; margin-bottom:0',
+ columnWidth: 0.34,
+ style: 'padding-top: 2px; margin-bottom: 0',
boxLabelCls: 'x-form-cb-label-alt1',
- boxLabel: 'Grand children',
+ boxLabel: 'Sub-x2-units',
labelWidth: gis.conf.layout.form_label_width,
handler: function(chb, checked) {
treePanel.xable([checked, userOrganisationUnit.getValue(), userOrganisationUnitChildren.getValue()]);
@@ -6019,7 +6019,7 @@
activeOnTop: true,
cls: 'ns-accordion',
bodyStyle: 'border:0 none; margin-bottom:1px',
- height: 354,
+ height: 414,
items: function() {
var panels = [
icons,
@@ -6125,7 +6125,7 @@
treePanel = Ext.create('Ext.tree.Panel', {
cls: 'gis-tree',
- height: 247,
+ height: 327,
style: 'border-top: 1px solid #ddd; padding-top: 1px',
displayField: 'name',
width: gis.conf.layout.widget.item_width,
@@ -6389,8 +6389,8 @@
});
userOrganisationUnit = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.30,
- style: 'padding-top:2px; padding-left:3px; margin-bottom:0',
+ columnWidth: 0.3,
+ style: 'padding-top: 2px; padding-left: 3px; margin-bottom: 0',
boxLabelCls: 'x-form-cb-label-alt1',
boxLabel: 'User OU',
labelWidth: gis.conf.layout.form_label_width,
@@ -6400,10 +6400,10 @@
});
userOrganisationUnitChildren = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.30,
- style: 'padding-top:2px; margin-bottom:0',
+ columnWidth: 0.33,
+ style: 'padding-top: 2px; margin-bottom: 0',
boxLabelCls: 'x-form-cb-label-alt1',
- boxLabel: 'Children',
+ boxLabel: 'Sub-units',
labelWidth: gis.conf.layout.form_label_width,
handler: function(chb, checked) {
treePanel.xable([checked, userOrganisationUnit.getValue(), userOrganisationUnitGrandChildren.getValue()]);
@@ -6411,10 +6411,10 @@
});
userOrganisationUnitGrandChildren = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.40,
- style: 'padding-top:2px; margin-bottom:0',
+ columnWidth: 0.34,
+ style: 'padding-top: 2px; margin-bottom: 0',
boxLabelCls: 'x-form-cb-label-alt1',
- boxLabel: 'Grand children',
+ boxLabel: 'Sub-x2-units',
labelWidth: gis.conf.layout.form_label_width,
handler: function(chb, checked) {
treePanel.xable([checked, userOrganisationUnit.getValue(), userOrganisationUnitChildren.getValue()]);
@@ -6724,7 +6724,7 @@
activeOnTop: true,
cls: 'ns-accordion',
bodyStyle: 'border:0 none; margin-bottom:1px',
- height: 328,
+ height: 408,
items: function() {
var panels = [
organisationUnit,
@@ -7494,7 +7494,7 @@
treePanel = Ext.create('Ext.tree.Panel', {
cls: 'gis-tree',
- height: 247,
+ height: 277,
style: 'border-top: 1px solid #ddd; padding-top: 1px',
displayField: 'name',
width: gis.conf.layout.widget.item_width,
@@ -7758,8 +7758,8 @@
});
userOrganisationUnit = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.30,
- style: 'padding-top:2px; padding-left:3px; margin-bottom:0',
+ columnWidth: 0.3,
+ style: 'padding-top: 2px; padding-left: 3px; margin-bottom: 0',
boxLabelCls: 'x-form-cb-label-alt1',
boxLabel: 'User OU',
labelWidth: gis.conf.layout.form_label_width,
@@ -7769,10 +7769,10 @@
});
userOrganisationUnitChildren = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.30,
- style: 'padding-top:2px; margin-bottom:0',
+ columnWidth: 0.33,
+ style: 'padding-top: 2px; margin-bottom: 0',
boxLabelCls: 'x-form-cb-label-alt1',
- boxLabel: 'Children',
+ boxLabel: 'Sub-units',
labelWidth: gis.conf.layout.form_label_width,
handler: function(chb, checked) {
treePanel.xable([checked, userOrganisationUnit.getValue(), userOrganisationUnitGrandChildren.getValue()]);
@@ -7780,10 +7780,10 @@
});
userOrganisationUnitGrandChildren = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.40,
- style: 'padding-top:2px; margin-bottom:0',
+ columnWidth: 0.34,
+ style: 'padding-top: 2px; margin-bottom: 0',
boxLabelCls: 'x-form-cb-label-alt1',
- boxLabel: 'Grand children',
+ boxLabel: 'Sub-x2-units',
labelWidth: gis.conf.layout.form_label_width,
handler: function(chb, checked) {
treePanel.xable([checked, userOrganisationUnit.getValue(), userOrganisationUnitChildren.getValue()]);
@@ -8377,7 +8377,7 @@
activeOnTop: true,
cls: 'ns-accordion',
bodyStyle: 'border:0 none; margin-bottom:1px',
- height: 380,
+ height: 410,
items: function() {
var panels = [
data,
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app.properties 2015-02-25 14:23:23 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app.properties 2015-03-05 17:32:21 +0000
@@ -18,8 +18,6 @@
organisation_units=Organisation units
parent_organisation_unit=Parent organisation unit
user_organisation_unit=User org unit
-user_organisation_unit_children=Org unit children
-user_organisation_unit_grandchildren=Org unit grand children
table_options=Table options
create=Create
update=Update
@@ -175,3 +173,5 @@
initializing=Initializing
clear_pivot_table=Clear pivot table
this_financial_year=This financial year
+user_sub_units=User sub-units
+user_sub_x2_units=User sub-x2-units
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2015-02-25 14:23:23 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2015-03-05 17:32:21 +0000
@@ -2495,7 +2495,7 @@
var xLayout,
paramString,
onFailure;
-
+
if (!layout) {
return;
}
@@ -4647,8 +4647,8 @@
});
userOrganisationUnit = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.28,
- style: 'padding-top:2px; padding-left:3px; margin-bottom:0',
+ columnWidth: 0.25,
+ style: 'padding-top: 3px; padding-left: 5px; margin-bottom: 0',
boxLabel: NS.i18n.user_organisation_unit,
labelWidth: ns.core.conf.layout.form_label_width,
handler: function(chb, checked) {
@@ -4657,9 +4657,9 @@
});
userOrganisationUnitChildren = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.31,
- style: 'padding-top:2px; margin-bottom:0',
- boxLabel: NS.i18n.user_organisation_unit_children,
+ columnWidth: 0.26,
+ style: 'padding-top: 3px; margin-bottom: 0',
+ boxLabel: NS.i18n.user_sub_units,
labelWidth: ns.core.conf.layout.form_label_width,
handler: function(chb, checked) {
treePanel.xable([checked, userOrganisationUnit.getValue(), userOrganisationUnitGrandChildren.getValue()]);
@@ -4667,9 +4667,9 @@
});
userOrganisationUnitGrandChildren = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.41,
- style: 'padding-top:2px; margin-bottom:0',
- boxLabel: NS.i18n.user_organisation_unit_grandchildren,
+ columnWidth: 0.4,
+ style: 'padding-top: 3px; margin-bottom: 0',
+ boxLabel: NS.i18n.user_sub_x2_units,
labelWidth: ns.core.conf.layout.form_label_width,
handler: function(chb, checked) {
treePanel.xable([checked, userOrganisationUnit.getValue(), userOrganisationUnitChildren.getValue()]);
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties 2015-02-25 14:51:26 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties 2015-03-05 17:32:21 +0000
@@ -162,8 +162,6 @@
prev_year=Prev year
next_year=Next year
user_organisation_unit=User org unit
-user_organisation_unit_children=Org unit children
-user_organisation_unit_grandchildren=Org unit grand children
filters=Filters
at_least_one_dimension_must_be_specified_as_row_or_column=At least one dimension must be specified as row or column
at_least_one_period_must_be_specified_as_column_row_or_filter=At least one period must be specified as column, row or filter
@@ -248,3 +246,5 @@
initializing=Initializing
clear_chart=Clear chart
this_financial_year=This financial year
+user_sub_units=User sub-units
+user_sub_x2_units=User sub-x2-units
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2015-02-25 14:51:26 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2015-03-05 17:32:21 +0000
@@ -4798,8 +4798,8 @@
});
userOrganisationUnit = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.28,
- style: 'padding-top:2px; padding-left:3px; margin-bottom:0',
+ columnWidth: 0.25,
+ style: 'padding-top: 3px; padding-left: 5px; margin-bottom: 0',
boxLabel: NS.i18n.user_organisation_unit,
labelWidth: ns.core.conf.layout.form_label_width,
handler: function(chb, checked) {
@@ -4808,9 +4808,9 @@
});
userOrganisationUnitChildren = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.31,
- style: 'padding-top:2px; margin-bottom:0',
- boxLabel: NS.i18n.user_organisation_unit_children,
+ columnWidth: 0.26,
+ style: 'padding-top: 3px; margin-bottom: 0',
+ boxLabel: NS.i18n.user_sub_units,
labelWidth: ns.core.conf.layout.form_label_width,
handler: function(chb, checked) {
treePanel.xable([checked, userOrganisationUnit.getValue(), userOrganisationUnitGrandChildren.getValue()]);
@@ -4818,9 +4818,9 @@
});
userOrganisationUnitGrandChildren = Ext.create('Ext.form.field.Checkbox', {
- columnWidth: 0.41,
- style: 'padding-top:2px; margin-bottom:0',
- boxLabel: NS.i18n.user_organisation_unit_grandchildren,
+ columnWidth: 0.4,
+ style: 'padding-top: 3px; margin-bottom: 0',
+ boxLabel: NS.i18n.user_sub_x2_units,
labelWidth: ns.core.conf.layout.form_label_width,
handler: function(chb, checked) {
treePanel.xable([checked, userOrganisationUnit.getValue(), userOrganisationUnitChildren.getValue()]);
