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/operator_detailedview.html | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'print/templates/operator_detailedview.html')

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