rename main toolbar elements to be more consistent

3 files changed, 7 insertions, 7 deletions

diff --git a/js/Feeds.js b/js/Feeds.js
index 07bc37192..70b5176f4 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -319,10 +319,10 @@ define(["dojo/_base/declare"], function (declare) {
 				}, 10 * 1000);
 			}
 
-			Form.enable("main_toolbar_form");
+			Form.enable("toolbar-main");
 
 			let query = Object.assign({op: "feeds", method: "view", feed: feed},
-				dojo.formToObject("main_toolbar_form"));
+				dojo.formToObject("toolbar-main"));
 
 			if (method) query.m = method;
 
@@ -347,7 +347,7 @@ define(["dojo/_base/declare"], function (declare) {
 				query.m = "ForceUpdate";
 			}
 
-			Form.enable("main_toolbar_form");
+			Form.enable("toolbar-main");
 
 			if (!delayed)
 				if (!this.setExpando(feed, is_cat,
diff --git a/js/Headlines.js b/js/Headlines.js
index c16b070be..ff3e6edf0 100755
--- a/js/Headlines.js
+++ b/js/Headlines.js
@@ -46,7 +46,7 @@ define(["dojo/_base/declare"], function (declare) {
 			}
 		},
 		loadMore: function () {
-			const view_mode = document.forms["main_toolbar_form"].view_mode.value;
+			const view_mode = document.forms["toolbar-main"].view_mode.value;
 			const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length;
 			const num_all = $$("#headlines-frame > div[id*=RROW]").length;
 			const num_unread = Feeds.getUnread(Feeds.getActive(), Feeds.activeIsCat());
@@ -270,7 +270,7 @@ define(["dojo/_base/declare"], function (declare) {
 				if (offset == 0) {
 					this.loaded_article_ids = [];
 
-					dojo.html.set($("headlines-toolbar"),
+					dojo.html.set($("toolbar-headlines"),
 						reply['headlines']['toolbar'],
 						{parseContent: true});
 
@@ -389,7 +389,7 @@ define(["dojo/_base/declare"], function (declare) {
 			Notify.close();
 		},
 		reverse: function () {
-			const toolbar = document.forms["main_toolbar_form"];
+			const toolbar = document.forms["toolbar-main"];
 			const order_by = dijit.getEnclosingWidget(toolbar.order_by);
 
 			let value = order_by.attr('value');
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 461adc147..8e5dac811 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -121,7 +121,7 @@ require(["dojo/_base/kernel",
 
 					Cookie.delete("ttrss_test");
 
-					const toolbar = document.forms["main_toolbar_form"];
+					const toolbar = document.forms["toolbar-main"];
 
 					dijit.getEnclosingWidget(toolbar.view_mode).attr('value',
 						App.getInitParam("default_view_mode"));