diff --git a/octoprint_klipper/__init__.py b/octoprint_klipper/__init__.py index 23132f0..862b6f3 100644 --- a/octoprint_klipper/__init__.py +++ b/octoprint_klipper/__init__.py @@ -551,7 +551,10 @@ class KlipperPlugin( @Permissions.PLUGIN_KLIPPER_CONFIG.require(403) def list_configs(self): files = cfgUtils.list_cfg_files(self, "") - return flask.jsonify(files = files, max_upload_size = MAX_UPLOAD_SIZE) + path = os.path.expanduser( + self._settings.get(["configuration", "configpath"]) + ) + return flask.jsonify(files = files, path = path, max_upload_size = MAX_UPLOAD_SIZE) # check syntax of a given data @octoprint.plugin.BlueprintPlugin.route("/config/check", methods=["POST"]) diff --git a/octoprint_klipper/static/css/klipper.css b/octoprint_klipper/static/css/klipper.css index 3921f3f..5bd129c 100644 --- a/octoprint_klipper/static/css/klipper.css +++ b/octoprint_klipper/static/css/klipper.css @@ -97,6 +97,7 @@ ul#klipper-settings { #tab_plugin_klipper_main #left-side { flex: 3 1; padding-right: 10px; + padding-top: 5px; } #tab_plugin_klipper_main .span8 label { diff --git a/octoprint_klipper/static/js/klipper_settings.js b/octoprint_klipper/static/js/klipper_settings.js index a75d3cc..f8de6e4 100644 --- a/octoprint_klipper/static/js/klipper_settings.js +++ b/octoprint_klipper/static/js/klipper_settings.js @@ -30,6 +30,7 @@ $(function () { }); self.markedForFileRemove = ko.observableArray([]); + self.PathToConfigs = ko.observable(""); $(document).on('shown.bs.modal','#klipper_editor', function () { self.klipperEditorViewModel.onShown(); @@ -84,6 +85,7 @@ $(function () { OctoPrint.plugins.klipper.listCfg().done(function (response) { self.klipperViewModel.consoleMessage("debug", "listCfgFiles done"); self.configs.updateItems(response.files); + self.PathToConfigs("Path: "+ response.path); self.configs.resetPage(); }); }; diff --git a/octoprint_klipper/templates/klipper_settings.jinja2 b/octoprint_klipper/templates/klipper_settings.jinja2 index cd1a8f9..14ceb25 100644 --- a/octoprint_klipper/templates/klipper_settings.jinja2 +++ b/octoprint_klipper/templates/klipper_settings.jinja2 @@ -262,7 +262,9 @@ {{ _('Refresh Files') }} + data-bind="click: removeMarkedFiles, enable: markedForFileRemove().length > 0">{{ _('Delete selected') }} + +