dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #23568
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11469: (PT, DV, GIS) Link icons.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 11469 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-07-22 17:08:58 +0200
message:
(PT, DV, GIS) Link icons.
added:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/images/chart_14.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/images/map_14.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/images/table_14.png
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/chart_14.png
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/map_14.png
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/table_14.png
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/chart_14.png
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/map_14.png
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/table_14.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-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css
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-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css
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
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/images/chart_14.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/images/chart_14.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/images/chart_14.png 2013-07-22 15:03:42 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/images/map_14.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/images/map_14.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/images/map_14.png 2013-07-22 15:03:42 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/images/table_14.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/images/table_14.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/images/table_14.png 2013-07-22 15:03:42 +0000 differ
=== 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-07-22 13:30:31 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2013-07-22 15:03:42 +0000
@@ -3057,7 +3057,7 @@
});
button = Ext.create('Ext.button.Button', {
- text: GIsvS.i18n.download,
+ text: GIS.i18n.download,
handler: function() {
var type = format.getValue(),
title = name.getValue(),
@@ -3098,7 +3098,7 @@
],
listeners: {
show: function() {
- this.setPosition(253, 37);
+ this.setPosition(253, 33);
}
}
});
@@ -5069,6 +5069,7 @@
a.push({
text: GIS.i18n.table,
+ iconCls: 'gis-button-icon-table',
toggleGroup: 'module',
handler: function(b) {
window.location.href = '../../dhis-web-pivot/app/index.html';
@@ -5077,6 +5078,7 @@
a.push({
text: GIS.i18n.chart,
+ iconCls: 'gis-button-icon-chart',
toggleGroup: 'module',
handler: function(b) {
window.location.href = '../../dhis-web-visualizer/app/index.html';
@@ -5085,6 +5087,7 @@
a.push({
text: GIS.i18n.map,
+ iconCls: 'gis-button-icon-map',
toggleGroup: 'module',
pressed: true
});
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css 2013-04-17 16:01:35 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css 2013-07-22 15:03:42 +0000
@@ -1,24 +1,45 @@
/* General
* OpenLayers
*
+ * Combobox
+ * GIS Combobox
+ *
* Panel
- * Form
+ *
+ * GIS form
+ *
* Button
+ * GIS Button
+ *
* Toolbar
+ *
* Menu
+ * GIS Menu
+ *
* Treepanel
* Colorpicker
- * Window
- * Grid
- * TextField
- * TextArea
+ *
+ * GIS Window
+ *
+ * GIS Grid
+ *
+ * GIS TextField
+ *
+ * GIS TextArea
+ *
* Checkbox
- * NumberField
- * Label
+ *
+ * GIS NumberField
+ *
+ * GIS Label
+ *
* Tooltip
*/
-/* General */
+
+/*----------------------------------------------------------------------------
+ * General
+ *--------------------------------------------------------------------------*/
html * {
font-family: arial, sans-serif, liberation sans, consolas !important;
@@ -102,7 +123,10 @@
display: none;
}
-/* OpenLayers overrides */
+
+/*----------------------------------------------------------------------------
+ * Openlayers
+ *--------------------------------------------------------------------------*/
.olControlPanel { /* Control panel */
position: absolute;
@@ -191,6 +215,7 @@
font-weight: bold;
}
+
/*----------------------------------------------------------------------------
* Combobox
*--------------------------------------------------------------------------*/
@@ -211,6 +236,7 @@
color: #111;
}
+
/*----------------------------------------------------------------------------
* GIS Combobox
*--------------------------------------------------------------------------*/
@@ -230,7 +256,9 @@
}
-/* Panel */
+/*----------------------------------------------------------------------------
+ * Panel
+ *--------------------------------------------------------------------------*/
.x-panel-header { /* Panel header */
height: 30px;
@@ -238,7 +266,9 @@
}
-/* Form */
+/*----------------------------------------------------------------------------
+ * GIS form
+ *--------------------------------------------------------------------------*/
.gis-form-subtitle,
.gis-form-subtitle-first { /* Subtitle panel */
@@ -273,7 +303,10 @@
border-radius: 1px;
}
-/* Button */
+
+/*----------------------------------------------------------------------------
+ * Button
+ *--------------------------------------------------------------------------*/
.x-btn-arrow {
background-image: url('../images/arrow.png') !important;
@@ -301,7 +334,25 @@
background-image: linear-gradient(top, #d1d1d1,#e5e5e5);
}
-/* Toolbar */
+
+/*----------------------------------------------------------------------------
+ * GIS Button
+ *--------------------------------------------------------------------------*/
+
+.gis-button-icon-table {
+ background: url('../images/table_14.png') no-repeat;
+}
+.gis-button-icon-chart {
+ background: url('../images/chart_14.png') no-repeat;
+}
+.gis-button-icon-map {
+ background: url('../images/map_14.png') no-repeat;
+}
+
+
+/*----------------------------------------------------------------------------
+ * Toolbar
+ *--------------------------------------------------------------------------*/
.x-toolbar-default {
background-image: none;
@@ -357,23 +408,28 @@
border-color: #999;
}
-/* Menu */
+
+/*----------------------------------------------------------------------------
+ * Menu
+ *--------------------------------------------------------------------------*/
.x-menu-body { /* General menu */
background: #fff !important;
padding: 0;
}
+
+/*----------------------------------------------------------------------------
+ * GIS Menu
+ *--------------------------------------------------------------------------*/
+
.gis-toolbar-btn-menu-first { /* Boundary layer menu spacing from viewport */
left: 3px !important;
}
/* Menu item */
.x-menu-item-link { /* Menu item normal */
- line-height: 12px;
- padding-right: 8px;
- padding-bottom: 6px;
- padding-left: 30px;
+ padding: 4px 5px 4px 26px;
}
.x-menu-item-active .x-menu-item-link { /* Menu item hover */
background: #ddd;
@@ -403,6 +459,7 @@
.gis-menu-item-icon-favorite {
left: 6px;
}
+
.gis-menu-item-icon-edit {
background: url('../images/edit_16.png') no-repeat;
}
@@ -444,7 +501,9 @@
}
-/* Treepanel */
+/*----------------------------------------------------------------------------
+ * Treepanel
+ *--------------------------------------------------------------------------*/
.x-tree-panel .x-grid-row .x-grid-cell-inner { /* Tree font */
font-size: 10px !important;
@@ -457,7 +516,10 @@
padding: 3px 0 0px 3px;
}
-/* ColorPicker */
+
+/*----------------------------------------------------------------------------
+ * Color picker
+ *--------------------------------------------------------------------------*/
.x-color-picker a { /* Square spacing */
padding: 0;
@@ -467,7 +529,10 @@
height: 14px;
}
-/* Window */
+
+/*----------------------------------------------------------------------------
+ * GIS Window
+ *--------------------------------------------------------------------------*/
.gis-window-widget-feature {
padding: 0;
@@ -550,7 +615,10 @@
background: url('../images/measure_14.png') no-repeat;
}
-/* Grid */
+
+/*----------------------------------------------------------------------------
+ * GIS Grid
+ *--------------------------------------------------------------------------*/
.gis-grid-row-icon-edit,
.gis-grid-row-icon-overwrite,
@@ -632,18 +700,27 @@
text-decoration: underline;
}
-/* TextField */
+
+/*----------------------------------------------------------------------------
+ * GIS Textfield
+ *--------------------------------------------------------------------------*/
.gis-textfield input.x-form-text {
border-radius: 1px;
}
-/* Textarea */
+
+/*----------------------------------------------------------------------------
+ * GIS Textarea
+ *--------------------------------------------------------------------------*/
.gis-textarea .x-form-field {
font-size: 11px;
}
-/* Checkbox */
+
+/*----------------------------------------------------------------------------
+ * Checkbox
+ *--------------------------------------------------------------------------*/
.x-form-checkbox {
background-image: url('../images/checkbox.gif');
@@ -655,14 +732,20 @@
cursor: hand;
}
-/* NumberField */
+
+/*----------------------------------------------------------------------------
+ * GIS Numberfield
+ *--------------------------------------------------------------------------*/
.gis-numberfield input.x-form-text {
border-top-left-radius: 1px;
border-bottom-left-radius: 1px;
}
-/* Label */
+
+/*----------------------------------------------------------------------------
+ * GIS Label
+ *--------------------------------------------------------------------------*/
.gis-label-info {
font-size: 10px !important;
@@ -672,7 +755,10 @@
line-height: 21px;
}
-/* Tooltip */
+
+/*----------------------------------------------------------------------------
+ * Tooltip
+ *--------------------------------------------------------------------------*/
.x-tip {
border-radius: 2px;
padding: 1px 4px;
=== added file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/chart_14.png'
Binary files dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/chart_14.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/chart_14.png 2013-07-22 15:03:42 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/map_14.png'
Binary files dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/map_14.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/map_14.png 2013-07-22 15:03:42 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/table_14.png'
Binary files dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/table_14.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/table_14.png 2013-07-22 15:03:42 +0000 differ
=== 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-07-19 09:16:10 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2013-07-22 15:03:42 +0000
@@ -4157,6 +4157,7 @@
defaultButton = Ext.create('Ext.button.Button', {
text: PT.i18n.table,
+ iconCls: 'pt-button-icon-table',
toggleGroup: 'module',
pressed: true,
handler: function() {
@@ -4205,6 +4206,7 @@
defaultButton,
{
text: PT.i18n.chart,
+ iconCls: 'pt-button-icon-chart',
toggleGroup: 'module',
menu: {},
handler: function(b) {
@@ -4214,7 +4216,8 @@
showSeparator: false,
items: [
{
- text: 'Go to charts', //i18n
+ text: 'Go to charts' + ' ', //i18n
+ cls: 'pt-menu-item-noicon',
handler: function() {
window.location.href = pt.baseUrl + '/dhis-web-visualizer/app/index.html';
}
@@ -4222,6 +4225,7 @@
'-',
{
text: 'View table as chart' + ' ', //i18n
+ cls: 'pt-menu-item-noicon',
disabled: !PT.isSessionStorage || !pt.layout,
handler: function() {
if (PT.isSessionStorage) {
@@ -4231,6 +4235,7 @@
},
{
text: 'View last chart' + ' ', //i18n
+ cls: 'pt-menu-item-noicon',
disabled: !(PT.isSessionStorage && JSON.parse(sessionStorage.getItem('dhis2')) && JSON.parse(sessionStorage.getItem('dhis2'))['chart']),
handler: function() {
window.location.href = pt.baseUrl + '/dhis-web-visualizer/app/index.html?s=chart';
@@ -4256,6 +4261,7 @@
},
{
text: PT.i18n.map,
+ iconCls: 'pt-button-icon-map',
toggleGroup: 'module',
//menu: {},
handler: function(b) {
=== 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-07-22 13:25:23 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js 2013-07-22 15:03:42 +0000
@@ -2149,6 +2149,7 @@
items: [
{
text: 'View selection as chart' + ' ', //i18n
+ iconCls: 'pt-button-icon-chart',
param: 'chart',
handler: function() {
that.setSessionStorage(layoutConfig, 'analytical', pt.baseUrl + '/dhis-web-visualizer/app/index.html?s=analytical');
@@ -2167,6 +2168,7 @@
},
{
text: 'View selection as map' + ' ', //i18n
+ iconCls: 'pt-button-icon-map',
param: 'map',
disabled: true,
handler: function() {
=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css 2013-07-15 16:00:24 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css 2013-07-22 15:03:42 +0000
@@ -491,7 +491,7 @@
/* Menu item */
.x-menu-item-link {
- padding: 4px 5px 4px 28px;
+ padding: 4px 5px 4px 26px;
}
/* Menu item color */
.x-menu-item-text {
@@ -503,6 +503,10 @@
*--------------------------------------------------------------------------*/
/* Menu item icon */
+.pt-menu-item-noicon .x-menu-item-link {
+ padding-left: 10px;
+}
+
.pt-menu-item-image {
background-image:url('../images/dl_image.png');
padding-left: 18px;
@@ -579,10 +583,21 @@
background: url('../images/gear_18.png') no-repeat;
}
+.pt-button-icon-table {
+ background: url('../images/table_14.png') no-repeat;
+}
+.pt-button-icon-chart {
+ background: url('../images/chart_14.png') no-repeat;
+}
+.pt-button-icon-map {
+ background: url('../images/map_14.png') no-repeat;
+}
+
.pt-button-organisationunitselection .x-btn-center {
width: 18px !important;
}
+
/*----------------------------------------------------------------------------
* Tooltip
*--------------------------------------------------------------------------*/
=== 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-07-15 16:00:24 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css 2013-07-22 15:03:42 +0000
@@ -2,17 +2,26 @@
*
* Panel
* DV Panel
+ *
* Combobox
* DV Combobox
+ *
* MultiSelect
* DV MultiSelect
+ *
* Checkbox
* DV Checkbox
+ *
* Toolbar
* DV Toolbar
+ *
+ * Menu
+ * DV Menu
+ *
* Button
* Tooltip
* LoadMask
+ *
* DV Grid
* DV Window
* DV Label
@@ -21,8 +30,6 @@
* DV Accordion
* DV Textarea
* DV Tips
- * Menu
- * DV Menu
*/
/* General */
@@ -347,6 +354,64 @@
/*----------------------------------------------------------------------------
+ * 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;
+}
+
+ /* Menu item */
+.x-menu-item-link {
+ padding: 4px 5px 4px 26px;
+}
+ /* Menu item color */
+.x-menu-item-text {
+ color: #111;
+}
+
+
+/*----------------------------------------------------------------------------
+ * DV Menu
+ *--------------------------------------------------------------------------*/
+
+ /* Menu item icon */
+.dv-menu-item-noicon .x-menu-item-link {
+ padding-left: 10px;
+}
+
+.dv-menu-item-image {
+ background-image:url('../images/dl_image.png');
+ padding-left: 18px;
+}
+.dv-menu-item-datasource {
+ background-image:url('../images/dl_datasource.png');
+ padding-left: 18px;
+}
+
+.dv-menu-item-selected {
+ background-image:url('../images/check.png');
+ padding-left: 18px;
+}
+
+ /* Menu align */
+.dv-btn-menu {
+ margin-top: 2px;
+}
+
+
+/*----------------------------------------------------------------------------
* Button
*--------------------------------------------------------------------------*/
@@ -400,6 +465,16 @@
background: url('../images/gear_18.png') no-repeat;
}
+.dv-button-icon-table {
+ background: url('../images/table_14.png') no-repeat;
+}
+.dv-button-icon-chart {
+ background: url('../images/chart_14.png') no-repeat;
+}
+.dv-button-icon-map {
+ background: url('../images/map_14.png') no-repeat;
+}
+
.dv-button-organisationunitselection .x-btn-center {
width: 18px !important;
}
@@ -741,107 +816,3 @@
-webkit-text-stroke: 0;
}
-
-/*----------------------------------------------------------------------------
- * 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;
-}
-
- /* Menu item */
-.x-menu-item-link {
- padding: 4px 5px 4px 28px;
-}
- /* Menu item color */
-.x-menu-item-text {
- color: #111;
-}
-
-
-/*----------------------------------------------------------------------------
- * DV Menu
- *--------------------------------------------------------------------------*/
-
-.dv-menu-item-selected {
- background-image:url('../images/check.png');
- padding-left: 18px;
-}
-
- /* Menu align */
-.dv-btn-menu {
- margin-top: 2px;
-}
-
-
-/*----------------------------------------------------------------------------
- * DV Menu
- *--------------------------------------------------------------------------*/
-
- /* Menu item icon */
-.dv-menu-item-image {
- background-image:url('../images/dl_image.png');
- padding-left: 18px;
-}
-.dv-menu-item-datasource {
- background-image:url('../images/dl_datasource.png');
- padding-left: 18px;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
=== added file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/chart_14.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/chart_14.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/chart_14.png 2013-07-22 15:03:42 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/map_14.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/map_14.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/map_14.png 2013-07-22 15:03:42 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/table_14.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/table_14.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/table_14.png 2013-07-22 15:03:42 +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 2013-07-19 09:16:10 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2013-07-22 15:03:42 +0000
@@ -4296,6 +4296,7 @@
defaultButton = Ext.create('Ext.button.Button', {
text: DV.i18n.chart,
+ iconCls: 'dv-button-icon-chart',
toggleGroup: 'module',
pressed: true,
handler: function() {
@@ -4351,6 +4352,7 @@
'->',
{
text: DV.i18n.table,
+ iconCls: 'dv-button-icon-table',
toggleGroup: 'module',
menu: {},
handler: function(b) {
@@ -4360,7 +4362,8 @@
showSeparator: false,
items: [
{
- text: 'Go to pivot tables', //i18n
+ text: 'Go to pivot tables' + ' ', //i18n
+ cls: 'dv-menu-item-noicon',
handler: function() {
window.location.href = dv.baseUrl + '/dhis-web-pivot/app/index.html';
}
@@ -4368,6 +4371,7 @@
'-',
{
text: 'View chart as table' + ' ', //i18n
+ cls: 'dv-menu-item-noicon',
disabled: !DV.isSessionStorage || !dv.layout,
handler: function() {
if (DV.isSessionStorage) {
@@ -4377,6 +4381,7 @@
},
{
text: 'View last table' + ' ', //i18n
+ cls: 'dv-menu-item-noicon',
disabled: !(DV.isSessionStorage && JSON.parse(sessionStorage.getItem('dhis2')) && JSON.parse(sessionStorage.getItem('dhis2'))['table']),
handler: function() {
window.location.href = dv.baseUrl + '/dhis-web-pivot/app/index.html?s=table';
@@ -4403,6 +4408,7 @@
defaultButton,
{
text: DV.i18n.map,
+ iconCls: 'dv-button-icon-map',
toggleGroup: 'module',
//menu: {},
handler: function(b) {
