dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #14828
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5144: Minor fixes.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 5144 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-11-11 19:20:43 +0000
message:
Minor fixes.
modified:
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/css/style.css
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/pie.png
--
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-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-11-08 12:44:02 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2011-11-11 19:05:43 +0000
@@ -55,7 +55,8 @@
layout: {
west_cmp_width: 380,
west_width: 424,
- east_tbar_height: 27
+ center_tbar_height: 31,
+ east_tbar_height: 31
}
};
@@ -1757,67 +1758,73 @@
region: 'center',
layout: 'fit',
bodyStyle: 'padding:10px',
- tbar: [
- {
- xtype: 'button',
- name: 'resizeleft',
- text: '<span style="font-weight:bold"><<<</span>',
- tooltip: 'Show/hide chart settings',
- handler: function() {
- var p = DV.util.getCmp('panel[region="west"]');
- if (p.collapsed) {
- p.expand();
- }
- else {
- p.collapse();
- }
- }
- },
- ' ',
- {
- xtype: 'button',
- text: 'Update',
- cls: 'x-btn-text-icon',
- icon: 'images/refresh.png',
- handler: function() {
- DV.exe.execute(true, DV.init.isInit);
- }
- },
- {
- xtype: 'button',
- text: 'Data table',
- tooltip: 'Show/hide data table',
- cls: 'x-btn-text-icon',
- icon: 'images/datatable.png',
- handler: function(b) {
- var p = DV.util.getCmp('panel[region="east"]');
- if (p.collapsed && p.items.length) {
- p.expand();
- DV.exe.datatable(true);
- }
- else {
- p.collapse();
- }
- }
- },
- '-',' ',
- {
- xtype: 'label',
- text: 'Example chart',
- style: 'font-weight:bold; padding:0 4px'
- },
- '->',
- {
- xtype: 'button',
- text: 'Exit',
- cls: 'x-btn-text-icon',
- icon: 'images/exit.png',
- handler: function() {
- window.location.href = DV.conf.finals.ajax.url_portal + 'redirect.action';
- }
- }
+ tbar: {
+ xtype: 'toolbar',
+ height: DV.conf.layout.center_tbar_height,
+ items: [
+ {
+ xtype: 'button',
+ id: 'resizeleft_b',
+ name: 'resizeleft',
+ text: '<span style="font-weight:bold; color:#444;"><<<</span>',
+ tooltip: 'Show/hide chart settings',
+ handler: function() {
+ var p = DV.util.getCmp('panel[region="west"]');
+ if (p.collapsed) {
+ p.expand();
+ }
+ else {
+ p.collapse();
+ }
+ }
+ },'-',
+ {
+ xtype: 'button',
+ id: 'update_b',
+ text: '<b style="color:#444">Update</b>',
+ cls: 'x-btn-text-icon',
+ icon: 'images/refresh.png',
+ handler: function() {
+ DV.exe.execute(true, DV.init.isInit);
+ }
+ },'-',
+ {
+ xtype: 'button',
+ id: 'datatable_b',
+ text: '<b style="color:#444">Data table</b>',
+ cls: 'x-btn-text-icon',
+ icon: 'images/datatable.png',
+ handler: function(b) {
+ var p = DV.util.getCmp('panel[region="east"]');
+ if (p.collapsed && p.items.length) {
+ p.expand();
+ DV.exe.datatable(true);
+ }
+ else {
+ p.collapse();
+ }
+ }
+ },
+ '-',' ',' ',
+ {
+ xtype: 'label',
+ text: 'Example chart',
+ style: 'font-weight:bold; padding:0 4px;'
+ },
+ '->',
+ {
+ xtype: 'button',
+ id: 'exit_b',
+ text: '<b style="color:#444">Exit</b>',
+ cls: 'x-btn-text-icon',
+ icon: 'images/exit.png',
+ handler: function() {
+ window.location.href = DV.conf.finals.ajax.url_portal + 'redirect.action';
+ }
+ }
- ]
+ ]
+ }
},
{
region: 'east',
@@ -1835,7 +1842,7 @@
{
xtype: 'label',
text: 'Data table',
- style: 'font-weight:bold; padding:0 4px'
+ style: 'font-weight:bold; color:#444; padding:0 4px'
}
]
}
=== 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-11-04 13:08:06 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css 2011-11-11 19:05:43 +0000
@@ -22,6 +22,11 @@
font-size: 10px;
}
+/* General font */
+.x-form-item, .x-form-field, .x-form-display-field {
+ font: normal 10px arial, ubuntu;
+}
+
/* Combobox field label font */
.x-form-item-label {
font: 11px arial, ubuntu;
@@ -47,7 +52,8 @@
}
.x-fieldset-header {
- font-size: 11px/15px;
+ font-size: 11px;
+ font-family: arial, ubuntu;
font-weight: bold;
color: #000;
padding: 0 7px 0 5px;
@@ -146,18 +152,24 @@
/* Button border */
.x-btn-default-toolbar-small {
- border-width: 1px;
+ -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;
+ border-width: 1px;
}
.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;
+ -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;
border-color: #aaa;
- border-style: double;
+ border-style: solid;
border-width: 1px;
}
@@ -172,6 +184,19 @@
border-right: 1px solid #f2f2f2;
}
+/* Toolbar background */
+.x-toolbar-default {
+ border-color: #D0D0D0;
+ background-image: none;
+ background-color: #f3f3f3;
+ background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f1f1f1), color-stop(100%, #f5f5f5));
+ background-image: -webkit-linear-gradient(top, #f1f1f1,#f5f5f5);
+ background-image: -moz-linear-gradient(top, #f1f1f1,#f5f5f5);
+ background-image: -o-linear-gradient(top, #f1f1f1,#f5f5f5);
+ background-image: -ms-linear-gradient(top, #f1f1f1,#f5f5f5);
+ background-image: linear-gradient(top, #f1f1f1,#f5f5f5);
+}
+
/* Tooltip */
.x-tip {
-moz-border-radius: 3px 3px 3px 3px;
@@ -206,7 +231,7 @@
/* Second toolbar */
#chartsettings_tb {
- background: #eee;
+ background: #f5f5f5;
padding: 5px 0 0 8px;
border-style: none;
border-top: 1px dashed #ccc;
@@ -297,6 +322,18 @@
border-color: #aaa;
}
+/* Update button */
+#update_b, #datatable_b, #exit_b {
+ border-width: 1px;
+ padding: 3px 1px 3px 4px;
+}
+
+#resizeleft_b {
+ border-width: 1px;
+ padding: 3px;
+}
+
+
/* Fieldset */
.dv-fieldset-title-link {
color:#000;
@@ -325,6 +362,11 @@
border-style: none;
}
+/* Grid datatable column header */
+.x-column-header {
+ font: normal 11px arial, ubuntu;
+}
+
/* Grid datatable column chooser */
.x-column-header-over .x-column-header-trigger, .x-column-header-open .x-column-header-trigger {
display: none;
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/pie.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/pie.png 2011-10-10 16:03:13 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/pie.png 2011-11-11 17:55:42 +0000 differ
