Merge branch 'maintenance' of github.com:OctoPrint/OctoPrint into mai…

…ntenance
OctoPrint · Apr 17, 2024 · b6e6f1c · b6e6f1c
2 parents 243c59c + ce4ac0e
commit b6e6f1c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
@@ -2,7 +2,7 @@ name: "Cleanup issues & PRs"
 
 on:
   schedule:
-    - cron: "0 0 * * *"
+    - cron: "42 23 * * *"
   workflow_dispatch:
 
 jobs:
@@ -13,8 +13,7 @@ jobs:
       - uses: dessant/lock-threads@v5
         with:
           github-token: ${{ github.token }}
-          issue-comment: ""
-          pr-comment: ""
+          process-only: "issues, prs"
 
   cleanup:
     name: 🧹 Close issues marked as incomplete & older than 14 days

diff --git a/src/octoprint/templates/sidebar/files.jinja2 b/src/octoprint/templates/sidebar/files.jinja2
@@ -67,23 +67,17 @@
         </span>
     </div>
     <div class="row-fluid upload-buttons">
+        <span class="btn btn-primary fileinput-button span{% if enableSdSupport %}6{% else %}12{% endif %}" style="margin-bottom: 10px">
+            <i class="fas fa-upload"></i>
+            <span>{{ _('Upload') }}</span>
+            <input id="gcode_upload" data-test-id="upload-local" accept="{{ ",".join(supportedExtensions) }}" type="file" name="file" class="fileinput-button" multiple>
+        </span>
         {% if enableSdSupport %}
-            <span class="btn btn-primary fileinput-button span6" style="margin-bottom: 10px">
-                                <i class="fas fa-upload"></i>
-                                <span>{{ _('Upload') }}</span>
-                                <input id="gcode_upload" data-test-id="upload-local" accept="{{ ",".join(supportedExtensions) }}" type="file" name="file" class="fileinput-button" multiple>
-                            </span>
             <span class="btn btn-primary fileinput-button span6" data-bind="enable: $root.isSdReady() && !$root.isPrinting(), css: {disabled: !$root.isSdReady() || $root.isPrinting()}" style="margin-bottom: 10px">
-                                <i class="fas fa-upload"></i>
-                                <span>{{ _('Upload to SD') }}</span>
-                                <input id="gcode_upload_sd" data-test-id="upload-sd" accept="{{ ",".join(supportedExtensions) }}" type="file" name="file" class="fileinput-button" data-bind="enable: isSdReady()">
-                            </span>
-        {% else %}
-            <span class="btn btn-primary fileinput-button span12" style="margin-bottom: 10px">
-                                <i class="icon-upload-alt icon-white"></i>
-                                <span>{{ _('Upload') }}</span>
-                                <input id="gcode_upload" data-test-id="upload-local" accept="{{ ",".join(supportedExtensions) }}" type="file" name="file" class="fileinput-button">
-                            </span>
+                <i class="fas fa-upload"></i>
+                <span>{{ _('Upload to SD') }}</span>
+                <input id="gcode_upload_sd" data-test-id="upload-sd" accept="{{ ",".join(supportedExtensions) }}" type="file" name="file" class="fileinput-button" data-bind="enable: isSdReady()">
+            </span>
         {% endif %}
     </div>
     <div id="gcode_upload_progress" class="progress progress-text-centered">