=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js' --- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2011-10-04 10:22:17 +0000 +++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2011-10-04 10:50:29 +0000 @@ -51,7 +51,7 @@ document.body.oncontextmenu = function(){return false;}; Ext.QuickTips.init(); Ext.override(Ext.form.FieldSet,{setExpanded:function(a){var b=this,c=b.checkboxCmp,d=b.toggleCmp,e;a=!!a;if(c){c.setValue(a)}if(d){d.setType(a?"up":"down")}if(a){e="expand";b.removeCls(b.baseCls+"-collapsed")}else{e="collapse";b.addCls(b.baseCls+"-collapsed")}b.collapsed=!a;b.doComponentLayout();b.fireEvent(e,b);return b}}); - + Ext.Ajax.request({ url: DV.conf.finals.ajax.url_visualizer + 'initialize.action', success: function(r) { @@ -1222,8 +1222,7 @@ xtype: 'button', name: 'resize', text: '<<<', - style: 'color:red', - tooltip: 'Show/hide panel', + tooltip: 'Show/hide panel', handler: function() { var p = DV.util.getCmp('panel[region="west"]'); if (p.collapsed) { === 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 2011-10-03 15:17:06 +0000 +++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css 2011-10-04 10:50:29 +0000 @@ -32,9 +32,12 @@ /* Fieldset border */ .x-fieldset { border: 1px solid #ddd; - border-radius: 2px 2px 2px 2px; -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; padding-bottom: 4px; } @@ -128,12 +131,43 @@ width: 32px !important; } +/* Button border */ +.x-btn-default-toolbar-small { + border-width: 2px; +} + +.x-btn-default-toolbar-small-over { + -moz-border-radius: 3px 3px 3px 3px; + -webkit-border-radius: 3px 3px 3px 3px; + -o-border-radius: 3px 3px 3px 3px; + -ms-border-radius: 3px 3px 3px 3px; + -khtml-border-radius: 3px 3px 3px 3px; + border-radius: 3px 3px 3px 3px; + border-color: #aaa; + border-style: double; + border-width: 2px; +} + +/* Tooltip */ +.x-tip { + -moz-border-radius: 3px 3px 3px 3px; + -webkit-border-radius: 3px 3px 3px 3px; + -o-border-radius: 3px 3px 3px 3px; + -ms-border-radius: 3px 3px 3px 3px; + -khtml-border-radius: 3px 3px 3px 3px; + border-radius: 3px 3px 3px 3px; + padding: 2px 2px 2px 2px; + border-width: 2px; + border-style: solid; + background-color: #ddd; +} + /**************** Data Visualizer ***************/ body { - font: normal 10px arial; + font: normal 11px arial; } li { @@ -141,49 +175,49 @@ color: #000; } +/* Second toolbar */ #chartsettings_tb { background: #eee; } /* Multiselect dock border radius */ -#availableIndicators .x-docked-top { - -webkit-border-top-left-radius: 2px; - -moz-border-radius-topleft: 2px; - border-top-left-radius: 2px; -} - -#availableDataElements .x-docked-top { - -webkit-border-top-left-radius: 2px; - -moz-border-radius-topleft: 2px; - border-top-left-radius: 2px; -} - -#selectedIndicators .x-docked-top { - -webkit-border-top-right-radius: 2px; - -moz-border-radius-topright: 2px; - border-top-right-radius: 2px; -} - -#selectedDataElements .x-docked-top { - -webkit-border-top-right-radius: 2px; - -moz-border-radius-topright: 2px; - border-top-right-radius: 2px; +#availableIndicators .x-docked-top { + -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; +} + +#availableDataElements .x-docked-top { + -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; +} + +#selectedIndicators .x-docked-top { + -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; +} + +#selectedDataElements .x-docked-top { + -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; } .dv-fieldset-title-link { color:#000; text-decoration:none; } - -.x-btn-default-toolbar-small { - border-width: 2px; -} - -.x-btn-default-toolbar-small-over { - background-color: transparent; - border-color: #aaa; - border-radius: 3px 3px 3px 3px; - border-style: double; - border-width: 2px; - padding: 2px; -}