------------------------------------------------------------
revno: 18025
committer: Lars Helge Overland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Fri 2015-01-16 15:09:38 +0100
message:
Dashboard, fix for swapping positions for wide items
modified:
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css
--
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-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js 2015-01-15 23:40:16 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js 2015-01-16 14:09:38 +0000
@@ -453,17 +453,20 @@
dhis2.db.setNormalItemWidth = function( id, isScrollbar ) {
$( "#" + id ).css( "width", dhis2.db.widthNormal + "px" );
+ $( "#drop-" + id ).css( "width", dhis2.db.widthNormal + "px" );
Ext.get( "plugin-" + id ).setViewportWidth( dhis2.db.widthNormal - (isScrollbar ? dhis2.db.itemScrollbarWidth : 0));
}
dhis2.db.setDoubleItemWidth = function( id, isScrollbar ) {
$( "#" + id ).css( "width", dhis2.db.widthDouble + "px" );
+ $( "#drop-" + id ).css( "width", dhis2.db.widthDouble + "px" );
Ext.get( "plugin-" + id ).setViewportWidth( dhis2.db.widthDouble - (isScrollbar ? dhis2.db.itemScrollbarWidth : 0));
}
dhis2.db.setFullItemWidth = function( id, isScrollbar ) {
var fullWidth = dhis2.db.getFullWidth();
$( "#" + id ).css( "width", fullWidth + "px" );
+ $( "#drop-" + id ).css( "width", fullWidth + "px" );
Ext.get( "plugin-" + id ).setViewportWidth( fullWidth - (isScrollbar ? dhis2.db.itemScrollbarWidth : 0));
}
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css 2015-01-14 17:12:42 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css 2015-01-16 14:09:38 +0000
@@ -136,7 +136,7 @@
.dropItem
{
- width: 405px;
+ width: 408px;
height: 328px;
padding: 6px;
margin: 0 19px 19px 0;
_______________________________________________
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
