Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 9047 [merge]
committer: Jan Henrik Overland <janhenrik.overl...@gmail.com>
branch nick: dhis2
timestamp: Thu 2012-11-15 12:58:57 +0100
message:
(DV) Style harmonized with GIS.
added:
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrow.png
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/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/edit.png
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/favorite.png
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/interpretation.png
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 2012-11-14 14:46:41 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2012-11-15 11:55:00 +0000
@@ -3413,7 +3413,6 @@
xtype: 'gx_mappanel',
region: 'center',
map: GIS.map,
- height: 31,
cmp: {
tbar: {}
},
=== 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 2012-11-12 15:53:28 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css 2012-11-15 11:55:00 +0000
@@ -1,3 +1,23 @@
+/* General
+ *
+ * Panel
+ * Combobox
+ * Grid
+ * DV menu grid
+ * Treepanel
+ * MultiSelect
+ * Checkbox
+ * Toolbar
+ * Button
+ * Tooltip
+ * Menu
+ * Window
+ * Textfield
+ *
+*/
+
+/* General */
+
body,
.x-body,
.x-btn-default-toolbar-small .x-btn-inner,
@@ -12,42 +32,33 @@
body {
font-size: 10px;
}
-
+
+.dv-accordion-options .x-panel-body-default {
+ border: 0 none;
+}
+
+.dv-invisible .x-form-item-body { /* Disable class invisible */
+ display: none;
+}
+
+.x-splitter { /* Splitter column */
+ display: none;
+}
+
+/* Panel */
+
.x-panel-body {
font-size: 11px;
}
-
-.dv-accordion-options .x-panel-body-default {
- border: 0 none;
-}
-
-/* Disable class invisible */
-.dv-invisible .x-form-item-body {
- display: none;
-}
-
-/* Combobox empty text */
-.x-form-empty-field, textarea.x-form-empty-field {
- font-size: 20px;
- color: red;
-}
-
-/* Combobox text position*/
-.x-webkit .x-form-empty-field {
+.x-panel .x-grid-body {
+ border-style: none;
+}
+
+/* Combobox */
+
+.x-webkit .x-form-empty-field { /* Combobox text position*/
line-height: 14px;
}
-
-/* Combobox font size */
-.x-form-text, textarea.x-form-field {
- font-size: 10px;
-}
-
-/* Combobox border-radius */
-.dv-combo input {
- border-radius: 2px 0px 0px 0px;
-}
-
-/* Combobox text position */
.dv-combo .x-form-text {
padding-left: 5px;
}
@@ -55,64 +66,21 @@
padding-top: 2px;
}
-/* Combobox field label font */
-.x-form-item-label {
+.x-form-text, textarea.x-form-field { /* Combobox font size */
+ font-size: 10px;
+}
+
+.dv-combo input { /* Combobox border-radius */
+ border-radius: 2px 0px 0px 0px;
+}
+
+.x-form-item-label { /* Combobox field label font */
font-size: 11px;
color: #111;
}
-/* Splitter column */
-.x-splitter {
- display: none;
-}
-
-/* Fieldset border */
-.x-fieldset {
- border: 1px solid #ddd;
- border-radius: 2px;
- padding-top: 8px;
- padding-bottom: 4px;
-}
-
-/* Fieldset header */
-.x-fieldset-header {
- padding-right: 7px;
-}
-.x-fieldset-header .x-fieldset-header-text {
- padding-left: 3px;
-}
-
-/* Fieldset trigger icons */
-.dv-fieldset .x-tool img {
- background-image: url('../images/tool-sprites.gif');
- width: 25px;
-}
-
- /* Untoggeled */
-.x-tool-over .x-tool-toggle {
- background-position: -25px -60px;
-}
-.x-panel-collapsed .x-tool-over .x-tool-toggle, .x-fieldset-collapsed .x-tool-over .x-tool-toggle {
- background-position: -25px -75px;
-}
- /* Toggeled */
-.x-tool-down {
- background-position: 0 -75px;
-}
-
-.x-tool-over .x-tool-down {
- background-position: -25px -75px;
-}
-
-.x-tool-up {
- background-position: 0 -60px;
-}
-
-.x-tool-over .x-tool-up {
- background-position: -25px -60px;
-}
-
-/* Grid / Tree panel font color */
+/* Grid */
+
.x-grid-row .x-grid-cell {
color: #222;
background-color: transparent;
@@ -136,9 +104,10 @@
}
/* DV menu grid */
+
.dv-menugrid .x-grid-row .x-grid-cell, .dv-menugrid .x-grid-row-selected .x-grid-cell {
border: 0 none;
- background: #f1f1f1;
+ background: #f5f5f5;
}
.dv-menugrid .x-grid-row .x-grid-cell-first,
.dv-menugrid .x-grid-row-selected .x-grid-cell-first,
@@ -149,7 +118,7 @@
.dv-menugrid .x-grid-row-over .x-grid-cell {
border: 0 none;
- background-color: #e1e1e1;
+ background-color: #e4e4e4;
background-image: none;
}
.dv-menugrid .x-grid-row-over .x-grid-cell-first,
@@ -164,31 +133,68 @@
border-color: #f1f1f1;
}
-/* Tree panel node height */
-.dv-tree .x-tree-panel .x-grid-row .x-grid-cell-inner {
+/* Tree panel */
+
+.dv-tree .x-tree-panel .x-grid-row .x-grid-cell-inner { /* node height */
height: 17px;
}
-/* Tree panel selected row background */
.dv-tree .x-grid-row-selected .x-grid-cell,
-.dv-tree .x-grid-row-selected .x-grid-rowwrap-div {
+.dv-tree .x-grid-row-selected .x-grid-rowwrap-div { /* Selected row background */
background-color: #e0e0e0;
border-radius: 2px 2px 2px 2px;
}
-/* Tree panel hover row background */
-.dv-tree .x-grid-cell {
+.dv-tree .x-grid-cell { /* Hover row background */
border-radius: 2px 2px 2px 2px;
}
-/* Panel border */
-.x-panel .x-grid-body {
- border-style: none;
-}
-
-/* Multiselect inner border */
-.x-fit-item {
- border-style: none;
+/* Multiselect */
+
+.x-fit-item { /* Inner border */
+ border-style: none;
+}
+
+.dv-multiselect {
+ color: #111;
+}
+
+/* Multiselect dock border radius */
+.dv-toolbar-multiselect-left .x-docked-top {
+ border-top-left-radius: 2px;
+}
+
+.dv-toolbar-multiselect-right .x-docked-top {
+ border-top-right-radius: 2px;
+}
+
+/* Multiselect docked bar font size */
+.dv-toolbar-multiselect-left .dv-toolbar-multiselect-left-label {
+ font-size: 11px;
+ padding-left: 6px;
+}
+.dv-toolbar-multiselect-right .dv-toolbar-multiselect-right-label {
+ font-size: 11px;
+ padding-right: 7px;
+}
+
+/* Multiselect boundlist */
+.dv-toolbar-multiselect-left .x-boundlist-item-over {
+ background-color: transparent;
+ border-color: transparent;
+}
+.dv-toolbar-multiselect-left .x-boundlist-selected {
+ background-color: #e5e5e5;
+ border-color: #e5e5e5;
+}
+
+.dv-toolbar-multiselect-right .x-boundlist-item-over {
+ background-color: transparent;
+ border-color: transparent;
+}
+.dv-toolbar-multiselect-right .x-boundlist-selected {
+ background-color: #e5e5e5;
+ border-color: #e5e5e5;
}
/* Boundlist (multiselect, comboboxlist etc) */
@@ -207,12 +213,13 @@
border-color: #d3d3d3;
}
-/* Checkbox box label */
-.x-form-cb-label-after {
+/* Checkbox */
+
+.x-form-cb-label-after { /* Box label */
padding-left: 1px;
font-size: 11px;
}
-/* DV checkbox */
+
.dv-checkbox .x-form-item-label {
padding-left: 5px;
}
@@ -221,123 +228,18 @@
font-size: 11px;
}
-/* Checkbox icons */
-.x-form-checkbox {
+.x-form-checkbox { /* Icons */
background-image: url('../images/checkbox.gif');
}
-/* DV toolbar */
-.dv-toolbar-1, .dv-toolbar-2, .dv-toolbar-tbar, .dv-toolbar-bbar {
- padding: 0;
-}
-.dv-toolbar-1 {
- height: 31px;
-}
-.dv-toolbar-tbar {
- height: 30px;
-}
-.dv-toolbar-bbar {
- height: 29px;
-}
-
-/* DV toolbar checkbox */
-.dv-toolbar-1 .x-form-cb-wrap {
- padding-top: 5px;
-}
-.dv-toolbar-1 .x-form-cb-label-after {
- margin-left: 3px;
- color: #333;
-}
-
-/* Button dv-toolbar font size */
-.dv-toolbar-1 * {
- font-size: 11px;
-}
-.dv-toolbar-1 .dv-toolbar-btn-1 * {
- color: #111;
- font-weight: bold;
-}
-.dv-toolbar-1 .dv-toolbar-btn-2 * {
- color: #444;
-}
-
-/* Button chart image */
-.x-btn-default-toolbar-small-icon button {
- width: 32px !important;
-}
-.x-btn-default-toolbar-small-icon .x-btn-icon {
- width: 32px;
- height: 32px;
-}
-
-/* Button border */
-.x-btn-default-toolbar-small,
-.x-btn-default-toolbar-small-over,
-.x-btn-default-toolbar-small-pressed {
- border-radius: 0px;
- border: 1px solid transparent;
-}
-.dv-toolbar-2 .x-btn-default-toolbar-small,
-.dv-toolbar-2 .x-btn-default-toolbar-small-over,
-.dv-toolbar-2 .x-btn-default-toolbar-small-pressed,
-.dv-toolbar-multiselect-left .x-btn-default-toolbar-small,
-.dv-toolbar-multiselect-left .x-btn-default-toolbar-small-over,
-.dv-toolbar-multiselect-right .x-btn-default-toolbar-small,
-.dv-toolbar-multiselect-right .x-btn-default-toolbar-small-over {
- border-radius: 2px;
-}
-
-.x-btn-default-toolbar-small-over {
- border-color: #e1e1e1;
- background-color: #e1e1e1;
- background-image: none;
-}
-.dv-toolbar-2 .x-btn-default-toolbar-small-over,
-.dv-toolbar-multiselect-left .x-btn-default-toolbar-small-over,
-.dv-toolbar-multiselect-right .x-btn-default-toolbar-small-over {
- border-color: #ccc;
- background-image: none;
- background-color: #f3f3f3;
- background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fbfbfb), color-stop(100%, #e9e9e9));
- background-image: -webkit-linear-gradient(top, #fbfbfb,#e9e9e9);
- background-image: -moz-linear-gradient(top, #fbfbfb,#e9e9e9);
- background-image: -o-linear-gradient(top, #fbfbfb,#e9e9e9);
- background-image: -ms-linear-gradient(top, #fbfbfb,#e9e9e9);
- background-image: linear-gradient(top, #fbfbfb,#e9e9e9);
-}
-
-.dv-toolbar-2 .x-btn-default-toolbar-small-pressed,
-.dv-toolbar-multiselect-left .x-btn-default-toolbar-small-pressed,
-.dv-toolbar-multiselect-right .x-btn-default-toolbar-small-pressed {
- border-color: #aaa;
- background-image: none;
- background-color: #d6d6d6;
- background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #c7c7c7), color-stop(100%, #e0e0e0));
- background-image: -webkit-linear-gradient(top, #c7c7c7,#e0e0e0);
- background-image: -moz-linear-gradient(top, #c7c7c7,#e0e0e0);
- background-image: -o-linear-gradient(top, #c7c7c7,#e0e0e0);
- background-image: -ms-linear-gradient(top, #c7c7c7,#e0e0e0);
- background-image: linear-gradient(top, #c7c7c7,#e0e0e0);
-}
-
-
-.dv-toolbar-tbar .dv-toolbar-btn-2, .dv-toolbar-tbar .dv-toolbar-btn-2.x-menu-active {
- background: transparent;
- border-color: transparent;
-}
-.dv-toolbar-tbar .dv-toolbar-btn-2.over, .dv-toolbar-tbar .dv-toolbar-btn-2.x-menu-active.over {
- background: #e1e1e1;
- border-color: transparent;
-}
-
-/* Toolbar separator */
-.x-toolbar .x-toolbar-separator-horizontal {
+/* Toolbar */
+
+.x-toolbar .x-toolbar-separator-horizontal { /* Separator */
height: 15px;
border-right: 1px solid #f2f2f2;
}
-/* Toolbar background */
-.x-toolbar-default {
+.x-toolbar-default { /* Background */
border-color: #D0D0D0;
background-image: none;
background-color: #f3f3f3;
@@ -349,7 +251,44 @@
background-image: linear-gradient(top, #f1f1f1,#f5f5f5);
}
+/* Button */
+
+.x-btn-arrow {
+ background-image: url('../images/arrow.png') !important;
+}
+
+.x-btn-default-toolbar-small,
+.x-btn-default-toolbar-small-over,
+.x-btn-default-toolbar-small-pressed {
+ border-radius: 1px;
+}
+.x-btn-default-toolbar-small-over,
+.x-btn-default-toolbar-small-pressed {
+ border-color: #bbb;
+}
+
+.x-btn-default-toolbar-small-icon button { /* Chart image */
+ width: 32px !important;
+}
+.x-btn-default-toolbar-small-icon .x-btn-icon {
+ width: 32px;
+ height: 32px;
+}
+
+.x-btn-default-toolbar-small-pressed {
+ border-color: #bbb;
+ background-image: none;
+ background-color: #d6d6d6;
+ background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #d1d1d1), color-stop(100%, #e5e5e5));
+ background-image: -webkit-linear-gradient(top, #d1d1d1,#e5e5e5);
+ background-image: -moz-linear-gradient(top, #d1d1d1,#e5e5e5);
+ background-image: -o-linear-gradient(top, #d1d1d1,#e5e5e5);
+ background-image: -ms-linear-gradient(top, #d1d1d1,#e5e5e5);
+ background-image: linear-gradient(top, #d1d1d1,#e5e5e5);
+}
+
/* Tooltip */
+
.x-tip {
border-radius: 2px;
padding: 1px 4px;
@@ -414,55 +353,23 @@
border-radius: 2px;
}
-.x-btn-default-toolbar-small-menu-active, .x-btn-default-toolbar-small-pressed {
- border-color: #e1e1e1;
- background: #e1e1e1;
-}
-
-/* Multiselect dock border radius */
-.dv-toolbar-multiselect-left .x-docked-top {
- border-top-left-radius: 2px;
-}
-
-.dv-toolbar-multiselect-right .x-docked-top {
- border-top-right-radius: 2px;
-}
-
-/* Multiselect docked bar font size */
-.dv-toolbar-multiselect-left .dv-toolbar-multiselect-left-label {
- font-size: 11px;
- padding-left: 6px;
-}
-.dv-toolbar-multiselect-right .dv-toolbar-multiselect-right-label {
- font-size: 11px;
- padding-right: 7px;
-}
-
-/* Multiselect boundlist */
-.dv-toolbar-multiselect-left .x-boundlist-item-over {
- background-color: transparent;
- border-color: transparent;
-}
-.dv-toolbar-multiselect-left .x-boundlist-selected {
- background-color: #e5e5e5;
- border-color: #e5e5e5;
-}
-
-.dv-toolbar-multiselect-right .x-boundlist-item-over {
- background-color: transparent;
- border-color: transparent;
-}
-.dv-toolbar-multiselect-right .x-boundlist-selected {
- background-color: #e5e5e5;
- border-color: #e5e5e5;
-}
-
/* Menu */
+
.x-menu-body {
border-color: #bbb;
border-radius: 2px;
}
+.x-menu-item-active .x-menu-item-link {
+ border-radius: 0;
+ border-color: #e1e1e1;
+ background-color: #e1e1e1;
+ background-image: none;
+}
+.x-menu-body {
+ padding: 0;
+}
+
/* Treepanel contextmenu */
#treepanel-contextmenu {
border-radius: 2px;
@@ -481,25 +388,6 @@
color: #111;
}
-/* Fieldset */
-.dv-fieldset-title-link {
- color:#000;
- font-size: 11px;
- font-weight: bold;
- text-decoration: none;
-}
-.dv-fieldset-title-link-alt1 {
- color:#555;
- font-size: 11px;
- font-weight: bold;
- text-decoration: none;
-}
-
-/* Multiselect */
-.dv-multiselect {
- color: #111;
-}
-
/* Chart tips */
.dv-chart-tips, .dv-chart-tips-pie {
border-radius: 2px;
@@ -523,6 +411,7 @@
}
/* Window */
+
.dv-window-title-favorite {
padding-left: 19px;
background-image: url('../images/favorite.png');
@@ -581,10 +470,11 @@
}
/* Textfield */
+
.dv-textfield .x-form-field, .dv-textfield-alt1 .x-form-field {
height: 26px;
padding-left: 4px;
- border-radius: 2px;
+ border-radius: 1px;
font-size: 11px;
color: #333;
}
@@ -619,11 +509,11 @@
/* DV menu grid icon/text position aligned with menuitem */
.dv-menugrid .x-grid-cell-inner {
- padding: 4px 3px 4px 5px;
+ padding: 4px 3px 4px 6px;
font-size: 10px;
color: #444;
line-height: 16px;
- height: 24px;
+ height: 23px;
}
/* DV menu grid background now looks like a menu */
@@ -728,17 +618,7 @@
}
/* DV textarea */
+
.dv-textarea .x-form-field {
font-size: 11px;
}
-
-/* Ext menu */
-.x-menu-item-active .x-menu-item-link {
- border-radius: 0;
- border-color: #e1e1e1;
- background-color: #e1e1e1;
- background-image: none;
-}
-.x-menu-body {
- padding: 0;
-}
=== added file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrow.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrow.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrow.png 2012-11-15 11:55:00 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/edit.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/edit.png 2011-12-16 15:12:55 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/edit.png 2012-11-15 10:02:56 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/favorite.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/favorite.png 2011-12-16 15:12:55 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/favorite.png 2012-11-15 10:02:56 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/interpretation.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/interpretation.png 2012-06-02 10:57:29 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/interpretation.png 2012-11-15 10:02:56 +0000 differ
=== 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 2012-11-14 15:04:57 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2012-11-15 11:55:00 +0000
@@ -2527,8 +2527,7 @@
collapseMode: 'mini',
items: [
{
- xtype: 'toolbar',
- cls: 'dv-toolbar-2',
+ xtype: 'toolbar',
height: 45,
style: 'padding-top:0px; border-style:none',
defaults: {
@@ -3616,7 +3615,6 @@
{
id: 'organisationunit_t',
xtype: 'toolbar',
- cls: 'dv-toolbar-tbar',
style: 'margin-bottom: 5px',
width: DV.conf.layout.west_fieldset_width - 18,
xable: function(checked, value) {
@@ -3628,18 +3626,17 @@
}
},
defaults: {
- height: 28
+ height: 24
},
items: [
{
xtype: 'label',
text: 'Auto-select organisation units by',
- style: 'padding-left:8px; color:#666; line-height:28px'
+ style: 'padding-left:8px; color:#666; line-height:24px'
},
'->',
{
text: 'Group..',
- cls: 'dv-toolbar-btn-2',
handler: function() {},
listeners: {
added: function() {
@@ -4142,16 +4139,13 @@
layout: 'fit',
bodyStyle: 'padding-top:5px',
tbar: {
- xtype: 'toolbar',
- cls: 'dv-toolbar-1',
defaults: {
- height: 30
+ height: 26
},
items: [
{
xtype: 'button',
name: 'resizewest',
- cls: 'dv-toolbar-btn-2',
text: '<<<',
handler: function() {
var p = DV.cmp.region.west;
@@ -4170,21 +4164,14 @@
},
{
xtype: 'button',
- cls: 'dv-toolbar-btn-1',
- text: DV.i18n.update,
+ text: '<b>' + DV.i18n.update + '</b>',
handler: function() {
DV.c.currentFavorite = null;
DV.exe.execute();
}
},
- {
- xtype: 'tbseparator',
- height: 18,
- style: 'border-color: transparent #d1d1d1 transparent transparent; margin-right: 4px',
- },
{
xtype: 'button',
- cls: 'dv-toolbar-btn-2',
text: DV.i18n.favorites,
menu: {},
listeners: {
@@ -4286,9 +4273,8 @@
store: DV.store.favorite,
tbar: {
id: 'favorite_t',
- cls: 'dv-toolbar-tbar',
defaults: {
- height: 28
+ height: 24
},
items: [
{
@@ -4402,7 +4388,7 @@
bbar: {
cls: 'dv-toolbar-bbar',
defaults: {
- height: 28
+ height: 22
},
items: [
{
@@ -4505,7 +4491,7 @@
bbar: {
cls: 'dv-toolbar-bbar',
defaults: {
- height: 28
+ height: 22
},
items: [
{
@@ -4561,12 +4547,12 @@
bbar: {
cls: 'dv-toolbar-bbar',
defaults: {
- height: 28
+ height: 22
},
items: [
{
xtype: 'label',
- style: 'padding-left:6px; line-height:29px; font-size:10px; color:#666; width:70%',
+ style: 'padding-left:6px; line-height:22px; font-size:10px; color:#666; width:70%',
listeners: {
added: function() {
DV.cmp.favorite.label = this;
@@ -4635,7 +4621,7 @@
bbar: {
cls: 'dv-toolbar-bbar',
defaults: {
- height: 28
+ height: 22
},
items: [
{
@@ -4765,7 +4751,6 @@
},
{
xtype: 'button',
- cls: 'dv-toolbar-btn-2',
text: DV.i18n.download,
menu: {},
execute: function(type) {
@@ -4820,7 +4805,6 @@
},
{
xtype: 'button',
- cls: 'dv-toolbar-btn-2',
text: DV.i18n.share,
menu: {},
disabled: true,
@@ -4890,7 +4874,7 @@
bbar: {
cls: 'dv-toolbar-bbar',
defaults: {
- height: 28
+ height: 24
},
items: [
'->',
@@ -4948,9 +4932,13 @@
}
}
},
+ {
+ xtype: 'tbseparator',
+ height: 18,
+ style: 'border-color: transparent #d1d1d1 transparent transparent; margin-right: 4px',
+ },
{
xtype: 'button',
- cls: 'dv-toolbar-btn-2',
text: DV.i18n.data_table,
disabled: true,
handler: function() {
@@ -4981,7 +4969,6 @@
'->',
{
xtype: 'button',
- cls: 'dv-toolbar-btn-2',
text: 'Exit',
handler: function() {
window.location.href = '../../dhis-web-commons-about/redirect.action';
@@ -4990,7 +4977,6 @@
{
xtype: 'button',
name: 'resizeeast',
- cls: 'dv-toolbar-btn-2',
text: '>>>',
hidden: true,
handler: function() {
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
