diff options
Diffstat (limited to 'print/templates')
| -rw-r--r-- | print/templates/headline.html | 14 | ||||
| -rw-r--r-- | print/templates/index.html | 2 | ||||
| -rw-r--r-- | print/templates/operator_detailedview.html | 10 | ||||
| -rw-r--r-- | print/templates/operator_overview.html | 11 | ||||
| -rw-r--r-- | print/templates/print_detail.html | 9 | ||||
| -rw-r--r-- | print/templates/print_overview.html | 11 | ||||
| -rw-r--r-- | print/templates/ui.html | 13 |
7 files changed, 45 insertions, 25 deletions
diff --git a/print/templates/headline.html b/print/templates/headline.html index 649c02ea..7a7059b9 100644 --- a/print/templates/headline.html +++ b/print/templates/headline.html @@ -1,12 +1,16 @@ <figure class="brandlogo"> - <img src="{{ logo.src or "resources/inkstitch-logo.svg" }}" alt="{{ logo.title }}" title="{{ logo.title }}"> + <label for="logo-picker"> + <img src="{{ logo.src or "resources/inkstitch-logo.svg" }}" alt="{{ logo.title }}" title="{{ logo.title }}" data-field-name="logo"> + <input type=file id="logo-picker" /> + </label> + <span class="logo-instructions">{{ _("Click to choose another logo") }}</span> </figure> <div class="headline"> <div class="pageTitle"> - <h1><span class="jobtitle" contenteditable="true" data-placeholder="{{ _('Enter job title...') }}" data-field-name="job-title">{{ job.title }}</span></h1> - <p class="header-field" data-label="{{ _('CLIENT') }}:" contenteditable="true" data-placeholder="{{ _('Enter client name...') }}" data-field-name="client-name">{{ client }}</p> - <p class="header-field" data-label="{{ _('PURCHASE ORDER #:') }}" contenteditable="true" data-placeholder="{{ _('Enter purchase order number...') }}" data-field-name="purchase-order">{{ purchase_order }}</p> + <h1><span class="jobtitle" contenteditable="true" data-placeholder="{{ _('Enter job title...') }}" data-field-name="title"></span></h1> + <p class="header-field" data-label="{{ _('CLIENT') }}:" contenteditable="true" data-placeholder="{{ _('Enter client name...') }}" data-field-name="client-name"></p> + <p class="header-field" data-label="{{ _('PURCHASE ORDER #:') }}" contenteditable="true" data-placeholder="{{ _('Enter purchase order number...') }}" data-field-name="purchase-order"></p> </div> - + <div class="currentDate">{{ date|datetimeformat(_('%Y.%m.%d')) }}</div> </div> diff --git a/print/templates/index.html b/print/templates/index.html index 21ca74ab..0c9cedfd 100644 --- a/print/templates/index.html +++ b/print/templates/index.html @@ -23,7 +23,7 @@ <div class="page operator-overview" style="display: {{ 'block' if view.operator_overview else 'none' }}">{% include 'operator_overview.html' %}</div> {# operator detailed view #} - {% for color_block_part in color_blocks | batch(13) %} + {% for color_block_part in color_blocks | batch(12) %} {% set outer_loop = loop %} <div class="page operator-detailedview" style="display: {{ 'block' if view.operator_detailedview else 'none' }}">{% include 'operator_detailedview.html' %}</div> {% endfor %} diff --git a/print/templates/operator_detailedview.html b/print/templates/operator_detailedview.html index 633b9286..f78028d7 100644 --- a/print/templates/operator_detailedview.html +++ b/print/templates/operator_detailedview.html @@ -10,7 +10,7 @@ <p>{{ _('Color') }}</p> <p>{{ _('Thread Consumption') }}</p> <p>{{ _('Stops and Trims') }}</p> - <p>{{ _('Estimated Time') }}</p> + <p>{{ _('Notes') }}</p> </div> {% if outer_loop.index == 1 %} <div> @@ -25,7 +25,7 @@ <span>{{ _('Color Blocks') }}: {{ job.num_color_blocks }}</span> </p> <p> - <span>{{ _('Design box size') }}: {{ job.dimensions }}</span> + <span>{{ _('Design box size') }}: {{ "%0.1fmm X %0.1fmm" | format(*job.dimensions) }}</span> <span>{{ _('Total thread used') }}: {{job.estimated_thread }}</span> <span>{{ _('Total stitch count') }}: {{job.num_stitches }}</span> </p> @@ -34,7 +34,7 @@ <span>{{ _('Total nr trims') }}: {{ job.num_trims }}</span> </p> <p> - <span>{{ job.estimated_time }}</span> + <span></span> </p> </div> {% endif %} @@ -45,7 +45,7 @@ <svg xmlns="http://www.w3.org/2000/svg"> <rect fill="rgb{{ color_block.color.rgb }}" width="15mm" height="100%" /> <text fill="rgb{{ color_block.color.font_color }}"> - <tspan x="4mm" y="7.5mm" class="color-index">#{{ loop.index + outer_loop.index0 * 13 }}</tspan> + <tspan x="4mm" y="7.5mm" class="color-index">#{{ loop.index + outer_loop.index0 * 12 }}</tspan> </text> </svg> </p> @@ -65,7 +65,7 @@ <span>{{ _('# trims') }}: {{ color_block.num_trims }}</span> </p> <p> - <span>{{ color_block.estimatedtime }}</span> + <span class="notes" contenteditable="true" data-field-name="operator-notes-block{{ loop.index0 + outer_loop.index0 * 12 }}" data-placeholder="{{ _("Enter operator notes...") }}"></span> </p> </div> {% endfor %} diff --git a/print/templates/operator_overview.html b/print/templates/operator_overview.html index 25048ab7..367d6d2b 100644 --- a/print/templates/operator_overview.html +++ b/print/templates/operator_overview.html @@ -11,7 +11,7 @@ </div> <div> <div class="table"> - <p><span>{{ _('Design box size') }}:</span><span>{{ job.dimensions }}</span></p> + <p><span>{{ _('Design box size') }}:</span><span>{{ "%0.1fmm X %0.1fmm" | format(*job.dimensions) }}</span></p> <p><span>{{ _('Total stitch count') }}:</span><span>{{job.num_stitches }}</span></p> <p><span>{{ _('Total thread used') }}:</span><span>{{job.estimated_thread }}</span></p> </div> @@ -25,9 +25,14 @@ </div> </header> <main> - <figure class="inksimulation operator" style="height: 210mm;"> + <figure class="inksimulation operator" data-field-name="operator-overview-transform" style="height: 210mm;" title="{{ _('Ctrl + Scroll to Zoom') }}"> {{ svg_overview|safe }} - <figcaption>{{ _('Scale') }} <span>{{ svg_scale }}</span></figcaption> + <figcaption>{{ _('Scale') }} <span class="scale" data-field-name="svg-scale" contenteditable="true" data-placeholder=""></span>%</figcaption> + <div> + <button class="svg-fit">{{ _('Fit') }}</button> + <button class="svg-full">100%</button> + <button class="svg-apply">{{ _('Apply to all') }}</button> + </div> </figure> </main> {% include 'footer.html' %} diff --git a/print/templates/print_detail.html b/print/templates/print_detail.html index 18a70bba..714d33a2 100644 --- a/print/templates/print_detail.html +++ b/print/templates/print_detail.html @@ -15,9 +15,14 @@ </div> </header> <main> - <figure class="inksimulation"> + <figure class="inksimulation" data-field-name="client-detail-transform-block{{ loop.index0 }}" title="{{ _('Ctrl + Scroll to Zoom') }}"> {{color_block.svg_preview|safe}} - <figcaption>{{ _('Scale') }} <span>{{ svg_scale }}</span></figcaption> + <figcaption>{{ _('Scale') }} <span class="scale" data-field-name="svg-scale" contenteditable="true" data-placeholder=""></span>%</figcaption> + <div> + <button class="svg-fit">Fit</button> + <button class="svg-full">100%</button> + <button class="svg-apply">Apply to all</button> + </div> </figure> <div class="color-palette detailed"> diff --git a/print/templates/print_overview.html b/print/templates/print_overview.html index f5632ceb..efcf5b2e 100644 --- a/print/templates/print_overview.html +++ b/print/templates/print_overview.html @@ -11,7 +11,7 @@ </div> <div> <div class="table"> - <p><span>{{ _('Design box size') }}:</span><span>{{ job.dimensions }}</span></p> + <p><span>{{ _('Design box size') }}:</span><span>{{ "%0.1fmm X %0.1fmm" | format(*job.dimensions) }}</span></p> <p><span>{{ _('Total stitch count') }}:</span><span>{{job.num_stitches }}</span></p> <p><span>{{ _('Total thread used') }}:</span><span>{{job.estimated_thread }}</span></p> </div> @@ -25,9 +25,14 @@ </div> </header> <main class="client-overview-main"> - <figure class="inksimulation"> + <figure class="inksimulation" data-field-name="client-overview-transform" title="{{ _('Ctrl + Scroll to Zoom') }}"> {{ svg_overview|safe }} - <figcaption>{{ _('Scale') }} <span>{{ svg_scale }}</span></figcaption> + <figcaption>{{ _('Scale') }} <span class="scale" data-field-name="svg-scale" contenteditable="true" data-placeholder=""></span>%</figcaption> + <div> + <button class="svg-fit">Fit</button> + <button class="svg-full">100%</button> + <button class="svg-apply">Apply to all</button> + </div> </figure> <div class="color-palette"> diff --git a/print/templates/ui.html b/print/templates/ui.html index 078f1a4c..f7246962 100644 --- a/print/templates/ui.html +++ b/print/templates/ui.html @@ -15,7 +15,7 @@ <h1>{{ _('Settings') }}</h1> <div> <p>{{ _('Printing Size') }}: - <select id="printing-size"> + <select id="printing-size" data-field-name="paper-size"> <option value="letter" selected="selected">Letter</option> <option value="a4">A4</option> </select> @@ -23,11 +23,12 @@ </div> <div> <fieldset> - <legend>{{ ('Print Layouts') }}:</legend> - <p><input type="checkbox" id="client-overview" {{ 'checked' if view.client_overview else '' }}><label for="client-overview">Client Overview</label></p> - <p><input type="checkbox" id="client-detailedview" {{ 'checked' if view.client_detailedview else '' }}><label for="client-detailedview">Client Detailed View</label></p> - <p><input type="checkbox" id="operator-overview" {{ 'checked' if view.operator_overview else '' }}><label for="operator-overview">Operator Overview</label></p> - <p><input type="checkbox" id="operator-detailedview" {{ 'checked' if view.operator_detailedview else '' }}><label for="operator-overview">Operator Detailed View</label></p> + <legend>{{ _('Print Layouts') }}:</legend> + <p><input type="checkbox" id="client-overview" data-field-name="client-overview" /><label for="client-overview">Client Overview</label></p> + <p><input type="checkbox" id="client-detailedview" data-field-name="client-detailedview" /><label for="client-detailedview">Client Detailed View</label></p> + <p><input type="checkbox" id="operator-overview" data-field-name="operator-overview" CHECKED /><label for="operator-overview">Operator Overview</label></p> + <p><input type="checkbox" id="operator-detailedview" data-field-name="operator-detailedview" CHECKED /><label for="operator-detailedview">Operator Detailed View</label></p> </fieldset> + <button id="save-settings" title="{{ _("Includes all settings visible here and also the icon.") }}">{{ _("Save as defaults") }}</button> </div> </div> |
