From 183ca3291b2399f8f847fbd4ad2209f3a9e7e5af Mon Sep 17 00:00:00 2001
From: Mark Walker <markwal@hotmail.com>
Date: Mon, 28 Mar 2016 12:59:08 -0700
Subject: [PATCH 1/3] If no SD card support, remove SD file filter

When SD card support is disabled on the server, remove any client side
filtering to just SD files since there aren't any and there won't be UI
turn remove the filter either.  Should address #1300
---
 src/octoprint/static/js/app/viewmodels/files.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/octoprint/static/js/app/viewmodels/files.js b/src/octoprint/static/js/app/viewmodels/files.js
index 304bc527..9f0d6cb2 100644
--- a/src/octoprint/static/js/app/viewmodels/files.js
+++ b/src/octoprint/static/js/app/viewmodels/files.js
@@ -396,6 +396,7 @@ $(function() {
                 self.localTarget = $("#drop_locally");
             } else {
                 self.localTarget = $("#drop");
+                self.listHelper.removeFilter('sd');
             }
             self.sdTarget = $("#drop_sd");
 

From 8f0b7dd6d19f60897e1b4a2e2b0d6d8f5bb5fdad Mon Sep 17 00:00:00 2001
From: Salandora <Sunpack@web.de>
Date: Sat, 2 Apr 2016 15:41:27 +0200
Subject: [PATCH 2/3] Fix timelapse postroll Images got captured with wrong
 filename Additionally fixed some refactoring mistakes

---
 src/octoprint/timelapse.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/octoprint/timelapse.py b/src/octoprint/timelapse.py
index b24bd5a1..2b6f2990 100644
--- a/src/octoprint/timelapse.py
+++ b/src/octoprint/timelapse.py
@@ -500,12 +500,12 @@ class ZTimelapse(Timelapse):
 
 	def process_post_roll(self):
 		with self._capture_mutex:
-			filename = os.path.join(self._capture_dir, "tmp_%05d.jpg" % self._image_number)
+			filename = os.path.join(self._capture_dir, _capture_format.format(prefix=self._file_prefix) % self._image_number)
 			self._image_number += 1
 
 		if self._perform_capture(filename):
 			for _ in range(self._post_roll * self._fps):
-				newFile = os.path.join(self._capture_dir, "tmp_%05d.jpg" % self._image_number)
+				newFile = os.path.join(self._capture_dir, _capture_format.format(prefix=self._file_prefix) % self._image_number)
 				self._image_number += 1
 				shutil.copyfile(filename, newFile)
 
@@ -550,11 +550,11 @@ class TimedTimelapse(Timelapse):
 		self._timer.start()
 
 	def on_print_done(self, event, payload):
-		self._postroll_captures = self.post_roll * self.fps
+		self._postroll_captures = self._post_roll * self._fps
 		Timelapse.on_print_done(self, event, payload)
 
 	def calculate_post_roll(self):
-		return self.post_roll * self.fps * self.interval
+		return self._post_roll * self._fps * self._interval
 
 	def process_post_roll(self):
 		pass

From 5a3e9e7abad94c952513eb580e7539161cb0b765 Mon Sep 17 00:00:00 2001
From: BillyBlaze <pablo@blacktower.nl>
Date: Sat, 9 Apr 2016 21:46:32 +0000
Subject: [PATCH 3/3] Fix wrong css data-binding

---
 src/octoprint/templates/sidebar/files.jinja2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/octoprint/templates/sidebar/files.jinja2 b/src/octoprint/templates/sidebar/files.jinja2
index fbff0ce8..e1441c76 100644
--- a/src/octoprint/templates/sidebar/files.jinja2
+++ b/src/octoprint/templates/sidebar/files.jinja2
@@ -11,10 +11,10 @@
         <div class="additionalInfo hide" data-bind="html: $root.getAdditionalData($data)"></div>
         <div class="btn-group action-buttons">
             <div class="btn btn-mini toggleAdditionalData" data-bind="click: function() { if ($root.enableAdditionalData($data)) { $root.toggleAdditionalData($data); } else { return; } }, css: { disabled: !$root.enableAdditionalData($data) }" title="{{ _('Additional data') }}"><i class="icon-chevron-down"></i></div>
-            <a class="btn btn-mini" data-bind="attr: {href: $root.downloadLink($data), css: {disabled: !$root.downloadLink($data)}}" title="{{ _('Download') }}"><i class="icon-download-alt"></i></a>
+            <a class="btn btn-mini" data-bind="attr: {href: $root.downloadLink($data)}, css: {disabled: !$root.downloadLink($data)}" title="{{ _('Download') }}"><i class="icon-download-alt"></i></a>
             <div class="btn btn-mini" data-bind="click: function() { if ($root.enableRemove($data)) { $root.removeFile($data); } else { return; } }, css: {disabled: !$root.enableRemove($data)}" title="{{ _('Remove') }}"><i class="icon-trash"></i></div>
             <div class="btn btn-mini" data-bind="click: function() { if ($root.enableSelect($data)) { $root.loadFile($data, false); } else { return; } }, css: {disabled: !$root.enableSelect($data)}" title="{{ _('Load') }}"><i class="icon-folder-open"></i></div>
-            <div class="btn btn-mini"  data-bind="click: function() { if ($root.enableSelect($data)) { $root.loadFile($data, true); } else { return; } }, css: {disabled: !$root.enableSelect($data)}" title="{{ _('Load and Print') }}"><i class="icon-print"></i></div>
+            <div class="btn btn-mini" data-bind="click: function() { if ($root.enableSelect($data)) { $root.loadFile($data, true); } else { return; } }, css: {disabled: !$root.enableSelect($data)}" title="{{ _('Load and Print') }}"><i class="icon-print"></i></div>
         </div>
     </script>