luci-mod-system: use generic .cbi-section-actions style for row actions
authorJo-Philipp Wich <jo@mein.io>
Mon, 23 Mar 2020 20:53:53 +0000 (21:53 +0100)
committerJo-Philipp Wich <jo@mein.io>
Thu, 7 May 2020 17:40:49 +0000 (19:40 +0200)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9706388c42b7490cfdbdad8cc32012870211524d)

modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js

index 7fbe48151b65cba5553cf2df070e5415314de0dd..146a991dfc6c86342bb2e95a33dc52e001f200f7 100644 (file)
@@ -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'))
+                               ])
                        ]);
                }