servers
/
ttrss
mirror of https://tt-rss.org/git/tt-rss.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Error.report: use JS template strings

This commit is contained in:
Andrew Dolgov 2018-12-11 12:45:05 +03:00
parent 2cbc2f5261
commit 071ca5aa96
6 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
css/default.css
View File

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

2
css/default.css.map
View File

File diff suppressed because one or more lines are too long

13
css/tt-rss.less
View File

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

21
js/AppBase.js
View File

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

14
themes/night.css
View File

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

2
themes/night.css.map
View File

File diff suppressed because one or more lines are too long