diff --git a/tailbone/forms/core.py b/tailbone/forms/core.py index 1f04b07e..161bfa25 100644 --- a/tailbone/forms/core.py +++ b/tailbone/forms/core.py @@ -24,12 +24,9 @@ Forms Core """ -from __future__ import unicode_literals, absolute_import - import json import logging -import six import sqlalchemy as sa from sqlalchemy import orm from sqlalchemy.ext.associationproxy import AssociationProxy, ASSOCIATION_PROXY @@ -338,7 +335,7 @@ class Form(object): model_instance=None, model_class=None, appstruct=UNSPECIFIED, nodes={}, enums={}, labels={}, assume_local_times=False, renderers=None, renderer_kwargs={}, hidden={}, widgets={}, defaults={}, validators={}, required={}, helptext={}, focus_spec=None, - action_url=None, cancel_url=None, use_buefy=True, component='tailbone-form', + action_url=None, cancel_url=None, component='tailbone-form', vuejs_field_converters={}, # TODO: ugh this is getting out hand! can_edit_help=False, edit_help_url=None, route_prefix=None, @@ -377,7 +374,6 @@ class Form(object): self.focus_spec = focus_spec self.action_url = action_url self.cancel_url = cancel_url - self.use_buefy = use_buefy self.component = component self.vuejs_field_converters = vuejs_field_converters or {} self.can_edit_help = can_edit_help @@ -758,10 +754,7 @@ class Form(object): def render(self, template=None, **kwargs): if not template: - if self.readonly and not self.use_buefy: - template = '/forms/form_readonly.mako' - else: - template = '/forms/form.mako' + template = '/forms/form.mako' context = kwargs context['form'] = self return render(template, context) @@ -806,10 +799,7 @@ class Form(object): def render_deform(self, dform=None, template=None, **kwargs): if not template: - if self.use_buefy: - template = '/forms/deform_buefy.mako' - else: - template = '/forms/deform.mako' + template = '/forms/deform_buefy.mako' if dform is None: dform = self.make_deform_form() @@ -829,11 +819,8 @@ class Form(object): context.setdefault('form_kwargs', {}) # TODO: deprecate / remove the latter option here if self.auto_disable_save or self.auto_disable: - if self.use_buefy: - context['form_kwargs'].setdefault('ref', self.component_studly) - context['form_kwargs']['@submit'] = 'submit{}'.format(self.component_studly) - else: - context['form_kwargs']['class_'] = 'autodisable' + context['form_kwargs'].setdefault('ref', self.component_studly) + context['form_kwargs']['@submit'] = 'submit{}'.format(self.component_studly) if self.focus_spec: context['form_kwargs']['data-focus'] = self.focus_spec context['request'] = self.request @@ -975,8 +962,7 @@ class Form(object): if self.readonly or fieldname in self.readonly_fields: html = self.render_field_value(fieldname) or HTML.tag('span') elif field: - html = field.serialize(use_buefy=True, - **self.get_renderer_kwargs(fieldname)) + html = field.serialize(**self.get_renderer_kwargs(fieldname)) html = HTML.literal(html) # may need a complex label @@ -1064,7 +1050,7 @@ class Form(object): value = self.obtain_value(record, field_name) if value is None: return "" - return six.text_type(value) + return str(value) def render_datetime(self, record, field_name): value = self.obtain_value(record, field_name) @@ -1099,7 +1085,7 @@ class Form(object): return "(${:0,.2f})".format(0 - value) return "${:0,.2f}".format(value) except ValueError: - return six.text_type(value) + return str(value) def render_quantity(self, obj, field): value = self.obtain_value(obj, field) @@ -1124,8 +1110,8 @@ class Form(object): return "" enum = self.enums.get(field_name) if enum and value in enum: - return six.text_type(enum[value]) - return six.text_type(value) + return str(enum[value]) + return str(value) def render_codeblock(self, record, field_name): value = self.obtain_value(record, field_name) @@ -1193,8 +1179,8 @@ class Form(object): controls[i][1] = 'true' elif value is False: controls[i][1] = 'false' - elif not isinstance(value, six.string_types): - controls[i][1] = six.text_type(value) + elif not isinstance(value, str): + controls[i][1] = str(value) dform = self.make_deform_form() try: diff --git a/tailbone/static/css/jquery.tagit.css b/tailbone/static/css/jquery.tagit.css deleted file mode 100644 index f18650d9..00000000 --- a/tailbone/static/css/jquery.tagit.css +++ /dev/null @@ -1,69 +0,0 @@ -ul.tagit { - padding: 1px 5px; - overflow: auto; - margin-left: inherit; /* usually we don't want the regular ul margins. */ - margin-right: inherit; -} -ul.tagit li { - display: block; - float: left; - margin: 2px 5px 2px 0; -} -ul.tagit li.tagit-choice { - position: relative; - line-height: inherit; -} -input.tagit-hidden-field { - display: none; -} -ul.tagit li.tagit-choice-read-only { - padding: .2em .5em .2em .5em; -} - -ul.tagit li.tagit-choice-editable { - padding: .2em 18px .2em .5em; -} - -ul.tagit li.tagit-new { - padding: .25em 4px .25em 0; -} - -ul.tagit li.tagit-choice a.tagit-label { - cursor: pointer; - text-decoration: none; -} -ul.tagit li.tagit-choice .tagit-close { - cursor: pointer; - position: absolute; - right: .1em; - top: 50%; - margin-top: -8px; - line-height: 17px; -} - -/* used for some custom themes that don't need image icons */ -ul.tagit li.tagit-choice .tagit-close .text-icon { - display: none; -} - -ul.tagit li.tagit-choice input { - display: block; - float: left; - margin: 2px 5px 2px 0; -} -ul.tagit input[type="text"] { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; - - border: none; - margin: 0; - padding: 0; - width: inherit; - background-color: inherit; - outline: none; -} diff --git a/tailbone/static/css/login.css b/tailbone/static/css/login.css deleted file mode 100644 index 448f9f70..00000000 --- a/tailbone/static/css/login.css +++ /dev/null @@ -1,48 +0,0 @@ - -/****************************** - * login.css - ******************************/ - -.logo img, -#logo { - display: block; - margin: 40px auto; - max-height: 350px; - max-width: 800px; -} - -div.form { - margin: auto; - float: none; - text-align: center; -} - -div.field-wrapper { - margin: 10px auto; - width: 300px; -} - -div.field-wrapper label { - text-align: right; - width: auto; -} - -div.field-wrapper div.field input[type="text"], -div.field-wrapper div.field input[type="password"] { - margin-left: 1em; - width: 150px; -} - -div.buttons { - display: block; -} - -div.buttons input { - margin: auto 5px; -} - -/* this is for "login as chuck" tip in demo mode */ -.tips { - margin-top: 2em; - text-align: center; -} diff --git a/tailbone/static/js/lib/tag-it.min.js b/tailbone/static/js/lib/tag-it.min.js deleted file mode 100644 index fd6140c8..00000000 --- a/tailbone/static/js/lib/tag-it.min.js +++ /dev/null @@ -1,17 +0,0 @@ -(function(b){b.widget("ui.tagit",{options:{allowDuplicates:!1,caseSensitive:!0,fieldName:"tags",placeholderText:null,readOnly:!1,removeConfirmation:!1,tagLimit:null,availableTags:[],autocomplete:{},showAutocompleteOnFocus:!1,allowSpaces:!1,singleField:!1,singleFieldDelimiter:",",singleFieldNode:null,animate:!0,tabIndex:null,beforeTagAdded:null,afterTagAdded:null,beforeTagRemoved:null,afterTagRemoved:null,onTagClicked:null,onTagLimitExceeded:null,onTagAdded:null,onTagRemoved:null,tagSource:null},_create:function(){var a= -this;this.element.is("input")?(this.tagList=b("").insertAfter(this.element),this.options.singleField=!0,this.options.singleFieldNode=this.element,this.element.addClass("tagit-hidden-field")):this.tagList=this.element.find("ul, ol").andSelf().last();this.tagInput=b('').addClass("ui-widget-content");this.options.readOnly&&this.tagInput.attr("disabled","disabled");this.options.tabIndex&&this.tagInput.attr("tabindex",this.options.tabIndex);this.options.placeholderText&&this.tagInput.attr("placeholder", -this.options.placeholderText);this.options.autocomplete.source||(this.options.autocomplete.source=function(a,e){var d=a.term.toLowerCase(),c=b.grep(this.options.availableTags,function(a){return 0===a.toLowerCase().indexOf(d)});this.options.allowDuplicates||(c=this._subtractArray(c,this.assignedTags()));e(c)});this.options.showAutocompleteOnFocus&&(this.tagInput.focus(function(b,d){a._showAutocomplete()}),"undefined"===typeof this.options.autocomplete.minLength&&(this.options.autocomplete.minLength= -0));b.isFunction(this.options.autocomplete.source)&&(this.options.autocomplete.source=b.proxy(this.options.autocomplete.source,this));b.isFunction(this.options.tagSource)&&(this.options.tagSource=b.proxy(this.options.tagSource,this));this.tagList.addClass("tagit").addClass("ui-widget ui-widget-content ui-corner-all").append(b('
  • ').append(this.tagInput)).click(function(d){var c=b(d.target);c.hasClass("tagit-label")?(c=c.closest(".tagit-choice"),c.hasClass("removed")||a._trigger("onTagClicked", -d,{tag:c,tagLabel:a.tagLabel(c)})):a.tagInput.focus()});var c=!1;if(this.options.singleField)if(this.options.singleFieldNode){var d=b(this.options.singleFieldNode),f=d.val().split(this.options.singleFieldDelimiter);d.val("");b.each(f,function(b,d){a.createTag(d,null,!0);c=!0})}else this.options.singleFieldNode=b(''),this.tagList.after(this.options.singleFieldNode);c||this.tagList.children("li").each(function(){b(this).hasClass("tagit-new")|| -(a.createTag(b(this).text(),b(this).attr("class"),!0),b(this).remove())});this.tagInput.keydown(function(c){if(c.which==b.ui.keyCode.BACKSPACE&&""===a.tagInput.val()){var d=a._lastTag();!a.options.removeConfirmation||d.hasClass("remove")?a.removeTag(d):a.options.removeConfirmation&&d.addClass("remove ui-state-highlight")}else a.options.removeConfirmation&&a._lastTag().removeClass("remove ui-state-highlight");if(c.which===b.ui.keyCode.COMMA&&!1===c.shiftKey||c.which===b.ui.keyCode.ENTER||c.which== -b.ui.keyCode.TAB&&""!==a.tagInput.val()||c.which==b.ui.keyCode.SPACE&&!0!==a.options.allowSpaces&&('"'!=b.trim(a.tagInput.val()).replace(/^s*/,"").charAt(0)||'"'==b.trim(a.tagInput.val()).charAt(0)&&'"'==b.trim(a.tagInput.val()).charAt(b.trim(a.tagInput.val()).length-1)&&0!==b.trim(a.tagInput.val()).length-1))c.which===b.ui.keyCode.ENTER&&""===a.tagInput.val()||c.preventDefault(),a.options.autocomplete.autoFocus&&a.tagInput.data("autocomplete-open")||(a.tagInput.autocomplete("close"),a.createTag(a._cleanedInput()))}).blur(function(b){a.tagInput.data("autocomplete-open")|| -a.createTag(a._cleanedInput())});if(this.options.availableTags||this.options.tagSource||this.options.autocomplete.source)d={select:function(b,c){a.createTag(c.item.value);return!1}},b.extend(d,this.options.autocomplete),d.source=this.options.tagSource||d.source,this.tagInput.autocomplete(d).bind("autocompleteopen.tagit",function(b,c){a.tagInput.data("autocomplete-open",!0)}).bind("autocompleteclose.tagit",function(b,c){a.tagInput.data("autocomplete-open",!1)}),this.tagInput.autocomplete("widget").addClass("tagit-autocomplete")}, -destroy:function(){b.Widget.prototype.destroy.call(this);this.element.unbind(".tagit");this.tagList.unbind(".tagit");this.tagInput.removeData("autocomplete-open");this.tagList.removeClass("tagit ui-widget ui-widget-content ui-corner-all tagit-hidden-field");this.element.is("input")?(this.element.removeClass("tagit-hidden-field"),this.tagList.remove()):(this.element.children("li").each(function(){b(this).hasClass("tagit-new")?b(this).remove():(b(this).removeClass("tagit-choice ui-widget-content ui-state-default ui-state-highlight ui-corner-all remove tagit-choice-editable tagit-choice-read-only"), -b(this).text(b(this).children(".tagit-label").text()))}),this.singleFieldNode&&this.singleFieldNode.remove());return this},_cleanedInput:function(){return b.trim(this.tagInput.val().replace(/^"(.*)"$/,"$1"))},_lastTag:function(){return this.tagList.find(".tagit-choice:last:not(.removed)")},_tags:function(){return this.tagList.find(".tagit-choice:not(.removed)")},assignedTags:function(){var a=this,c=[];this.options.singleField?(c=b(this.options.singleFieldNode).val().split(this.options.singleFieldDelimiter), -""===c[0]&&(c=[])):this._tags().each(function(){c.push(a.tagLabel(this))});return c},_updateSingleTagsField:function(a){b(this.options.singleFieldNode).val(a.join(this.options.singleFieldDelimiter)).trigger("change")},_subtractArray:function(a,c){for(var d=[],f=0;f=this.options.tagLimit)return this._trigger("onTagLimitExceeded",null,{duringInitialization:d}),!1;var g=b(this.options.onTagClicked?'':'').text(a),e=b("
  • ").addClass("tagit-choice ui-widget-content ui-state-default ui-corner-all").addClass(c).append(g); -this.options.readOnly?e.addClass("tagit-choice-read-only"):(e.addClass("tagit-choice-editable"),c=b("").addClass("ui-icon ui-icon-close"),c=b('\u00d7').addClass("tagit-close").append(c).click(function(a){f.removeTag(e)}),e.append(c));this.options.singleField||(g=g.html(),e.append(''));!1!==this._trigger("beforeTagAdded",null,{tag:e,tagLabel:this.tagLabel(e), -duringInitialization:d})&&(this.options.singleField&&(g=this.assignedTags(),g.push(a),this._updateSingleTagsField(g)),this._trigger("onTagAdded",null,e),this.tagInput.val(""),this.tagInput.parent().before(e),this._trigger("afterTagAdded",null,{tag:e,tagLabel:this.tagLabel(e),duringInitialization:d}),this.options.showAutocompleteOnFocus&&!d&&setTimeout(function(){f._showAutocomplete()},0))},removeTag:function(a,c){c="undefined"===typeof c?this.options.animate:c;a=b(a);this._trigger("onTagRemoved", -null,a);if(!1!==this._trigger("beforeTagRemoved",null,{tag:a,tagLabel:this.tagLabel(a)})){if(this.options.singleField){var d=this.assignedTags(),f=this.tagLabel(a),d=b.grep(d,function(a){return a!=f});this._updateSingleTagsField(d)}if(c){a.addClass("removed");var d=this._effectExists("blind")?["blind",{direction:"horizontal"},"fast"]:["fast"],g=this;d.push(function(){a.remove();g._trigger("afterTagRemoved",null,{tag:a,tagLabel:g.tagLabel(a)})});a.fadeOut("fast").hide.apply(a,d).dequeue()}else a.remove(), -this._trigger("afterTagRemoved",null,{tag:a,tagLabel:this.tagLabel(a)})}},removeTagByLabel:function(a,b){var d=this._findTagByLabel(a);if(!d)throw"No such tag exists with the name '"+a+"'";this.removeTag(d,b)},removeAll:function(){var a=this;this._tags().each(function(b,d){a.removeTag(d,!1)})}})})(jQuery); diff --git a/tailbone/static/js/login.js b/tailbone/static/js/login.js deleted file mode 100644 index f2a072b8..00000000 --- a/tailbone/static/js/login.js +++ /dev/null @@ -1,32 +0,0 @@ - -$(function() { - - $('input[name="username"]').keydown(function(event) { - if (event.which == 13) { - $('input[name="password"]').focus().select(); - return false; - } - return true; - }); - - $('form').submit(function() { - if (! $('input[name="username"]').val()) { - with ($('input[name="username"]').get(0)) { - select(); - focus(); - } - return false; - } - if (! $('input[name="password"]').val()) { - with ($('input[name="password"]').get(0)) { - select(); - focus(); - } - return false; - } - return true; - }); - - $('input[name="username"]').focus(); - -}); diff --git a/tailbone/static/js/tailbone.appsettings.js b/tailbone/static/js/tailbone.appsettings.js deleted file mode 100644 index ae378931..00000000 --- a/tailbone/static/js/tailbone.appsettings.js +++ /dev/null @@ -1,29 +0,0 @@ - -/************************************************************ - * - * tailbone.appsettings.js - * - * Logic for App Settings page. - * - ************************************************************/ - - -function show_group(group) { - if (group == "(All)") { - $('.panel').show(); - } else { - $('.panel').hide(); - $('.panel[data-groupname="' + group + '"]').show(); - } -} - - -$(function() { - - $('#settings-group').on('selectmenuchange', function(event, ui) { - show_group(ui.item.value); - }); - - show_group($('#settings-group').val()); - -}); diff --git a/tailbone/static/js/tailbone.batch.js b/tailbone/static/js/tailbone.batch.js deleted file mode 100644 index 2844c0b4..00000000 --- a/tailbone/static/js/tailbone.batch.js +++ /dev/null @@ -1,41 +0,0 @@ - -/************************************************************ - * - * tailbone.batch.js - * - * Common logic for view/edit batch pages - * - ************************************************************/ - - -$(function() { - - $('#execute-batch').click(function() { - if (has_execution_options) { - $('#execution-options-dialog').dialog({ - title: "Execution Options", - width: 600, - modal: true, - buttons: [ - { - text: "Execute", - click: function(event) { - dialog_button(event).button('option', 'label', "Executing, please wait...").button('disable'); - $('form[name="batch-execution"]').submit(); - } - }, - { - text: "Cancel", - click: function() { - $(this).dialog('close'); - } - } - ] - }); - } else { - $(this).button('option', 'label', "Executing, please wait...").button('disable'); - $('form[name="batch-execution"]').submit(); - } - }); - -}); diff --git a/tailbone/subscribers.py b/tailbone/subscribers.py index 7ffd92bc..229296ab 100644 --- a/tailbone/subscribers.py +++ b/tailbone/subscribers.py @@ -24,8 +24,6 @@ Event Subscribers """ -from __future__ import unicode_literals, absolute_import - import six import json import datetime @@ -42,7 +40,7 @@ from tailbone import helpers from tailbone.db import Session from tailbone.config import csrf_header_name, should_expose_websockets from tailbone.menus import make_simple_menus -from tailbone.util import should_use_buefy, get_global_search_options +from tailbone.util import get_global_search_options def new_request(event): @@ -156,23 +154,20 @@ def before_render(event): renderer_globals['background_color'] = request.rattail_config.get( 'tailbone', 'background_color') - # buefy themes get some extra treatment - if should_use_buefy(request): + # TODO: remove this hack once nothing references it + renderer_globals['buefy_0_8'] = False - # TODO: remove this hack once nothing references it - renderer_globals['buefy_0_8'] = False + # maybe set custom stylesheet + css = None + if request.user: + css = request.rattail_config.get('tailbone.{}'.format(request.user.uuid), + 'buefy_css') + if not css: + css = request.rattail_config.get('tailbone', 'theme.falafel.buefy_css') + renderer_globals['buefy_css'] = css - # maybe set custom stylesheet - css = None - if request.user: - css = request.rattail_config.get('tailbone.{}'.format(request.user.uuid), - 'buefy_css') - if not css: - css = request.rattail_config.get('tailbone', 'theme.falafel.buefy_css') - renderer_globals['buefy_css'] = css - - # add global search data for quick access - renderer_globals['global_search_data'] = get_global_search_options(request) + # add global search data for quick access + renderer_globals['global_search_data'] = get_global_search_options(request) # here we globally declare widths for grid filter pseudo-columns widths = request.rattail_config.get('tailbone', 'grids.filters.column_widths') diff --git a/tailbone/templates/appsettings.mako b/tailbone/templates/appsettings.mako index a80dafc2..46f4a7e3 100644 --- a/tailbone/templates/appsettings.mako +++ b/tailbone/templates/appsettings.mako @@ -5,34 +5,6 @@ <%def name="content_title()"> -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - % if not use_buefy: - ${h.javascript_link(request.static_url('tailbone:static/js/tailbone.appsettings.js') + '?ver={}'.format(tailbone.__version__))} - % endif - - -<%def name="extra_styles()"> - ${parent.extra_styles()} - % if not use_buefy: - - % endif - - <%def name="context_menu_items()"> % if request.has_perm('settings.list'):
  • ${h.link_to("View Raw Settings", url('settings'))}
    • @@ -223,76 +195,4 @@ -% if use_buefy: - ${parent.body()} - -% else: -## legacy / not buefy -
    - ${h.form(form.action_url, id=dform.formid, method='post', class_='autodisable')} - ${h.csrf_token(request)} - - % if dform.error: -
    -
    - - Please see errors below. -
    -
    - - ${dform.error} -
    -
    - % endif - -
    -
    - -
    - ${h.select('settings-group', current_group, group_options, **{'auto-enhance': 'true'})} -
    -
    -
    - - % for group in groups: -
    -

    ${group}

    -
    - - % for setting in settings: - % if setting.group == group: - <% field = dform[setting.node_name] %> - -
    - % if field.error: -
    - % for msg in field.error.messages(): - ${msg} - % endfor -
    - % endif -
    - -
    - ${field.serialize()|n} -
    -
    - % if form.has_helptext(field.name): - ${form.render_helptext(field.name)} - % endif -
    - % endif - % endfor - -
    -
    - % endfor - -
    - ${h.submit('save', getattr(form, 'submit_label', getattr(form, 'save_label', "Submit")), class_='button is-primary')} - ${h.link_to("Cancel", form.cancel_url, class_='cancel button{}'.format(' autodisable' if form.auto_disable_cancel else ''))} -
    - - ${h.end_form()} -
    -% endif +${parent.body()} diff --git a/tailbone/templates/batch/importer/view_row.mako b/tailbone/templates/batch/importer/view_row.mako index 24eb6456..9e08cf43 100644 --- a/tailbone/templates/batch/importer/view_row.mako +++ b/tailbone/templates/batch/importer/view_row.mako @@ -76,12 +76,5 @@ -<%def name="render_form()"> - ${parent.render_form()} - % if not use_buefy: - ${self.field_diff_table()} - % endif - - ${parent.body()} diff --git a/tailbone/templates/batch/index.mako b/tailbone/templates/batch/index.mako index 89358567..3ea76641 100644 --- a/tailbone/templates/batch/index.mako +++ b/tailbone/templates/batch/index.mako @@ -1,150 +1,66 @@ ## -*- coding: utf-8; -*- <%inherit file="/master/index.mako" /> -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - % if not use_buefy: - % if master.results_executable and master.has_perm('execute_multiple'): - - % endif - % endif - - <%def name="grid_tools()"> ${parent.grid_tools()} ## Refresh Results % if master.results_refreshable and master.has_perm('refresh'): - % if use_buefy: - - {{ refreshResultsButtonText }} - - ${h.form(url('{}.refresh_results'.format(route_prefix)), ref='refreshResultsForm')} - ${h.csrf_token(request)} - ${h.end_form()} - % else: - - % endif + + {{ refreshResultsButtonText }} + + ${h.form(url('{}.refresh_results'.format(route_prefix)), ref='refreshResultsForm')} + ${h.csrf_token(request)} + ${h.end_form()} % endif ## Execute Results % if master.results_executable and master.has_perm('execute_multiple'): - % if use_buefy: - - Execute Results - + + Execute Results + - -
    + +
    -
    -

    Execution Options

    -
    - -
    -

    - Please be advised, you are about to execute {{ total }} batches! -

    -
    -
    -
    - <${execute_form.component} ref="executeResultsForm"> -
    -
    -
    - -
    - - Cancel - - - -
    +
    +

    Execution Options

    +
    +
    +

    + Please be advised, you are about to execute {{ total }} batches! +

    +
    +
    +
    + <${execute_form.component} ref="executeResultsForm"> +
    - +
    - % else: - - % endif +
    + + Cancel + + + +
    + +
    +     % endif @@ -224,24 +140,3 @@ ${parent.body()} - -% if not use_buefy: - -## Refresh Results -% if master.results_refreshable and master.has_perm('refresh'): - ${h.form(url('{}.refresh_results'.format(route_prefix)), name='refresh-results')} - ${h.csrf_token(request)} - ${h.end_form()} -% endif - -% if master.results_executable and master.has_perm('execute_multiple'): - -% endif -% endif diff --git a/tailbone/templates/batch/inventory/desktop_form.mako b/tailbone/templates/batch/inventory/desktop_form.mako index 7e3787ae..2a853f4f 100644 --- a/tailbone/templates/batch/inventory/desktop_form.mako +++ b/tailbone/templates/batch/inventory/desktop_form.mako @@ -3,298 +3,67 @@ <%def name="title()">Inventory Form -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - % if not use_buefy: - ${h.javascript_link(request.static_url('tailbone:static/js/numeric.js'))} - - % endif - - -<%def name="extra_styles()"> - ${parent.extra_styles()} - % if not use_buefy: - - % endif - - <%def name="context_menu_items()"> ${parent.context_menu_items()}
  • ${h.link_to("Back to Inventory Batch", url('batch.inventory.view', uuid=batch.uuid))}
    • <%def name="render_form()"> - % if use_buefy: + + + {{ submitting ? "Working, please wait..." : "Submit" }} + - - let ${form.component_studly} = { - template: '#${form.component}-template', + + if (response.data.error) { + alert(response.data.error) + if (response.data.redirect) { + location.href = response.data.redirect + } - % else: - ## not buefy + } else if (response.data.product.uuid) { -
    - ${h.form(form.action_url, id='inventory-form')} - ${h.csrf_token(request)} + this.productUPC = response.data.product.upc_pretty + this.productInfo = response.data.product + this.forceUnitItem = response.data.force_unit_item + this.alreadyPresentInBatch = response.data.already_present_in_batch -
    - -
    - ${h.hidden('product')} -
    ${h.text('upc', autocomplete='off')}
    -
    -

    please ENTER a scancode

    -
    -
    please confirm UPC and provide more details
    -
    product already exists in batch, please confirm count
    -
    pack item scanned, but must count units instead
    -
    -
    -
    + if (this.alreadyPresentInBatch) { + this.productCases = response.data.cases + this.productUnits = response.data.units + } else if (this.productInfo.type2) { + this.productUnits = this.productInfo.units + } - + productUPC: null, + ## productNotFound: false, + productInfo: {}, % if allow_cases: -
    - -
    ${h.text('cases', autocomplete='off')}
    -
    + productCases: null, % endif + productUnits: null, -
    - -
    ${h.text('units', autocomplete='off')}
    -
    + alreadyPresentInBatch: false, + forceUnitItem: false, + } -
    - ${h.submit('submit', "Submit")} -
    - - ${h.end_form()} -
    - - % endif + diff --git a/tailbone/templates/batch/vendorcatalog/create.mako b/tailbone/templates/batch/vendorcatalog/create.mako index 19e91dd0..d25c8f16 100644 --- a/tailbone/templates/batch/vendorcatalog/create.mako +++ b/tailbone/templates/batch/vendorcatalog/create.mako @@ -1,59 +1,6 @@ ## -*- coding: utf-8; -*- <%inherit file="/batch/create.mako" /> -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - % if not use_buefy: - - % endif - - <%def name="modify_this_page_vars()"> ${parent.modify_this_page_vars()} - % endif - - <%def name="extra_styles()"> ${parent.extra_styles()} - % if use_buefy: - % else: - - % endif <%def name="buttons()"> @@ -99,52 +26,39 @@ <%def name="leading_buttons()"> % if master.has_worksheet and master.allow_worksheet(batch) and master.has_perm('worksheet'): - % if use_buefy: - - - % else: - - % endif + + % endif <%def name="refresh_button()"> % if master.batch_refreshable(batch) and master.has_perm('refresh'): - % if use_buefy: - ## TODO: this should surely use a POST request? - - - % else: - - % endif + ## TODO: this should surely use a POST request? + + % endif <%def name="trailing_buttons()"> % if master.has_worksheet_file and master.allow_worksheet(batch) and master.has_perm('worksheet'): - % if use_buefy: - - Download Worksheet - - - Upload Worksheet - - % else: - ${h.link_to("Download Worksheet", master.get_action_url('download_worksheet', batch), class_='button')} - - % endif + + Download Worksheet + + + Upload Worksheet + % endif @@ -154,34 +68,12 @@ <%def name="render_status_breakdown()"> - % if use_buefy: -
    -

    Row Status Breakdown

    -
    - ${status_breakdown_grid} -
    -
    - % elif status_breakdown is not Undefined and status_breakdown is not None: -
    -

    Row Status Breakdown

    -
    - % if status_breakdown: -
    - - % for i, (status, count) in enumerate(status_breakdown): - - - - - % endfor -
    ${status}${count}
    -
    - % else: -

    Nothing to report yet.

    - % endif -
    -
    - % endif +
    +

    Row Status Breakdown

    +
    + ${status_breakdown_grid} +
    +
    <%def name="render_execute_helper()"> @@ -197,22 +89,21 @@ % elif master.handler.executable(batch): % if master.has_perm('execute'):

    Batch has not yet been executed.

    - % if use_buefy: -
    - - ${execute_title} - +
    + + ${execute_title} + - % if execute_enabled: + % if execute_enabled:
    @@ -245,22 +136,8 @@
    - % endif - - % else: - ## no buefy, do legacy thing - % endif + % else:

    TODO: batch *may* be executed, but not by *you*

    % endif @@ -281,71 +158,51 @@ ${parent.render_this_page()} % if master.has_worksheet_file and master.allow_worksheet(batch) and master.has_perm('worksheet'): - % if use_buefy: - -
    + +
    -
    -

    Upload Worksheet

    -
    +
    +

    Upload Worksheet

    +
    -
    -

    - This will update - the batch data with the worksheet file you provide.  - Please be certain to use the right one! -

    -
    - <${upload_worksheet_form.component} ref="uploadForm"> - -
    - -
    - - Cancel - - - {{ uploadButtonText }} - -
    - -
    -     - % else: - - % endif - % endif +
    + <${upload_worksheet_form.component} ref="uploadForm"> + + - % if not use_buefy: - % if master.handler.executable(batch) and master.has_perm('execute'): - - % endif +
    + + Cancel + + + {{ uploadButtonText }} + +
    + +
    +     % endif <%def name="render_this_page_template()"> ${parent.render_this_page_template()} - % if use_buefy: - % if master.has_worksheet_file and master.allow_worksheet(batch) and master.has_perm('worksheet'): - ${upload_worksheet_form.render_deform(buttons=False, form_kwargs={'ref': 'actualUploadForm'})|n} - % endif - % if master.handler.executable(batch) and master.has_perm('execute'): - ${execute_form.render_deform(form_kwargs={'ref': 'actualExecuteForm'}, buttons=False)|n} - % endif + % if master.has_worksheet_file and master.allow_worksheet(batch) and master.has_perm('worksheet'): + ${upload_worksheet_form.render_deform(buttons=False, form_kwargs={'ref': 'actualUploadForm'})|n} + % endif + % if master.handler.executable(batch) and master.has_perm('execute'): + ${execute_form.render_deform(form_kwargs={'ref': 'actualExecuteForm'}, buttons=False)|n} % endif @@ -358,7 +215,7 @@ <%def name="render_row_grid_tools()"> ${parent.render_row_grid_tools()} - % if use_buefy and master.rows_bulk_deletable and not batch.executed and master.has_perm('delete_rows'): + % if master.rows_bulk_deletable and not batch.executed and master.has_perm('delete_rows'): -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - % if not use_buefy: - - % endif - - <%def name="extra_styles()"> ${parent.extra_styles()} - % endif + <%def name="page_content()">
    - % if use_buefy: - - % else: -

    Sorry, but this page is not supported by your current theme configuration.

    - % endif + <%def name="order_form_buttons()"> diff --git a/tailbone/templates/datasync/changes/index.mako b/tailbone/templates/datasync/changes/index.mako index e92c3c3c..b5aeb79a 100644 --- a/tailbone/templates/datasync/changes/index.mako +++ b/tailbone/templates/datasync/changes/index.mako @@ -12,38 +12,22 @@ ${parent.grid_tools()} % if request.has_perm('datasync.restart'): - % if use_buefy: ${h.form(url('datasync.restart'), name='restart-datasync', class_='control', **{'@submit': 'submitRestartDatasyncForm'})} - % else: - ${h.form(url('datasync.restart'), name='restart-datasync', class_='autodisable')} - % endif ${h.csrf_token(request)} - % if use_buefy: {{ restartDatasyncFormButtonText }} - % else: - ${h.submit('submit', "Restart DataSync", data_working_label="Restarting DataSync", class_='button')} - % endif ${h.end_form()} % endif % if allow_filemon_restart and request.has_perm('filemon.restart'): - % if use_buefy: ${h.form(url('filemon.restart'), name='restart-filemon', class_='control', **{'@submit': 'submitRestartFilemonForm'})} - % else: - ${h.form(url('filemon.restart'), name='restart-filemon', class_='autodisable')} - % endif ${h.csrf_token(request)} - % if use_buefy: {{ restartFilemonFormButtonText }} - % else: - ${h.submit('submit', "Restart FileMon", data_working_label="Restarting FileMon", class_='button')} - % endif ${h.end_form()} % endif diff --git a/tailbone/templates/deform/autocomplete_jquery.pt b/tailbone/templates/deform/autocomplete_jquery.pt index dd9a6084..7a15c7f0 100644 --- a/tailbone/templates/deform/autocomplete_jquery.pt +++ b/tailbone/templates/deform/autocomplete_jquery.pt @@ -3,109 +3,10 @@ oid oid|field.oid; field_display field_display; style style|field.widget.style; - url url|field.widget.service_url; - use_buefy use_buefy|0;" + url url|field.widget.service_url;" tal:omit-tag=""> -
    - - - - - - - - - - - - - - - -
    - -
    -
    - ${field.start_mapping()} -
    - - Cases -
    -
    - - Units -
    - ${field.end_mapping()} -
    - -
    ${field.start_mapping()} diff --git a/tailbone/templates/deform/checkbox.pt b/tailbone/templates/deform/checkbox.pt index b00ced03..408fa1cb 100644 --- a/tailbone/templates/deform/checkbox.pt +++ b/tailbone/templates/deform/checkbox.pt @@ -2,21 +2,10 @@ true_val true_val|field.widget.true_val; css_class css_class|field.widget.css_class; style style|field.widget.style; - oid oid|field.oid; - use_buefy use_buefy|0;" + oid oid|field.oid;" tal:omit-tag=""> -
    - -
    - -
    +
    diff --git a/tailbone/templates/deform/checked_password.pt b/tailbone/templates/deform/checked_password.pt index 43657045..f78c0b85 100644 --- a/tailbone/templates/deform/checked_password.pt +++ b/tailbone/templates/deform/checked_password.pt @@ -2,37 +2,9 @@ tal:define="oid oid|field.oid; name name|field.name; css_class css_class|field.widget.css_class; - style style|field.widget.style; - use_buefy use_buefy|0;"> + style style|field.widget.style;"> -
    - ${field.start_mapping()} -
    - -
    -
    - -
    - ${field.end_mapping()} -
    - -
    +
    ${field.start_mapping()} -
    - ${field.start_mapping()} - - ${field.end_mapping()} - - -
    - -
    +
    ${field.start_mapping()} + field_name field_name|field.name;"> -
    - ${field.start_mapping()} - - - ${field.end_mapping()} - -
    - -
    +
    ${field.start_mapping()} - - - -
    -
    - - % - -
    - -
    +
    -
    - ${field.start_mapping()} - -
    - - -
    -

    ${permissions[groupkey]['label']}

    - - -
    - -
    -     - -
    -     - -
    - - ${field.end_mapping()} -
    - -
    +
    ${field.start_mapping()}
    diff --git a/tailbone/templates/deform/select.pt b/tailbone/templates/deform/select.pt index 4295380b..b033a8e2 100644 --- a/tailbone/templates/deform/select.pt +++ b/tailbone/templates/deform/select.pt @@ -7,58 +7,10 @@ unicode unicode|str; optgroup_class optgroup_class|field.widget.optgroup_class; multiple multiple|field.widget.multiple; - use_buefy use_buefy|0; input_handler input_handler|'';" tal:omit-tag=""> -
    - -
    - -
    - - -
    - -
    +
    -
    - -
    - -
    +
    diff --git a/tailbone/templates/deform/textinput.pt b/tailbone/templates/deform/textinput.pt index 52873cb7..47621654 100644 --- a/tailbone/templates/deform/textinput.pt +++ b/tailbone/templates/deform/textinput.pt @@ -4,29 +4,10 @@ mask mask|field.widget.mask; mask_placeholder mask_placeholder|field.widget.mask_placeholder; style style|field.widget.style; - use_buefy use_buefy|0; placeholder placeholder|getattr(field.widget, 'placeholder', ''); autocomplete autocomplete|getattr(field.widget, 'autocomplete', 'on');" tal:omit-tag=""> -
    - - -
    - -
    -
    - ${field.start_mapping()} - - ${field.end_mapping()} - -
    - -
    +
    ${field.start_mapping()} -<%def name="page_content()"> - ${parent.page_content()} - % if not use_buefy: -

    Employees

    - - % if employees: -

    The following employees are assigned to this department:

    - ${employees.render_grid()|n} - % else: -

    No employees are assigned to this department.

    - % endif - % endif - - <%def name="modify_this_page_vars()"> ${parent.modify_this_page_vars()} - % endif - - <%def name="extra_styles()"> ${parent.extra_styles()} - % if use_buefy: - % else: - - % endif <%def name="object_helpers()"> ${parent.object_helpers()} - % if use_buefy: - <%def name="render_this_page()"> ${parent.render_this_page()} - % if use_buefy: - - % endif + + ${parent.body()} diff --git a/tailbone/templates/form.mako b/tailbone/templates/form.mako index a00b8d97..cb6ef9c1 100644 --- a/tailbone/templates/form.mako +++ b/tailbone/templates/form.mako @@ -22,12 +22,8 @@ <%def name="page_content()">
    - % if use_buefy: -
    - ${self.render_buefy_form()} - % else: - ${self.render_form()} - % endif +
    + ${self.render_buefy_form()}
    diff --git a/tailbone/templates/forms/form.mako b/tailbone/templates/forms/form.mako index 71e28817..cd8fecc8 100644 --- a/tailbone/templates/forms/form.mako +++ b/tailbone/templates/forms/form.mako @@ -1,8 +1,2 @@ ## -*- coding: utf-8; -*- -% if form.use_buefy: - ${form.render_deform(buttons=buttons)|n} -% else: -
    - ${form.render_deform(buttons=buttons)|n} -
    -% endif +${form.render_deform(buttons=buttons)|n} diff --git a/tailbone/templates/login.mako b/tailbone/templates/login.mako index 0e65b4ad..e8f06848 100644 --- a/tailbone/templates/login.mako +++ b/tailbone/templates/login.mako @@ -4,36 +4,27 @@ <%def name="title()">Login -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - ${h.javascript_link(request.static_url('tailbone:static/js/login.js'))} - - <%def name="extra_styles()"> ${parent.extra_styles()} - % if use_buefy: - - % else: - ${h.stylesheet_link(request.static_url('tailbone:static/css/login.css'))} - % endif + .buttons { + justify-content: right; + } + <%def name="logo()"> @@ -55,21 +46,15 @@ ${self.logo()}
    - % if use_buefy: - -
    -
    -
    -
    - -
    -
    +
    +
    +
    +
    +
    - - % else: - ${self.login_form()} - % endif +
    +
    diff --git a/tailbone/templates/master/clone.mako b/tailbone/templates/master/clone.mako index 17b13751..07784f74 100644 --- a/tailbone/templates/master/clone.mako +++ b/tailbone/templates/master/clone.mako @@ -5,49 +5,31 @@ <%def name="render_buefy_form()">
    - % if use_buefy: - - You are about to clone the following ${model_title} as a new record: - - % else: -

    You are about to clone the following ${model_title} as a new record:

    - % endif - + + You are about to clone the following ${model_title} as a new record: + ${parent.render_buefy_form()} <%def name="render_form_buttons()">
    - % if use_buefy: - - Are you sure about this? - - % else: -

    Are you sure about this?

    - % endif + + Are you sure about this? +
    - % if use_buefy: ${h.form(request.current_route_url(), **{'@submit': 'submitForm'})} - % else: - ${h.form(request.current_route_url(), class_='autodisable')} - % endif ${h.csrf_token(request)} ${h.hidden('clone', value='clone')}
    - % if use_buefy: - - - - {{ submitButtonText }} - - % else: - ${h.link_to("Whoops, nevermind...", form.cancel_url, class_='button autodisable')} - ${h.submit('submit', "Yes, please clone away")} - % endif + + + + {{ submitButtonText }} +
    ${h.end_form()} diff --git a/tailbone/templates/master/delete.mako b/tailbone/templates/master/delete.mako index dded378f..0cb5b6c2 100644 --- a/tailbone/templates/master/delete.mako +++ b/tailbone/templates/master/delete.mako @@ -3,66 +3,32 @@ <%def name="title()">Delete ${model_title}: ${instance_title} -<%def name="context_menu_items()"> - % if not use_buefy and master.viewable and master.has_perm('view'): -
  • ${h.link_to("View this {}".format(model_title), action_url('view', instance))}
    • - % endif - % if not use_buefy and master.editable and master.has_perm('edit'): -
  • ${h.link_to("Edit this {}".format(model_title), action_url('edit', instance))}
    • - % endif - % if not use_buefy and master.creatable and master.show_create_link and master.has_perm('create'): - % if master.creates_multiple: -
  • ${h.link_to("Create new {}".format(model_title_plural), url('{}.create'.format(route_prefix)))}
    • - % else: -
  • ${h.link_to("Create a new {}".format(model_title), url('{}.create'.format(route_prefix)))}
    • - % endif - % endif - - <%def name="render_buefy_form()">
    - % if use_buefy: - - You are about to delete the following ${model_title} and all associated data: - - % else: -

    You are about to delete the following ${model_title} and all associated data:

    - % endif - + + You are about to delete the following ${model_title} and all associated data: + ${parent.render_buefy_form()} <%def name="render_form_buttons()">
    - % if use_buefy: - - Are you sure about this? - - % else: -

    Are you sure about this?

    - % endif + + Are you sure about this? +
    - % if use_buefy: ${h.form(request.current_route_url(), **{'@submit': 'submitForm'})} - % else: - ${h.form(request.current_route_url(), class_='autodisable')} - % endif ${h.csrf_token(request)}
    - % if use_buefy: - - - - {{ formButtonText }} - - % else: - Whoops, nevermind... - ${h.submit('submit', "Yes, please DELETE this data forever!", class_='button is-primary')} - % endif + + + + {{ formButtonText }} +
    ${h.end_form()} diff --git a/tailbone/templates/master/edit.mako b/tailbone/templates/master/edit.mako index de0cb524..f1bc7318 100644 --- a/tailbone/templates/master/edit.mako +++ b/tailbone/templates/master/edit.mako @@ -3,38 +3,5 @@ <%def name="title()">Edit: ${instance_title} -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - % if not use_buefy: - - % endif - - -<%def name="context_menu_items()"> - % if not use_buefy and master.viewable and master.has_perm('view'): -
  • ${h.link_to("View this {}".format(model_title), action_url('view', instance))}
    • - % endif - ${self.context_menu_item_delete()} - % if not use_buefy and master.creatable and master.show_create_link and master.has_perm('create'): - % if master.creates_multiple: -
  • ${h.link_to("Create new {}".format(model_title_plural), url('{}.create'.format(route_prefix)))}
    • - % else: -
  • ${h.link_to("Create a new {}".format(model_title), url('{}.create'.format(route_prefix)))}
    • - % endif - % endif - - ${parent.body()} diff --git a/tailbone/templates/master/form.mako b/tailbone/templates/master/form.mako index a37e3f91..c142d8ef 100644 --- a/tailbone/templates/master/form.mako +++ b/tailbone/templates/master/form.mako @@ -1,31 +1,6 @@ ## -*- coding: utf-8; -*- <%inherit file="/form.mako" /> -<%def name="context_menu_item_delete()"> - % if not use_buefy and master.deletable and instance_deletable and master.has_perm('delete'): - % if master.delete_confirm == 'simple': -
  • - ## note, the `ref` here is for buefy only - ${h.form(action_url('delete', instance), ref='deleteObjectForm')} - ${h.csrf_token(request)} - - Delete this ${model_title} - - ${h.end_form()} -
    • - % else: - ## assuming here that: delete_confirm == 'full' -
  • ${h.link_to("Delete this {}".format(model_title), action_url('delete', instance))}
    • - % endif - % endif - - <%def name="modify_this_page_vars()"> ${parent.modify_this_page_vars()} % if master.deletable and instance_deletable and request.has_perm('{}.delete'.format(permission_prefix)) and master.delete_confirm == 'simple': diff --git a/tailbone/templates/master/index.mako b/tailbone/templates/master/index.mako index 053e09fb..d2215abe 100644 --- a/tailbone/templates/master/index.mako +++ b/tailbone/templates/master/index.mako @@ -12,142 +12,6 @@ <%def name="content_title()"> -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - % if not use_buefy: - - % endif - - <%def name="context_menu_items()"> % if master.results_downloadable_csv and request.has_perm('{}.results_csv'.format(permission_prefix)):
  • ${h.link_to("Download results as CSV", url('{}.results_csv'.format(route_prefix)))}
    • @@ -155,13 +19,6 @@ % if master.results_downloadable_xlsx and request.has_perm('{}.results_xlsx'.format(permission_prefix)):
  • ${h.link_to("Download results as XLSX", url('{}.results_xlsx'.format(route_prefix)))}
    • % endif - % if not use_buefy and master.creatable and master.show_create_link and master.has_perm('create'): - % if master.creates_multiple: -
  • ${h.link_to("Create new {}".format(model_title_plural), url('{}.create'.format(route_prefix)))}
    • - % else: -
  • ${h.link_to("Create a new {}".format(model_title), url('{}.create'.format(route_prefix)))}
    • - % endif - % endif % if master.has_input_file_templates and master.has_perm('create'): % for template in six.itervalues(input_file_templates):
  • ${h.link_to("Download {} Template".format(template['label']), template['effective_url'])}
    • @@ -173,284 +30,233 @@ ## download search results % if master.results_downloadable and master.has_perm('download_results'): - % if use_buefy: - - Download Results - + + Download Results + - ${h.form(url('{}.download_results'.format(route_prefix)), ref='download_results_form')} - ${h.csrf_token(request)} - - - ${h.end_form()} + ${h.form(url('{}.download_results'.format(route_prefix)), ref='download_results_form')} + ${h.csrf_token(request)} + + + ${h.end_form()} - -
    + +
    -
    -

    - There are - - {{ total.toLocaleString('en') }} ${model_title_plural} - - matching your current filters. -

    -

    - You may download this set as a single data file if you like. -

    -
    +
    +

    + There are + + {{ total.toLocaleString('en') }} ${model_title_plural} + + matching your current filters. +

    +

    + You may download this set as a single data file if you like. +

    +
    - - Excel downloads for large data sets can take a long time to - generate, and bog down the server in the meantime. You are - encouraged to choose CSV for a large data set, even though - the end result (file size) may be larger with CSV. - + + Excel downloads for large data sets can take a long time to + generate, and bog down the server in the meantime. You are + encouraged to choose CSV for a large data set, even though + the end result (file size) may be larger with CSV. + -
    +
    -
    - - - % for key, label in six.iteritems(master.download_results_supported_formats()): - - % endfor - - -
    +
    + + + % for key, label in six.iteritems(master.download_results_supported_formats()): + + % endfor + + +
    -
    +
    -
    -

    - Will use DEFAULT fields. -

    -

    - Will use ALL fields. -

    +
    +

    + Will use DEFAULT fields. +

    +

    + Will use ALL fields. +

    +
    +
    + +
    + + Use Default Fields + + + Use All Fields + + + Choose Fields + +
    + +
    +
    +
    + + + + + +
    +
    +

    + + < +
    -
    - -
    - - Use Default Fields - - - Use All Fields - - - Choose Fields + + >
    - -
    -
    -
    - - - - - -
    -
    -

    - - < - -
    - - > - -
    -
    - - - - - -
    -
    +
    + + + + +
    -
    -
    -
    - - Cancel - - - -
    +
    - - % endif +
    + +
    + + Cancel + + + +
    +
    + % endif ## download rows for search results % if master.has_rows and master.results_rows_downloadable and master.has_perm('download_results_rows'): - % if use_buefy: - - {{ downloadResultsRowsButtonText }} - - ${h.form(url('{}.download_results_rows'.format(route_prefix)), ref='downloadResultsRowsForm')} - ${h.csrf_token(request)} - ${h.end_form()} - % else: - ${h.form(url('{}.download_results_rows'.format(route_prefix)))} - ${h.csrf_token(request)} - - ${h.end_form()} - % endif + + {{ downloadResultsRowsButtonText }} + + ${h.form(url('{}.download_results_rows'.format(route_prefix)), ref='downloadResultsRowsForm')} + ${h.csrf_token(request)} + ${h.end_form()} % endif ## merge 2 objects % if master.mergeable and request.has_perm('{}.merge'.format(permission_prefix)): - % if use_buefy: ${h.form(url('{}.merge'.format(route_prefix)), class_='control', **{'@submit': 'submitMergeForm'})} - % else: - ${h.form(url('{}.merge'.format(route_prefix)), name='merge-things')} - % endif ${h.csrf_token(request)} - % if use_buefy: - - - {{ mergeFormButtonText }} - - % else: - ${h.hidden('uuids')} - - % endif + + + {{ mergeFormButtonText }} + ${h.end_form()} % endif ## enable / disable selected objects % if master.supports_set_enabled_toggle and master.has_perm('enable_disable_set'): - % if use_buefy: - ${h.form(url('{}.enable_set'.format(route_prefix)), class_='control', ref='enable_selected_form')} - ${h.csrf_token(request)} - ${h.hidden('uuids', v_model='selected_uuids')} - - {{ enableSelectedText }} - - ${h.end_form()} - % else: - ${h.form(url('{}.enable_set'.format(route_prefix)), name='enable-set', class_='control')} - ${h.csrf_token(request)} - ${h.hidden('uuids')} - - ${h.end_form()} - % endif + ${h.form(url('{}.enable_set'.format(route_prefix)), class_='control', ref='enable_selected_form')} + ${h.csrf_token(request)} + ${h.hidden('uuids', v_model='selected_uuids')} + + {{ enableSelectedText }} + + ${h.end_form()} - % if use_buefy: - ${h.form(url('{}.disable_set'.format(route_prefix)), ref='disable_selected_form', class_='control')} - ${h.csrf_token(request)} - ${h.hidden('uuids', v_model='selected_uuids')} - - {{ disableSelectedText }} - - ${h.end_form()} - % else: - ${h.form(url('{}.disable_set'.format(route_prefix)), name='disable-set', class_='control')} - ${h.csrf_token(request)} - ${h.hidden('uuids')} - - ${h.end_form()} - % endif + ${h.form(url('{}.disable_set'.format(route_prefix)), ref='disable_selected_form', class_='control')} + ${h.csrf_token(request)} + ${h.hidden('uuids', v_model='selected_uuids')} + + {{ disableSelectedText }} + + ${h.end_form()} % endif ## delete selected objects % if master.set_deletable and master.has_perm('delete_set'): - % if use_buefy: - ${h.form(url('{}.delete_set'.format(route_prefix)), ref='delete_selected_form', class_='control')} - ${h.csrf_token(request)} - ${h.hidden('uuids', v_model='selected_uuids')} - - {{ deleteSelectedText }} - - ${h.end_form()} - % else: - ${h.form(url('{}.delete_set'.format(route_prefix)), name='delete-set', class_='control')} - ${h.csrf_token(request)} - ${h.hidden('uuids')} - - ${h.end_form()} - % endif + ${h.form(url('{}.delete_set'.format(route_prefix)), ref='delete_selected_form', class_='control')} + ${h.csrf_token(request)} + ${h.hidden('uuids', v_model='selected_uuids')} + + {{ deleteSelectedText }} + + ${h.end_form()} % endif ## delete search results % if master.bulk_deletable and request.has_perm('{}.bulk_delete'.format(permission_prefix)): - % if use_buefy: - ${h.form(url('{}.bulk_delete'.format(route_prefix)), ref='delete_results_form', class_='control')} - ${h.csrf_token(request)} - - {{ deleteResultsText }} - - ${h.end_form()} - % else: - ${h.form(url('{}.bulk_delete'.format(route_prefix)), name='bulk-delete', class_='control')} - ${h.csrf_token(request)} - - ${h.end_form()} - % endif + ${h.form(url('{}.bulk_delete'.format(route_prefix)), ref='delete_results_form', class_='control')} + ${h.csrf_token(request)} + + {{ deleteResultsText }} + + ${h.end_form()} % endif @@ -516,7 +322,7 @@ - % endif - % if request.session.pop('{}.results_xlsx.generated'.format(route_prefix), False): - - % endif - -% endif +${parent.body()} diff --git a/tailbone/templates/master/merge.mako b/tailbone/templates/master/merge.mako index 8924fcd0..565dece3 100644 --- a/tailbone/templates/master/merge.mako +++ b/tailbone/templates/master/merge.mako @@ -3,36 +3,6 @@ <%def name="title()">Merge 2 ${model_title_plural} -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - % if not use_buefy: - - % endif - - <%def name="extra_styles()"> ${parent.extra_styles()} - % endif - - <%def name="content_title()"> ${instance_title} @@ -54,33 +14,19 @@ <%def name="render_xref_helper()"> % if xref_buttons or xref_links: - % if use_buefy: - - % else: -
    -

    Cross-Reference

    -
    - % for button in xref_buttons: - ${button} - % endfor - % for link in xref_links: - ${link} - % endfor -
    + % endif @@ -91,63 +37,37 @@ % if master.has_versions and request.rattail_config.versioning_enabled() and request.has_perm('{}.versions'.format(permission_prefix)):
  • ${h.link_to("Version History", action_url('versions', instance))}
    • % endif - % if not use_buefy and master.editable and instance_editable and master.has_perm('edit'): -
  • ${h.link_to("Edit this {}".format(model_title), action_url('edit', instance))}
    • - % endif - ${self.context_menu_item_delete()} - % if not use_buefy and master.creatable and master.show_create_link and master.has_perm('create'): - % if master.creates_multiple: -
  • ${h.link_to("Create new {}".format(model_title_plural), url('{}.create'.format(route_prefix)))}
    • - % else: -
  • ${h.link_to("Create a new {}".format(model_title), url('{}.create'.format(route_prefix)))}
    • - % endif - % endif - % if not use_buefy and master.cloneable and master.has_perm('clone'): -
  • ${h.link_to("Clone this as new {}".format(model_title), url('{}.clone'.format(route_prefix), uuid=instance.uuid))}
    • - % endif % if master.touchable and request.has_perm('{}.touch'.format(permission_prefix)):
  • ${h.link_to("\"Touch\" this {}".format(model_title), master.get_action_url('touch', instance))}
    • % endif - % if not use_buefy and master.has_rows and master.rows_downloadable_csv and master.has_perm('row_results_csv'): -
  • ${h.link_to("Download row results as CSV", master.get_action_url('row_results_csv', instance))}
    • - % endif - % if not use_buefy and master.has_rows and master.rows_downloadable_xlsx and master.has_perm('row_results_xlsx'): -
  • ${h.link_to("Download row results as XLSX", master.get_action_url('row_results_xlsx', instance))}
    • - % endif <%def name="render_row_grid_tools()"> ${rows_grid_tools} - % if use_buefy: - % if master.rows_downloadable_xlsx and master.has_perm('row_results_xlsx'): - - Download Results XLSX - - % endif - % if master.rows_downloadable_csv and master.has_perm('row_results_csv'): - - Download Results CSV - - % endif + % if master.rows_downloadable_xlsx and master.has_perm('row_results_xlsx'): + + Download Results XLSX + + % endif + % if master.rows_downloadable_csv and master.has_perm('row_results_csv'): + + Download Results CSV + % endif <%def name="render_this_page()"> ${parent.render_this_page()} % if master.has_rows: - % if use_buefy: -
    - % if rows_title: -

    ${rows_title}

    - % endif - ${self.render_row_grid_component()} - % else: - ${rows_grid|n} +
    + % if rows_title: +

    ${rows_title}

    % endif + ${self.render_row_grid_component()} % endif diff --git a/tailbone/templates/master/view_row.mako b/tailbone/templates/master/view_row.mako index 255caf69..623a33a0 100644 --- a/tailbone/templates/master/view_row.mako +++ b/tailbone/templates/master/view_row.mako @@ -12,9 +12,6 @@ % if master.rows_editable and instance_editable and request.has_perm('{}.edit'.format(permission_prefix)):
  • ${h.link_to("Edit this {}".format(model_title), action_url('edit', instance))}
    • % endif - % if not use_buefy and instance_deletable and master.has_perm('delete_row'): -
  • ${h.link_to("Delete this {}".format(model_title), action_url('delete', instance))}
    • - % endif % if rows_creatable and request.has_perm('{}.create'.format(permission_prefix)):
  • ${h.link_to("Create a new {}".format(model_title), url('{}.create'.format(route_prefix)))}
    • % endif diff --git a/tailbone/templates/messages/archive/index.mako b/tailbone/templates/messages/archive/index.mako index 002b9e90..16a05ee2 100644 --- a/tailbone/templates/messages/archive/index.mako +++ b/tailbone/templates/messages/archive/index.mako @@ -3,15 +3,6 @@ <%def name="title()">Message Archive -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - % if not use_buefy: - - % endif - - <%def name="context_menu_items()"> ${parent.context_menu_items()}
  • ${h.link_to("Go to my Message Inbox", url('messages.inbox'))}
    • diff --git a/tailbone/templates/messages/create.mako b/tailbone/templates/messages/create.mako index fc046e36..10729590 100644 --- a/tailbone/templates/messages/create.mako +++ b/tailbone/templates/messages/create.mako @@ -2,148 +2,26 @@ <%inherit file="/master/create.mako" /> <%namespace file="/messages/recipients.mako" import="message_recipients_template" /> -<%def name="content_title()">${parent.content_title() if not use_buefy else ''} +<%def name="content_title()"> <%def name="extra_javascript()"> ${parent.extra_javascript()} - % if use_buefy: - ${h.javascript_link(request.static_url('tailbone:static/js/tailbone.buefy.message_recipients.js'))} - % else: - ${h.javascript_link(request.static_url('tailbone:static/js/lib/tag-it.min.js'))} - - ${self.validate_message_js()} - % endif - - -<%def name="validate_message_js()"> - + ${h.javascript_link(request.static_url('tailbone:static/js/tailbone.buefy.message_recipients.js'))} <%def name="extra_styles()"> ${parent.extra_styles()} - % if use_buefy: - - % else: - ${h.stylesheet_link(request.static_url('tailbone:static/css/jquery.tagit.css'))} - % endif - - -<%def name="before_tag_added()"> - function(event, ui) { - - // Lookup the name in cached mapping, and show that on the tag, instead - // of the UUID. The tagit widget should take care of keeping the - // hidden field in sync for us, still using the UUID. - var uuid = ui.tagLabel; - var name = recipient_mappings.get(uuid); - ui.tag.find('.tagit-label').html(name); - } <%def name="context_menu_items()"> diff --git a/tailbone/templates/messages/inbox/index.mako b/tailbone/templates/messages/inbox/index.mako index f88010b0..2ac24b9e 100644 --- a/tailbone/templates/messages/inbox/index.mako +++ b/tailbone/templates/messages/inbox/index.mako @@ -3,15 +3,6 @@ <%def name="title()">Message Inbox -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - % if not use_buefy: - - % endif - - <%def name="context_menu_items()"> ${parent.context_menu_items()}
  • ${h.link_to("Go to my Message Archive", url('messages.archive'))}
    • diff --git a/tailbone/templates/messages/index.mako b/tailbone/templates/messages/index.mako index 4ded5571..3fc82fd3 100644 --- a/tailbone/templates/messages/index.mako +++ b/tailbone/templates/messages/index.mako @@ -1,52 +1,6 @@ ## -*- coding: utf-8; -*- <%inherit file="/master/index.mako" /> -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - % if not use_buefy: - - % endif - - <%def name="context_menu_items()"> % if request.has_perm('messages.create'):
  • ${h.link_to("Send a new Message", url('messages.create'))}
    • @@ -55,25 +9,16 @@ <%def name="grid_tools()"> % if request.matched_route.name in ('messages.inbox', 'messages.archive'): - % if use_buefy: - ${h.form(url('messages.move_bulk'), **{'@submit': 'moveMessagesSubmit'})} - ${h.csrf_token(request)} - ${h.hidden('destination', value='archive' if request.matched_route.name == 'messages.inbox' else 'inbox')} - ${h.hidden('uuids', v_model='selected_uuids')} - - {{ moveMessagesTextCurrent }} - - ${h.end_form()} - % else: - ${h.form(url('messages.move_bulk'), name='move-selected')} - ${h.csrf_token(request)} - ${h.hidden('destination', value='archive' if request.matched_route.name == 'messages.inbox' else 'inbox')} - ${h.hidden('uuids')} - - ${h.end_form()} - % endif + ${h.form(url('messages.move_bulk'), **{'@submit': 'moveMessagesSubmit'})} + ${h.csrf_token(request)} + ${h.hidden('destination', value='archive' if request.matched_route.name == 'messages.inbox' else 'inbox')} + ${h.hidden('uuids', v_model='selected_uuids')} + + {{ moveMessagesTextCurrent }} + + ${h.end_form()} % endif diff --git a/tailbone/templates/messages/view.mako b/tailbone/templates/messages/view.mako index 78caab93..2e2baa60 100644 --- a/tailbone/templates/messages/view.mako +++ b/tailbone/templates/messages/view.mako @@ -1,66 +1,20 @@ ## -*- coding: utf-8; -*- <%inherit file="/master/view.mako" /> -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - % if not use_buefy: - - % endif - - <%def name="extra_styles()"> ${parent.extra_styles()} - % if use_buefy: - - % else: - % endif <%def name="context_menu_items()"> @@ -86,43 +40,29 @@ <%def name="message_tools()"> % if recipient: - % if use_buefy: -
    - % if request.has_perm('messages.create'): - - - - - % endif - % if recipient.status == enum.MESSAGE_STATUS_INBOX: - - - % else: - - - % endif -
    - % else: -
    - % if request.has_perm('messages.create'): - ${h.link_to("Reply", url('messages.reply', uuid=instance.uuid), class_='button')} - ${h.link_to("Reply to All", url('messages.reply_all', uuid=instance.uuid), class_='button')} - % endif - % if recipient.status == enum.MESSAGE_STATUS_INBOX: - ${h.link_to("Move to Archive", url('messages.move', uuid=instance.uuid) + '?dest=archive', class_='button')} - % else: - ${h.link_to("Move to Inbox", url('messages.move', uuid=instance.uuid) + '?dest=inbox', class_='button')} - % endif -
    - % endif +
    + % if request.has_perm('messages.create'): + + + + + % endif + % if recipient.status == enum.MESSAGE_STATUS_INBOX: + + + % else: + + + % endif +
    % endif @@ -132,22 +72,14 @@ <%def name="page_content()"> ${parent.page_content()} - % if use_buefy: -
    -
    - ${self.message_tools()} -
    - ${self.message_body()} -
    - ${self.message_tools()} -
    - % else: - ${self.message_tools()} -
    - ${self.message_body()} -
    - ${self.message_tools()} - % endif +
    +
    + ${self.message_tools()} +
    + ${self.message_body()} +
    + ${self.message_tools()} +
    <%def name="modify_this_page_vars()"> diff --git a/tailbone/templates/ordering/create.mako b/tailbone/templates/ordering/create.mako index ff0fc836..8f2d5e27 100644 --- a/tailbone/templates/ordering/create.mako +++ b/tailbone/templates/ordering/create.mako @@ -1,82 +1,6 @@ ## -*- coding: utf-8; -*- <%inherit file="/batch/create.mako" /> -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - % if not use_buefy: - ${self.func_show_mode()} - - % endif - - -<%def name="func_show_mode()"> - - +## TODO: deprecate / remove ${parent.body()} diff --git a/tailbone/templates/ordering/worksheet.mako b/tailbone/templates/ordering/worksheet.mako index 97b1b51b..e41fe15f 100644 --- a/tailbone/templates/ordering/worksheet.mako +++ b/tailbone/templates/ordering/worksheet.mako @@ -3,63 +3,6 @@ <%def name="title()">Ordering Worksheet -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - % if not use_buefy: - ${h.javascript_link(request.static_url('tailbone:static/js/numeric.js'))} - - % endif - - <%def name="extra_styles()"> ${parent.extra_styles()} - % endif - - <%def name="render_deform_field(form, field)"> - % if use_buefy: - - ${field.serialize(use_buefy=True)|n} - - % else: -
    -
    - -
    - ${field.serialize()|n} -
    -
    -
    - % endif + + ${field.serialize()|n} + <%def name="render_form_innards()"> - % if use_buefy: ${h.form(request.current_route_url(), **{'@submit': 'submit{}'.format(form.component_studly)})} - % else: - ${h.form(request.current_route_url(), class_='autodisable')} - % endif ${h.csrf_token(request)}
    @@ -75,53 +31,33 @@ ${render_deform_field(form, dform['notes'])} % for key, pform in six.iteritems(params_forms): - % if use_buefy: -
    - % for field in pform.make_deform_form(): - ${render_deform_field(pform, field)} - % endfor -
    - % else: -
    - ## TODO: hacky to use deform? at least is explicit.. - % for field in pform.make_deform_form(): - ${render_deform_field(pform, field)} - % endfor -
    - % endif +
    + % for field in pform.make_deform_form(): + ${render_deform_field(pform, field)} + % endfor +
    % endfor

    - % if use_buefy: - - {{ ${form.component_studly}ButtonText }} - - - Cancel - - % else: - ${h.submit('make-batch', "Create Batch")} - ${h.link_to("Cancel", url('products'), class_='button')} - % endif + + {{ ${form.component_studly}ButtonText }} + + + Cancel +
    ${h.end_form()} <%def name="render_form()"> - % if use_buefy: - - % else: -
    - ${self.render_form_innards()} -
    - % endif + <%def name="modify_this_page_vars()"> diff --git a/tailbone/templates/products/index.mako b/tailbone/templates/products/index.mako index 8eada2fc..0d4bc410 100644 --- a/tailbone/templates/products/index.mako +++ b/tailbone/templates/products/index.mako @@ -1,133 +1,26 @@ ## -*- coding: utf-8; -*- <%inherit file="/master/index.mako" /> -<%def name="extra_styles()"> - ${parent.extra_styles()} - % if not use_buefy: - - % endif - - -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - % if not use_buefy and label_profiles and master.has_perm('print_labels'): - - % endif - - <%def name="grid_tools()"> ${parent.grid_tools()} % if label_profiles and master.has_perm('print_labels'): - % if use_buefy: - - - - % for profile in label_profiles: - - % endfor - - - - - - - - % else: - - - - - - - - - - - -
    LabelQty.
    - - - -
    - % endif + + + + % for profile in label_profiles: + + % endfor + + + + + + + % endif diff --git a/tailbone/templates/products/view.mako b/tailbone/templates/products/view.mako index 0d0b2650..a6df1e7a 100644 --- a/tailbone/templates/products/view.mako +++ b/tailbone/templates/products/view.mako @@ -1,94 +1,16 @@ ## -*- coding: utf-8; -*- <%inherit file="/master/view.mako" /> -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - % if not use_buefy and request.rattail_config.versioning_enabled() and master.has_perm('versions'): - - % endif - - <%def name="extra_styles()"> ${parent.extra_styles()} @@ -100,37 +22,22 @@ <%def name="left_column()"> - % if use_buefy: - - - % else: -
    -

    Pricing

    -
    - ${self.render_price_fields(form)} +
    -
    -

    Flags

    -
    - ${self.render_flag_fields(form)} + +
    - % endif + ${self.extra_left_panels()} @@ -147,23 +54,14 @@ <%def name="extra_main_fields(form)"> <%def name="organization_panel()"> - % if use_buefy: - - % else: -
    -

    Organization

    -
    - ${self.render_organization_fields(form)} +
    - % endif + <%def name="render_organization_fields(form)"> @@ -195,23 +93,14 @@ <%def name="movement_panel()"> - % if use_buefy: - - % else: -
    -

    Movement

    -
    - ${self.render_movement_fields(form)} +
    - % endif + <%def name="render_movement_fields(form)"> @@ -219,9 +108,7 @@ <%def name="lookup_codes_grid()"> - % if use_buefy: - ${lookup_codes['grid'].render_buefy_table_element(data_prop='lookupCodesData')|n} - % else: + ${lookup_codes['grid'].render_buefy_table_element(data_prop='lookupCodesData')|n}
    @@ -238,29 +125,19 @@
    - % endif <%def name="lookup_codes_panel()"> - % if use_buefy: - - % else: -
    -

    Additional Lookup Codes

    - ${self.lookup_codes_grid()} -
    - % endif + <%def name="sources_grid()"> - % if use_buefy: - ${vendor_sources['grid'].render_buefy_table_element(data_prop='vendorSourcesData')|n} - % else: + ${vendor_sources['grid'].render_buefy_table_element(data_prop='vendorSourcesData')|n}
    @@ -293,71 +170,40 @@
    - % endif <%def name="sources_panel()"> - % if use_buefy: - - % else: -
    -

    +

    - ${self.sources_grid()} -
    - % endif +

    +
    + ${self.sources_grid()} +
    + <%def name="notes_panel()"> - % if use_buefy: - - % else: -
    -

    Notes

    -
    +
    - % endif + <%def name="ingredients_panel()"> - % if use_buefy: - - % else: -
    -

    Ingredients

    -
    +
    - % endif + <%def name="extra_left_panels()"> @@ -366,7 +212,7 @@ <%def name="render_this_page()"> ${parent.render_this_page()} - % if use_buefy and request.rattail_config.versioning_enabled() and master.has_perm('versions'): + % if request.rattail_config.versioning_enabled() and master.has_perm('versions'): @@ -447,83 +293,34 @@ <%def name="page_content()"> - % if use_buefy:
    - - -
    -
    - ${self.left_column()} -
    -
    - ${self.right_column()} -
    -
    - + - % if request.rattail_config.versioning_enabled() and master.has_perm('versions'): -
    - ${regular_price_history_grid.render_grid()|n} -
    -
    - ${current_price_history_grid.render_grid()|n} -
    -
    - ${suggested_price_history_grid.render_grid()|n} -
    -
    - ${cost_history_grid.render_grid()|n} -
    - % endif - % endif +
    +
    + ${self.left_column()} +
    +
    + ${self.right_column()} +
    +
    + +
    % if buttons: ${buttons|n} diff --git a/tailbone/templates/purchases/batches/receive_form.mako b/tailbone/templates/purchases/batches/receive_form.mako deleted file mode 100644 index 3a3ed888..00000000 --- a/tailbone/templates/purchases/batches/receive_form.mako +++ /dev/null @@ -1,468 +0,0 @@ -## -*- coding: utf-8 -*- -<%inherit file="/base.mako" /> - -<%def name="title()">Receiving Form (${batch.vendor}) - -<%def name="head_tags()"> - ${parent.head_tags()} - ${h.javascript_link(request.static_url('tailbone:static/js/numeric.js'))} - - - -<%def name="extra_styles()"> - ${parent.extra_styles()} - - - - -<%def name="context_menu_items()"> -
  • ${h.link_to("Back to Purchase Batch", url('purchases.batch.view', uuid=batch.uuid))}
    • - - - -
      - ${self.context_menu_items()} -
    - -
    - ${form.begin(id='receiving-form')} - ${form.csrf_token()} - ${h.hidden('mode')} - ${h.hidden('expiration_date')} - ${h.hidden('trash')} - ${h.hidden('ordered_product')} - -
    - -
    - ${h.hidden('product')} -
    ${h.text('upc', autocomplete='off')}
    -
    -

    please ENTER a scancode

    -
    -
    please confirm UPC and provide more details
    -
    warning: product not found on current purchase
    -
    -
    -
    - - - - - -
    - -
    ${h.text('cases', autocomplete='off')}
    -
    - -
    - -
    ${h.text('units', autocomplete='off')}
    -
    - -
    - - - - -
    - - ${form.end()} -
    - - - - - - diff --git a/tailbone/templates/receiving/create.mako b/tailbone/templates/receiving/create.mako index c31cb849..35ee878a 100644 --- a/tailbone/templates/receiving/create.mako +++ b/tailbone/templates/receiving/create.mako @@ -1,80 +1,6 @@ ## -*- coding: utf-8; -*- <%inherit file="/batch/create.mako" /> -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - % if not use_buefy: - ${self.func_show_batch_type()} - - % endif - - -<%def name="func_show_batch_type()"> - - +## TODO: deprecate / remove this ${parent.body()} diff --git a/tailbone/templates/receiving/declare_credit.mako b/tailbone/templates/receiving/declare_credit.mako index 84d4dbec..6224a539 100644 --- a/tailbone/templates/receiving/declare_credit.mako +++ b/tailbone/templates/receiving/declare_credit.mako @@ -11,35 +11,6 @@ % endif -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - % if not use_buefy: - - % endif - - <%def name="render_buefy_form()">

    @@ -75,30 +46,7 @@ <%def name="render_form()"> - % if use_buefy: - - ${form.render_deform(buttons=capture(self.render_form_buttons), form_body=capture(self.buefy_form_body))|n} - - % else: - -

    - Please select the "state" of the product, and enter the appropriate - quantity. -

    - -

    - Note that this tool will deduct from the "received" - quantity, and add to the corresponding credit quantity. -

    - -

    - Please see ${h.link_to("Receive Row", url('{}.receive_row'.format(route_prefix), uuid=batch.uuid, row_uuid=row.uuid))} - if you need to "receive" instead of "convert" the product. -

    - - ${parent.render_form()} - - % endif + ${form.render_deform(buttons=capture(self.render_form_buttons), form_body=capture(self.buefy_form_body))|n} diff --git a/tailbone/templates/receiving/receive_row.mako b/tailbone/templates/receiving/receive_row.mako index b17b118a..7ef95ac4 100644 --- a/tailbone/templates/receiving/receive_row.mako +++ b/tailbone/templates/receiving/receive_row.mako @@ -11,35 +11,6 @@ % endif -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - % if not use_buefy: - - % endif - - <%def name="render_buefy_form()">

    @@ -72,30 +43,7 @@ <%def name="render_form()"> - % if use_buefy: - - ${form.render_deform(buttons=capture(self.render_form_buttons), form_body=capture(self.buefy_form_body))|n} - - % else: - -

    - Please select the "state" of the product, and enter the appropriate - quantity. -

    - -

    - Note that this tool will add the corresponding - quantities for the row. -

    - -

    - Please see ${h.link_to("Declare Credit", url('{}.declare_credit'.format(route_prefix), uuid=batch.uuid, row_uuid=row.uuid))} - if you need to "convert" some already-received amount, into a credit. -

    - - ${parent.render_form()} - - % endif + ${form.render_deform(buttons=capture(self.render_form_buttons), form_body=capture(self.buefy_form_body))|n} diff --git a/tailbone/templates/receiving/view.mako b/tailbone/templates/receiving/view.mako index f4a90dcb..463fdf6c 100644 --- a/tailbone/templates/receiving/view.mako +++ b/tailbone/templates/receiving/view.mako @@ -1,311 +1,32 @@ ## -*- coding: utf-8; -*- <%inherit file="/batch/view.mako" /> -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - % if not use_buefy and master.has_perm('edit_row'): - ${h.javascript_link(request.static_url('tailbone:static/js/numeric.js'))} - - % endif - - <%def name="extra_styles()"> ${parent.extra_styles()} - % if use_buefy: - - % elif not use_buefy and not batch.executed and master.has_perm('edit_row'): - - % endif + tr.invoice_cost_confirmed td.c_invoice_unit_cost { + background-color: #cfc; + } + % endif + <%def name="render_po_vs_invoice_helper()"> - % if use_buefy and master.handler.has_purchase_order(batch) and master.handler.has_invoice_file(batch): + % if master.handler.has_purchase_order(batch) and master.handler.has_invoice_file(batch):

    PO vs. Invoice

    @@ -321,60 +42,51 @@

    Tools

    - % if use_buefy: - - Auto-Receive All Items - - % else: - ${h.form(url('{}.auto_receive'.format(route_prefix), uuid=batch.uuid), class_='autodisable')} - ${h.csrf_token(request)} - ${h.submit('submit', "Auto-Receive All Items")} - ${h.end_form()} - % endif + + Auto-Receive All Items +
    - % if use_buefy: - -
    + +
    -
    -

    Auto-Receive All Items

    -
    +
    +

    Auto-Receive All Items

    +
    -
    -

    - You can automatically set the "received" quantity to - match the "shipped" quantity for all items, based on - the invoice. -

    -

    - Would you like to do so? -

    -
    +
    +

    + You can automatically set the "received" quantity to + match the "shipped" quantity for all items, based on + the invoice. +

    +

    + Would you like to do so? +

    +
    -
    - - Cancel - - ${h.form(url('{}.auto_receive'.format(route_prefix), uuid=batch.uuid), **{'@submit': 'autoReceiveSubmitting = true'})} - ${h.csrf_token(request)} - - {{ autoReceiveSubmitting ? "Working, please wait..." : "Auto-Receive All Items" }} - - ${h.end_form()} -
    -
    -     - % endif +
    + + Cancel + + ${h.form(url('{}.auto_receive'.format(route_prefix), uuid=batch.uuid), **{'@submit': 'autoReceiveSubmitting = true'})} + ${h.csrf_token(request)} + + {{ autoReceiveSubmitting ? "Working, please wait..." : "Auto-Receive All Items" }} + + ${h.end_form()} +
    +
    +     % endif @@ -607,14 +319,3 @@ ${parent.body()} - -% if not use_buefy and master.handler.allow_truck_dump_receiving() and master.has_perm('edit_row'): - ${h.form(url('{}.transform_unit_row'.format(route_prefix), uuid=batch.uuid), name='transform-unit-form')} - ${h.csrf_token(request)} - ${h.hidden('row_uuid')} - ${h.end_form()} - - -% endif diff --git a/tailbone/templates/receiving/view_row.mako b/tailbone/templates/receiving/view_row.mako index 308e97d7..4d596391 100644 --- a/tailbone/templates/receiving/view_row.mako +++ b/tailbone/templates/receiving/view_row.mako @@ -4,479 +4,456 @@ <%def name="extra_styles()"> ${parent.extra_styles()} -<%def name="object_helpers()"> - ${parent.object_helpers()} - % if not use_buefy and master.row_editable(row) and not batch.is_truck_dump_child(): -
    -

    Receiving Tools

    -
    -
    - ${h.link_to("Receive Product", url('{}.receive_row'.format(route_prefix), uuid=batch.uuid, row_uuid=row.uuid), class_='button autodisable')} - ${h.link_to("Declare Credit", url('{}.declare_credit'.format(route_prefix), uuid=batch.uuid, row_uuid=row.uuid), class_='button autodisable')} +<%def name="page_content()"> + + + + + {{ rowData.sequence }} + + + + {{ rowData.status }} + + + + {{ rowData.invoice_total_calculated }} + + + + +
    + + -<%def name="page_content()"> - % if use_buefy: - - - - - {{ rowData.sequence }} - - - - {{ rowData.status }} - - - - {{ rowData.invoice_total_calculated }} - - - - -
    - - - - - -
    - - -
    - -
    -

    Account for Product

    -
    - -
    - -

    - This is for declaring that you have encountered some - amount of the product.  Ideally you will just - "receive" it normally, but you can indicate a "credit" - state if there is something amiss. -

    - - - - % if allow_cases: - - - {{ rowData.case_quantity }} - - - - -   - - % endif - - - - - - - - - - - +
    - -
    - - Cancel - - - {{ accountForProductSubmitting ? "Working, please wait..." : "Account for Product" }} - -
    -     +
    + - -
    +
    -
    -

    Declare Credit

    -
    + +
    -
    +
    +

    Account for Product

    +
    -

    - This is for converting - some amount you already - received, and now declaring there is something - wrong with it. -

    +
    - +

    + This is for declaring that you have encountered some + amount of the product.  Ideally you will just + "receive" it normally, but you can indicate a "credit" + state if there is something amiss. +

    - + + + % if allow_cases: + - {{ rowData.received }} + {{ rowData.case_quantity }}   + % endif - - - - - + + + + + - - - - + + + + - + -
    -
    +
    +
    -
    - - -
    - -
    - % if allow_cases: - - - Units - - - Cases - - - % else: - - - Units - - % endif -
    - - % if allow_cases: -
    - = {{ declareCreditTotalUnits }} -
    - % endif - -
    +
    + +
    -
    +
    + % if allow_cases: + + + Units + + + Cases + + + % else: + + + Units + + % endif +
    -
    - - Cancel - - - {{ declareCreditSubmitting ? "Working, please wait..." : "Declare this Credit" }} - -
    -
    -     + % if allow_cases: +
    + = {{ accountForProductTotalUnits }} +
    + % endif - - -
    + -
    -

    Un-Declare Credit

    -
    +
    + + Cancel + + + {{ accountForProductSubmitting ? "Working, please wait..." : "Account for Product" }} + +
    +
    +     -
    + +
    -

    - If you un-declare this credit, the quantity below will - be added back to the - Received tally. -

    +
    +

    Declare Credit

    +
    - - {{ removeCreditRow.credit_type }} - +
    - - {{ removeCreditRow.shorted }} - +

    + This is for converting + some amount you already + received, and now declaring there is something + wrong with it. +

    -
    + -
    - - Cancel - - - {{ removeCreditSubmitting ? "Working, please wait..." : "Un-Declare this Credit" }} - -
    + + + {{ rowData.received }} + + + + +   + + + + + + + + + + + + + +     + +
    +
    + +
    + + +
    + +
    + % if allow_cases: + + + Units + + + Cases + + + % else: + + + Units + + % endif +
    + + % if allow_cases: +
    + = {{ declareCreditTotalUnits }} +
    + % endif + +
    - -
    +
    - % if master.batch_handler.has_purchase_order(batch): - - % endif - - % if master.batch_handler.has_invoice_file(batch): - - % endif +
    + + Cancel + + + {{ declareCreditSubmitting ? "Working, please wait..." : "Declare this Credit" }} + +
    +
    + + - % else: - ## legacy / not buefy - ${parent.page_content()} - % endif + +
    + +
    +

    Un-Declare Credit

    +
    + +
    + +

    + If you un-declare this credit, the quantity below will + be added back to the + Received tally. +

    + + + {{ removeCreditRow.credit_type }} + + + + {{ removeCreditRow.shorted }} + + +
    + +
    + + Cancel + + + {{ removeCreditSubmitting ? "Working, please wait..." : "Un-Declare this Credit" }} + +
    +
    +     + +
    + + % if master.batch_handler.has_purchase_order(batch): + + % endif + + % if master.batch_handler.has_invoice_file(batch): + + % endif + +
    <%def name="modify_this_page_vars()"> diff --git a/tailbone/templates/reports/generated/choose.mako b/tailbone/templates/reports/generated/choose.mako index 31aa3cd5..55cf71dd 100644 --- a/tailbone/templates/reports/generated/choose.mako +++ b/tailbone/templates/reports/generated/choose.mako @@ -1,47 +1,14 @@ ## -*- coding: utf-8; -*- <%inherit file="/master/create.mako" /> -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - % if not use_buefy: - - % endif - - <%def name="extra_styles()"> ${parent.extra_styles()}