diff options
Diffstat (limited to 'print/templates')
| -rw-r--r-- | print/templates/color_swatch.html | 18 | ||||
| -rw-r--r-- | print/templates/operator_detailedview.html | 13 |
2 files changed, 15 insertions, 16 deletions
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' %} - - |