dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #21715
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10360: (PT, DV, GIS) Public access fallback set to RW.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 10360 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-03-20 17:28:23 +0100
message:
(PT, DV, GIS) Public access fallback set to RW.
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js
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-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/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-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2013-03-20 13:43:02 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2013-03-20 16:27:17 +0000
@@ -1535,7 +1535,7 @@
labelSeparator: null,
editable: false,
disabled: !!disallowPublicAccess,
- value: obj.access,
+ value: obj.access || 'rw------',
store: store
});
=== 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 2013-03-20 15:59:32 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2013-03-20 16:27:17 +0000
@@ -1176,7 +1176,7 @@
nameTextfield = Ext.create('Ext.form.field.Text', {
height: 26,
- width: 250,
+ width: 371,
fieldStyle: 'padding-left: 6px; border-radius: 1px; border-color: #bbb; font-size:11px',
style: 'margin-bottom:0',
emptyText: 'Favorite name',
@@ -1268,7 +1268,7 @@
window = Ext.create('Ext.window.Window', {
title: id ? 'Rename favorite' : 'Create new favorite',
//iconCls: 'pt-window-title-icon-favorite',
- bodyStyle: 'padding:5px; background:#fff',
+ bodyStyle: 'padding:2px; background:#fff',
resizable: false,
modal: true,
items: nameTextfield,
@@ -1693,7 +1693,7 @@
labelSeparator: null,
editable: false,
disabled: !!disallowPublicAccess,
- value: obj.access,
+ value: obj.access || 'rw------',
store: store
});
@@ -1835,7 +1835,7 @@
window = Ext.create('Ext.window.Window', {
title: 'Sharing settings',
- bodyStyle: 'padding:8px 8px 3px; background-color:#fff',
+ bodyStyle: 'padding:6px 6px 0px; background-color:#fff',
width: 434,
resizable: false,
modal: true,
@@ -2052,12 +2052,11 @@
{
xtype: 'combobox',
cls: 'pt-combo',
- style: 'margin-bottom:4px; margin-top:2px',
+ style: 'margin-bottom:2px; margin-top:0px',
width: pt.conf.layout.west_fieldset_width - pt.conf.layout.west_width_padding,
valueField: 'id',
displayField: 'name',
- fieldLabel: 'Select group', //i18n pt.i18n.select_group
- labelStyle: 'padding-left:8px',
+ emptyText: 'Select indicator group',
editable: false,
store: {
xtype: 'store',
@@ -2243,12 +2242,11 @@
{
xtype: 'combobox',
cls: 'pt-combo',
- style: 'margin-bottom:4px; margin-top:2px',
+ style: 'margin-bottom:2px; margin-top:0px',
width: pt.conf.layout.west_fieldset_width - pt.conf.layout.west_width_padding,
valueField: 'id',
displayField: 'name',
- fieldLabel: 'Select group', //i18n pt.i18n.select_group
- labelStyle: 'padding-left:8px',
+ emptyText: 'Select data element group',
editable: false,
store: {
xtype: 'store',
@@ -2908,18 +2906,16 @@
xtype: 'panel',
layout: 'column',
bodyStyle: 'border-style:none',
- style: 'margin-top:2px',
+ style: 'margin-top:0px',
items: [
{
xtype: 'combobox',
cls: 'pt-combo',
- style: 'margin-bottom:4px',
- width: pt.conf.layout.west_fieldset_width - pt.conf.layout.west_width_padding - 62 - 62 - 7,
+ style: 'margin-bottom:2px',
+ width: pt.conf.layout.west_fieldset_width - pt.conf.layout.west_width_padding - 62 - 62 - 4,
valueField: 'id',
displayField: 'name',
- fieldLabel: 'Select period type', //i18n pt.i18n.select_type,
- labelStyle: 'padding-left:8px',
- labelWidth: 110,
+ emptyText: 'Select period type',
editable: false,
queryMode: 'remote',
store: pt.store.periodType,
@@ -2944,7 +2940,7 @@
{
xtype: 'button',
text: 'Prev year', //i18n
- style: 'margin-left:4px; border-radius:2px',
+ style: 'margin-left:2px; border-radius:2px',
height: 24,
handler: function() {
var cb = this.up('panel').down('combobox');
@@ -2957,7 +2953,7 @@
{
xtype: 'button',
text: 'Next year', //i18n
- style: 'margin-left:3px; border-radius:2px',
+ style: 'margin-left:2px; border-radius:2px',
height: 24,
handler: function() {
var cb = this.up('panel').down('combobox');
=== 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 2013-03-20 13:58:21 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js 2013-03-20 16:18:05 +0000
@@ -206,10 +206,10 @@
west_fieldset_width: 416,
west_width_padding: 4,
west_fill: 2,
- west_fill_accordion_indicator: 63,
- west_fill_accordion_dataelement: 63,
+ west_fill_accordion_indicator: 59,
+ west_fill_accordion_dataelement: 59,
west_fill_accordion_dataset: 33,
- west_fill_accordion_period: 300,
+ west_fill_accordion_period: 296,
west_fill_accordion_organisationunit: 62,
west_maxheight_accordion_indicator: 400,
west_maxheight_accordion_dataelement: 400,
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css 2013-03-19 17:04:42 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css 2013-03-20 16:21:23 +0000
@@ -41,8 +41,8 @@
/* Scrollbar Webkit */
::-webkit-scrollbar {
- width: 9px;
- height: 9px;
+ width: 10px;
+ height: 10px;
border: 0 none;
}
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2013-03-20 15:59:32 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2013-03-20 16:27:17 +0000
@@ -3260,7 +3260,7 @@
labelSeparator: null,
editable: false,
disabled: !!disallowPublicAccess,
- value: obj.access,
+ value: obj.access || 'rw------',
store: store
});
