=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/settings.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/settings.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/settings.png 2010-12-06 13:25:24 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/style/images/Thumbs.db'
Binary files dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/style/images/Thumbs.db 2009-11-13 10:28:52 +0000 and dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/style/images/Thumbs.db 1970-01-01 00:00:00 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 2010-11-29 16:11:36 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 2010-12-06 13:25:24 +0000
@@ -164,25 +164,6 @@
filter:alpha(opacity=100);
}
-/* Ext Grid */
-.row-assigned {
- background-color:#90ee90;
-}
-.row-unassigned {
- background-color:#FFFFFF;
-}
-#grid_gp .x-grid3-cell-inner {
- color:#333;
-}
-.x-grid3-cell-inner, .x-grid3-hd-inner {
- font:normal 10px lucida sans unicode,ubuntu,arial;
- color:#777;
-}
-.x-grid3-hd-inner, .x-grid3-hd-organisationUnitId {
- font-family:normal 11px lucida sans unicode,ubuntu,arial;
- color:#333;
-}
-
/* Ext Button */
.x-btn-icon .x-btn-small .x-btn-text {
height:14px;
@@ -224,6 +205,9 @@
.x-btn .icon-help {
background-image:url(../../../images/help2.png);
}
+.x-btn .icon-admin {
+ background-image:url(../../../images/settings.png);
+}
.aa_med button {
color:#333;
padding-bottom:2px;
@@ -339,6 +323,12 @@
font:bold 11px arial;
color:#111;
}
+#window-admin-title {
+ padding:0 0 3px 21px;
+ background:url('../../../images/settings.png') no-repeat 0 0 transparent;
+ font:bold 11px arial;
+ color:#111;
+}
#window-maplayer-title {
padding:0 0 3px 0px;
font:bold 11px arial;
@@ -364,6 +354,9 @@
font:normal 11px lucida sans unicode,ubuntu,arial;
color:#333;
}
+.x-panel-header {
+ font-family:lucida sans unicode,ubuntu,arial,tahoma;
+}
/* Msg */
.x-msg-hl {
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/globals.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/globals.js 2010-12-02 19:03:23 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/globals.js 2010-12-06 12:32:39 +0000
@@ -36,7 +36,7 @@
combo_list_width_fieldset: 112 + 17,
combo_number_width: 65,
combo_number_width_small: 30,
-
+
emptytext: '',
labelseparator: '',
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js 2010-12-03 12:40:38 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js 2010-12-06 13:25:24 +0000
@@ -674,7 +674,6 @@
editable: true,
valueField: 'id',
displayField: 'text',
- isFormField: true,
width: GLOBAL.conf.combo_width_fieldset,
mode: 'local',
triggerAction: 'all'
@@ -687,7 +686,6 @@
editable: false,
valueField: 'id',
displayField: 'layer',
- isFormField: true,
width: GLOBAL.conf.combo_width_fieldset,
minListWidth: GLOBAL.conf.combo_width_fieldset,
mode: 'local',
@@ -707,7 +705,6 @@
emptyText: 'Type custom px',
valueField: 'width',
displayField: 'text',
- isFormField: true,
width: GLOBAL.conf.combo_width_fieldset,
minListWidth: GLOBAL.conf.combo_width_fieldset,
mode: 'local',
@@ -726,7 +723,6 @@
emptyText: 'Type custom px',
valueField: 'height',
displayField: 'text',
- isFormField: true,
width: GLOBAL.conf.combo_width_fieldset,
minListWidth: GLOBAL.conf.combo_width_fieldset,
mode: 'local',
@@ -1945,69 +1941,59 @@
]
});
- /* Section: administrator */
+ /* Section: administrator settings */
+ var adminDateTypeCombo = new Ext.form.ComboBox({
+ id: 'mapdatetype_cb',
+ fieldLabel: i18n_date_type,
+ labelSeparator: GLOBAL.conf.labelseparator,
+ editable: false,
+ valueField: 'value',
+ displayField: 'text',
+ mode: 'local',
+ value: GLOBAL.conf.map_date_type_fixed,
+ triggerAction: 'all',
+ width: GLOBAL.conf.combo_width_fieldset,
+ minListWidth: GLOBAL.conf.combo_width_fieldset,
+ store: new Ext.data.ArrayStore({
+ fields: ['value', 'text'],
+ data: [
+ [GLOBAL.conf.map_date_type_fixed, i18n_fixed_periods],
+ [GLOBAL.conf.map_date_type_start_end, i18n_start_end_dates]
+ ]
+ }),
+ listeners: {
+ 'select': function(cb) {
+ if (cb.getValue() != GLOBAL.vars.mapDateType.value) {
+ GLOBAL.vars.mapDateType.value = cb.getValue();
+ Ext.Ajax.request({
+ url: GLOBAL.conf.path_mapping + 'setMapUserSettings' + GLOBAL.conf.type,
+ method: 'POST',
+ params: {mapDateType: GLOBAL.vars.mapDateType.value},
+ success: function() {
+ Ext.message.msg(true, '' + cb.getRawValue() + ' '+i18n_saved_as_date_type);
+ choropleth.prepareMapViewDateType();
+ symbol.prepareMapViewDateType();
+ }
+ });
+ }
+ }
+ }
+ });
+
var adminPanel = new Ext.form.FormPanel({
- id: 'admin_p',
- title: '' + i18n_administrator + '',
- items:
- [
- {
- xtype:'fieldset',
- columnWidth: 0.5,
- title: ' ' + i18n_date_type + ' ',
- collapsible: true,
- animCollapse: true,
- autoHeight:true,
- items: [
- {
- xtype: 'combo',
- id: 'mapdatetype_cb',
- fieldLabel: i18n_date_type,
- labelSeparator: GLOBAL.conf.labelseparator,
- editable: false,
- valueField: 'value',
- displayField: 'text',
- mode: 'local',
- value: GLOBAL.conf.map_date_type_fixed,
- triggerAction: 'all',
- width: GLOBAL.vars.mapDateType.value,
- minListWidth: GLOBAL.conf.combo_width_fieldset,
- store: new Ext.data.ArrayStore({
- fields: ['value', 'text'],
- data: [
- [GLOBAL.conf.map_date_type_fixed, i18n_fixed_periods],
- [GLOBAL.conf.map_date_type_start_end, i18n_start_end_dates]
- ]
- }),
- listeners: {
- 'select': function(cb) {
- if (cb.getValue() != GLOBAL.vars.mapDateType.value) {
- GLOBAL.vars.mapDateType.value = cb.getValue();
- Ext.Ajax.request({
- url: GLOBAL.conf.path_mapping + 'setMapUserSettings' + GLOBAL.conf.type,
- method: 'POST',
- params: {mapDateType: GLOBAL.vars.mapDateType.value},
- success: function() {
- Ext.message.msg(true, '' + cb.getRawValue() + ' '+i18n_saved_as_date_type);
- choropleth.prepareMapViewDateType();
- symbol.prepareMapViewDateType();
- }
- });
- }
- }
- }
- }
- ]
- }
- ],
- listeners: {
- expand: function() {
- GLOBAL.vars.activePanel.value = GLOBAL.conf.administration;
- },
- collapse: function() {
- GLOBAL.vars.activePanel.value = null;
- }
- }
+ title: 'Date type',
+ items: [adminDateTypeCombo]
+ });
+
+ var adminWindow = new Ext.Window({
+ id: 'admin_w',
+ title: 'Administrator settings',
+ layout: 'accordion',
+ defaults: {bodyStyle:'padding:8px; border:0px'},
+ width: 250,
+ height: 93,
+ closeAction: 'hide',
+ items: [adminPanel]
});
/* Section: layers */
@@ -2623,7 +2609,7 @@
tooltip: i18n_create_predefined_legend_sets,
handler: function() {
var x = Ext.getCmp('center').x + 15;
- var y = Ext.getCmp('center').y + 41;
+ var y = Ext.getCmp('center').y + 41;
predefinedMapLegendSetWindow.setPosition(x,y);
if (predefinedMapLegendSetWindow.visible) {
@@ -2644,6 +2630,17 @@
}
});
+ var adminButton = new Ext.Button({
+ iconCls: 'icon-admin',
+ tooltip: 'Administrator settings',
+ handler: function() {
+ var x = Ext.getCmp('center').x + 15;
+ var y = Ext.getCmp('center').y + 41;
+ adminWindow.setPosition(x,y);
+ adminWindow.show();
+ }
+ });
+
var helpButton = new Ext.Button({
iconCls: 'icon-help',
tooltip: i18n_help ,
@@ -2680,6 +2677,7 @@
predefinedMapLegendSetButton, ' ',
exportImageButton,
'-',
+ adminButton,
helpButton,
'->',
exitButton, ' ',' '
@@ -2777,8 +2775,7 @@
},
items: [
choropleth,
- symbol,
- adminPanel
+ symbol
]
},
{