Merge authors: Jan Henrik Ă˜verland (janhenrik-overland) ------------------------------------------------------------ revno: 18477 [merge] committer: Jan Henrik Overland <janhenrik.overl...@gmail.com> branch nick: dhis2 timestamp: Wed 2015-03-04 17:18:59 +0100 message: ER css fixes. modified: dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/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/scripts/app.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-03-03 17:54:42 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-03-04 16:03:20 +0000 @@ -7765,18 +7765,17 @@ ns.app.centerRegion = this; }, afterrender: function(p) { - var liStyle = 'padding:3px 10px; color:#333', - html = ''; + var html = ''; - html += '<div style="padding:20px">'; - html += '<div style="font-size:14px; padding-bottom:8px">' + NS.i18n.example1 + '</div>'; - html += '<div style="' + liStyle + '">- ' + NS.i18n.example2 + '</div>'; - html += '<div style="' + liStyle + '">- ' + NS.i18n.example3 + '</div>'; - html += '<div style="' + liStyle + '">- ' + NS.i18n.example4 + '</div>'; - html += '<div style="font-size:14px; padding-top:20px; padding-bottom:8px">' + NS.i18n.example5 + '</div>'; - html += '<div style="' + liStyle + '">- ' + NS.i18n.example6 + '</div>'; - html += '<div style="' + liStyle + '">- ' + NS.i18n.example7 + '</div>'; - html += '<div style="' + liStyle + '">- ' + NS.i18n.example8 + '</div>'; + html += '<div class="ns-viewport-text" style="padding:20px">'; + html += '<h3>' + NS.i18n.example1 + '</h3>'; + html += '<div>- ' + NS.i18n.example2 + '</div>'; + html += '<div>- ' + NS.i18n.example3 + '</div>'; + html += '<div>- ' + NS.i18n.example4 + '</div>'; + html += '<h3 style="padding-top:20px">' + NS.i18n.example5 + '</h3>'; + html += '<div>- ' + NS.i18n.example6 + '</div>'; + html += '<div>- ' + NS.i18n.example7 + '</div>'; + html += '<div>- ' + NS.i18n.example8 + '</div>'; html += '</div>'; p.update(html); === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js 2015-03-03 17:14:13 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js 2015-03-04 12:34:20 +0000 @@ -2349,8 +2349,6 @@ rowSpan = config.rowSpan ? 'rowspan="' + config.rowSpan + '" ' : ''; htmlValue = config.collapsed ? '' : config.htmlValue || config.value || ''; htmlValue = config.type !== 'dimension' ? support.prototype.number.prettyPrint(htmlValue, xLayout.digitGroupSeparator) : htmlValue; - displayDensity = conf.report.displayDensity[config.displayDensity] || conf.report.displayDensity[xLayout.displayDensity]; - fontSize = conf.report.fontSize[config.fontSize] || conf.report.fontSize[xLayout.fontSize]; cls += config.hidden ? ' td-hidden' : ''; cls += config.collapsed ? ' td-collapsed' : ''; @@ -2394,7 +2392,7 @@ //} //else { //html += 'style="padding:' + displayDensity + '; font-size:' + fontSize + ';"' + '>' + htmlValue + '</td>'; - html += 'style="' + (bgColor && isValue ? 'color:' + bgColor + '; ' : '') + 'padding:' + displayDensity + '; font-size:' + fontSize + ';"' + '>' + htmlValue + '</td>'; + html += 'style="' + (bgColor && isValue ? 'color:' + bgColor + '; ' : '') + '">' + htmlValue + '</td>'; //} return html; @@ -3054,13 +3052,19 @@ }; getHtml = function() { - var s = '<table id="' + xLayout.tableUuid + '" class="pivot">'; + var cls = 'pivot', + table; + + cls += xLayout.displayDensity && xLayout.displayDensity !== 'normal' ? ' displaydensity-' + xLayout.displayDensity : ''; + cls += xLayout.fontSize && xLayout.fontSize !== 'normal' ? ' fontsize-' + xLayout.fontSize : ''; + + table = '<table id="' + xLayout.tableUuid + '" class="' + cls + '">'; for (var i = 0; i < htmlArray.length; i++) { - s += '<tr>' + htmlArray[i].join('') + '</tr>'; + table += '<tr>' + htmlArray[i].join('') + '</tr>'; } - return s += '</table>'; + return table += '</table>'; }; // get html === 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 2015-03-03 15:19:07 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css 2015-03-04 16:03:20 +0000 @@ -212,17 +212,18 @@ -ms-user-select: all; user-select: all; } -table.comfortable td { - padding: 10px; + +table.pivot.displaydensity-comfortable td { + padding: 7px; } -table.compact td { +table.pivot.displaydensity-compact td { padding: 3px; } -table.large td { +table.pivot.fontsize-large td { font-size: 13px; } -table.small td { +table.pivot.fontsize-small td { font-size: 10px; } @@ -334,6 +335,23 @@ /*---------------------------------------------------------------------------- + * NS viewport + *--------------------------------------------------------------------------*/ + +.ns-viewport-text * { + padding: 3px 10px; + font-size: 13px; + color: #515a62; +} +.ns-viewport-text h3 { + font-size: 15px; + font-weight: 500; + color: #333; + padding: 0 0 8px 0; +} + + +/*---------------------------------------------------------------------------- * Panel *--------------------------------------------------------------------------*/
_______________________________________________ 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