diff options
-rw-r--r-- | js/CommonFilters.js | 34 | ||||
-rw-r--r-- | themes/compact.css | 33 | ||||
-rw-r--r-- | themes/compact_night.css | 33 | ||||
-rw-r--r-- | themes/light.css | 33 | ||||
-rw-r--r-- | themes/light/cdm.less | 2 | ||||
-rw-r--r-- | themes/light/tt-rss.less | 41 | ||||
-rw-r--r-- | themes/night.css | 33 | ||||
-rw-r--r-- | themes/night_blue.css | 33 |
8 files changed, 103 insertions, 139 deletions
diff --git a/js/CommonFilters.js b/js/CommonFilters.js index 1450458f8..8a20480f0 100644 --- a/js/CommonFilters.js +++ b/js/CommonFilters.js @@ -38,16 +38,19 @@ const Filters = { console.log("got results:" + result.length); - App.byId("prefFilterProgressMsg").innerHTML = __("Looking for articles (%d processed, %f found)...") - .replace("%f", test_dialog.results) - .replace("%d", offset); + const loading_message = test_dialog.domNode.querySelector(".loading-message"); + const results_list = test_dialog.domNode.querySelector(".filter-results-list"); + + 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); 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) { @@ -60,14 +63,15 @@ const Filters = { } else { // all done - Element.hide("prefFilterLoadingIndicator"); + test_dialog.domNode.querySelector(".loading-indicator").hide(); if (test_dialog.results == 0) { - App.byId("prefFilterTestResultList").innerHTML = `<tr><td align='center'> - ${__('No recent articles matching this filter have been found.')}</td></tr>`; - App.byId("prefFilterProgressMsg").innerHTML = "Articles matching this filter:"; + results_list.innerHTML = `<li class="text-center text-muted"> + ${__('No recent articles matching this filter have been found.')}</li>`; + + loading_message.innerHTML = __("Articles matching this filter:"); } 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); } @@ -75,7 +79,7 @@ const Filters = { } else if (!result) { 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."); } else { console.log("getTestResults: dialog closed, bailing out."); @@ -86,12 +90,12 @@ const Filters = { }); }, content: ` - <div> - <img id='prefFilterLoadingIndicator' src='images/indicator_tiny.gif'> - <span id='prefFilterProgressMsg'>Looking for articles...</span> + <div class="text-muted"> + <img class="loading-indicator icon-three-dots" src="${App.getInitParam("icon_three_dots")}"> + <span class="loading-message">${__("Looking for articles...")}</span> </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'> <button dojoType='dijit.form.Button' type='submit' class='alt-primary'>${__('Close this window')}</button> diff --git a/themes/compact.css b/themes/compact.css index 374e976c1..ccdd83247 100644 --- a/themes/compact.css +++ b/themes/compact.css @@ -1045,14 +1045,23 @@ body.ttrss_main .text-right { body.ttrss_main .text-left { text-align: left; } -body.ttrss_main #prefFilterTestResultList .preview { +body.ttrss_main .dijitDialog .filter-results-list .preview { margin: 8px; } -body.ttrss_main #prefFilterTestResultList .title { +body.ttrss_main .dijitDialog .filter-results-list .title { font-weight: bold; } -body.ttrss_main #prefFilterTestResultList .feed { - color: #257aa7; +body.ttrss_main .dijitDialog #feed_add_spinner { + 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_utility { @@ -1186,17 +1195,6 @@ body.ttrss_utility hr { border: 0px solid #ccc; 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 { background: #257aa7; color: white; @@ -1385,11 +1383,6 @@ body.ttrss_utility hr { .cdm .feed-title a:hover { color: #257aa7; } -.cdm .content-inner .icon-unpack-pending { - width: 18px; - height: 18px; - vertical-align: middle; -} .cdm .content-inner .embed-responsive { overflow: hidden; padding-bottom: 56.25%; diff --git a/themes/compact_night.css b/themes/compact_night.css index 980e05ec0..8515ce6ef 100644 --- a/themes/compact_night.css +++ b/themes/compact_night.css @@ -1045,14 +1045,23 @@ body.ttrss_main .text-right { body.ttrss_main .text-left { text-align: left; } -body.ttrss_main #prefFilterTestResultList .preview { +body.ttrss_main .dijitDialog .filter-results-list .preview { margin: 8px; } -body.ttrss_main #prefFilterTestResultList .title { +body.ttrss_main .dijitDialog .filter-results-list .title { font-weight: bold; } -body.ttrss_main #prefFilterTestResultList .feed { - color: #b87d2c; +body.ttrss_main .dijitDialog #feed_add_spinner { + 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_utility { @@ -1186,17 +1195,6 @@ body.ttrss_utility hr { border: 0px solid #ccc; 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 { background: #b87d2c; color: #333; @@ -1385,11 +1383,6 @@ body.ttrss_utility hr { .cdm .feed-title a:hover { color: #b87d2c; } -.cdm .content-inner .icon-unpack-pending { - width: 18px; - height: 18px; - vertical-align: middle; -} .cdm .content-inner .embed-responsive { overflow: hidden; padding-bottom: 56.25%; diff --git a/themes/light.css b/themes/light.css index 95a6863b1..214ef79d3 100644 --- a/themes/light.css +++ b/themes/light.css @@ -1045,14 +1045,23 @@ body.ttrss_main .text-right { body.ttrss_main .text-left { text-align: left; } -body.ttrss_main #prefFilterTestResultList .preview { +body.ttrss_main .dijitDialog .filter-results-list .preview { margin: 8px; } -body.ttrss_main #prefFilterTestResultList .title { +body.ttrss_main .dijitDialog .filter-results-list .title { font-weight: bold; } -body.ttrss_main #prefFilterTestResultList .feed { - color: #257aa7; +body.ttrss_main .dijitDialog #feed_add_spinner { + 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_utility { @@ -1186,17 +1195,6 @@ body.ttrss_utility hr { border: 0px solid #ccc; 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 { background: #257aa7; color: white; @@ -1385,11 +1383,6 @@ body.ttrss_utility hr { .cdm .feed-title a:hover { color: #257aa7; } -.cdm .content-inner .icon-unpack-pending { - width: 18px; - height: 18px; - vertical-align: middle; -} .cdm .content-inner .embed-responsive { overflow: hidden; padding-bottom: 56.25%; diff --git a/themes/light/cdm.less b/themes/light/cdm.less index acd5016fe..05f785cd3 100644 --- a/themes/light/cdm.less +++ b/themes/light/cdm.less @@ -210,7 +210,7 @@ .content-inner { .icon-unpack-pending { - .icon-three-dots; + &:extend(body.ttrss_main .icon-three-dots); } } diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less index 56a2e608e..ed6f65679 100644 --- a/themes/light/tt-rss.less +++ b/themes/light/tt-rss.less @@ -1251,20 +1251,30 @@ body.ttrss_main { text-align : left; } - #prefFilterTestResultList { - .preview { - margin : 8px; - } + .dijitDialog { + .filter-results-list { + .preview { + margin : 8px; + } - .title { - font-weight: bold; + .title { + font-weight: bold; + } } - .feed { - color : @color-accent; + #feed_add_spinner { + position : relative; + top : 5px; + width : 18px; + height : 18px; } } + .icon-three-dots { + width : 18px; + height : 18px; + vertical-align : middle; + } } 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 { background : @color-accent; color : @default-bg; diff --git a/themes/night.css b/themes/night.css index e6fd20be5..bb241dc79 100644 --- a/themes/night.css +++ b/themes/night.css @@ -1046,14 +1046,23 @@ body.ttrss_main .text-right { body.ttrss_main .text-left { text-align: left; } -body.ttrss_main #prefFilterTestResultList .preview { +body.ttrss_main .dijitDialog .filter-results-list .preview { margin: 8px; } -body.ttrss_main #prefFilterTestResultList .title { +body.ttrss_main .dijitDialog .filter-results-list .title { font-weight: bold; } -body.ttrss_main #prefFilterTestResultList .feed { - color: #b87d2c; +body.ttrss_main .dijitDialog #feed_add_spinner { + 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_utility { @@ -1187,17 +1196,6 @@ body.ttrss_utility hr { border: 0px solid #ccc; 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 { background: #b87d2c; color: #333; @@ -1386,11 +1384,6 @@ body.ttrss_utility hr { .cdm .feed-title a:hover { color: #b87d2c; } -.cdm .content-inner .icon-unpack-pending { - width: 18px; - height: 18px; - vertical-align: middle; -} .cdm .content-inner .embed-responsive { overflow: hidden; padding-bottom: 56.25%; diff --git a/themes/night_blue.css b/themes/night_blue.css index c9a335a9e..372c65469 100644 --- a/themes/night_blue.css +++ b/themes/night_blue.css @@ -1046,14 +1046,23 @@ body.ttrss_main .text-right { body.ttrss_main .text-left { text-align: left; } -body.ttrss_main #prefFilterTestResultList .preview { +body.ttrss_main .dijitDialog .filter-results-list .preview { margin: 8px; } -body.ttrss_main #prefFilterTestResultList .title { +body.ttrss_main .dijitDialog .filter-results-list .title { font-weight: bold; } -body.ttrss_main #prefFilterTestResultList .feed { - color: #257aa7; +body.ttrss_main .dijitDialog #feed_add_spinner { + 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_utility { @@ -1187,17 +1196,6 @@ body.ttrss_utility hr { border: 0px solid #ccc; 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 { background: #257aa7; color: #333; @@ -1386,11 +1384,6 @@ body.ttrss_utility hr { .cdm .feed-title a:hover { color: #257aa7; } -.cdm .content-inner .icon-unpack-pending { - width: 18px; - height: 18px; - vertical-align: middle; -} .cdm .content-inner .embed-responsive { overflow: hidden; padding-bottom: 56.25%; |