From 85e12f4b859af8c47b2e113af993b7591738130b Mon Sep 17 00:00:00 2001
From: Kaalleen <36401965+kaalleen@users.noreply.github.com>
Date: Tue, 1 Jan 2019 19:47:28 +0100
Subject: Fix print metadata (#372)

---
 print/templates/operator_detailedview.html | 4 ++--
 print/templates/operator_overview.html     | 2 +-
 print/templates/print_detail.html          | 2 +-
 print/templates/print_overview.html        | 2 +-
 print/templates/ui.html                    | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'print')

diff --git a/print/templates/operator_detailedview.html b/print/templates/operator_detailedview.html
index 608b3661..c74a7a72 100644
--- a/print/templates/operator_detailedview.html
+++ b/print/templates/operator_detailedview.html
@@ -18,7 +18,7 @@
             <span>##</span>
           </p>
           <p class="operator-svg operator-preview">
-            {{ svg_overview|safe }}
+            {{ svg_overview|replace("<li>", "")|replace("</li>", "")|safe }}
           </p>
           <p>
             <span>{{ _('Unique Colors') }}: {{ job.num_colors }}</span>
@@ -51,7 +51,7 @@
               </svg>
             </p>
             <p class="operator-svg operator-preview">
-                {{ color_block.svg_preview|safe }}
+                {{ color_block.svg_preview|replace("<li>", "")|replace("</li>", "")|safe }}
             </p>
             <p>
               <span data-field-name="color-{{ color_block.color.hex_digits }}" contenteditable="true" data-placeholder="{{ _('Enter thread name...') }}">{{ color_block.color.name }}</span>
diff --git a/print/templates/operator_overview.html b/print/templates/operator_overview.html
index 359d4f50..8f70b4f0 100644
--- a/print/templates/operator_overview.html
+++ b/print/templates/operator_overview.html
@@ -26,7 +26,7 @@
         </header>
         <main>
             <figure class="inksimulation operator" data-field-name="operator-overview-transform" style="height: 210mm;" title="{{ _('Ctrl + Scroll to Zoom') }}">
-                {{ svg_overview|safe }}
+                {{ svg_overview|replace("<li>", "")|replace("</li>", "")|safe }}
                 {% include 'ui_svg_action_buttons.html' %}
             </figure>
         </main>
diff --git a/print/templates/print_detail.html b/print/templates/print_detail.html
index 0c6bbefe..0dca4978 100644
--- a/print/templates/print_detail.html
+++ b/print/templates/print_detail.html
@@ -16,7 +16,7 @@
         </header>
         <main>
             <figure class="inksimulation" data-field-name="client-detail-transform-block{{ loop.index0 }}" title="{{ _('Ctrl + Scroll to Zoom') }}">
-                {{color_block.svg_preview|safe}}
+                {{color_block.svg_preview|replace("<li>", "")|replace("</li>", "")|safe}}
                 {% include 'ui_svg_action_buttons.html' %}
             </figure>
             <div class="color-palette detailed">
diff --git a/print/templates/print_overview.html b/print/templates/print_overview.html
index a2548070..d5111562 100644
--- a/print/templates/print_overview.html
+++ b/print/templates/print_overview.html
@@ -26,7 +26,7 @@
         </header>
         <main class="client-overview-main">
             <figure class="inksimulation" data-field-name="client-overview-transform" title="{{ _('Ctrl + Scroll to Zoom') }}">
-                {{ svg_overview|safe }}
+                {{ svg_overview|replace("<li>", "")|replace("</li>", "")|safe }}
                 {% include 'ui_svg_action_buttons.html' %}
             </figure>
 
diff --git a/print/templates/ui.html b/print/templates/ui.html
index 2db3a81d..71908b52 100644
--- a/print/templates/ui.html
+++ b/print/templates/ui.html
@@ -112,12 +112,12 @@
         </fieldset>
         <fieldset>
           <legend>{{ _('Display Time On') }}</legend>
-          <p>
+          <div>
             <p><input type="checkbox" class="time-display" id="time-clo" data-field-name="time-clo" /><label for="time-clo">{{ _('Client Overview') }}</label></p>
             <p><input type="checkbox" class="time-display" id="time-cld" data-field-name="time-cld" /><label for="time-cld">{{ _('Client Detailed View') }}</label></p>
             <p><input type="checkbox" class="time-display" id="time-opo" data-field-name="time-opo" CHECKED /><label for="time-opo">{{ _('Operator Overview') }}</label></p>
             <p><input type="checkbox" class="time-display" id="time-opd" data-field-name="time-opd" CHECKED /><label for="time-opd">{{ _('Operator Detailed View') }}</label></p>
-          </p>
+          </div>
         </fieldset>
         <button class="save-settings" title="{{ _('Includes page setup, estimated time and also the branding.') }}">{{ _("Save as defaults") }}</button>
       </fieldset>
-- 
cgit v1.2.3