Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 10258 [merge]
committer: Jan Henrik Overland <janhenrik.overl...@gmail.com>
branch nick: dhis2
timestamp: Fri 2013-03-15 17:39:17 +0100
message:
(DV) Minor tree issues fixed.
modified:
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
=== 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-03-15 15:41:21 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css 2013-03-15 16:38:11 +0000
@@ -203,8 +203,9 @@
/* Tree panel */
-.dv-tree .x-tree-panel .x-grid-row .x-grid-cell-inner { /* node height */
+.dv-tree.x-tree-panel .x-grid-row .x-grid-cell-inner { /* node height, font size */
height: 17px;
+ font-size: 10px;
}
.dv-tree .x-grid-row-selected .x-grid-cell,
@@ -521,6 +522,16 @@
border-top: 1px solid #d0d0d0;
}
+.dv-datatable .x-grid-header-ct {
+ border-top: 0 none;
+ border-right: 0 none;
+ border-left: 0 none;
+}
+
+.dv-datatable .x-grid-cell-inner {
+ font-size: 10px;
+}
+
/* Menu item icon */
.dv-menu-item-png {
background-image:url('../images/png.png');
=== 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-03-15 15:41:21 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2013-03-15 16:23:26 +0000
@@ -4803,6 +4803,12 @@
render: function() {
this.rendered = true;
},
+ afterrender: function() {
+ var node = this.getRootNode().findChild('id', DV.init.system.rootnodes[0].id, true);
+ if (node && node.expand) {
+ node.expand();
+ }
+ },
itemcontextmenu: function(v, r, h, i, e) {
v.getSelectionModel().select(r, false);
_______________________________________________
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
