dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 17539 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-11-19 17:32:21 +0100
message:
  PT ER line breaking for textual values.
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.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-apps/src/main/webapp/dhis-web-event-reports/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css	2014-11-06 15:44:09 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css	2014-11-19 16:30:33 +0000
@@ -270,8 +270,8 @@
 
 .pivot-value {
 	background-color: #fff;
-	white-space: nowrap;
 	text-align: right;
+	max-width: 700px;
 }
 .pivot-value.highlighted {
 	background-color: #f3f3f3;

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js	2014-11-19 14:36:03 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js	2014-11-19 16:30:33 +0000
@@ -2715,7 +2715,7 @@
 				else if (uid === 0) {
 					path = '/indicators.json?fields=id,' + ns.core.init.namePropertyUrl + '' + (filter ? '&filter=name:like:' + filter : '');
 				}
-				
+
 				if (!path) {
 					console.log('Available indicators: invalid id');
 					return;
@@ -2728,7 +2728,7 @@
 					params.page = store.nextPage;
 					params.pageSize = 50;
 				}
-				
+
                 store.isPending = true;
                 ns.core.web.mask.show(indicatorAvailable.boundList);
 
@@ -2750,7 +2750,7 @@
             },
             loadStore: function(data, pager, append, fn) {
 				pager = pager || {};
-				
+
                 this.loadData(data, append);
                 this.sortStore();
 
@@ -2948,7 +2948,7 @@
 			},
             loadStore: function(data, pager, append, fn) {
 				pager = pager || {};
-				
+
                 this.loadData(data, append);
                 this.sortStore();
 
@@ -3068,7 +3068,7 @@
             },
             loadStore: function(data, pager, append, fn) {
 				pager = pager || {};
-				
+
                 this.loadData(data, append);
                 this.sortStore();
 
@@ -4958,7 +4958,7 @@
 				},
 				loadStore: function(data, pager, append, fn) {
 					pager = pager || {};
-					
+
 					this.loadData(data, append);
 					this.lastPage = this.nextPage;
 
@@ -5085,7 +5085,7 @@
 						xtype: 'button',
 						icon: 'images/arrowrightdouble.png',
 						width: 22,
-						handler: function() {							
+						handler: function() {
 							availableStore.loadPage(null, null, true, function() {
 								ns.core.web.multiSelect.selectAll(available, selected);
 							});

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css	2014-11-06 15:44:09 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css	2014-11-19 16:30:33 +0000
@@ -57,7 +57,7 @@
 .x-window-header-text-default {
     font-size: 11px;
 	font-family: 'Arial','Sans-serif','Roboto','Helvetica','Consolas';
-}                                  
+}
 
 #init {
     display: table;
@@ -234,8 +234,8 @@
 
 .pivot-value {
 	background-color: #fff;
-	white-space: nowrap;
 	text-align: right;
+	max-width: 700px;
 }
 .pivot-value.highlighted {
 	background-color: #f3f3f3;