From 6e1f4969e154343b458bad9f3b9cc0c0eb8203a4 Mon Sep 17 00:00:00 2001
From: Kaalleen <36401965+kaalleen@users.noreply.github.com>
Date: Sun, 8 Apr 2018 17:35:24 +0200
Subject: Update operator_overview.html

---
 print/templates/operator_overview.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'print/templates')

diff --git a/print/templates/operator_overview.html b/print/templates/operator_overview.html
index 25048ab7..c9706dbe 100644
--- a/print/templates/operator_overview.html
+++ b/print/templates/operator_overview.html
@@ -27,7 +27,7 @@
         <main>
           <figure class="inksimulation operator" style="height: 210mm;">
                 {{ svg_overview|safe }}
-                <figcaption>{{ _('Scale') }} <span>{{ svg_scale }}</span></figcaption>
+                <figcaption>{{ _('Scale') }} <span>{{ svg_scale }}</span>%</figcaption>
             </figure>
         </main>
         {% include 'footer.html' %}
-- 
cgit v1.2.3


From 29d62264328e88ec8b1e45704aad85304441e8f3 Mon Sep 17 00:00:00 2001
From: Kaalleen <36401965+kaalleen@users.noreply.github.com>
Date: Sun, 8 Apr 2018 17:35:40 +0200
Subject: Update print_detail.html

---
 print/templates/print_detail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'print/templates')

diff --git a/print/templates/print_detail.html b/print/templates/print_detail.html
index 18a70bba..2453faa4 100644
--- a/print/templates/print_detail.html
+++ b/print/templates/print_detail.html
@@ -17,7 +17,7 @@
         <main>
             <figure class="inksimulation">
                 {{color_block.svg_preview|safe}}
-                <figcaption>{{ _('Scale') }} <span>{{ svg_scale }}</span></figcaption>
+                <figcaption>{{ _('Scale') }} <span>{{ svg_scale }}</span>%</figcaption>
             </figure> 
             
             <div class="color-palette detailed">
-- 
cgit v1.2.3


From 3e00ba26da77add9bdb1315b6a1993c0b53135f2 Mon Sep 17 00:00:00 2001
From: Kaalleen <36401965+kaalleen@users.noreply.github.com>
Date: Sun, 8 Apr 2018 17:35:54 +0200
Subject: Update print_overview.html

---
 print/templates/print_overview.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'print/templates')

diff --git a/print/templates/print_overview.html b/print/templates/print_overview.html
index f5632ceb..dd2a1358 100644
--- a/print/templates/print_overview.html
+++ b/print/templates/print_overview.html
@@ -27,7 +27,7 @@
         <main class="client-overview-main">
             <figure class="inksimulation">
                 {{ svg_overview|safe }}
-                <figcaption>{{ _('Scale') }} <span>{{ svg_scale }}</span></figcaption>
+                <figcaption>{{ _('Scale') }} <span>{{ svg_scale }}</span>%</figcaption>
             </figure> 
             
             <div class="color-palette">
-- 
cgit v1.2.3


From 15222ed4c39bab5e19b622e9179f7abc88c5b1da Mon Sep 17 00:00:00 2001
From: kalleen <reni@allenka.de>
Date: Mon, 9 Apr 2018 19:20:02 +0200
Subject: add buttons to quickly adjust svg size

---
 print/templates/operator_overview.html | 8 ++++++--
 print/templates/print_detail.html      | 4 ++++
 print/templates/print_overview.html    | 4 ++++
 3 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'print/templates')

diff --git a/print/templates/operator_overview.html b/print/templates/operator_overview.html
index c9706dbe..ce28ae8e 100644
--- a/print/templates/operator_overview.html
+++ b/print/templates/operator_overview.html
@@ -25,9 +25,13 @@
             </div>
         </header>
         <main>
-          <figure class="inksimulation operator" style="height: 210mm;">
+            <figure class="inksimulation operator" style="height: 210mm;">
                 {{ svg_overview|safe }}
-                <figcaption>{{ _('Scale') }} <span>{{ svg_scale }}</span>%</figcaption>
+                <figcaption>{{ _('Scale') }} <span data-field-name="svg-scale" contenteditable="true" data-placeholder="Enter scale...">{{ svg_scale }}</span>%</figcaption>
+                <div>
+                  <button class="svg-fit">Fit</button>
+                  <button class="svg-full">100%</button>
+                </div>
             </figure>
         </main>
         {% include 'footer.html' %}
diff --git a/print/templates/print_detail.html b/print/templates/print_detail.html
index 2453faa4..b8b748b3 100644
--- a/print/templates/print_detail.html
+++ b/print/templates/print_detail.html
@@ -18,6 +18,10 @@
             <figure class="inksimulation">
                 {{color_block.svg_preview|safe}}
                 <figcaption>{{ _('Scale') }} <span>{{ svg_scale }}</span>%</figcaption>
+                <div>
+                  <button class="svg-fit">Fit</button>
+                  <button class="svg-full">100%</button>
+                </div>
             </figure> 
             
             <div class="color-palette detailed">
diff --git a/print/templates/print_overview.html b/print/templates/print_overview.html
index dd2a1358..d32cf1e9 100644
--- a/print/templates/print_overview.html
+++ b/print/templates/print_overview.html
@@ -28,6 +28,10 @@
             <figure class="inksimulation">
                 {{ svg_overview|safe }}
                 <figcaption>{{ _('Scale') }} <span>{{ svg_scale }}</span>%</figcaption>
+                <div>
+                  <button class="svg-fit">Fit</button>
+                  <button class="svg-full">100%</button>
+                </div>
             </figure> 
             
             <div class="color-palette">
-- 
cgit v1.2.3


From 75aa656c2cfb7ee4189c31a6c7a0d23d83b4d03a Mon Sep 17 00:00:00 2001
From: kalleen <reni@allenka.de>
Date: Wed, 11 Apr 2018 18:57:55 +0200
Subject: add apply to all button for svg transforms

---
 print/templates/operator_overview.html | 7 ++++---
 print/templates/print_detail.html      | 5 +++--
 print/templates/print_overview.html    | 5 +++--
 3 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'print/templates')

diff --git a/print/templates/operator_overview.html b/print/templates/operator_overview.html
index ce28ae8e..38da7746 100644
--- a/print/templates/operator_overview.html
+++ b/print/templates/operator_overview.html
@@ -25,12 +25,13 @@
             </div>
         </header>
         <main>
-            <figure class="inksimulation operator" style="height: 210mm;">
+            <figure class="inksimulation operator" style="height: 210mm;" title="{{ _('Ctrl + Scroll to Zoom') }}">
                 {{ svg_overview|safe }}
-                <figcaption>{{ _('Scale') }} <span data-field-name="svg-scale" contenteditable="true" data-placeholder="Enter scale...">{{ svg_scale }}</span>%</figcaption>
+                <figcaption>{{ _('Scale') }} <span data-field-name="svg-scale" contenteditable="true" data-placeholder="Enter scale...">{{ svg_transform }}</span>%</figcaption>
                 <div>
-                  <button class="svg-fit">Fit</button>
+                  <button class="svg-fit">{{ _('Fit') }}</button>
                   <button class="svg-full">100%</button>
+                  <button class="svg-apply">{{ _('Apply to all') }}</button>
                 </div>
             </figure>
         </main>
diff --git a/print/templates/print_detail.html b/print/templates/print_detail.html
index b8b748b3..eddcf36f 100644
--- a/print/templates/print_detail.html
+++ b/print/templates/print_detail.html
@@ -15,12 +15,13 @@
             </div>
         </header>
         <main>
-            <figure class="inksimulation">
+            <figure class="inksimulation" title="{{ _('Ctrl + Scroll to Zoom') }}">
                 {{color_block.svg_preview|safe}}
-                <figcaption>{{ _('Scale') }} <span>{{ svg_scale }}</span>%</figcaption>
+                <figcaption>{{ _('Scale') }} <span data-field-name="svg-scale" contenteditable="true" data-placeholder="Enter scale...">{{ svg_transform }}</span>%</figcaption>
                 <div>
                   <button class="svg-fit">Fit</button>
                   <button class="svg-full">100%</button>
+                  <button class="svg-apply">Apply to all</button>
                 </div>
             </figure> 
             
diff --git a/print/templates/print_overview.html b/print/templates/print_overview.html
index d32cf1e9..7a396b4a 100644
--- a/print/templates/print_overview.html
+++ b/print/templates/print_overview.html
@@ -25,12 +25,13 @@
             </div>
         </header>
         <main class="client-overview-main">
-            <figure class="inksimulation">
+            <figure class="inksimulation" title="{{ _('Ctrl + Scroll to Zoom') }}">
                 {{ svg_overview|safe }}
-                <figcaption>{{ _('Scale') }} <span>{{ svg_scale }}</span>%</figcaption>
+                <figcaption>{{ _('Scale') }} <span data-field-name="svg-scale" contenteditable="true" data-placeholder="Enter scale...">{{ svg_transform }}</span>%</figcaption>
                 <div>
                   <button class="svg-fit">Fit</button>
                   <button class="svg-full">100%</button>
+                  <button class="svg-apply">Apply to all</button>
                 </div>
             </figure> 
             
-- 
cgit v1.2.3


From 85a8b6b1cfe008eed49c678bc0af9e2bea931f3c Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Fri, 13 Apr 2018 21:23:00 -0400
Subject: inkstitch metadata framework

---
 print/templates/headline.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'print/templates')

diff --git a/print/templates/headline.html b/print/templates/headline.html
index 649c02ea..cbc9c43a 100644
--- a/print/templates/headline.html
+++ b/print/templates/headline.html
@@ -3,9 +3,9 @@
 </figure>
 <div class="headline">
   <div class="pageTitle">
-      <h1><span class="jobtitle" contenteditable="true" data-placeholder="{{ _('Enter job title...') }}" data-field-name="job-title">{{ job.title }}</span></h1>
-      <p class="header-field" data-label="{{ _('CLIENT') }}:" contenteditable="true" data-placeholder="{{ _('Enter client name...') }}" data-field-name="client-name">{{ client }}</p>
-      <p class="header-field" data-label="{{ _('PURCHASE ORDER #:') }}" contenteditable="true" data-placeholder="{{ _('Enter purchase order number...') }}" data-field-name="purchase-order">{{ purchase_order }}</p>
+      <h1><span class="jobtitle" contenteditable="true" data-placeholder="{{ _('Enter job title...') }}" data-field-name="title"></span></h1>
+      <p class="header-field" data-label="{{ _('CLIENT') }}:" contenteditable="true" data-placeholder="{{ _('Enter client name...') }}" data-field-name="client-name"></p>
+      <p class="header-field" data-label="{{ _('PURCHASE ORDER #:') }}" contenteditable="true" data-placeholder="{{ _('Enter purchase order number...') }}" data-field-name="purchase-order"></p>
   </div>
   
   <div class="currentDate">{{ date|datetimeformat(_('%Y.%m.%d')) }}</div>
-- 
cgit v1.2.3


From f9b90d31b7730103e296b0c2509885b07000eac4 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Sat, 14 Apr 2018 20:39:59 -0400
Subject: round-trip editable fields and checkboxes

---
 print/templates/ui.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'print/templates')

diff --git a/print/templates/ui.html b/print/templates/ui.html
index 078f1a4c..9acdd1bc 100644
--- a/print/templates/ui.html
+++ b/print/templates/ui.html
@@ -24,10 +24,10 @@
       <div>
        <fieldset>
           <legend>{{ ('Print Layouts') }}:</legend>
-          <p><input type="checkbox" id="client-overview" {{ 'checked' if view.client_overview else '' }}><label for="client-overview">Client Overview</label></p>
-          <p><input type="checkbox" id="client-detailedview" {{ 'checked' if view.client_detailedview else '' }}><label for="client-detailedview">Client Detailed View</label></p>
-          <p><input type="checkbox" id="operator-overview" {{ 'checked' if view.operator_overview else '' }}><label for="operator-overview">Operator Overview</label></p>
-          <p><input type="checkbox" id="operator-detailedview" {{ 'checked' if view.operator_detailedview else '' }}><label for="operator-overview">Operator Detailed View</label></p>
+          <p><input type="checkbox" id="client-overview" data-field-name="client-overview" /><label for="client-overview">Client Overview</label></p>
+          <p><input type="checkbox" id="client-detailedview" data-field-name="client-detailedview" /><label for="client-detailedview">Client Detailed View</label></p>
+          <p><input type="checkbox" id="operator-overview" data-field-name="operator-overview" CHECKED /><label for="operator-overview">Operator Overview</label></p>
+          <p><input type="checkbox" id="operator-detailedview" data-field-name="operator-detailedview" CHECKED /><label for="operator-detailedview">Operator Detailed View</label></p>
         </fieldset>
       </div>
     </div>
-- 
cgit v1.2.3


From 7b0804562e4ce3b440e67de6cb001ac021326990 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Mon, 16 Apr 2018 20:17:07 -0400
Subject: add 'save as defaults' button

---
 print/templates/headline.html | 5 ++++-
 print/templates/ui.html       | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'print/templates')

diff --git a/print/templates/headline.html b/print/templates/headline.html
index cbc9c43a..421202e4 100644
--- a/print/templates/headline.html
+++ b/print/templates/headline.html
@@ -1,5 +1,8 @@
 <figure class="brandlogo">
-      <img src="{{ logo.src or "resources/inkstitch-logo.svg" }}" alt="{{ logo.title }}" title="{{ logo.title }}">
+  <label for="logo-picker">
+    <img src="{{ logo.src or "resources/inkstitch-logo.svg" }}" alt="{{ logo.title }}" title="{{ logo.title }}" data-field-name="logo">
+    <input type=file id="logo-picker" />
+  </label>
 </figure>
 <div class="headline">
   <div class="pageTitle">
diff --git a/print/templates/ui.html b/print/templates/ui.html
index 9acdd1bc..f7246962 100644
--- a/print/templates/ui.html
+++ b/print/templates/ui.html
@@ -15,7 +15,7 @@
       <h1>{{ _('Settings') }}</h1>
       <div>
         <p>{{ _('Printing Size') }}: 
-          <select id="printing-size">
+          <select id="printing-size" data-field-name="paper-size">
             <option value="letter" selected="selected">Letter</option>
             <option value="a4">A4</option>
           </select>
@@ -23,11 +23,12 @@
       </div>
       <div>
        <fieldset>
-          <legend>{{ ('Print Layouts') }}:</legend>
+          <legend>{{ _('Print Layouts') }}:</legend>
           <p><input type="checkbox" id="client-overview" data-field-name="client-overview" /><label for="client-overview">Client Overview</label></p>
           <p><input type="checkbox" id="client-detailedview" data-field-name="client-detailedview" /><label for="client-detailedview">Client Detailed View</label></p>
           <p><input type="checkbox" id="operator-overview" data-field-name="operator-overview" CHECKED /><label for="operator-overview">Operator Overview</label></p>
           <p><input type="checkbox" id="operator-detailedview" data-field-name="operator-detailedview" CHECKED /><label for="operator-detailedview">Operator Detailed View</label></p>
         </fieldset>
+        <button id="save-settings" title="{{ _("Includes all settings visible here and also the icon.") }}">{{ _("Save as defaults") }}</button>
       </div>
     </div>
-- 
cgit v1.2.3


From 51741745b0bb691a55b642a2ea938ac74324da2d Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Tue, 17 Apr 2018 15:48:38 -0400
Subject: don't get transform from html

---
 print/templates/operator_overview.html | 2 +-
 print/templates/print_detail.html      | 2 +-
 print/templates/print_overview.html    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'print/templates')

diff --git a/print/templates/operator_overview.html b/print/templates/operator_overview.html
index 38da7746..8615c42a 100644
--- a/print/templates/operator_overview.html
+++ b/print/templates/operator_overview.html
@@ -27,7 +27,7 @@
         <main>
             <figure class="inksimulation operator" style="height: 210mm;" title="{{ _('Ctrl + Scroll to Zoom') }}">
                 {{ svg_overview|safe }}
-                <figcaption>{{ _('Scale') }} <span data-field-name="svg-scale" contenteditable="true" data-placeholder="Enter scale...">{{ svg_transform }}</span>%</figcaption>
+                <figcaption>{{ _('Scale') }} <span class="scale" data-field-name="svg-scale" contenteditable="true" data-placeholder=""></span>%</figcaption>
                 <div>
                   <button class="svg-fit">{{ _('Fit') }}</button>
                   <button class="svg-full">100%</button>
diff --git a/print/templates/print_detail.html b/print/templates/print_detail.html
index eddcf36f..d3b064a5 100644
--- a/print/templates/print_detail.html
+++ b/print/templates/print_detail.html
@@ -17,7 +17,7 @@
         <main>
             <figure class="inksimulation" title="{{ _('Ctrl + Scroll to Zoom') }}">
                 {{color_block.svg_preview|safe}}
-                <figcaption>{{ _('Scale') }} <span data-field-name="svg-scale" contenteditable="true" data-placeholder="Enter scale...">{{ svg_transform }}</span>%</figcaption>
+                <figcaption>{{ _('Scale') }} <span class="scale" data-field-name="svg-scale" contenteditable="true" data-placeholder=""></span>%</figcaption>
                 <div>
                   <button class="svg-fit">Fit</button>
                   <button class="svg-full">100%</button>
diff --git a/print/templates/print_overview.html b/print/templates/print_overview.html
index 7a396b4a..f876ad70 100644
--- a/print/templates/print_overview.html
+++ b/print/templates/print_overview.html
@@ -27,7 +27,7 @@
         <main class="client-overview-main">
             <figure class="inksimulation" title="{{ _('Ctrl + Scroll to Zoom') }}">
                 {{ svg_overview|safe }}
-                <figcaption>{{ _('Scale') }} <span data-field-name="svg-scale" contenteditable="true" data-placeholder="Enter scale...">{{ svg_transform }}</span>%</figcaption>
+                <figcaption>{{ _('Scale') }} <span class="scale" data-field-name="svg-scale" contenteditable="true" data-placeholder=""></span>%</figcaption>
                 <div>
                   <button class="svg-fit">Fit</button>
                   <button class="svg-full">100%</button>
-- 
cgit v1.2.3


From b5968dc11ff479f2c7cd5217c47a872fe04295e4 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Tue, 17 Apr 2018 15:55:52 -0400
Subject: fix formatting of dimensions

---
 print/templates/operator_detailedview.html | 2 +-
 print/templates/operator_overview.html     | 2 +-
 print/templates/print_overview.html        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'print/templates')

diff --git a/print/templates/operator_detailedview.html b/print/templates/operator_detailedview.html
index 633b9286..92c3445f 100644
--- a/print/templates/operator_detailedview.html
+++ b/print/templates/operator_detailedview.html
@@ -25,7 +25,7 @@
                 <span>{{ _('Color Blocks') }}: {{ job.num_color_blocks }}</span>
               </p>
               <p>
-                <span>{{ _('Design box size') }}: {{ job.dimensions }}</span>
+                <span>{{ _('Design box size') }}: {{ "%0.1fmm X %0.1fmm" | format(*job.dimensions) }}</span>
                 <span>{{ _('Total thread used') }}: {{job.estimated_thread }}</span>
                 <span>{{ _('Total stitch count') }}: {{job.num_stitches }}</span>
               </p>
diff --git a/print/templates/operator_overview.html b/print/templates/operator_overview.html
index 8615c42a..59b2e028 100644
--- a/print/templates/operator_overview.html
+++ b/print/templates/operator_overview.html
@@ -11,7 +11,7 @@
                 </div>
                 <div>
                     <div class="table">
-                      <p><span>{{ _('Design box size') }}:</span><span>{{ job.dimensions }}</span></p>
+                      <p><span>{{ _('Design box size') }}:</span><span>{{ "%0.1fmm X %0.1fmm" | format(*job.dimensions) }}</span></p>
                       <p><span>{{ _('Total stitch count') }}:</span><span>{{job.num_stitches }}</span></p>
                       <p><span>{{ _('Total thread used') }}:</span><span>{{job.estimated_thread }}</span></p>
                     </div>
diff --git a/print/templates/print_overview.html b/print/templates/print_overview.html
index f876ad70..62d2982c 100644
--- a/print/templates/print_overview.html
+++ b/print/templates/print_overview.html
@@ -11,7 +11,7 @@
                 </div>
                 <div>
                     <div class="table">
-                      <p><span>{{ _('Design box size') }}:</span><span>{{ job.dimensions }}</span></p>
+                      <p><span>{{ _('Design box size') }}:</span><span>{{ "%0.1fmm X %0.1fmm" | format(*job.dimensions) }}</span></p>
                       <p><span>{{ _('Total stitch count') }}:</span><span>{{job.num_stitches }}</span></p>
                       <p><span>{{ _('Total thread used') }}:</span><span>{{job.estimated_thread }}</span></p>
                     </div>
-- 
cgit v1.2.3


From a5900865c76b4b65c712ef6d39fda9eaae2c5007 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Wed, 18 Apr 2018 16:09:43 -0400
Subject: save and restore zoom and pan

---
 print/templates/operator_overview.html | 2 +-
 print/templates/print_detail.html      | 2 +-
 print/templates/print_overview.html    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'print/templates')

diff --git a/print/templates/operator_overview.html b/print/templates/operator_overview.html
index 59b2e028..367d6d2b 100644
--- a/print/templates/operator_overview.html
+++ b/print/templates/operator_overview.html
@@ -25,7 +25,7 @@
             </div>
         </header>
         <main>
-            <figure class="inksimulation operator" style="height: 210mm;" title="{{ _('Ctrl + Scroll to Zoom') }}">
+            <figure class="inksimulation operator" data-field-name="operator-overview-transform" style="height: 210mm;" title="{{ _('Ctrl + Scroll to Zoom') }}">
                 {{ svg_overview|safe }}
                 <figcaption>{{ _('Scale') }} <span class="scale" data-field-name="svg-scale" contenteditable="true" data-placeholder=""></span>%</figcaption>
                 <div>
diff --git a/print/templates/print_detail.html b/print/templates/print_detail.html
index d3b064a5..714d33a2 100644
--- a/print/templates/print_detail.html
+++ b/print/templates/print_detail.html
@@ -15,7 +15,7 @@
             </div>
         </header>
         <main>
-            <figure class="inksimulation" title="{{ _('Ctrl + Scroll to Zoom') }}">
+            <figure class="inksimulation" data-field-name="client-detail-transform-block{{ loop.index0 }}" title="{{ _('Ctrl + Scroll to Zoom') }}">
                 {{color_block.svg_preview|safe}}
                 <figcaption>{{ _('Scale') }} <span class="scale" data-field-name="svg-scale" contenteditable="true" data-placeholder=""></span>%</figcaption>
                 <div>
diff --git a/print/templates/print_overview.html b/print/templates/print_overview.html
index 62d2982c..efcf5b2e 100644
--- a/print/templates/print_overview.html
+++ b/print/templates/print_overview.html
@@ -25,7 +25,7 @@
             </div>
         </header>
         <main class="client-overview-main">
-            <figure class="inksimulation" title="{{ _('Ctrl + Scroll to Zoom') }}">
+            <figure class="inksimulation" data-field-name="client-overview-transform" title="{{ _('Ctrl + Scroll to Zoom') }}">
                 {{ svg_overview|safe }}
                 <figcaption>{{ _('Scale') }} <span class="scale" data-field-name="svg-scale" contenteditable="true" data-placeholder=""></span>%</figcaption>
                 <div>
-- 
cgit v1.2.3


From aea5919c63796efd748d724752a86773b79b7c3b Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Wed, 18 Apr 2018 16:29:06 -0400
Subject: add notes in operator detailed view

switch to 12 color blocks per page to give more room for detailed notes
---
 print/templates/index.html                 | 2 +-
 print/templates/operator_detailedview.html | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'print/templates')

diff --git a/print/templates/index.html b/print/templates/index.html
index 21ca74ab..0c9cedfd 100644
--- a/print/templates/index.html
+++ b/print/templates/index.html
@@ -23,7 +23,7 @@
         <div class="page operator-overview" style="display: {{ 'block' if view.operator_overview else 'none' }}">{% include 'operator_overview.html' %}</div>
     
 {# operator detailed view #}
-    {% for color_block_part in color_blocks | batch(13) %}
+    {% for color_block_part in color_blocks | batch(12) %}
         {% set outer_loop = loop %}
         <div class="page operator-detailedview" style="display: {{ 'block' if view.operator_detailedview else 'none' }}">{% include 'operator_detailedview.html' %}</div>
     {% endfor %}
diff --git a/print/templates/operator_detailedview.html b/print/templates/operator_detailedview.html
index 92c3445f..f78028d7 100644
--- a/print/templates/operator_detailedview.html
+++ b/print/templates/operator_detailedview.html
@@ -10,7 +10,7 @@
               <p>{{ _('Color') }}</p>
               <p>{{ _('Thread Consumption') }}</p>
               <p>{{ _('Stops and Trims') }}</p>
-              <p>{{ _('Estimated Time') }}</p>
+              <p>{{ _('Notes') }}</p>
             </div>
             {% if outer_loop.index == 1 %}
             <div>
@@ -34,7 +34,7 @@
                 <span>{{ _('Total nr trims') }}: {{ job.num_trims }}</span>
               </p>
               <p>
-                <span>{{ job.estimated_time }}</span>
+                <span></span>
               </p>
             </div>
             {% endif %}
@@ -45,7 +45,7 @@
                 <svg xmlns="http://www.w3.org/2000/svg">
                   <rect fill="rgb{{ color_block.color.rgb }}" width="15mm" height="100%" />
                   <text fill="rgb{{ color_block.color.font_color }}">
-                    <tspan x="4mm" y="7.5mm" class="color-index">#{{ loop.index + outer_loop.index0 * 13 }}</tspan>
+                    <tspan x="4mm" y="7.5mm" class="color-index">#{{ loop.index + outer_loop.index0 * 12 }}</tspan>
                   </text>
                 </svg>
               </p>
@@ -65,7 +65,7 @@
                 <span>{{ _('# trims') }}: {{ color_block.num_trims }}</span>
               </p>
               <p>
-                <span>{{ color_block.estimatedtime }}</span>
+                <span class="notes" contenteditable="true" data-field-name="operator-notes-block{{ loop.index0 + outer_loop.index0 * 12 }}" data-placeholder="{{ _("Enter operator notes...") }}"></span>
               </p>
             </div>
           {% endfor %}
-- 
cgit v1.2.3


From 8e3dd74a286d4549fdb1dd9cc7a9fcfadb85bb9e Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Sat, 28 Apr 2018 13:36:03 -0400
Subject: add hint about clicking logo

---
 print/templates/headline.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'print/templates')

diff --git a/print/templates/headline.html b/print/templates/headline.html
index 421202e4..7a7059b9 100644
--- a/print/templates/headline.html
+++ b/print/templates/headline.html
@@ -3,6 +3,7 @@
     <img src="{{ logo.src or "resources/inkstitch-logo.svg" }}" alt="{{ logo.title }}" title="{{ logo.title }}" data-field-name="logo">
     <input type=file id="logo-picker" />
   </label>
+  <span class="logo-instructions">{{ _("Click to choose another logo") }}</span>
 </figure>
 <div class="headline">
   <div class="pageTitle">
@@ -10,6 +11,6 @@
       <p class="header-field" data-label="{{ _('CLIENT') }}:" contenteditable="true" data-placeholder="{{ _('Enter client name...') }}" data-field-name="client-name"></p>
       <p class="header-field" data-label="{{ _('PURCHASE ORDER #:') }}" contenteditable="true" data-placeholder="{{ _('Enter purchase order number...') }}" data-field-name="purchase-order"></p>
   </div>
-  
+
   <div class="currentDate">{{ date|datetimeformat(_('%Y.%m.%d')) }}</div>
 </div>
-- 
cgit v1.2.3