summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/extensions/print_pdf.py2
-rw-r--r--print/resources/inkstitch.js2
-rw-r--r--print/resources/style.css17
-rw-r--r--print/templates/full_page_pattern.html17
-rw-r--r--print/templates/index.html4
-rw-r--r--print/templates/ui.html11
6 files changed, 50 insertions, 3 deletions
diff --git a/lib/extensions/print_pdf.py b/lib/extensions/print_pdf.py
index 47e68c5d..01878e8d 100644
--- a/lib/extensions/print_pdf.py
+++ b/lib/extensions/print_pdf.py
@@ -274,6 +274,8 @@ class Print(InkstitchExtension):
'client_detailedview': False,
'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 01908246..8bce3912 100644
--- a/print/resources/inkstitch.js
+++ b/print/resources/inkstitch.js
@@ -736,6 +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-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/resources/style.css b/print/resources/style.css
index d4a05e52..db5ba603 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;
}
@@ -956,7 +965,7 @@ body {
height: 30mm;
}
- .custom-page main {
+ .custom-page main, .custom-page main fieldset {
height: 230mm
}
#custom-page-tool-bar {
@@ -969,6 +978,11 @@ body {
text-align: left;
}
+ @media print {
+ #custom-page-content {
+ border: none;
+ }
+ }
/* Color Swatch Logic */
/* reference : http://jsfiddle.net/jrulle/btg63ezy/3/ */
@@ -1162,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/full_page_pattern.html b/print/templates/full_page_pattern.html
new file mode 100644
index 00000000..f8bd3c5e
--- /dev/null
+++ b/print/templates/full_page_pattern.html
@@ -0,0 +1,17 @@
+<main>
+ <figure class="inksimulation full-page-pattern operator"
+ data-field-name="full-page-patternview-transform"
+ title="{{ _('Ctrl + Scroll to Zoom') }}"
+ style="cursor: auto;">
+ {{ svg_overview|replace("<li>", "")|replace("</li>", "")|safe }}
+ {% with %}
+ {% set realistic_id='realistic-pattern-overview' %}
+ {% include 'ui_svg_action_buttons.html' with context %}
+ {% endwith %}
+ </figure>
+ </main>
+
+<div class="show-footer" style="display: {{ 'block' if view.show_footer else 'none' }}">
+ {% include 'footer.html' %}
+</div>
+
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 #}
+ <div class="page full-page-patternview" style="display: {{'block' if view.full_page_patternview else 'none' }}">
+ {% include 'full_page_pattern.html' %}
+ </div>
{# custom pages #}
<div class="page custom-page" style="display: {{ 'block' if view.custom_page else 'none' }}">{% include 'custom-page.html' %}</div>
</body>
diff --git a/print/templates/ui.html b/print/templates/ui.html
index dd61e2d8..4282838d 100644
--- a/print/templates/ui.html
+++ b/print/templates/ui.html
@@ -54,11 +54,20 @@
<input type="checkbox" class="view" id="operator-detailedview" data-field-name="operator-detailedview" CHECKED />
<label for="operator-detailedview">{{ _('Operator Detailed View') }}</label>
</p>
- <p style="text-indent: 1.5em;">{{ _('Thumbnail size') }}:
+ <p style="text-indent: 1.5em;">
+ <label for="operator-detailedview-thumbnail-size">{{ _('Thumbnail size') }}</label>
<input type="range" min="15" max="110" value="15" step="5" id="operator-detailedview-thumbnail-size" data-field-name="operator-detailedview-thumbnail-size" style="vertical-align: middle;" />
<span id="display-thumbnail-size">15mm</span>
</p>
<p>
+ <input type="checkbox" class="view" id="full-page-patternview" data-field-name="full-page-patternview" />
+ <label for="full-page-patternview">{{ _('Full Page Pattern View') }}</label>
+ </p>
+ <p style="text-indent: 1.5em;">
+ <input type="checkbox" class="view" id="show-footer" data-field-name="show-footer" />
+ <label for="show-footer">{{ _('Show Footer') }}</label>
+ </p>
+ <p>
<input type="checkbox" class="view" id="custom-page" data-field-name="custom-page" />
<label for="custom-page">{{ _('Custom information sheet') }}</label>
</p>