From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 23 Mar 2020 20:53:53 +0000 (+0100)
Subject: luci-mod-system: use generic .cbi-section-actions style for row actions
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0bcb9109f200c09f7f878e57cc75650ff29a1e5d;p=oweals%2Fluci.git

luci-mod-system: use generic .cbi-section-actions style for row actions

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9706388c42b7490cfdbdad8cc32012870211524d)
---

diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js
index 7fbe48151..146a991df 100644
--- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js
+++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js
@@ -37,12 +37,12 @@ return view.extend({
 	},
 
 	handleEnableDisable: function(name, isEnabled, ev) {
-		return this.handleAction(name, isEnabled ? 'disable' : 'enable', ev).then(L.bind(function(name, isEnabled, cell) {
-			L.dom.content(cell, this.renderEnableDisable({
+		return this.handleAction(name, isEnabled ? 'disable' : 'enable', ev).then(L.bind(function(name, isEnabled, btn) {
+			btn.parentNode.replaceChild(this.renderEnableDisable({
 				name: name,
 				enabled: isEnabled
-			}));
-		}, this, name, !isEnabled, ev.currentTarget.parentNode));
+			}), btn);
+		}, this, name, !isEnabled, ev.currentTarget));
 	},
 
 	handleRcLocalSave: function(ev) {
@@ -72,10 +72,7 @@ return view.extend({
 			E('div', { 'class': 'tr table-titles' }, [
 				E('div', { 'class': 'th' }, _('Start priority')),
 				E('div', { 'class': 'th' }, _('Initscript')),
-				E('div', { 'class': 'th' }, _('Enable/Disable')),
-				E('div', { 'class': 'th' }, _('Start')),
-				E('div', { 'class': 'th' }, _('Restart')),
-				E('div', { 'class': 'th' }, _('Stop'))
+				E('div', { 'class': 'th nowrap cbi-section-actions' })
 			])
 		]);
 
@@ -94,10 +91,12 @@ return view.extend({
 			rows.push([
 				'%02d'.format(list[i].index),
 				list[i].name,
-				this.renderEnableDisable(list[i]),
-				E('button', { 'class': 'btn cbi-button-action', 'click': ui.createHandlerFn(this, 'handleAction', list[i].name, 'start') }, _('Start')),
-				E('button', { 'class': 'btn cbi-button-action', 'click': ui.createHandlerFn(this, 'handleAction', list[i].name, 'restart') }, _('Restart')),
-				E('button', { 'class': 'btn cbi-button-action', 'click': ui.createHandlerFn(this, 'handleAction', list[i].name, 'stop') }, _('Stop'))
+				E('div', [
+					this.renderEnableDisable(list[i]),
+					E('button', { 'class': 'btn cbi-button-action', 'click': ui.createHandlerFn(this, 'handleAction', list[i].name, 'start') }, _('Start')),
+					E('button', { 'class': 'btn cbi-button-action', 'click': ui.createHandlerFn(this, 'handleAction', list[i].name, 'restart') }, _('Restart')),
+					E('button', { 'class': 'btn cbi-button-action', 'click': ui.createHandlerFn(this, 'handleAction', list[i].name, 'stop') }, _('Stop'))
+				])
 			]);
 		}