From d4c95e080ffb80ceb6f10b663c7547b25689a840 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Sat, 21 Apr 2018 16:23:13 -0400
Subject: assign thread color names in printout

---
 print/templates/color_swatch.html          | 18 +++++++++---------
 print/templates/operator_detailedview.html | 13 ++++++-------
 2 files changed, 15 insertions(+), 16 deletions(-)

(limited to 'print/templates')

diff --git a/print/templates/color_swatch.html b/print/templates/color_swatch.html
index 21cc0c21..6785b080 100644
--- a/print/templates/color_swatch.html
+++ b/print/templates/color_swatch.html
@@ -1,18 +1,18 @@
-  
+
   {% if printview != 'detailedview' %}
   <div class="color-swatch">
     <div class="swatch-info">
        <svg width="100%" height="100%" class="color-swatch-svg" xmlns="http://www.w3.org/2000/svg">
         <rect fill="rgb{{ color_block.color.rgb }}" stroke="rgb(192, 192, 192)" stroke-width="1px" width="100%" height="100%" />
         <text fill="rgb{{ color_block.color.font_color }}">
-            <tspan dy="1.2em" x="2mm" y="2mm" class="color-name">{{ _('Color') }}: </tspan><tspan data-field-name="color-{{ color_block.color.hex_digits }}">{{ color_block.color.thread_name }}</tspan>
+            <tspan dy="1.2em" x="2mm" y="2mm" class="color-name">{{ _('Color') }}: </tspan><tspan data-field-name="color-{{ color_block.color.hex_digits }}">{{ color_block.color.name }}</tspan>
             {# We don't want to see rgb if we have more than 7 colorSwatches #}
             {% if color_blocks|length < 7 %}
             <tspan dy="1.2em" x="2mm" class="color-rgb">{{ _('rgb') }}: {{ color_block.color.rgb }}</tspan>
             {% endif %}
             {# We don't want to see thread_used if we have more than 7 colorSwatches to show #}
-            {% if color_blocks|length < 7 %}       
-            <tspan dy="1.2em" x="2mm" class="swatch-thread">{{ _('thread used') }}: {{ color_block.color.thread_description }}</tspan>
+            {% if color_blocks|length < 7 %}
+            <tspan dy="1.2em" x="2mm" class="swatch-thread" data-field-name="thread-{{ color_block.color.hex_digits }}">{{ _('thread') }}: {{ color_block.color.manufacturer }} {{ "#" + color_block.color.number if color_block.color.number }}</tspan>
             {% endif %}
             {# We don't want to see num_stitch if we have more than 49 colorSwatches to show #}
             {% if color_blocks|length < 49 %}
@@ -27,9 +27,9 @@
       </svg>
     </div>
   </div>
-  
+
   {% else %}
-  
+
   <div class="color-swatch">
     <div class="swatch-info">
        <svg width="100%" height="100%" class="colorSwatchSVG" xmlns="http://www.w3.org/2000/svg">
@@ -37,9 +37,9 @@
        </svg>
        <div class="color-info">
         <div>
-          <p><span class="color-name">{{ _('Color') }}:</span><span data-field-name="color-{{ color_block.color.hex_digits }}" contenteditable="true" data-placeholder="Enter thread name...">{{ color_block.color.thread_name }}</span></p>
+          <p><span class="color-name">{{ _('Color') }}:</span><span data-field-name="color-{{ color_block.color.hex_digits }}" contenteditable="true" data-placeholder="Enter thread name...">{{ color_block.color.name }}</span></p>
           <p><span class="color-rgb">{{ _('rgb') }}:</span><span>{{ color_block.color.rgb }}</span></p>
-          <p><span class="swatch-thread">{{ _('thread used') }}:</span><span>{{ color_block.color.thread_description }}</span></p>
+          <p><span class="swatch-thread">{{ _('thread') }}:</span><span data-field-name="thread-{{ color_block.color.hex_digits }}" contenteditable="true">{{ color_block.color.manufacturer }} {{ "#" + color_block.color.number if color_block.color.number }}</span></p>
           <p><span class="swatch-stitches">{{ _('# stitches') }}:</span><span>{{ color_block.num_stitches }}</span></p>
           <p><span class="swatch-stops">{{ _('# stops') }}:</span><span>{{ color_block.num_stops }}</span></p>
           <p><span class="swatch-trims">{{ _('# trims') }}:</span><span>{{ color_block.num_trims }}</span></p>
@@ -47,5 +47,5 @@
       </div>
     </div>
   </div>
-  
+
   {%endif %}
diff --git a/print/templates/operator_detailedview.html b/print/templates/operator_detailedview.html
index f78028d7..0b948cb0 100644
--- a/print/templates/operator_detailedview.html
+++ b/print/templates/operator_detailedview.html
@@ -1,7 +1,7 @@
         <header>
           {% include 'headline.html' %}
         </header>
-        
+
         <main>
           <div class="operator-job-info">
             <div class="job-headline">
@@ -39,7 +39,7 @@
             </div>
             {% endif %}
             {% for color_block in color_block_part %}
-            
+
             <div style="display: table-row;">
               <p class="operator-svg operator-colorswatch">
                 <svg xmlns="http://www.w3.org/2000/svg">
@@ -53,11 +53,12 @@
                   {{ color_block.svg_preview|safe }}
               </p>
               <p>
-                <span data-field-name="color-{{ color_block.color.hex_digits }}" contenteditable="true" data-placeholder="Enter thread name...">{{ color_block.color.thread_name }}</span>
+                <span data-field-name="color-{{ color_block.color.hex_digits }}" contenteditable="true" data-placeholder="Enter thread name...">{{ color_block.color.name }}</span>
                 <span>{{ color_block.color.rgb }}</span>
+                <span data-field-name="thread-{{ color_block.color.hex_digits }}" contenteditable="true">{{ color_block.color.manufacturer }} {{ "#" + color_block.color.number if color_block.color.number }}</span>
               </p>
               <p>
-                <span>{{ _('thread used') }}: {{ color_block.color.thread_description }}</span>
+                <span>{{ _('thread used') }}:</span>
                 <span>{{ _('# stitches') }}: {{ color_block.num_stitches }}</span>
               </p>
               <p>
@@ -71,7 +72,5 @@
           {% endfor %}
           </div>
         </main>
-        
+
         {% include 'footer.html' %}
-        
-           
-- 
cgit v1.2.3


From c234d6ed2c7d8cd7b7991643dbec4383bed9e2dc Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Mon, 23 Apr 2018 23:12:48 -0400
Subject: UI to select different thread paette

---
 print/templates/ui.html | 61 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 44 insertions(+), 17 deletions(-)

(limited to 'print/templates')

diff --git a/print/templates/ui.html b/print/templates/ui.html
index f7246962..112a342e 100644
--- a/print/templates/ui.html
+++ b/print/templates/ui.html
@@ -9,26 +9,53 @@
           {{ _('⚠ lost connection to Ink/Stitch') }}
         </div>
     </div>
-    
+
     <div id="settings-ui">
       <p id="close-settings">X</p>
       <h1>{{ _('Settings') }}</h1>
-      <div>
-        <p>{{ _('Printing Size') }}: 
-          <select id="printing-size" data-field-name="paper-size">
-            <option value="letter" selected="selected">Letter</option>
-            <option value="a4">A4</option>
+      <fieldset>
+        <legend>{{ _('Page Setup') }}</legend>
+        <div>
+          <p>{{ _('Printing Size') }}:
+            <select id="printing-size" data-field-name="paper-size">
+              <option value="letter" selected="selected">Letter</option>
+              <option value="a4">A4</option>
+            </select>
+          </p>
+        </div>
+        <div>
+         <fieldset>
+            <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 these Page Setup settings and also the icon.") }}">{{ _("Save as defaults") }}</button>
+        </div>
+      </fieldset>
+      <fieldset>
+        <legend>{{ _('Design') }}</legend>
+        <p>{{ _('Thread Palette') }}:
+          <select id="thread-palette" data-field-name="thread-palette">
+            {% if selected_palette is none %}
+              <option value="" selected>None</option>
+            {% endif %}
+            {% for palette in palettes %}
+              <option value="{{ palette }}" {{ "selected" if palette == selected_palette else "" }}>{{ palette }}</option>
+            {% endfor %}
           </select>
         </p>
-      </div>
-      <div>
-       <fieldset>
-          <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>
+      </fieldset>
+    </div>
+
+    <div id="modal-background" class="modal"></div>
+    <div id="modal-content" class="modal">
+        <p>
+          {{ _("Changing the thread palette will cause thread names and catalog numbers to be recalculated based on the new palette.  Any changes you have made to color or thread names will be lost.  Are you sure?") }}
+        </p>
+        <p>
+          <button id="modal-yes">{{ _("Yes") }}</button>
+          <button id="modal-no">{{ _("No") }}</button>
+        </p>
     </div>
-- 
cgit v1.2.3