Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix print metadata #372

Merged
merged 2 commits into from Jan 1, 2019
Merged

Fix print metadata #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d00a728
remove li-tag from svg
kaalleen Dec 31, 2018
deea4d0
remove accidentally added svg-tag
kaalleen Dec 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion lib/extensions/print_pdf.py
View file
Open in desktop
Expand Up @@ -365,7 +365,6 @@ def render_html(self, stitch_plan, overview_svg, selected_palette):
'num_trims': stitch_plan.num_trims,
'dimensions': stitch_plan.dimensions_mm,
'num_stitches': stitch_plan.num_stitches,
'estimated_time': '', # TODO
'estimated_thread': '', # TODO
},
svg_overview=overview_svg,
Expand Down
4 changes: 2 additions & 2 deletions print/templates/operator_detailedview.html
View file
Open in desktop
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion print/templates/operator_overview.html
View file
Open in desktop
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion print/templates/print_detail.html
View file
Open in desktop
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion print/templates/print_overview.html
View file
Open in desktop
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions print/templates/ui.html
View file
Open in desktop
Expand Up @@ -112,12 +112,12 @@ <h1>{{ _('Settings') }}</h1>
</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>
Expand Down