diff --git a/src/locales/en.json b/src/locales/en.json index 3e16c5de0..bfb024d6a 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -69,6 +69,7 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", + "pad.importExport.authorColors": "Include Author Colors in HTML Export", "pad.importExport.abiword.innerHTML": "You only can import from plain text or HTML formats. For more advanced import features please install abiword.", "pad.modals.connected": "Connected.", diff --git a/src/node/handler/ExportHandler.js b/src/node/handler/ExportHandler.js index 8f91ced23..77ece23bc 100644 --- a/src/node/handler/ExportHandler.js +++ b/src/node/handler/ExportHandler.js @@ -92,7 +92,8 @@ exports.doExport = function(req, res, padId, type) //render the html document function(callback) { - exporthtml.getPadHTMLDocument(padId, req.params.rev, false, function(err, _html) + var authorColors = req.query.authorColors; + exporthtml.getPadHTMLDocument(padId, req.params.rev, false, authorColors, function(err, _html) { if(ERR(err, callback)) return; html = _html; diff --git a/src/node/hooks/express/padreadonly.js b/src/node/hooks/express/padreadonly.js index 66be33390..0a7809057 100644 --- a/src/node/hooks/express/padreadonly.js +++ b/src/node/hooks/express/padreadonly.js @@ -40,7 +40,7 @@ exports.expressCreateServer = function (hook_name, args, cb) { hasPadAccess(req, res, function() { //render the html document - exporthtml.getPadHTMLDocument(padId, null, false, function(err, _html) + exporthtml.getPadHTMLDocument(padId, null, false, false, function(err, _html) { if(ERR(err, callback)) return; html = _html; diff --git a/src/node/utils/ExportHtml.js b/src/node/utils/ExportHtml.js index 4fde2e888..dd5108a25 100644 --- a/src/node/utils/ExportHtml.js +++ b/src/node/utils/ExportHtml.js @@ -478,7 +478,7 @@ function getHTMLFromAtext(pad, atext, authorColors) return pieces.join(''); } -exports.getPadHTMLDocument = function (padId, revNum, noDocType, callback) +exports.getPadHTMLDocument = function (padId, revNum, noDocType, authorColor, callback) { padManager.getPad(padId, function (err, pad) { @@ -591,8 +591,7 @@ exports.getPadHTMLDocument = function (padId, revNum, noDocType, callback) '\n' + '\n') + ''; var foot = '\n\n'; - - getPadHTML(pad, revNum, function (err, html) + getPadHTML(pad, revNum, authorColor, function (err, html) { if(ERR(err, callback)) return; callback(null, head + html + foot); diff --git a/src/static/js/pad_impexp.js b/src/static/js/pad_impexp.js index 70220f87e..746e22a61 100644 --- a/src/static/js/pad_impexp.js +++ b/src/static/js/pad_impexp.js @@ -193,6 +193,14 @@ var padimpexp = (function() //get http://example.com/p/padname without Params var pad_root_url = document.location.protocol + '//' + document.location.host + document.location.pathname; + $('#exportauthorcolors').click(function(){ + if($('#exportauthorcolors').is(":checked")){ + $("#exporthtmla").attr("href", pad_root_path + "/export/html?authorColors=true"); + }else{ + $("#exporthtmla").attr("href", pad_root_path + "/export/html"); + } + }); + //i10l buttom import $('#importsubmitinput').val(html10n.get("pad.impexp.importbutton")); html10n.bind('localized', function() { diff --git a/src/templates/pad.html b/src/templates/pad.html index 767c1ec9b..36c8703ff 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -232,6 +232,8 @@
+ + <% e.end_block(); %>