From ea961767c48b0396d81399d33a27dc025ccf3134 Mon Sep 17 00:00:00 2001
From: thelastWallE <12502210+thelastWallE@users.noreply.github.com>
Date: Fri, 12 Mar 2021 00:58:12 +0100
Subject: [PATCH] cleaning of rebase

---
 octoprint_klipper/templates/klipper_sidebar.jinja2  | 6 +-----
 octoprint_klipper/templates/klipper_tab_main.jinja2 | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/octoprint_klipper/templates/klipper_sidebar.jinja2 b/octoprint_klipper/templates/klipper_sidebar.jinja2
index bdadac1..6482e3f 100644
--- a/octoprint_klipper/templates/klipper_sidebar.jinja2
+++ b/octoprint_klipper/templates/klipper_sidebar.jinja2
@@ -3,14 +3,10 @@
       <label for="connection_printers" data-bind="css: {disabled: !connectionState.isErrorOrClosed()}, enable: connectionState.isErrorOrClosed() && loginState.isUser()">{{ _('Printer Profile') }}</label>
       <select id="connection_printers" data-bind="options: connectionState.printerOptions, optionsText: 'name', optionsValue: 'id', value: connectionState.selectedPrinter, css: {disabled: !connectionState.isErrorOrClosed()}, enable: connectionState.isErrorOrClosed() && loginState.isUser()"></select>
       <button class="btn btn-block" data-bind="click: connectionState.connect, text: connectionState.buttonText(), enable: loginState.isUser()">{{ _('Connect') }}</button>
+      <button class="btn btn-block" data-bind="visible: hasRight('CONFIG', 'Ko'), click: function() {openOctoKlipperSettings('klipper-config');}">{{ _('Open Klipper config') }}</button>
    </div>
 </div>
 <div class="control-group" data-bind="visible: hasRight('MACRO', 'Ko')">
-   <div class="controls">
-      <button class="btn btn-block" data-bind="visible: loginState.hasPermissionKo(access.permissions.PLUGIN_KLIPPER_CONFIG), click: function() {openOctoKlipperSettings('klipper-config');}">{{ _('Open Klipper config') }}</button>
-   </div>
-</div>
-<div class="control-group">
    <div class="controls">
       <label class="control-label small"><i class="icon-list-alt"></i> {{ _('Macros') }}</label>
       <div data-bind="foreach: settings.settings.plugins.klipper.macros">
diff --git a/octoprint_klipper/templates/klipper_tab_main.jinja2 b/octoprint_klipper/templates/klipper_tab_main.jinja2
index 1df721b..aa92d21 100644
--- a/octoprint_klipper/templates/klipper_tab_main.jinja2
+++ b/octoprint_klipper/templates/klipper_tab_main.jinja2
@@ -23,7 +23,7 @@
                <button class="btn btn-block btn-small" data-bind="click: onGetStatus, enable: isActive()" title="Query Klipper for its current status">
                   <i class="fa icon-black fa-info-circle"></i> {{ _('Get Status') }}
                </button>
-               <button class="btn btn-block btn-small" data-bind="visible: loginState.hasPermissionKo(access.permissions.PLUGIN_KLIPPER_CONFIG), click: function() {openOctoKlipperSettings('klipper-config');}" title="Open the Klipper configurationfile">
+               <button class="btn btn-block btn-small" data-bind="visible: hasRight('CONFIG', 'Ko'), click: function() {openOctoKlipperSettings('klipper-config');}" title="Open the Klipper configurationfile">
                   <i class="fa icon-black fa-file-code-o"></i> {{ _('Open Klipper config') }}
                </button>
             </div>
@@ -62,7 +62,7 @@
                </button>
             </div>
          </div>
-         <div class="controls">
+         <div class="controls" data-bind="visible: hasRight('MACRO', 'Ko')">
             <label class="control-label"><i class="icon-list-alt"></i> {{ _('Macros') }}</label>
             <div data-bind="foreach: settings.settings.plugins.klipper.macros">
                <!-- ko if: tab -->