From ef14a002785ddf7087e369b49be8c779d93ba17c Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <b.brodersen@xplosion.de>
Date: Mon, 30 Nov 2015 13:26:37 +0100
Subject: [PATCH] no message

---
 bookmarklet.js    | 16 +++++++---------
 printPreview.html |  6 +++++-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/bookmarklet.js b/bookmarklet.js
index 3477d46..8f1f4ef 100644
--- a/bookmarklet.js
+++ b/bookmarklet.js
@@ -91,7 +91,7 @@
     var settings = global.settings;
 
     // restore UI state
-    jQuery("#font-scale-range").val(settings.scale);
+    jQuery("#fscaleRange").val(settings.scale);
     jQuery("#rowCount").val(settings.rowCount);
     jQuery("#columnCount").val(settings.colCount);
 
@@ -152,18 +152,19 @@
 
   function saveSettings(){
     var settings = global.settings;
+    writeCookie("card_printer_scale", settings.scale);
+    writeCookie("card_printer_row_count", settings.rowCount);
+    writeCookie("card_printer_column_count", settings.colCount);
+
     writeCookie("card_printer_single_card_page", settings.singleCardPage);
     writeCookie("card_printer_hide_description", settings.hideDescription);
     writeCookie("card_printer_hide_assignee", settings.hideAssignee);
     writeCookie("card_printer_hide_due_date", settings.hideDueDate);
-    writeCookie("card_printer_font_scale", settings.scale);
-    writeCookie("card_printer_row_count", settings.rowCount);
-    writeCookie("card_printer_column_count", settings.colCount);
   }
 
   function loadSettings(){
     var settings = global.settings = global.settings || {};
-    settings.scale = parseFloat(readCookie("card_printer_font_scale")) || 1.0;
+    settings.scale = parseFloat(readCookie("card_printer_scale")) || 1.0;
     settings.rowCount = parseInt(readCookie("card_printer_row_count2")) || 2;
     settings.colCount = parseInt(readCookie("card_printer_column_count")) || 1;
 
@@ -385,9 +386,6 @@
     var scaleHeight = cardMaxHeight / cardMinHeight ;
     var scale = Math.min(scaleWidth, scaleHeight, 1);
 
-    console.log("scaleRoot: " + scaleRoot + " scale:     " + scale);
-    console.log("scaleWidth: " + scaleWidth + " scaleHeight:     " + scaleHeight);
-
     // scale
     jQuery("html", printDocument).css("font-size", ( scaleRoot * scale ) + "cm");
 
@@ -493,7 +491,7 @@
 
     // scale font
 
-    result.find("#font-scale-range").on("input", function() {
+    result.find("#scaleRange").on("input", function() {
       global.settings.scale = jQuery(this).val();
       saveSettings();
       redrawCards();
diff --git a/printPreview.html b/printPreview.html
index b59d8f5..e023a43 100644
--- a/printPreview.html
+++ b/printPreview.html
@@ -18,7 +18,11 @@
           <div style="float: left; margin-left: 5px; margin-right: 5px;">x</div>
           <div style="float: left; display: inline;"><input id="rowCount" type="text" class="text" maxlength="1" style="width: 10px; margin-right:5px;" value="2"/>Page Grid</div>
         </div>
-        <div style="float: left; margin-right:10px; padding-right: 3px; display: inline; -webkit-appearance: default"><input id="font-scale-range" type="range" min="-1.0" max="1.0" step="0.01" value="0.0" style="width: 80px; position: relative; top: 2px; margin-right:5px;" />Scale</div>
+        <div style="float: left; margin-right:10px; padding-right: 3px; display: inline; -webkit-appearance: default">
+        <form oninput="amount.value=scaleRange.value">
+            <input type="range" id="scaleRange" min="-1.0" max="1.0" step="0.1" value="0.0" style="width: 80px; position: relative; top: 2px; margin-right:5px;" />
+            <output name="amount" for="scaleRange">0.0</output> Scale</form>
+        </div>
         <div style="float: left; margin-right:10px"><input id="single-card-page-checkbox" type="checkbox"/>Single Card Per Page</div>
         <div style="float: left; margin-right:10px"><input id="hide-description-checkbox" type="checkbox"/>Hide Description</div>
         <div style="float: left; margin-right:10px"><input id="hide-assignee-checkbox" type="checkbox"/>Hide Assignee</div>