diff --git a/classes/handler/public.php b/classes/handler/public.php
index c6310f18bb34616a9c0948e23a9eb8d424694202..9dbb197f26812dcaeafb87430700681db0f9b0a2 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -871,7 +871,7 @@ class Handler_Public extends Handler {
if ($feed_id) {
print "<form method='GET' action=\"$tp_uri\">
- <input type='hidden' name='tab' value='feedConfig'>
+ <input type='hidden' name='tab' value='feeds'>
<input type='hidden' name='method' value='editfeed'>
<input type='hidden' name='methodparam' value='$feed_id'>
<button dojoType='dijit.form.Button' class='alt-info' type='submit'>".__("Edit subscription options")."</button>
diff --git a/index.php b/index.php
index 6834891eeef1eefeec173f464ea8bcbbff356a4a..ead02f2c44b97c652c330c270de94013b4135594 100644
--- a/index.php
+++ b/index.php
@@ -167,7 +167,7 @@
<i class="material-icons net-alert" style="display : none"
title="<?php echo __("Communication problem with server.") ?>">error_outline</i>
- <i class="material-icons log-alert" style="display : none"
+ <i class="material-icons log-alert" style="display : none" onclick="App.openPreferences('system')"
title="<?php echo __("Recent entries found in event log.") ?>">warning</i>
<i id="updates-available" class="material-icons icon-new-version" style="display : none"
diff --git a/js/App.js b/js/App.js
index 87c4bd3e799d9db90bf685545e2f7390140bdcfd..db7797b7542a9a76af4d853a99af756514a9d003 100644
--- a/js/App.js
+++ b/js/App.js
@@ -1098,7 +1098,7 @@ const App = {
this.displayDlg(__("Tag cloud"), "printTagCloud");
};
this.hotkey_actions["goto_prefs"] = () => {
- document.location.href = "prefs.php";
+ App.openPreferences();
};
this.hotkey_actions["select_article_cursor"] = () => {
const id = Article.getUnderPointer();
@@ -1163,10 +1163,13 @@ const App = {
};
}
},
+ openPreferences: function(tab) {
+ document.location.href = "prefs.php" + (tab ? "?tab=" + tab : "");
+ },
onActionSelected: function(opid) {
switch (opid) {
case "qmcPrefs":
- document.location.href = "prefs.php";
+ App.openPreferences();
break;
case "qmcLogout":
App.postCurrentWindow("public.php", {op: "logout", csrf_token: __csrf_token});
diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js
index 4ea0cdac11c33a814027df088d0551e16ae15923..acd410a2ce72d9842c096fe4e9b2c12d07d8d14e 100644
--- a/js/PrefFeedTree.js
+++ b/js/PrefFeedTree.js
@@ -92,7 +92,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
let search = (searchElem) ? searchElem.value : "";
xhrPost("backend.php", { op: "pref-feeds", search: search }, (transport) => {
- dijit.byId('feedConfigTab').attr('content', transport.responseText);
+ dijit.byId('feedsTab').attr('content', transport.responseText);
Notify.close();
});
},
diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index 0e8e52658ab55ebea7a9b71fc8e83134253a7cc8..b2041d1824afc6cfe02fa40cd720623c77351d11 100644
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -90,7 +90,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
if (user_search) { search = user_search.value; }
xhrPost("backend.php", { op: "pref-filters", search: search }, (transport) => {
- dijit.byId('filterConfigTab').attr('content', transport.responseText);
+ dijit.byId('filtersTab').attr('content', transport.responseText);
Notify.close();
});
},
diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js
index 57dff2333adab13fd543450adb5cc48d17128341..f9cb450e53200f87a982fa093a8a8ae25551abac 100644
--- a/js/PrefHelpers.js
+++ b/js/PrefHelpers.js
@@ -58,7 +58,7 @@ const Helpers = {
},
update: function() {
xhrPost("backend.php", { op: "pref-system", severity: dijit.byId("severity").attr('value'), page: Helpers.EventLog.log_page }, (transport) => {
- dijit.byId('systemConfigTab').attr('content', transport.responseText);
+ dijit.byId('systemTab').attr('content', transport.responseText);
Notify.close();
});
},
@@ -206,7 +206,7 @@ const Helpers = {
},
refresh: function() {
xhrPost("backend.php", { op: "pref-prefs" }, (transport) => {
- dijit.byId('genConfigTab').attr('content', transport.responseText);
+ dijit.byId('prefsTab').attr('content', transport.responseText);
Notify.close();
});
},
diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js
index b14474febcc138446727f25833b4e71bd11a54f3..624b197b4ad7b076bbc7b59de9ba4029c204bab7 100644
--- a/js/PrefLabelTree.js
+++ b/js/PrefLabelTree.js
@@ -54,7 +54,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
},
reload: function() {
xhrPost("backend.php", { op: "pref-labels" }, (transport) => {
- dijit.byId('labelConfigTab').attr('content', transport.responseText);
+ dijit.byId('labelsTab').attr('content', transport.responseText);
Notify.close();
});
},
diff --git a/js/PrefUsers.js b/js/PrefUsers.js
index f09c738055af884ef8437080778d2cd19809f854..2cebce6efb3ff9259e59bd13cab286fb752e199a 100644
--- a/js/PrefUsers.js
+++ b/js/PrefUsers.js
@@ -9,7 +9,7 @@ const Users = {
const search = user_search ? user_search.value : "";
xhrPost("backend.php", { op: "pref-users", sort: sort, search: search }, (transport) => {
- dijit.byId('userConfigTab').attr('content', transport.responseText);
+ dijit.byId('usersTab').attr('content', transport.responseText);
Notify.close();
});
},
diff --git a/prefs.php b/prefs.php
index ad96ab15ea54e5bbc340f649d068ab2b9e343c0e..07e636a0a82900eb3910e11984840558035c910c 100644
--- a/prefs.php
+++ b/prefs.php
@@ -136,26 +136,26 @@
<div id="main" dojoType="dijit.layout.BorderContainer">
<div dojoType="dijit.layout.TabContainer" region="center" id="pref-tabs">
- <div id="genConfigTab" dojoType="dijit.layout.ContentPane"
+ <div id="prefsTab" dojoType="dijit.layout.ContentPane"
href="backend.php?op=pref-prefs"
title="<i class='material-icons'>settings</i> <?php echo __('Preferences') ?>"></div>
- <div id="feedConfigTab" dojoType="dijit.layout.ContentPane"
+ <div id="feedsTab" dojoType="dijit.layout.ContentPane"
href="backend.php?op=pref-feeds"
title="<i class='material-icons'>rss_feed</i> <?php echo __('Feeds') ?>"></div>
- <div id="filterConfigTab" dojoType="dijit.layout.ContentPane"
+ <div id="filtersTab" dojoType="dijit.layout.ContentPane"
style="padding : 0px"
href="backend.php?op=pref-filters"
title="<i class='material-icons'>filter_list1</i> <?php echo __('Filters') ?>"></div>
- <div id="labelConfigTab" dojoType="dijit.layout.ContentPane"
+ <div id="labelsTab" dojoType="dijit.layout.ContentPane"
style="padding : 0px"
href="backend.php?op=pref-labels"
title="<i class='material-icons'>label_outline1</i> <?php echo __('Labels') ?>"></div>
<?php if ($_SESSION["access_level"] >= 10) { ?>
- <div id="userConfigTab" dojoType="dijit.layout.ContentPane"
+ <div id="usersTab" dojoType="dijit.layout.ContentPane"
style="padding : 0px"
href="backend.php?op=pref-users"
title="<i class='material-icons'>person</i> <?php echo __('Users') ?>"></div>
- <div id="systemConfigTab" dojoType="dijit.layout.ContentPane"
+ <div id="systemTab" dojoType="dijit.layout.ContentPane"
href="backend.php?op=pref-system"
title="<i class='material-icons'>info_outline</i> <?php echo __('System') ?>"></div>
<?php } ?>
diff --git a/themes/compact.css b/themes/compact.css
index 8dc12d92f93306457a2e1a33a16a964d4d83f559..c3c953b0e2fd7c4b075c49bd4b431c9770db0867 100644
--- a/themes/compact.css
+++ b/themes/compact.css
@@ -707,6 +707,7 @@ body.ttrss_main #toolbar-frame #toolbar .left i.icon-error {
}
body.ttrss_main #toolbar-frame #toolbar i.log-alert {
color: #ddba1c;
+ cursor: pointer;
}
body.ttrss_main #toolbar-frame #toolbar i {
margin: 0 4px;
diff --git a/themes/compact_night.css b/themes/compact_night.css
index 0777e05505a88cbfba15c8a16cd5f06e450cf958..17d3908955719d302f3819d34b233c0833a6aec1 100644
--- a/themes/compact_night.css
+++ b/themes/compact_night.css
@@ -707,6 +707,7 @@ body.ttrss_main #toolbar-frame #toolbar .left i.icon-error {
}
body.ttrss_main #toolbar-frame #toolbar i.log-alert {
color: #ddba1c;
+ cursor: pointer;
}
body.ttrss_main #toolbar-frame #toolbar i {
margin: 0 4px;
diff --git a/themes/light.css b/themes/light.css
index eba96e40557b23f4e28a0059155d0b93bb2a6439..7d34794e405e16316cbb851dc78aef864c624379 100644
--- a/themes/light.css
+++ b/themes/light.css
@@ -707,6 +707,7 @@ body.ttrss_main #toolbar-frame #toolbar .left i.icon-error {
}
body.ttrss_main #toolbar-frame #toolbar i.log-alert {
color: #ddba1c;
+ cursor: pointer;
}
body.ttrss_main #toolbar-frame #toolbar i {
margin: 0 4px;
diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less
index 835585fe608d3f4943977b045f5baf11e6366693..65ec33bc332db7cee6ad7ffc19f67310da203dc0 100644
--- a/themes/light/tt-rss.less
+++ b/themes/light/tt-rss.less
@@ -826,6 +826,7 @@ body.ttrss_main {
i.log-alert {
color : #ddba1c;
+ cursor : pointer;
}
i {
diff --git a/themes/night.css b/themes/night.css
index f15b73d85247ab6702e1d2c6d7ccd0747b351476..880cfe00193ed09447b8184bf728022ce595568c 100644
--- a/themes/night.css
+++ b/themes/night.css
@@ -708,6 +708,7 @@ body.ttrss_main #toolbar-frame #toolbar .left i.icon-error {
}
body.ttrss_main #toolbar-frame #toolbar i.log-alert {
color: #ddba1c;
+ cursor: pointer;
}
body.ttrss_main #toolbar-frame #toolbar i {
margin: 0 4px;
diff --git a/themes/night_blue.css b/themes/night_blue.css
index f7e81386d754e4c26e08642c4a8dbd64d6bcef29..49c9b15c49366e077a2a0aaad54716a71ecee374 100644
--- a/themes/night_blue.css
+++ b/themes/night_blue.css
@@ -708,6 +708,7 @@ body.ttrss_main #toolbar-frame #toolbar .left i.icon-error {
}
body.ttrss_main #toolbar-frame #toolbar i.log-alert {
color: #ddba1c;
+ cursor: pointer;
}
body.ttrss_main #toolbar-frame #toolbar i {
margin: 0 4px;