Error.report: use JS template strings

master
Andrew Dolgov 6 years ago
parent 2cbc2f5261
commit 071ca5aa96

@ -577,16 +577,16 @@ body.ttrss_main #feed_browser_spinner {
height: 18px; height: 18px;
width: 18px; width: 18px;
} }
body.ttrss_main div.fatalError { body.ttrss_main .error-contents .message {
margin-bottom: 10px; color: red;
}
body.ttrss_main div.fatalError button {
margin-top: 5px;
} }
body.ttrss_main div.fatalError textarea { body.ttrss_main .error-contents textarea {
width: 565px; width: 99%;
height: 200px; height: 200px;
} }
body.ttrss_main .error-contents .dlgButtons {
text-align: center;
}
body.ttrss_main #content-wrap { body.ttrss_main #content-wrap {
padding: 0px; padding: 0px;
border-width: 0px; border-width: 0px;

File diff suppressed because one or more lines are too long

@ -676,17 +676,18 @@ body.ttrss_main {
width : 18px; width : 18px;
} }
div.fatalError { .error-contents {
margin-bottom : 10px; .message {
color : red;
button {
margin-top : 5px;
} }
textarea { textarea {
width : 565px; width : 99%;
height : 200px; height : 200px;
} }
.dlgButtons {
text-align : center;
}
} }
#content-wrap { #content-wrap {

@ -414,18 +414,15 @@ define(["dojo/_base/declare"], function (declare) {
if (dijit.byId("exceptionDlg")) if (dijit.byId("exceptionDlg"))
dijit.byId("exceptionDlg").destroyRecursive(); dijit.byId("exceptionDlg").destroyRecursive();
let content = "<div class='fatalError'><p>" + message + "</p>"; let content = `<div class="error-contents">
<p class="message">${message}</p>
if (error.stack) <div><b>Stack trace:</b></div>
content += "<div><b>Stack trace:</b></div>" + <textarea name="stack" readonly="1">${error.stack}</textarea>
"<textarea name=\"stack\" readonly=\"1\">" + error.stack + "</textarea>"; <div class="dlgButtons">
<button dojoType="dijit.form.Button"
content += "<div style='text-align : center'>"; onclick=\"dijit.byId('exceptionDlg').hide()">${__('Close this window')}</button>
</div>
content += "<button dojoType=\"dijit.form.Button\" " + </div>`;
"onclick=\"dijit.byId('exceptionDlg').hide()\">" +
__('Close this window') + "</button>";
content += "</div>";
const dialog = new dijit.Dialog({ const dialog = new dijit.Dialog({
id: "exceptionDlg", id: "exceptionDlg",

@ -577,16 +577,16 @@ body.ttrss_main #feed_browser_spinner {
height: 18px; height: 18px;
width: 18px; width: 18px;
} }
body.ttrss_main div.fatalError { body.ttrss_main .error-contents .message {
margin-bottom: 10px; color: red;
}
body.ttrss_main div.fatalError button {
margin-top: 5px;
} }
body.ttrss_main div.fatalError textarea { body.ttrss_main .error-contents textarea {
width: 565px; width: 99%;
height: 200px; height: 200px;
} }
body.ttrss_main .error-contents .dlgButtons {
text-align: center;
}
body.ttrss_main #content-wrap { body.ttrss_main #content-wrap {
padding: 0px; padding: 0px;
border-width: 0px; border-width: 0px;

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save