pref-feeds: load error button via xhr

master
Andrew Dolgov 2 years ago
parent 43d8a1f2ff
commit d4c925819b
  1. 21
      classes/pref/feeds.php
  2. 7
      js/PrefFeedTree.js
  3. 2
      themes/compact.css
  4. 2
      themes/compact_night.css
  5. 2
      themes/light.css
  6. 2
      themes/light/prefs.less
  7. 2
      themes/night.css
  8. 2
      themes/night_blue.css

@ -1198,22 +1198,10 @@ class Pref_Feeds extends Handler_Protected {
}
private function index_feeds() {
$sth = $this->pdo->prepare("SELECT COUNT(id) AS num_errors
FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ?");
$sth->execute([$_SESSION['uid']]);
if ($row = $sth->fetch()) {
$num_errors = $row["num_errors"];
} else {
$num_errors = 0;
}
if ($num_errors > 0) {
$error_button = "<button dojoType='dijit.form.Button' onclick='CommonDialogs.showFeedsWithErrors()' id='errorButton'>".
__("Feeds with errors")."</button>";
} else {
$error_button = "";
}
$error_button = "<button dojoType='dijit.form.Button'
id='pref_feeds_errors_btn' style='display : none'
onclick='CommonDialogs.showFeedsWithErrors()'>".
__("Feeds with errors")."</button>";
$inactive_button = "<button dojoType='dijit.form.Button'
id='pref_feeds_inactive_btn'
@ -1311,6 +1299,7 @@ class Pref_Feeds extends Handler_Protected {
</script>
<script type="dojo/method" event="onLoad" args="item">
dijit.byId('feedTree').checkInactiveFeeds();
dijit.byId('feedTree').checkErrorFeeds();
</script>
</div>
</div>

@ -209,6 +209,13 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b
return false;
},
checkErrorFeeds: function() {
xhrJson("backend.php", {op: "pref-feeds", method: "feedsWithErrors"}, (reply) => {
if (reply.length > 0) {
Element.show(dijit.byId("pref_feeds_errors_btn").domNode);
}
});
},
checkInactiveFeeds: function() {
xhrJson("backend.php", {op: "pref-feeds", method: "inactivefeeds"}, (reply) => {
if (reply.length > 0) {

@ -1456,7 +1456,7 @@ body.ttrss_prefs #feedsTab {
body.ttrss_prefs .dijitDialog #pref-profiles-list .dijitInlineEditBoxDisplayMode {
padding: 0px;
}
body.ttrss_prefs #errorButton {
body.ttrss_prefs #pref_feeds_errors_btn {
color: red;
}
body.ttrss_prefs .user-css-editor {

@ -1456,7 +1456,7 @@ body.ttrss_prefs #feedsTab {
body.ttrss_prefs .dijitDialog #pref-profiles-list .dijitInlineEditBoxDisplayMode {
padding: 0px;
}
body.ttrss_prefs #errorButton {
body.ttrss_prefs #pref_feeds_errors_btn {
color: red;
}
body.ttrss_prefs .user-css-editor {

@ -1456,7 +1456,7 @@ body.ttrss_prefs #feedsTab {
body.ttrss_prefs .dijitDialog #pref-profiles-list .dijitInlineEditBoxDisplayMode {
padding: 0px;
}
body.ttrss_prefs #errorButton {
body.ttrss_prefs #pref_feeds_errors_btn {
color: red;
}
body.ttrss_prefs .user-css-editor {

@ -65,7 +65,7 @@ body.ttrss_prefs {
padding : 0px;
}
#errorButton {
#pref_feeds_errors_btn {
color : red;
}

@ -1457,7 +1457,7 @@ body.ttrss_prefs #feedsTab {
body.ttrss_prefs .dijitDialog #pref-profiles-list .dijitInlineEditBoxDisplayMode {
padding: 0px;
}
body.ttrss_prefs #errorButton {
body.ttrss_prefs #pref_feeds_errors_btn {
color: red;
}
body.ttrss_prefs .user-css-editor {

@ -1457,7 +1457,7 @@ body.ttrss_prefs #feedsTab {
body.ttrss_prefs .dijitDialog #pref-profiles-list .dijitInlineEditBoxDisplayMode {
padding: 0px;
}
body.ttrss_prefs #errorButton {
body.ttrss_prefs #pref_feeds_errors_btn {
color: red;
}
body.ttrss_prefs .user-css-editor {

Loading…
Cancel
Save