valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove old-style markup from exception dialog

This commit is contained in:
Andrew Dolgov 2021-02-14 18:59:09 +03:00
parent 4996d8ccfe
commit ff6031d3c9
7 changed files with 45 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
js/App.js
View File

@ -542,29 +542,31 @@ const App = {
}
try {
let stack_msg = "";
if (error.stack)
stack_msg += `<div><b>Stack trace:</b></div>
<textarea name="stack" readonly="1">${error.stack}</textarea>`;
if (params.info)
stack_msg += `<div><b>Additional information:</b></div>
<textarea name="stack" readonly="1">${params.info}</textarea>`;
const content = `<div class="error-contents">
<p class="message">${message}</p>
${stack_msg}
<div class="dlgButtons">
<button dojoType="dijit.form.Button"
onclick="dijit.byId('exceptionDlg').hide()">${__('Close this window')}</button>
</div>
</div>`;
const dialog = new fox.SingleUseDialog({
id: "exceptionDlg",
title: params.title || __("Unhandled exception"),
content: content
content: `
<div class='exception-contents'>
<h3>${message}</h3>
<header>${__('Stack trace')}</header>
<section>
<textarea readonly='readonly'>${error.stack}</textarea>
</section>
${params && params.info ?
`
<header>${__('Additional information')}</header>
<section>
<textarea readonly='readonly'>${params.info}</textarea>
</section>
` : ''}
</div>
<footer class='text-center'>
<button dojoType="dijit.form.Button" class='alt-primary' type='submit'>
${__('Close this window')}
</button>
</footer>
</div>`
});
dialog.show();

15
themes/compact.css
View File

@ -526,22 +526,13 @@ body.ttrss_main #feed_browser_spinner {
height: 18px;
width: 18px;
}
body.ttrss_main #exceptionDlg .dijitDialogTitleBar {
background: red;
color: white;
}
body.ttrss_main #exceptionDlg .dijitDialogPaneContent {
background: #fcc;
}
body.ttrss_main #exceptionDlg .error-contents .message {
body.ttrss_main .exception-contents h3 {
color: red;
}
body.ttrss_main #exceptionDlg .error-contents textarea {
body.ttrss_main .exception-contents textarea {
width: 99%;
height: 200px;
}
body.ttrss_main #exceptionDlg .error-contents .dlgButtons {
text-align: center;
font-size: 11px;
}
body.ttrss_main #content-wrap {
padding: 0px;

15
themes/compact_night.css
View File

@ -526,22 +526,13 @@ body.ttrss_main #feed_browser_spinner {
height: 18px;
width: 18px;
}
body.ttrss_main #exceptionDlg .dijitDialogTitleBar {
background: red;
color: white;
}
body.ttrss_main #exceptionDlg .dijitDialogPaneContent {
background: #fcc;
}
body.ttrss_main #exceptionDlg .error-contents .message {
body.ttrss_main .exception-contents h3 {
color: red;
}
body.ttrss_main #exceptionDlg .error-contents textarea {
body.ttrss_main .exception-contents textarea {
width: 99%;
height: 200px;
}
body.ttrss_main #exceptionDlg .error-contents .dlgButtons {
text-align: center;
font-size: 11px;
}
body.ttrss_main #content-wrap {
padding: 0px;

15
themes/light.css
View File

@ -526,22 +526,13 @@ body.ttrss_main #feed_browser_spinner {
height: 18px;
width: 18px;
}
body.ttrss_main #exceptionDlg .dijitDialogTitleBar {
background: red;
color: white;
}
body.ttrss_main #exceptionDlg .dijitDialogPaneContent {
background: #fcc;
}
body.ttrss_main #exceptionDlg .error-contents .message {
body.ttrss_main .exception-contents h3 {
color: red;
}
body.ttrss_main #exceptionDlg .error-contents textarea {
body.ttrss_main .exception-contents textarea {
width: 99%;
height: 200px;
}
body.ttrss_main #exceptionDlg .error-contents .dlgButtons {
text-align: center;
font-size: 11px;
}
body.ttrss_main #content-wrap {
padding: 0px;

28
themes/light/tt-rss.less
View File

@ -609,28 +609,14 @@ body.ttrss_main {
width : 18px;
}
#exceptionDlg {
.dijitDialogTitleBar {
background : red;
color : white;
.exception-contents {
h3 {
color : red;
}
.dijitDialogPaneContent {
background : #fcc;
}
.error-contents {
.message {
color : red;
}
textarea {
width : 99%;
height : 200px;
}
.dlgButtons {
text-align : center;
}
textarea {
width : 99%;
height : 200px;
font-size : 11px;
}
}

15
themes/night.css
View File

@ -527,22 +527,13 @@ body.ttrss_main #feed_browser_spinner {
height: 18px;
width: 18px;
}
body.ttrss_main #exceptionDlg .dijitDialogTitleBar {
background: red;
color: white;
}
body.ttrss_main #exceptionDlg .dijitDialogPaneContent {
background: #fcc;
}
body.ttrss_main #exceptionDlg .error-contents .message {
body.ttrss_main .exception-contents h3 {
color: red;
}
body.ttrss_main #exceptionDlg .error-contents textarea {
body.ttrss_main .exception-contents textarea {
width: 99%;
height: 200px;
}
body.ttrss_main #exceptionDlg .error-contents .dlgButtons {
text-align: center;
font-size: 11px;
}
body.ttrss_main #content-wrap {
padding: 0px;

15
themes/night_blue.css
View File

@ -527,22 +527,13 @@ body.ttrss_main #feed_browser_spinner {
height: 18px;
width: 18px;
}
body.ttrss_main #exceptionDlg .dijitDialogTitleBar {
background: red;
color: white;
}
body.ttrss_main #exceptionDlg .dijitDialogPaneContent {
background: #fcc;
}
body.ttrss_main #exceptionDlg .error-contents .message {
body.ttrss_main .exception-contents h3 {
color: red;
}
body.ttrss_main #exceptionDlg .error-contents textarea {
body.ttrss_main .exception-contents textarea {
width: 99%;
height: 200px;
}
body.ttrss_main #exceptionDlg .error-contents .dlgButtons {
text-align: center;
font-size: 11px;
}
body.ttrss_main #content-wrap {
padding: 0px;