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

filter test dialog: remove .gif; cleanup markup

This commit is contained in:
Andrew Dolgov 2021-03-17 08:45:04 +03:00
parent 7c2b473d12
commit 82bed1e651
8 changed files with 104 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
js/CommonFilters.js
View File

@ -38,16 +38,19 @@ const Filters = {
console.log("got results:" + result.length); console.log("got results:" + result.length);
App.byId("prefFilterProgressMsg").innerHTML = __("Looking for articles (%d processed, %f found)...") const loading_message = test_dialog.domNode.querySelector(".loading-message");
.replace("%f", test_dialog.results) const results_list = test_dialog.domNode.querySelector(".filter-results-list");
.replace("%d", offset);
loading_message.innerHTML = __("Looking for articles (%d processed, %f found)...")
.replace("%f", test_dialog.results)
.replace("%d", offset);
console.log(offset + " " + test_dialog.max_offset); console.log(offset + " " + test_dialog.max_offset);
for (let i = 0; i < result.length; i++) { for (let i = 0; i < result.length; i++) {
const tmp = dojo.create("table", { innerHTML: result[i]}); const tmp = dojo.create("div", { innerHTML: result[i]});
App.byId("prefFilterTestResultList").innerHTML += tmp.innerHTML; results_list.innerHTML += tmp.innerHTML;
} }
if (test_dialog.results < 30 && offset < test_dialog.max_offset) { if (test_dialog.results < 30 && offset < test_dialog.max_offset) {
@ -60,14 +63,15 @@ const Filters = {
} else { } else {
// all done // all done
Element.hide("prefFilterLoadingIndicator"); test_dialog.domNode.querySelector(".loading-indicator").hide();
if (test_dialog.results == 0) { if (test_dialog.results == 0) {
App.byId("prefFilterTestResultList").innerHTML = `<tr><td align='center'> results_list.innerHTML = `<li class="text-center text-muted">
${__('No recent articles matching this filter have been found.')}</td></tr>`; ${__('No recent articles matching this filter have been found.')}</li>`;
App.byId("prefFilterProgressMsg").innerHTML = "Articles matching this filter:";
loading_message.innerHTML = __("Articles matching this filter:");
} else { } else {
App.byId("prefFilterProgressMsg").innerHTML = __("Found %d articles matching this filter:") loading_message.innerHTML = __("Found %d articles matching this filter:")
.replace("%d", test_dialog.results); .replace("%d", test_dialog.results);
} }
@ -75,7 +79,7 @@ const Filters = {
} else if (!result) { } else if (!result) {
console.log("getTestResults: can't parse results object"); console.log("getTestResults: can't parse results object");
Element.hide("prefFilterLoadingIndicator"); test_dialog.domNode.querySelector(".loading-indicator").hide();
Notify.error("Error while trying to get filter test results."); Notify.error("Error while trying to get filter test results.");
} else { } else {
console.log("getTestResults: dialog closed, bailing out."); console.log("getTestResults: dialog closed, bailing out.");
@ -86,12 +90,12 @@ const Filters = {
}); });
}, },
content: ` content: `
<div> <div class="text-muted">
<img id='prefFilterLoadingIndicator' src='images/indicator_tiny.gif'>&nbsp; <img class="loading-indicator icon-three-dots" src="${App.getInitParam("icon_three_dots")}">
<span id='prefFilterProgressMsg'>Looking for articles...</span> <span class="loading-message">${__("Looking for articles...")}</span>
</div> </div>
<ul class='panel panel-scrollable list list-unstyled' id='prefFilterTestResultList'></ul> <ul class='panel panel-scrollable list list-unstyled filter-results-list'></ul>
<footer class='text-center'> <footer class='text-center'>
<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>${__('Close this window')}</button> <button dojoType='dijit.form.Button' type='submit' class='alt-primary'>${__('Close this window')}</button>

33
themes/compact.css
View File

@ -1045,14 +1045,23 @@ body.ttrss_main .text-right {
body.ttrss_main .text-left { body.ttrss_main .text-left {
text-align: left; text-align: left;
} }
body.ttrss_main #prefFilterTestResultList .preview { body.ttrss_main .dijitDialog .filter-results-list .preview {
margin: 8px; margin: 8px;
} }
body.ttrss_main #prefFilterTestResultList .title { body.ttrss_main .dijitDialog .filter-results-list .title {
font-weight: bold; font-weight: bold;
} }
body.ttrss_main #prefFilterTestResultList .feed { body.ttrss_main .dijitDialog #feed_add_spinner {
color: #257aa7; position: relative;
top: 5px;
width: 18px;
height: 18px;
}
body.ttrss_main .icon-three-dots,
.cdm .content-inner .icon-unpack-pending {
width: 18px;
height: 18px;
vertical-align: middle;
} }
body.ttrss_main, body.ttrss_main,
body.ttrss_utility { body.ttrss_utility {
@ -1186,17 +1195,6 @@ body.ttrss_utility hr {
border: 0px solid #ccc; border: 0px solid #ccc;
border-bottom-width: 1px; border-bottom-width: 1px;
} }
.dijitDialog #feed_add_spinner {
position: relative;
top: 5px;
width: 18px;
height: 18px;
}
.icon-three-dots {
width: 18px;
height: 18px;
vertical-align: middle;
}
::selection { ::selection {
background: #257aa7; background: #257aa7;
color: white; color: white;
@ -1385,11 +1383,6 @@ body.ttrss_utility hr {
.cdm .feed-title a:hover { .cdm .feed-title a:hover {
color: #257aa7; color: #257aa7;
} }
.cdm .content-inner .icon-unpack-pending {
width: 18px;
height: 18px;
vertical-align: middle;
}
.cdm .content-inner .embed-responsive { .cdm .content-inner .embed-responsive {
overflow: hidden; overflow: hidden;
padding-bottom: 56.25%; padding-bottom: 56.25%;

33
themes/compact_night.css
View File

@ -1045,14 +1045,23 @@ body.ttrss_main .text-right {
body.ttrss_main .text-left { body.ttrss_main .text-left {
text-align: left; text-align: left;
} }
body.ttrss_main #prefFilterTestResultList .preview { body.ttrss_main .dijitDialog .filter-results-list .preview {
margin: 8px; margin: 8px;
} }
body.ttrss_main #prefFilterTestResultList .title { body.ttrss_main .dijitDialog .filter-results-list .title {
font-weight: bold; font-weight: bold;
} }
body.ttrss_main #prefFilterTestResultList .feed { body.ttrss_main .dijitDialog #feed_add_spinner {
color: #b87d2c; position: relative;
top: 5px;
width: 18px;
height: 18px;
}
body.ttrss_main .icon-three-dots,
.cdm .content-inner .icon-unpack-pending {
width: 18px;
height: 18px;
vertical-align: middle;
} }
body.ttrss_main, body.ttrss_main,
body.ttrss_utility { body.ttrss_utility {
@ -1186,17 +1195,6 @@ body.ttrss_utility hr {
border: 0px solid #ccc; border: 0px solid #ccc;
border-bottom-width: 1px; border-bottom-width: 1px;
} }
.dijitDialog #feed_add_spinner {
position: relative;
top: 5px;
width: 18px;
height: 18px;
}
.icon-three-dots {
width: 18px;
height: 18px;
vertical-align: middle;
}
::selection { ::selection {
background: #b87d2c; background: #b87d2c;
color: #333; color: #333;
@ -1385,11 +1383,6 @@ body.ttrss_utility hr {
.cdm .feed-title a:hover { .cdm .feed-title a:hover {
color: #b87d2c; color: #b87d2c;
} }
.cdm .content-inner .icon-unpack-pending {
width: 18px;
height: 18px;
vertical-align: middle;
}
.cdm .content-inner .embed-responsive { .cdm .content-inner .embed-responsive {
overflow: hidden; overflow: hidden;
padding-bottom: 56.25%; padding-bottom: 56.25%;

33
themes/light.css
View File

@ -1045,14 +1045,23 @@ body.ttrss_main .text-right {
body.ttrss_main .text-left { body.ttrss_main .text-left {
text-align: left; text-align: left;
} }
body.ttrss_main #prefFilterTestResultList .preview { body.ttrss_main .dijitDialog .filter-results-list .preview {
margin: 8px; margin: 8px;
} }
body.ttrss_main #prefFilterTestResultList .title { body.ttrss_main .dijitDialog .filter-results-list .title {
font-weight: bold; font-weight: bold;
} }
body.ttrss_main #prefFilterTestResultList .feed { body.ttrss_main .dijitDialog #feed_add_spinner {
color: #257aa7; position: relative;
top: 5px;
width: 18px;
height: 18px;
}
body.ttrss_main .icon-three-dots,
.cdm .content-inner .icon-unpack-pending {
width: 18px;
height: 18px;
vertical-align: middle;
} }
body.ttrss_main, body.ttrss_main,
body.ttrss_utility { body.ttrss_utility {
@ -1186,17 +1195,6 @@ body.ttrss_utility hr {
border: 0px solid #ccc; border: 0px solid #ccc;
border-bottom-width: 1px; border-bottom-width: 1px;
} }
.dijitDialog #feed_add_spinner {
position: relative;
top: 5px;
width: 18px;
height: 18px;
}
.icon-three-dots {
width: 18px;
height: 18px;
vertical-align: middle;
}
::selection { ::selection {
background: #257aa7; background: #257aa7;
color: white; color: white;
@ -1385,11 +1383,6 @@ body.ttrss_utility hr {
.cdm .feed-title a:hover { .cdm .feed-title a:hover {
color: #257aa7; color: #257aa7;
} }
.cdm .content-inner .icon-unpack-pending {
width: 18px;
height: 18px;
vertical-align: middle;
}
.cdm .content-inner .embed-responsive { .cdm .content-inner .embed-responsive {
overflow: hidden; overflow: hidden;
padding-bottom: 56.25%; padding-bottom: 56.25%;

2
themes/light/cdm.less
View File

@ -210,7 +210,7 @@
.content-inner { .content-inner {
.icon-unpack-pending { .icon-unpack-pending {
.icon-three-dots; &:extend(body.ttrss_main .icon-three-dots);
} }
} }

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

@ -1251,20 +1251,30 @@ body.ttrss_main {
text-align : left; text-align : left;
} }
#prefFilterTestResultList { .dijitDialog {
.preview { .filter-results-list {
margin : 8px; .preview {
margin : 8px;
}
.title {
font-weight: bold;
}
} }
.title { #feed_add_spinner {
font-weight: bold; position : relative;
} top : 5px;
width : 18px;
.feed { height : 18px;
color : @color-accent;
} }
} }
.icon-three-dots {
width : 18px;
height : 18px;
vertical-align : middle;
}
} }
body.ttrss_main, body.ttrss_utility { body.ttrss_main, body.ttrss_utility {
@ -1394,21 +1404,6 @@ body.ttrss_main, body.ttrss_utility {
}*/ }*/
} }
.dijitDialog {
#feed_add_spinner {
position : relative;
top : 5px;
width : 18px;
height : 18px;
}
}
.icon-three-dots {
width : 18px;
height : 18px;
vertical-align : middle;
}
::selection { ::selection {
background : @color-accent; background : @color-accent;
color : @default-bg; color : @default-bg;

33
themes/night.css
View File

@ -1046,14 +1046,23 @@ body.ttrss_main .text-right {
body.ttrss_main .text-left { body.ttrss_main .text-left {
text-align: left; text-align: left;
} }
body.ttrss_main #prefFilterTestResultList .preview { body.ttrss_main .dijitDialog .filter-results-list .preview {
margin: 8px; margin: 8px;
} }
body.ttrss_main #prefFilterTestResultList .title { body.ttrss_main .dijitDialog .filter-results-list .title {
font-weight: bold; font-weight: bold;
} }
body.ttrss_main #prefFilterTestResultList .feed { body.ttrss_main .dijitDialog #feed_add_spinner {
color: #b87d2c; position: relative;
top: 5px;
width: 18px;
height: 18px;
}
body.ttrss_main .icon-three-dots,
.cdm .content-inner .icon-unpack-pending {
width: 18px;
height: 18px;
vertical-align: middle;
} }
body.ttrss_main, body.ttrss_main,
body.ttrss_utility { body.ttrss_utility {
@ -1187,17 +1196,6 @@ body.ttrss_utility hr {
border: 0px solid #ccc; border: 0px solid #ccc;
border-bottom-width: 1px; border-bottom-width: 1px;
} }
.dijitDialog #feed_add_spinner {
position: relative;
top: 5px;
width: 18px;
height: 18px;
}
.icon-three-dots {
width: 18px;
height: 18px;
vertical-align: middle;
}
::selection { ::selection {
background: #b87d2c; background: #b87d2c;
color: #333; color: #333;
@ -1386,11 +1384,6 @@ body.ttrss_utility hr {
.cdm .feed-title a:hover { .cdm .feed-title a:hover {
color: #b87d2c; color: #b87d2c;
} }
.cdm .content-inner .icon-unpack-pending {
width: 18px;
height: 18px;
vertical-align: middle;
}
.cdm .content-inner .embed-responsive { .cdm .content-inner .embed-responsive {
overflow: hidden; overflow: hidden;
padding-bottom: 56.25%; padding-bottom: 56.25%;

33
themes/night_blue.css
View File

@ -1046,14 +1046,23 @@ body.ttrss_main .text-right {
body.ttrss_main .text-left { body.ttrss_main .text-left {
text-align: left; text-align: left;
} }
body.ttrss_main #prefFilterTestResultList .preview { body.ttrss_main .dijitDialog .filter-results-list .preview {
margin: 8px; margin: 8px;
} }
body.ttrss_main #prefFilterTestResultList .title { body.ttrss_main .dijitDialog .filter-results-list .title {
font-weight: bold; font-weight: bold;
} }
body.ttrss_main #prefFilterTestResultList .feed { body.ttrss_main .dijitDialog #feed_add_spinner {
color: #257aa7; position: relative;
top: 5px;
width: 18px;
height: 18px;
}
body.ttrss_main .icon-three-dots,
.cdm .content-inner .icon-unpack-pending {
width: 18px;
height: 18px;
vertical-align: middle;
} }
body.ttrss_main, body.ttrss_main,
body.ttrss_utility { body.ttrss_utility {
@ -1187,17 +1196,6 @@ body.ttrss_utility hr {
border: 0px solid #ccc; border: 0px solid #ccc;
border-bottom-width: 1px; border-bottom-width: 1px;
} }
.dijitDialog #feed_add_spinner {
position: relative;
top: 5px;
width: 18px;
height: 18px;
}
.icon-three-dots {
width: 18px;
height: 18px;
vertical-align: middle;
}
::selection { ::selection {
background: #257aa7; background: #257aa7;
color: #333; color: #333;
@ -1386,11 +1384,6 @@ body.ttrss_utility hr {
.cdm .feed-title a:hover { .cdm .feed-title a:hover {
color: #257aa7; color: #257aa7;
} }
.cdm .content-inner .icon-unpack-pending {
width: 18px;
height: 18px;
vertical-align: middle;
}
.cdm .content-inner .embed-responsive { .cdm .content-inner .embed-responsive {
overflow: hidden; overflow: hidden;
padding-bottom: 56.25%; padding-bottom: 56.25%;