From b426c0ba9ea9d18e7341e119ebb244d202b9fc2b Mon Sep 17 00:00:00 2001
From: sanjayk03-dev <imsanjay003@gmail.com>
Date: Mon, 3 Jun 2024 19:00:49 +0530
Subject: [PATCH] moved icon to macros page.

---
 src/js/macros.js                   | 3 +++
 src/pug/templates/control-view.pug | 4 ----
 src/pug/templates/macros.pug       | 3 +++
 src/py/bbctrl/Web.py               | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/js/macros.js b/src/js/macros.js
index c6dc934..bd2ed41 100644
--- a/src/js/macros.js
+++ b/src/js/macros.js
@@ -56,6 +56,9 @@ module.exports = {
     initial_tab: function () {
       return this.tab == 0;
     },
+    downloadMacrosUrl() {
+      return '/api/macros/download/' + this.state.macros_list.map(item => item.file_name).join(',');
+    },
   },
   methods: {
     open: function () {
diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug
index 5d8cc7a..512bf5f 100644
--- a/src/pug/templates/control-view.pug
+++ b/src/pug/templates/control-view.pug
@@ -319,10 +319,6 @@ script#control-view-template(type="text/x-template")
             @click="deleteGCode = true",
             :disabled="!state.selected || !is_ready",style="height:100px;width:100px;font-weight:normal")
             img(src="images/delete_gcode.png" style="height: 30px;")
-          
-          a(download, title="Download Macros",
-            :href="'/api/macros/download/' + state.macros_list.map(item => item.file_name).join(',')")
-            button.pure-button(style="height:100px;width:100px") Download Macros
 
           message.error-message(:show.sync="deleteGCode")
             h3(slot="header") Select files to delete:
diff --git a/src/pug/templates/macros.pug b/src/pug/templates/macros.pug
index 51e66d0..69ad7c6 100644
--- a/src/pug/templates/macros.pug
+++ b/src/pug/templates/macros.pug
@@ -72,6 +72,9 @@ script#macros-template(type="text/x-template")
             button.pure-button.button-error(@click="delete_selected_macro")
               .fa.fa-trash
               | &nbsp;Yes
+        
+        a(download, title="Download Macros", :href="downloadMacrosUrl")
+          button.config-button.button-blue(style="margin-left:5px;width:55%") Download Macros
 
     .warning-box
         p
diff --git a/src/py/bbctrl/Web.py b/src/py/bbctrl/Web.py
index 9c306a0..98245aa 100644
--- a/src/py/bbctrl/Web.py
+++ b/src/py/bbctrl/Web.py
@@ -670,7 +670,7 @@ class Web(tornado.web.Application):
             (r'/api/firmware/update', FirmwareUpdateHandler),
             (r'/api/upgrade', UpgradeHandler),
             (r'/api/file(/[^/]+)?', bbctrl.FileHandler),
-            (r'/api/macros/download',MacrosDownloadHandler),
+            (r'/api/macros/download(/[^/]+)?',MacrosDownloadHandler),
             (r'/api/path/([^/]+)((/positions)|(/speeds))?', PathHandler),
             (r'/api/home(/[xyzabcXYZABC]((/set)|(/clear))?)?', HomeHandler),
             (r'/api/start', StartHandler),