From ff05e24696a1ddeea415594f6f447d6055045de2 Mon Sep 17 00:00:00 2001 From: cole Date: Fri, 30 Sep 2022 12:34:00 -0500 Subject: change to full-page-patternview --- lib/extensions/print_pdf.py | 1 + print/resources/inkstitch.js | 1 + print/resources/style.css | 9 +++++++++ print/templates/full_page_pattern.html | 12 ++++++++++++ print/templates/index.html | 4 ++++ print/templates/ui.html | 4 ++++ 6 files changed, 31 insertions(+) create mode 100644 print/templates/full_page_pattern.html diff --git a/lib/extensions/print_pdf.py b/lib/extensions/print_pdf.py index 47e68c5d..9df5d83c 100644 --- a/lib/extensions/print_pdf.py +++ b/lib/extensions/print_pdf.py @@ -274,6 +274,7 @@ class Print(InkstitchExtension): 'client_detailedview': False, 'operator_overview': True, 'operator_detailedview': True, + 'full_page_patternview': False, 'custom_page': False }, logo={'src': '', 'title': 'LOGO'}, diff --git a/print/resources/inkstitch.js b/print/resources/inkstitch.js index 01908246..d81e019d 100644 --- a/print/resources/inkstitch.js +++ b/print/resources/inkstitch.js @@ -736,6 +736,7 @@ $(function() { settings["operator-detailedview"] = $("[data-field-name='operator-detailedview']").is(':checked'); settings["operator-detailedview-thumbnail-size"] = $("[data-field-name='operator-detailedview-thumbnail-size']").val(); settings["custom-page"] = $("[data-field-name='custom-page']").is(':checked'); + settings["full_page_patternview"] = $("[data-filed-name='full_page_patternview']").is(':checked'); settings["paper-size"] = $('select#printing-size').find(':selected').val(); var logo = $("figure.brandlogo img").attr('src'); diff --git a/print/resources/style.css b/print/resources/style.css index d4a05e52..44be4104 100644 --- a/print/resources/style.css +++ b/print/resources/style.css @@ -573,6 +573,15 @@ body { overflow: hidden; } + figure.full-page-pattern { + border: none; + height: 265mm; + } + + div.full-page-patternview figcaption { + display: none; + } + .client-overview-main figure.inksimulation { height: 155mm; } diff --git a/print/templates/full_page_pattern.html b/print/templates/full_page_pattern.html new file mode 100644 index 00000000..bf0e84c4 --- /dev/null +++ b/print/templates/full_page_pattern.html @@ -0,0 +1,12 @@ +
+
+ {{ svg_overview|replace("
  • ", "")|replace("
  • ", "")|safe }} + {% with %} + {% set realistic_id='realistic-pattern-overview' %} + {% include 'ui_svg_action_buttons.html' with context %} + {% endwith %} +
    +
    diff --git a/print/templates/index.html b/print/templates/index.html index 612506c9..6ff8de67 100644 --- a/print/templates/index.html +++ b/print/templates/index.html @@ -31,6 +31,10 @@ {# operator detailed view #} {% include 'operator_detailedview.html' %} + {# full page pattern view #} +
    + {% include 'full_page_pattern.html' %} +
    {# custom pages #}
    {% include 'custom-page.html' %}
    diff --git a/print/templates/ui.html b/print/templates/ui.html index dd61e2d8..b6999b57 100644 --- a/print/templates/ui.html +++ b/print/templates/ui.html @@ -54,6 +54,10 @@

    +

    + + +

    {{ _('Thumbnail size') }}: 15mm -- cgit v1.2.3 From d4720ceb9bf4e8789d5aadc0bdac73750e0e0e51 Mon Sep 17 00:00:00 2001 From: cole Date: Fri, 30 Sep 2022 14:14:59 -0500 Subject: add footer toggle --- lib/extensions/print_pdf.py | 1 + print/resources/inkstitch.js | 3 ++- print/templates/full_page_pattern.html | 5 +++++ print/templates/ui.html | 4 ++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/extensions/print_pdf.py b/lib/extensions/print_pdf.py index 9df5d83c..01878e8d 100644 --- a/lib/extensions/print_pdf.py +++ b/lib/extensions/print_pdf.py @@ -275,6 +275,7 @@ class Print(InkstitchExtension): 'operator_overview': True, 'operator_detailedview': True, 'full_page_patternview': False, + 'show_footer': False, 'custom_page': False }, logo={'src': '', 'title': 'LOGO'}, diff --git a/print/resources/inkstitch.js b/print/resources/inkstitch.js index d81e019d..8bce3912 100644 --- a/print/resources/inkstitch.js +++ b/print/resources/inkstitch.js @@ -736,7 +736,8 @@ $(function() { settings["operator-detailedview"] = $("[data-field-name='operator-detailedview']").is(':checked'); settings["operator-detailedview-thumbnail-size"] = $("[data-field-name='operator-detailedview-thumbnail-size']").val(); settings["custom-page"] = $("[data-field-name='custom-page']").is(':checked'); - settings["full_page_patternview"] = $("[data-filed-name='full_page_patternview']").is(':checked'); + settings["full-page-patternview"] = $("[data-field-name='full-page-patternview']").is(':checked'); + settings["show-footer"] = $("[data-field-name='show-footer']").is(':checked'); settings["paper-size"] = $('select#printing-size').find(':selected').val(); var logo = $("figure.brandlogo img").attr('src'); diff --git a/print/templates/full_page_pattern.html b/print/templates/full_page_pattern.html index bf0e84c4..f8bd3c5e 100644 --- a/print/templates/full_page_pattern.html +++ b/print/templates/full_page_pattern.html @@ -10,3 +10,8 @@ {% endwith %} + +

    + diff --git a/print/templates/ui.html b/print/templates/ui.html index b6999b57..f1dd9c12 100644 --- a/print/templates/ui.html +++ b/print/templates/ui.html @@ -58,6 +58,10 @@

    +

    + + +

    {{ _('Thumbnail size') }}: 15mm -- cgit v1.2.3 From 318069d194c77fc294eeb8b30a5390c9d63b040c Mon Sep 17 00:00:00 2001 From: Kaalleen Date: Sat, 15 Oct 2022 17:23:47 +0200 Subject: fix custom information sheet print out --- print/resources/style.css | 8 ++++++-- print/templates/ui.html | 11 ++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/print/resources/style.css b/print/resources/style.css index 44be4104..db5ba603 100644 --- a/print/resources/style.css +++ b/print/resources/style.css @@ -965,7 +965,7 @@ body { height: 30mm; } - .custom-page main { + .custom-page main, .custom-page main fieldset { height: 230mm } #custom-page-tool-bar { @@ -978,6 +978,11 @@ body { text-align: left; } + @media print { + #custom-page-content { + border: none; + } + } /* Color Swatch Logic */ /* reference : http://jsfiddle.net/jrulle/btg63ezy/3/ */ @@ -1171,7 +1176,6 @@ body { #errors, span.logo-instructions, #custom-page-tool-bar, - #custom-page-content, .notice--warning { display: none !important; } diff --git a/print/templates/ui.html b/print/templates/ui.html index f1dd9c12..4282838d 100644 --- a/print/templates/ui.html +++ b/print/templates/ui.html @@ -54,18 +54,19 @@

    +

    + + + 15mm +

    -

    +

    -

    {{ _('Thumbnail size') }}: - - 15mm -

    -- cgit v1.2.3