From d4c4f2c7cc947eea71d99ef6030ecb4401508835 Mon Sep 17 00:00:00 2001 From: Kaalleen <36401965+kaalleen@users.noreply.github.com> Date: Thu, 12 Jul 2018 21:16:22 +0200 Subject: operator detailedview dynamic thumbnail size (#221) --- print/templates/headline.html | 2 +- print/templates/index.html | 6 +- print/templates/operator_detailedview.html | 138 ++++++++++++++--------------- print/templates/operator_overview.html | 11 +-- print/templates/print_detail.html | 11 +-- print/templates/print_overview.html | 11 +-- print/templates/ui.html | 76 +++++++++------- print/templates/ui_svg_action_buttons.html | 10 +++ 8 files changed, 128 insertions(+), 137 deletions(-) create mode 100644 print/templates/ui_svg_action_buttons.html (limited to 'print/templates') diff --git a/print/templates/headline.html b/print/templates/headline.html index 7a7059b9..369c370e 100644 --- a/print/templates/headline.html +++ b/print/templates/headline.html @@ -2,8 +2,8 @@ - {{ _("Click to choose another logo") }}
diff --git a/print/templates/index.html b/print/templates/index.html index 0c9cedfd..c7fa5d74 100644 --- a/print/templates/index.html +++ b/print/templates/index.html @@ -5,6 +5,7 @@ + {% include 'ui.html' %} @@ -23,10 +24,7 @@
{% include 'operator_overview.html' %}
{# operator detailed view #} - {% for color_block_part in color_blocks | batch(12) %} - {% set outer_loop = loop %} -
{% include 'operator_detailedview.html' %}
- {% endfor %} + {% include 'operator_detailedview.html' %} diff --git a/print/templates/operator_detailedview.html b/print/templates/operator_detailedview.html index 0b948cb0..e1899db4 100644 --- a/print/templates/operator_detailedview.html +++ b/print/templates/operator_detailedview.html @@ -1,76 +1,76 @@ + + +
+

+ ## +

+

+ {{ svg_overview|safe }} +

+

+ {{ _('Unique Colors') }}: {{ job.num_colors }} + {{ _('Color Blocks') }}: {{ job.num_color_blocks }} +

+

+ {{ _('Design box size') }}: {{ "%0.1fmm X %0.1fmm" | format(*job.dimensions) }} + {{ _('Total thread used') }}: {{job.estimated_thread }} + {{ _('Total stitch count') }}: {{job.num_stitches }} +

+

+ {{ _('Total nr stops') }}: {{ job.num_stops }} + {{ _('Total nr trims') }}: {{ job.num_trims }} +

+

+ +

+
+ + + {% for color_block in color_blocks %} -
-
-
-

{# svg color #}

-

{# svg preview #}

-

{{ _('Color') }}

-

{{ _('Thread Consumption') }}

-

{{ _('Stops and Trims') }}

-

{{ _('Notes') }}

-
- {% if outer_loop.index == 1 %} -
-

- ## -

-

- {{ svg_overview|safe }} -

-

- {{ _('Unique Colors') }}: {{ job.num_colors }} - {{ _('Color Blocks') }}: {{ job.num_color_blocks }} -

-

- {{ _('Design box size') }}: {{ "%0.1fmm X %0.1fmm" | format(*job.dimensions) }} - {{ _('Total thread used') }}: {{job.estimated_thread }} - {{ _('Total stitch count') }}: {{job.num_stitches }} -

-

- {{ _('Total nr stops') }}: {{ job.num_stops }} - {{ _('Total nr trims') }}: {{ job.num_trims }} -

-

- -

-
- {% endif %} - {% for color_block in color_block_part %} -
-

- - - - #{{ loop.index + outer_loop.index0 * 12 }} - - -

-

- {{ color_block.svg_preview|safe }} -

-

- {{ color_block.color.name }} - {{ color_block.color.rgb }} - {{ color_block.color.manufacturer }} {{ "#" + color_block.color.number if color_block.color.number }} -

-

- {{ _('thread used') }}: - {{ _('# stitches') }}: {{ color_block.num_stitches }} -

-

- {{ _('# stops') }}: {{ color_block.num_stops }} - {{ _('# trims') }}: {{ color_block.num_trims }} -

-

- -

-
- {% endfor %} +
+

+ + + + #{{ loop.index }} + + +

+

+ {{ color_block.svg_preview|safe }} +

+

+ {{ color_block.color.name }} + {{ color_block.color.rgb }} + {{ color_block.color.manufacturer }} {{ "#" + color_block.color.number if color_block.color.number }} +

+

+ {{ _('thread used') }}: + {{ _('# stitches') }}: {{ color_block.num_stitches }} +

+

+ {{ _('# stops') }}: {{ color_block.num_stops }} + {{ _('# trims') }}: {{ color_block.num_trims }} +

+

+ +

-
+ {% endfor %} + - {% include 'footer.html' %} diff --git a/print/templates/operator_overview.html b/print/templates/operator_overview.html index 6fa46911..0c379316 100644 --- a/print/templates/operator_overview.html +++ b/print/templates/operator_overview.html @@ -27,16 +27,7 @@
{{ svg_overview|safe }} -
{{ _('Scale') }} %
-
- - - - -
+ {% include 'ui_svg_action_buttons.html' %}
{% include 'footer.html' %} diff --git a/print/templates/print_detail.html b/print/templates/print_detail.html index e73fe918..241ac88b 100644 --- a/print/templates/print_detail.html +++ b/print/templates/print_detail.html @@ -17,16 +17,7 @@
{{color_block.svg_preview|safe}} -
{{ _('Scale') }} %
-
- - - - -
+ {% include 'ui_svg_action_buttons.html' %}
{% include 'color_swatch.html' %} diff --git a/print/templates/print_overview.html b/print/templates/print_overview.html index b42ab7a9..ca8638ff 100644 --- a/print/templates/print_overview.html +++ b/print/templates/print_overview.html @@ -27,16 +27,7 @@
{{ svg_overview|safe }} -
{{ _('Scale') }} %
-
- - - - -
+ {% include 'ui_svg_action_buttons.html' %}
diff --git a/print/templates/ui.html b/print/templates/ui.html index 3b11f345..bc6c57b9 100644 --- a/print/templates/ui.html +++ b/print/templates/ui.html @@ -13,41 +13,51 @@

X

{{ _('Settings') }}

-
- {{ _('Page Setup') }} -
-

{{ _('Printing Size') }}: - + + + +

+
+
+
+ {{ _('Print Layouts') }} +

+

+

+

+

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

+
+ +
+
+
+ {{ _('Design') }} +

+

-
-
-
- {{ _('Print Layouts') }} -

-

-

-

-
- -
- -
- {{ _('Design') }} -

{{ _('Thread Palette') }}: - -

-
-
+ +
+
diff --git a/print/templates/ui_svg_action_buttons.html b/print/templates/ui_svg_action_buttons.html new file mode 100644 index 00000000..c111d634 --- /dev/null +++ b/print/templates/ui_svg_action_buttons.html @@ -0,0 +1,10 @@ +
{{ _('Scale') }} %
+
+ + + + +
-- cgit v1.2.3