------------------------------------------------------------ revno: 13564 committer: Lars Helge Øverland <[email protected]> branch nick: dhis2 timestamp: Fri 2014-01-03 17:44:44 +0100 message: Stripped down pivot table plugin config a bit modified: dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/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-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 2014-01-03 16:26:42 +0000 +++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-01-03 16:44:44 +0000 @@ -4800,24 +4800,15 @@ window, text = ''; - text += '<!DOCTYPE html>\n<html>\n<head>\n\n'; + text += '<html>\n<head>\n'; text += '<link rel="stylesheet" href="http://dhis2-cdn.org/v214/ext/resources/css/ext-plugin-gray.css"; />\n'; text += '<script src="http://dhis2-cdn.org/v214/ext/ext-all.js";></script>\n'; text += '<script src="http://dhis2-cdn.org/v214/plugin/table.js";></script>\n\n'; text += '<script>\n'; text += 'var base = "http://apps.dhis2.org/demo";\n\n'; - text += 'Ext.onReady( function() {\n'; - text += ' Ext.Ajax.request({\n'; - text += ' url: base + "dhis-web-commons-security/login.action",\n'; - text += ' method: "POST",\n'; - text += ' params: { j_username: "portal", j_password: "Portal123" },\n'; - text += ' success: setLinks\n'; - text += ' })\n'; - text += '})\n\n'; - text += 'function setLinks() {\n\n'; - text += 'DHIS.getTable(' + JSON.stringify(ns.core.service.layout.layout2plugin(ns.app.layout, 'table1'), null, 2) + ');\n\n'; - text += '}\n</script>\n</head>\n\n<body>\n'; - text += ' <div id="table1"></div>\n'; + text += 'DHIS.getTable( url: base, el: "table1", ' + JSON.stringify(ns.core.service.layout.layout2plugin(ns.app.layout, 'table1'), null, 2) + ');\n'; + text += '</script>\n</head>\n\n<body>\n'; + text += '<div id="table1"></div>\n'; text += '</body>\n</html>'; textArea = Ext.create('Ext.form.field.TextArea', {
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
