diff --git a/docs/structure.rst b/docs/structure.rst
index b741475e..5585f71a 100644
--- a/docs/structure.rst
+++ b/docs/structure.rst
@@ -117,7 +117,6 @@ of course supply the web app layer.
│ │ │ └── foobatch/
│ │ ├── customers/
│ │ ├── menu.mako
- │ │ ├── mobile/
│ │ └── products/
│ └── views/
│ ├── __init__.py
diff --git a/tailbone/config.py b/tailbone/config.py
index 6be175ae..90799016 100644
--- a/tailbone/config.py
+++ b/tailbone/config.py
@@ -2,7 +2,7 @@
################################################################################
#
# Rattail -- Retail Software Framework
-# Copyright © 2010-2020 Lance Edgar
+# Copyright © 2010-2021 Lance Edgar
#
# This file is part of Rattail.
#
@@ -65,10 +65,5 @@ def global_help_url(config):
return config.get('tailbone', 'global_help_url')
-def legacy_mobile_enabled(config):
- return config.getbool('tailbone', 'legacy_mobile.enabled',
- default=True)
-
-
def protected_usernames(config):
return config.getlist('tailbone', 'protected_usernames')
diff --git a/tailbone/forms/core.py b/tailbone/forms/core.py
index ebad3f74..d35b8a35 100644
--- a/tailbone/forms/core.py
+++ b/tailbone/forms/core.py
@@ -2,7 +2,7 @@
################################################################################
#
# Rattail -- Retail Software Framework
-# Copyright © 2010-2020 Lance Edgar
+# Copyright © 2010-2021 Lance Edgar
#
# This file is part of Rattail.
#
@@ -339,7 +339,7 @@ class Form(object):
auto_disable_save = True
auto_disable_cancel = True
- def __init__(self, fields=None, schema=None, request=None, mobile=False, readonly=False, readonly_fields=[],
+ def __init__(self, fields=None, schema=None, request=None, readonly=False, readonly_fields=[],
model_instance=None, model_class=None, appstruct=UNSPECIFIED, nodes={}, enums={}, labels={},
assume_local_times=False, renderers=None,
hidden={}, widgets={}, defaults={}, validators={}, required={}, helptext={}, focus_spec=None,
@@ -352,7 +352,6 @@ class Form(object):
if self.fields is None and self.schema:
self.set_fields([f.name for f in self.schema])
self.request = request
- self.mobile = mobile
self.readonly = readonly
self.readonly_fields = set(readonly_fields or [])
self.model_instance = model_instance
diff --git a/tailbone/grids/__init__.py b/tailbone/grids/__init__.py
index 0d4970c8..7db22b26 100644
--- a/tailbone/grids/__init__.py
+++ b/tailbone/grids/__init__.py
@@ -2,7 +2,7 @@
################################################################################
#
# Rattail -- Retail Software Framework
-# Copyright © 2010-2017 Lance Edgar
+# Copyright © 2010-2021 Lance Edgar
#
# This file is part of Rattail.
#
@@ -28,4 +28,3 @@ from __future__ import unicode_literals, absolute_import
from . import filters
from .core import Grid, GridAction
-from .mobile import MobileGrid
diff --git a/tailbone/grids/core.py b/tailbone/grids/core.py
index a6672270..dde02d19 100644
--- a/tailbone/grids/core.py
+++ b/tailbone/grids/core.py
@@ -2,7 +2,7 @@
################################################################################
#
# Rattail -- Retail Software Framework
-# Copyright © 2010-2020 Lance Edgar
+# Copyright © 2010-2021 Lance Edgar
#
# This file is part of Rattail.
#
@@ -67,7 +67,7 @@ class Grid(object):
Core grid class. In sore need of documentation.
"""
- def __init__(self, key, data, columns=None, width='auto', request=None, mobile=False,
+ def __init__(self, key, data, columns=None, width='auto', request=None,
model_class=None, model_title=None, model_title_plural=None,
enums={}, labels={}, assume_local_times=False, renderers={},
extra_row_class=None, linked_columns=[], url='#',
@@ -84,7 +84,6 @@ class Grid(object):
self.columns = FieldList(columns) if columns is not None else None
self.width = width
self.request = request
- self.mobile = mobile
self.model_class = model_class
if self.model_class and self.columns is None:
self.columns = self.make_columns()
@@ -341,7 +340,6 @@ class Grid(object):
def make_webhelpers_grid(self):
kwargs = dict(self._whgrid_kwargs)
kwargs['request'] = self.request
- kwargs['mobile'] = self.mobile
kwargs['url'] = self.make_url
columns = list(self.columns)
@@ -1302,17 +1300,11 @@ class CustomWebhelpersGrid(webhelpers2_grid.Grid):
"""
def __init__(self, itemlist, columns, **kwargs):
- self.mobile = kwargs.pop('mobile', False)
self.renderers = kwargs.pop('renderers', {})
self.linked_columns = kwargs.pop('linked_columns', [])
self.extra_record_class = kwargs.pop('extra_record_class', None)
super(CustomWebhelpersGrid, self).__init__(itemlist, columns, **kwargs)
- def default_header_record_format(self, headers):
- if self.mobile:
- return HTML('')
- return super(CustomWebhelpersGrid, self).default_header_record_format(headers)
-
def generate_header_link(self, column_number, column, label_text):
# display column header as simple no-op link; client-side JS takes care
@@ -1329,8 +1321,6 @@ class CustomWebhelpersGrid(webhelpers2_grid.Grid):
label_text)
def default_record_format(self, i, record, columns):
- if self.mobile:
- return columns
kwargs = {
'class_': self.get_record_class(i, record, columns),
}
@@ -1359,12 +1349,6 @@ class CustomWebhelpersGrid(webhelpers2_grid.Grid):
def default_column_format(self, column_number, i, record, column_name):
value = self.get_column_value(column_number, i, record, column_name)
- if self.mobile:
- url = self.url_generator(record, i)
- attrs = {}
- if hasattr(record, 'uuid'):
- attrs['data_uuid'] = record.uuid
- return HTML.tag('li', tags.link_to(value, url), **attrs)
if self.linked_columns and column_name in self.linked_columns and (
value is not None and value != ''):
url = self.url_generator(record, i)
diff --git a/tailbone/grids/filters.py b/tailbone/grids/filters.py
index 02ca9130..0aa5046d 100644
--- a/tailbone/grids/filters.py
+++ b/tailbone/grids/filters.py
@@ -2,7 +2,7 @@
################################################################################
#
# Rattail -- Retail Software Framework
-# Copyright © 2010-2020 Lance Edgar
+# Copyright © 2010-2021 Lance Edgar
#
# This file is part of Rattail.
#
@@ -294,18 +294,6 @@ class GridFilter(object):
return self.value_renderer.render(value=value, **kwargs)
-class MobileFilter(GridFilter):
- """
- Base class for mobile grid filters.
- """
- default_verbs = ['equal']
-
- def __init__(self, key, **kwargs):
- kwargs.setdefault('default_active', True)
- kwargs.setdefault('default_verb', 'equal')
- super(MobileFilter, self).__init__(key, **kwargs)
-
-
class AlchemyGridFilter(GridFilter):
"""
Base class for SQLAlchemy grid filters.
diff --git a/tailbone/grids/mobile.py b/tailbone/grids/mobile.py
deleted file mode 100644
index dc6a04b9..00000000
--- a/tailbone/grids/mobile.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8; -*-
-################################################################################
-#
-# Rattail -- Retail Software Framework
-# Copyright © 2010-2017 Lance Edgar
-#
-# This file is part of Rattail.
-#
-# Rattail is free software: you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation, either version 3 of the License, or (at your option) any later
-# version.
-#
-# Rattail is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Rattail. If not, see
' + val.label + " ";
- });
- that.ul.html( html );
- that.ul.listview( "refresh" );
- that.ul.trigger( "updatelayout");
- });
- }
-
- });
-
- // when user clicks autocomplete result, hide search etc.
- this.ul.on('click', 'li', function() {
- var $li = $(this);
- var uuid = $li.data('uuid');
- that.search.hide();
- that.hidden_field.val(uuid);
- that.button.text($li.text()).show();
- that.ul.hide();
- that.element.trigger('autocompleteitemselected', uuid);
- });
-
- // when user clicks "change" button, show search etc.
- this.button.click(function() {
- that.button.hide();
- that.ul.empty().show();
- that.hidden_field.val('');
- that.search.show();
- that.text_field.focus();
- that.element.trigger('autocompleteitemcleared');
- });
-
- }
-
- });
-
-})( jQuery );
diff --git a/tailbone/static/js/tailbone.mobile.js b/tailbone/static/js/tailbone.mobile.js
deleted file mode 100644
index 432f3170..00000000
--- a/tailbone/static/js/tailbone.mobile.js
+++ /dev/null
@@ -1,308 +0,0 @@
-
-/************************************************************
- *
- * tailbone.mobile.js
- *
- * Global logic for mobile app
- *
- ************************************************************/
-
-
-$(function() {
-
- // must init header/footer toolbars since ours are "external"
- $('[data-role="header"], [data-role="footer"]').toolbar({theme: 'a'});
-});
-
-
-$(document).on('pagecontainerchange', function(event, ui) {
-
- // in some cases (i.e. when no user is logged in) we may want the (external)
- // header toolbar button to change between pages. here's how we do that.
- // note however that we do this *always* even when not technically needed
- var link = $('[data-role="header"] a:first');
- var newlink = ui.toPage.find('.replacement-header a');
- link.text(newlink.text());
- link.attr('href', newlink.attr('href'));
- link.removeClass('ui-icon-home ui-icon-user');
- link.addClass(newlink.attr('class'));
-});
-
-
-$(document).on('click', '#feedback-button', function() {
-
- // prepare and display 'feedback' popup dialog
- var popup = $('.ui-page-active #feedback-popup');
- popup.find('.referrer .field').html(location.href);
- popup.find('.referrer input').val(location.href);
- popup.find('.user_name input').val('');
- popup.find('.message textarea').val('');
- popup.data('feedback-sent', false);
- popup.popup('open');
-});
-
-
-$(document).on('click', '#feedback-popup .submit', function() {
-
- // send message when 'feedback' submit button pressed
- var popup = $('.ui-page-active #feedback-popup');
- var form = popup.find('form');
- $.post(form.attr('action'), form.serializeArray(), function(data) {
- if (data.ok) {
-
- // mark "feedback sent" flag, for popupafterclose
- popup.data('feedback-sent', true);
- popup.popup('close');
- }
- });
-
-});
-
-
-$(document).on('click', '#feedback-form-buttons .cancel', function() {
-
- // close 'feedback' popup when user clicks Cancel
- var popup = $('.ui-page-active #feedback-popup');
- popup.popup('close');
-});
-
-
-$(document).on('popupafterclose', '#feedback-popup', function() {
-
- // thank the user for their feedback, after msg is sent
- if ($(this).data('feedback-sent')) {
- var popup = $('.ui-page-active #feedback-thanks');
- popup.popup('open');
- }
-});
-
-
-$(document).on('pagecreate', function() {
-
- // setup any autocomplete fields
- $('.field.autocomplete').mobileautocomplete();
-
-});
-
-
-// submit "quick row" form upon autocomplete selection
-$(document).on('autocompleteitemselected', function(event, uuid) {
- var field = $(event.target);
- if (field.hasClass('quick-row')) {
- var form = field.parents('form:first');
- form.find('[name="quick_entry"]').val(uuid);
- form.submit();
- }
-});
-
-
-/**
- * Automatically set focus to certain fields, on various pages
- * TODO: should be letting the form declare a "focus spec" instead, to avoid
- * hard-coding these field names below!
- */
-function setfocus() {
- var el = null;
- var queries = [
- '#username',
- '#new-purchasing-batch-vendor-text',
- '#new-receiving-batch-vendor-text',
- ];
- $.each(queries, function(i, query) {
- el = $(query);
- if (el.is(':visible')) {
- el.focus();
- return false;
- }
- });
-}
-
-
-$(document).on('pageshow', function() {
-
- setfocus();
-
- // if current page has form, which has declared a "focus spec", then try to
- // set focus accordingly
- var form = $('.ui-page-active form');
- if (form) {
- var spec = form.data('focus');
- if (spec) {
- var input = $(spec);
- if (input) {
- if (input.is(':visible')) {
- input.focus();
- }
- }
- }
- }
-
-});
-
-
-// handle radio button value change for "simple" grid filter
-$(document).on('change', '.simple-filter .ui-radio', function() {
- $(this).parents('form:first').submit();
-});
-
-
-// vendor validation for new purchasing batch
-$(document).on('click', 'form[name="new-purchasing-batch"] input[type="submit"]', function() {
- var $form = $(this).parents('form');
- if (! $form.find('[name="vendor"]').val()) {
- alert("Please select a vendor");
- $form.find('[name="new-purchasing-batch-vendor-text"]').focus();
- return false;
- }
-});
-
-
-// disable datasync restart button when clicked
-$(document).on('click', '#datasync-restart', function() {
- $(this).button('disable');
-});
-
-
-// TODO: this should go away in favor of quick_row approach
-// handle global keypress on product batch "row" page, for sake of scanner wedge
-var product_batch_routes = [
- 'mobile.batch.inventory.view',
-];
-$(document).on('keypress', function(event) {
- var current_route = $('.ui-page-active [role="main"]').data('route');
- for (var route of product_batch_routes) {
- if (current_route == route) {
- var upc = $('.ui-page-active #upc-search');
- if (upc.length) {
- if (upc.is(':focus')) {
- if (event.which == 13) {
- if (upc.val()) {
- $.mobile.navigate(upc.data('url') + '?upc=' + upc.val());
- }
- }
- } else {
- if (event.which >= 48 && event.which <= 57) { // numeric (qwerty)
- upc.val(upc.val() + event.key);
- // TODO: these codes are correct for 'keydown' but apparently not 'keypress' ?
- // } else if (event.which >= 96 && event.which <= 105) { // numeric (10-key)
- // upc.val(upc.val() + event.key);
- } else if (event.which == 13) {
- if (upc.val()) {
- $.mobile.navigate(upc.data('url') + '?upc=' + upc.val());
- }
- }
- return false;
- }
- }
- }
- }
-});
-
-
-// handle various keypress events for quick entry forms
-$(document).on('keypress', function(event) {
- var quick_entry = $('.ui-page-active #quick_entry');
- if (quick_entry.length) {
-
- // if user hits enter with quick row input focused, submit form
- if (quick_entry.is(':focus')) {
- if (event.which == 13) { // ENTER
- if (quick_entry.val()) {
- var form = quick_entry.parents('form:first');
- form.submit();
- return false;
- }
- }
-
- } else { // quick row input not focused
-
- // mimic keyboard wedge if we're so instructed
- if (quick_entry.data('wedge')) {
-
- if (event.which >= 48 && event.which <= 57) { // numeric (qwerty)
- if (!event.altKey && !event.ctrlKey && !event.metaKey) {
- quick_entry.val(quick_entry.val() + event.key);
- return false;
- }
-
- // TODO: these codes are correct for 'keydown' but apparently not 'keypress' ?
- // } else if (event.which >= 96 && event.which <= 105) { // numeric (10-key)
- // upc.val(upc.val() + event.key);
-
- } else if (event.which == 13) { // ENTER
- // submit form when ENTER is received via keyboard "wedge"
- if (quick_entry.val()) {
- var form = quick_entry.parents('form:first');
- form.submit();
- return false;
- }
- }
- }
- }
- }
-});
-
-
-// when numeric keypad button is clicked, update quantity accordingly
-$(document).on('click', '.quantity-keypad-thingy .keypad-button', function() {
- var keypad = $(this).parents('.quantity-keypad-thingy');
- var quantity = keypad.find('.keypad-quantity');
- var value = quantity.text();
- var key = $(this).text();
- var changed = keypad.data('changed');
- if (key == 'Del') {
- if (value.length == 1) {
- quantity.text('0');
- } else {
- quantity.text(value.substring(0, value.length - 1));
- }
- changed = true;
- } else if (key == '.') {
- if (value.indexOf('.') == -1) {
- if (changed) {
- quantity.text(value + '.');
- } else {
- quantity.text('0.');
- changed = true;
- }
- }
- } else {
- if (value == '0') {
- quantity.text(key);
- changed = true;
- } else if (changed) {
- quantity.text(value + key);
- } else {
- quantity.text(key);
- changed = true;
- }
- }
- if (changed) {
- keypad.data('changed', true);
- }
-});
-
-
-// show/hide expiration date per receiving mode selection
-$(document).on('change', 'fieldset.receiving-mode input[name="mode"]', function() {
- var mode = $(this).val();
- if (mode == 'expired') {
- $('#expiration-row').show();
- } else {
- $('#expiration-row').hide();
- }
-});
-
-
-// handle inventory save button
-$(document).on('click', '.inventory-actions button.save', function() {
- var form = $(this).parents('form:first');
- var uom = form.find('[name="keypad-uom"]:checked').val();
- var qty = form.find('.keypad-quantity').text();
- if (uom == 'CS') {
- form.find('input[name="cases"]').val(qty);
- } else { // units
- form.find('input[name="units"]').val(qty);
- }
- form.submit();
-});
diff --git a/tailbone/static/js/tailbone.mobile.receiving.js b/tailbone/static/js/tailbone.mobile.receiving.js
deleted file mode 100644
index d46740ac..00000000
--- a/tailbone/static/js/tailbone.mobile.receiving.js
+++ /dev/null
@@ -1,92 +0,0 @@
-
-/************************************************************
- *
- * tailbone.mobile.receiving.js
- *
- * Global logic for mobile receiving feature
- *
- ************************************************************/
-
-
-// toggle visibility of "Receive" type buttons based on whether vendor is set
-$(document).on('autocompleteitemselected', 'form[name="new-receiving-batch"] .vendor', function(event, uuid) {
- $('#new-receiving-types').show();
-});
-$(document).on('autocompleteitemcleared', 'form[name="new-receiving-batch"] .vendor', function(event) {
- $('#new-receiving-types').hide();
-});
-$(document).on('change', 'form[name="new-receiving-batch"] select[name="vendor"]', function(event) {
- if ($(this).val()) {
- $('#new-receiving-types').show();
- } else {
- $('#new-receiving-types').hide();
- }
-});
-
-
-// submit new receiving batch form when user clicks "Receive" type button
-$(document).on('click', 'form[name="new-receiving-batch"] .start-receiving', function() {
- var form = $(this).parents('form');
- form.find('input[name="workflow"]').val($(this).data('workflow'));
- form.submit();
-});
-
-
-// submit new receiving batch form when user clicks Purchase Order option
-$(document).on('click', 'form[name="new-receiving-batch"] [data-role="listview"] a', function() {
- var form = $(this).parents('form');
- var key = $(this).parents('li').data('key');
- form.find('[name="workflow"]').val('from_po');
- form.find('.purchase-order-field').val(key);
- form.submit();
- return false;
-});
-
-
-// handle receiving action buttons
-$(document).on('click', 'form.receiving-update .receiving-actions button', function() {
- var action = $(this).data('action');
- var form = $(this).parents('form:first');
- var uom = form.find('[name="keypad-uom"]:checked').val();
- var mode = form.find('[name="mode"]:checked').val();
- var qty = form.find('.keypad-quantity').text();
- if (action == 'add' || action == 'subtract') {
- if (qty != '0') {
- if (action == 'subtract') {
- qty = '-' + qty;
- }
-
- if (uom == 'CS') {
- form.find('[name="cases"]').val(qty);
- } else { // units
- form.find('[name="units"]').val(qty);
- }
-
- if (action == 'add' && mode == 'expired') {
- var expiry = form.find('input[name="expiration_date"]');
- if (! /^\d{4}-\d{2}-\d{2}$/.test(expiry.val())) {
- alert("Please enter a valid expiration date.");
- expiry.focus();
- return;
- }
- }
-
- form.submit();
- }
- }
-});
-
-
-// quick-receive (1 case or unit)
-$(document).on('click', 'form.receiving-update .quick-receive', function() {
- var form = $(this).parents('form:first');
- form.find('[name="mode"]').val('received');
- var quantity = $(this).data('quantity');
- if ($(this).data('uom') == 'CS') {
- form.find('[name="cases"]').val(quantity);
- } else {
- form.find('[name="units"]').val(quantity);
- }
- form.find('input[name="quick_receive"]').val('true');
- form.submit();
-});
diff --git a/tailbone/static/themes/bobcat/css/base.css b/tailbone/static/themes/bobcat/css/base.css
deleted file mode 100644
index 758ea304..00000000
--- a/tailbone/static/themes/bobcat/css/base.css
+++ /dev/null
@@ -1,114 +0,0 @@
-
-/* /\****************************** */
-/* * General */
-/* ******************************\/ */
-
-/* * { */
-/* margin: 0px; */
-/* } */
-
-/* body { */
-/* font-family: Verdana, Arial, sans-serif; */
-/* font-size: 11pt; */
-/* } */
-
-/* a { */
-/* color: #0972a5; */
-/* text-decoration: none; */
-/* } */
-
-/* a:hover { */
-/* text-decoration: underline; */
-/* } */
-
-/* h1 { */
-/* margin-bottom: 15px; */
-/* } */
-
-/* h2 { */
-/* font-size: 12pt; */
-/* margin: 20px auto 10px auto; */
-/* } */
-
-/* li { */
-/* line-height: 2em; */
-/* } */
-
-/* p { */
-/* margin-bottom: 5px; */
-/* } */
-
-/* .left { */
-/* float: left; */
-/* text-align: left; */
-/* } */
-
-/* .right { */
-/* text-align: right; */
-/* } */
-
-/* .wrapper { */
-/* overflow: auto; */
-/* } */
-
-/* div.buttons { */
-/* clear: both; */
-/* margin-top: 10px; */
-/* } */
-
-/* div.dialog { */
-/* display: none; */
-/* } */
-
-/* div.flash-message { */
-/* background-color: #dddddd; */
-/* margin-bottom: 8px; */
-/* padding: 3px; */
-/* } */
-
-/* div.flash-messages div.ui-state-highlight { */
-/* padding: .3em; */
-/* margin-bottom: 8px; */
-/* } */
-
-/* div.error-messages div.ui-state-error { */
-/* padding: .3em; */
-/* margin-bottom: 8px; */
-/* } */
-
-/* .flash-messages, */
-/* .error-messages { */
-/* margin: 0.5em 0 0 0; */
-/* } */
-
-/* ul.error { */
-/* color: #dd6666; */
-/* font-weight: bold; */
-/* padding: 0px; */
-/* } */
-
-/* ul.error li { */
-/* list-style-type: none; */
-/* } */
-
-/* /\****************************** */
-/* * jQuery UI tweaks */
-/* ******************************\/ */
-
-/* ul.ui-menu { */
-/* max-height: 30em; */
-/* } */
-
-/******************************
- * tweaks for root user
- ******************************/
-
-.navbar .navbar-end .navbar-link.root-user,
-.navbar .navbar-end .navbar-link.root-user:hover,
-.navbar .navbar-end .navbar-link.root-user.is_active,
-.navbar .navbar-end .navbar-item.root-user,
-.navbar .navbar-end .navbar-item.root-user:hover,
-.navbar .navbar-end .navbar-item.root-user.is_active {
- background-color: red;
- font-weight: bold;
-}
diff --git a/tailbone/static/themes/bobcat/css/forms.css b/tailbone/static/themes/bobcat/css/forms.css
deleted file mode 100644
index 3ae22da3..00000000
--- a/tailbone/static/themes/bobcat/css/forms.css
+++ /dev/null
@@ -1,141 +0,0 @@
-
-/* /\****************************** */
-/* * Form Wrapper */
-/* ******************************\/ */
-
-/* div.form-wrapper { */
-/* overflow: auto; */
-/* } */
-
-
-/******************************
- * context menu
- ******************************/
-
-/* #context-menu { */
-/* /\* background-color: #ddcccc; *\/ */
-/* /\* background-color: green; *\/ */
-/* float: right; */
-/* /\* list-style-type: none; *\/ */
-/* /\* margin: 0px; *\/ */
-/* text-align: right; */
-/* } */
-
-/* div.form-wrapper ul.context-menu li { */
-/* line-height: 2em; */
-/* } */
-
-
-/* /\****************************** */
-/* * "object helper" panel */
-/* ******************************\/ */
-
-/* .object-helper { */
-/* border: 1px solid black; */
-/* float: right; */
-/* margin-top: 1em; */
-/* padding: 1em; */
-/* width: 20em; */
-/* } */
-
-/* .object-helper-content { */
-/* margin-top: 1em; */
-/* } */
-
-
-/******************************
- * forms
- ******************************/
-
-/* div.form, */
-/* div.fieldset-form, */
-/* div.fieldset { */
-/* clear: left; */
-/* float: left; */
-/* margin-top: 10px; */
-/* } */
-
-/* TODO: replace this with bulma equivalent */
-.form {
- padding-left: 5em;
-}
-
-
-/******************************
- * fieldsets
- ******************************/
-
-/* TODO: replace this with bulma equivalent */
-.field-wrapper {
- clear: both;
- min-height: 30px;
- overflow: auto;
- margin: 15px;
-}
-
-/* .field-wrapper.with-error { */
-/* background-color: #ddcccc; */
-/* border: 2px solid #dd6666; */
-/* padding-bottom: 1em; */
-/* } */
-
-/* TODO: replace this with bulma equivalent */
-.field-wrapper .field-row {
- display: table-row;
-}
-
-/* TODO: replace this with bulma equivalent */
-.field-wrapper label {
- display: table-cell;
- vertical-align: top;
- width: 18em;
- font-weight: bold;
- padding-top: 2px;
- white-space: nowrap;
-}
-
-/* .field-wrapper.with-error label { */
-/* padding-left: 1em; */
-/* } */
-
-/* .field-wrapper .field-error { */
-/* padding: 1em 0 0.5em 1em; */
-/* } */
-
-/* .field-wrapper .field-error .error-msg { */
-/* color: #dd6666; */
-/* font-weight: bold; */
-/* } */
-
-/* TODO: replace this with bulma equivalent */
-.field-wrapper .field {
- display: table-cell;
- line-height: 25px;
-}
-
-/* .field-wrapper .field input[type=text], */
-/* .field-wrapper .field input[type=password], */
-/* .field-wrapper .field select, */
-/* .field-wrapper .field textarea { */
-/* width: 320px; */
-/* } */
-
-/* label input[type="checkbox"], */
-/* label input[type="radio"] { */
-/* margin-right: 0.5em; */
-/* } */
-
-/* .field ul { */
-/* margin: 0px; */
-/* padding-left: 15px; */
-/* } */
-
-
-/* /\****************************** */
-/* * Buttons */
-/* ******************************\/ */
-
-/* div.buttons { */
-/* clear: both; */
-/* margin: 10px 0px; */
-/* } */
diff --git a/tailbone/static/themes/bobcat/css/layout.css b/tailbone/static/themes/bobcat/css/layout.css
deleted file mode 100644
index 1c490cbe..00000000
--- a/tailbone/static/themes/bobcat/css/layout.css
+++ /dev/null
@@ -1,208 +0,0 @@
-
-/******************************
- * main layout
- ******************************/
-
-body {
- display: flex;
- flex-direction: column;
- min-height: 100vh;
-}
-
-.content-wrapper {
- display: flex;
- flex: 1;
- flex-direction: column;
- justify-content: space-between;
-}
-
-
-/******************************
- * header
- ******************************/
-
-header .level {
- /* height: 60px; */
- line-height: 60px;
- padding-left: 0.5em;
- padding-right: 0.5em;
-}
-
-header .level #header-logo {
- display: inline-block;
-}
-
-header .level .global-title,
-header .level-left .global-title {
- font-size: 2em;
- font-weight: bold;
-}
-
-header .level #current-context,
-header .level-left #current-context {
- font-size: 2em;
- font-weight: bold;
-}
-
-header .level #current-context span,
-header .level-left #current-context span {
- margin-right: 10px;
-}
-
-header .level .theme-picker {
- display: inline-flex;
-}
-
-/* header .global .grid-nav { */
-/* display: inline-block; */
-/* font-size: 16px; */
-/* font-weight: bold; */
-/* line-height: 60px; */
-/* margin-left: 5em; */
-/* } */
-
-/* header .global .grid-nav .ui-button, */
-/* header .global .grid-nav span.viewing { */
-/* margin-left: 1em; */
-/* } */
-
-#content-title h1 {
- font-size: 2em;
-}
-
-/* /\****************************** */
-/* * Logo */
-/* ******************************\/ */
-
-/* #logo { */
-/* display: block; */
-/* margin: 40px auto; */
-/* } */
-
-
-/******************************
- * content
- ******************************/
-
-#page-body {
- padding: 0.4em;
-}
-
-/* body > #body-wrapper { */
-/* margin: 0px; */
-/* position: relative; */
-/* } */
-
-/* .content-wrapper { */
-/* height: 100%; */
-/* padding-bottom: 30px; */
-/* } */
-
-/* #scrollpane { */
-/* height: 100%; */
-/* } */
-
-/* #scrollpane .inner-content { */
-/* padding: 0 0.5em 0.5em 0.5em; */
-/* } */
-
-
-/******************************
- * context menu
- ******************************/
-
-#context-menu {
- text-align: right;
- white-space: nowrap;
-}
-
-/******************************
- * "object helper" panel
- ******************************/
-
-.object-helper {
- border: 1px solid black;
- margin: 1em;
- padding: 1em;
- min-width: 20em;
-}
-
-.object-helper-content {
- margin-top: 1em;
-}
-
-/* /\****************************** */
-/* * Panels */
-/* ******************************\/ */
-
-/* .panel-wrapper { */
-/* float: left; */
-/* margin-right: 15px; */
-/* width: 40%; */
-/* } */
-
-/* .panel, */
-/* .panel-grid { */
-/* border-left: 1px solid Black; */
-/* margin-bottom: 15px; */
-/* } */
-
-/* .panel { */
-/* border-bottom: 1px solid Black; */
-/* border-right: 1px solid Black; */
-/* padding: 0px; */
-/* } */
-
-/* .panel h2, */
-/* .panel-grid h2 { */
-/* border-bottom: 1px solid Black; */
-/* border-top: 1px solid Black; */
-/* padding: 5px; */
-/* margin: 0px; */
-/* } */
-
-/* .panel-grid h2 { */
-/* border-right: 1px solid Black; */
-/* } */
-
-/* .panel-body { */
-/* overflow: auto; */
-/* padding: 5px; */
-/* } */
-
-/******************************
- * feedback
- ******************************/
-
-#feedback-dialog {
- display: none;
-}
-
-#feedback-dialog p {
- margin-top: 1em;
-}
-
-#feedback-dialog .red {
- color: red;
- font-weight: bold;
-}
-
-#feedback-dialog .field-wrapper {
- margin-top: 1em;
- padding: 0;
-}
-
-#feedback-dialog .field {
- margin-bottom: 0;
- margin-top: 0.5em;
-}
-
-#feedback-dialog .referrer .field {
- clear: both;
- float: none;
- margin-top: 1em;
-}
-
-#feedback-dialog textarea {
- width: auto;
-}
diff --git a/tailbone/static/themes/dodo/css/admin.css b/tailbone/static/themes/dodo/css/admin.css
deleted file mode 100644
index a362b64f..00000000
--- a/tailbone/static/themes/dodo/css/admin.css
+++ /dev/null
@@ -1,84 +0,0 @@
-/* copied from https://github.com/dansup/bulma-templates/blob/master/css/admin.css */
-
-html, body {
- font-family: 'Open Sans', serif;
- font-size: 16px;
- line-height: 1.5;
- height: 100%;
- background: #ECF0F3;
-}
-nav.navbar {
- border-top: 4px solid #276cda;
- margin-bottom: 1rem;
-}
-.navbar-item.brand-text {
- font-weight: 300;
-}
-.navbar-item, .navbar-link {
- font-size: 14px;
- font-weight: 700;
-}
-.columns {
- width: 100%;
- height: 100%;
- margin-left: 0;
-}
-.menu-label {
- color: #8F99A3;
- letter-spacing: 1.3;
- font-weight: 700;
-}
-.menu-list a {
- color: #0F1D38;
- font-size: 14px;
- font-weight: 700;
-}
-.menu-list a:hover {
- background-color: transparent;
- color: #276cda;
-}
-.menu-list a.is-active {
- background-color: transparent;
- color: #276cda;
- font-weight: 700;
-}
-.card {
- box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.18);
- margin-bottom: 2rem;
-}
-.card-header-title {
- color: #8F99A3;
- font-weight: 400;
-}
-.info-tiles {
- margin: 1rem 0;
-}
-.info-tiles .subtitle {
- font-weight: 300;
- color: #8F99A3;
-}
-.hero.welcome.is-info {
- background: #36D1DC;
- background: -webkit-linear-gradient(to right, #5B86E5, #36D1DC);
- background: linear-gradient(to right, #5B86E5, #36D1DC);
-}
-.hero.welcome .title, .hero.welcome .subtitle {
- color: hsl(192, 17%, 99%);
-}
-.card .content {
- font-size: 14px;
-}
-.card-footer-item {
- font-size: 14px;
- font-weight: 700;
- color: #8F99A3;
-}
-.card-footer-item:hover {
-}
-.card-table .table {
- margin-bottom: 0;
-}
-.events-card .card-table {
- max-height: 250px;
- overflow-y: scroll;
-}
\ No newline at end of file
diff --git a/tailbone/static/themes/dodo/css/base.css b/tailbone/static/themes/dodo/css/base.css
deleted file mode 100644
index 27f44c9f..00000000
--- a/tailbone/static/themes/dodo/css/base.css
+++ /dev/null
@@ -1,11 +0,0 @@
-
-/******************************
- * tweaks for root user
- ******************************/
-
-.navbar .navbar-menu .navbar-link.root-user,
-.navbar .navbar-menu .navbar-item.root-user,
-.navbar.is-white .navbar-item.has-dropdown.is-active .navbar-link.root-user,
-.navbar.is-white .navbar-item.has-dropdown:hover .navbar-link.root-user {
- background-color: red;
-}
diff --git a/tailbone/static/themes/dodo/js/bulma.js b/tailbone/static/themes/dodo/js/bulma.js
deleted file mode 100644
index a2e2dc9a..00000000
--- a/tailbone/static/themes/dodo/js/bulma.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// copied from https://github.com/dansup/bulma-templates/blob/master/js/bulma.js
-
-// The following code is based off a toggle menu by @Bradcomp
-// source: https://gist.github.com/Bradcomp/a9ef2ef322a8e8017443b626208999c1
-(function() {
- var burger = document.querySelector('.burger');
- var menu = document.querySelector('#'+burger.dataset.target);
- burger.addEventListener('click', function() {
- burger.classList.toggle('is-active');
- menu.classList.toggle('is-active');
- });
-})();
diff --git a/tailbone/static/themes/falafel/css/forms.css b/tailbone/static/themes/falafel/css/forms.css
index b5b10c74..de4b1ebe 100644
--- a/tailbone/static/themes/falafel/css/forms.css
+++ b/tailbone/static/themes/falafel/css/forms.css
@@ -26,3 +26,36 @@
.form-wrapper .form .field.is-horizontal .field-body .select select {
width: 100%;
}
+
+/******************************
+ * field-wrappers
+ ******************************/
+
+/* TODO: replace this with bulma equivalent */
+.field-wrapper {
+ clear: both;
+ min-height: 30px;
+ overflow: auto;
+ margin: 15px;
+}
+
+/* TODO: replace this with bulma equivalent */
+.field-wrapper .field-row {
+ display: table-row;
+}
+
+/* TODO: replace this with bulma equivalent */
+.field-wrapper label {
+ display: table-cell;
+ vertical-align: top;
+ width: 18em;
+ font-weight: bold;
+ padding-top: 2px;
+ white-space: nowrap;
+}
+
+/* TODO: replace this with bulma equivalent */
+.field-wrapper .field {
+ display: table-cell;
+ line-height: 25px;
+}
diff --git a/tailbone/subscribers.py b/tailbone/subscribers.py
index 3deb9c1e..69aa29e5 100644
--- a/tailbone/subscribers.py
+++ b/tailbone/subscribers.py
@@ -2,7 +2,7 @@
################################################################################
#
# Rattail -- Retail Software Framework
-# Copyright © 2010-2020 Lance Edgar
+# Copyright © 2010-2021 Lance Edgar
#
# This file is part of Rattail.
#
@@ -208,7 +208,7 @@ def context_found(event):
return False
request.has_any_perm = has_any_perm
- def get_referrer(default=None, mobile=False):
+ def get_referrer(default=None, **kwargs):
if request.params.get('referrer'):
return request.params['referrer']
if request.session.get('referrer'):
@@ -218,8 +218,6 @@ def context_found(event):
or not referrer.startswith(request.host_url)):
if default:
referrer = default
- elif mobile:
- referrer = request.route_url('mobile.home')
else:
referrer = request.route_url('home')
return referrer
diff --git a/tailbone/templates/forms/deform.mako b/tailbone/templates/forms/deform.mako
index d6c99953..ede55f12 100644
--- a/tailbone/templates/forms/deform.mako
+++ b/tailbone/templates/forms/deform.mako
@@ -89,11 +89,7 @@ ${h.csrf_token(request)}
+
% else:
- % if form.auto_disable_cancel:
-
-
- % else:
-
- Cancel
-
- % endif
+
+ Cancel
+
% endif
% endif
diff --git a/tailbone/templates/mobile/about.mako b/tailbone/templates/mobile/about.mako
deleted file mode 100644
index bfa55379..00000000
--- a/tailbone/templates/mobile/about.mako
+++ /dev/null
@@ -1,13 +0,0 @@
-## -*- coding: utf-8 -*-
-<%inherit file="/mobile/base.mako" />
-<%namespace name="base_meta" file="/base_meta.mako" />
-
-<%def name="title()">About ${base_meta.app_title()}
-
-${project_title} ${project_version}
-
-% for name, version in packages.items():
- ${name} ${version}
-% endfor
-
-Please see rattailproject.org for more info.
diff --git a/tailbone/templates/mobile/base.mako b/tailbone/templates/mobile/base.mako
deleted file mode 100644
index c05c2100..00000000
--- a/tailbone/templates/mobile/base.mako
+++ /dev/null
@@ -1,208 +0,0 @@
-## -*- coding: utf-8 -*-
-<%namespace name="base_meta" file="/base_meta.mako" />
-
-
-
- ${base_meta.global_title()} » ${self.title()}
-
-
- ${self.mobile_usermenu()}
-
- ${self.mobile_page_body()}
-
-
-
- ${self.mobile_footer()}
-
-
-
-
-<%def name="page_url()">${request.current_route_url()}
-
-<%def name="page_title()">${self.title()}
-
-<%def name="jquery()">
- ${h.javascript_link('https://code.jquery.com/jquery-1.12.4.min.js')}
- ${h.javascript_link('https://code.jquery.com/mobile/1.4.5/jquery.mobile-1.4.5.min.js')}
-
-
-<%def name="extra_javascript()">
-
-<%def name="jquery_theme()">
- ${h.stylesheet_link('https://code.jquery.com/mobile/1.4.5/jquery.mobile-1.4.5.min.css')}
-
-
-<%def name="extra_styles()">
-
-<%def name="mobile_header()">
-
- ${self.mobile_header_link()}
-
${base_meta.global_title()}
- ${self.mobile_header_feedback()}
-
-
-
-<%def name="mobile_header_link()">
- <% classes = 'ui-btn-left ui-btn ui-btn-inline ui-mini ui-corner-all ui-btn-icon-left ' %>
- % if request.user:
- ${h.link_to(request.user.get_short_name(), '#usermenu', data_role='button', data_icon='user',
- class_=' root-user' if request.is_root else '')}
- % elif request.matched_route.name in ('mobile.login', 'mobile.about'):
- ${h.link_to("Home", url('mobile.home'), data_role='button', data_icon='home')}
- % else:
- ${h.link_to("Login", url('mobile.login'), data_role='button', data_icon='user')}
- % endif
-
-
-<%def name="mobile_header_feedback()">
- ${h.link_to("Feedback", '#', id='feedback-button', data_role='button', data_icon='recycle')}
-
-
-<%def name="mobile_usermenu()">
-
-
-
-<%def name="mobile_page_body()">
-
-
- % if request.session.peek_flash('error'):
- % for error in request.session.pop_flash('error'):
-
${error}
- % endfor
- % endif
-
- % if request.session.peek_flash():
- % for msg in request.session.pop_flash():
-
${msg|n}
- % endfor
- % endif
-
-
${self.page_title()}
-
- ${self.body()}
-
-
-
-
- Thank you for your feedback.
-
-
-
-
-
-
powered by ${h.link_to("Rattail", url('mobile.about'))}
-
-
-
-<%def name="mobile_feedback_form()">
- ${h.form(url('mobile.feedback'))}
- ${h.csrf_token(request)}
- ${h.hidden('user', value=request.user.uuid if request.user else None)}
-
-
- Questions, suggestions, comments, complaints, etc. regarding this website
- are welcome and may be submitted below.
-
-
-
-
Referring URL
-
- ${h.hidden('referrer')}
-
-
Your Name
-
- ${h.text('user_name')}
-
-
-
Message
-
- ${h.textarea('message', cols=45, rows=15)}
-
-
- Send Note
- Cancel
-
-
- ${h.end_form()}
-
diff --git a/tailbone/templates/mobile/base_internal_toolbars.mako b/tailbone/templates/mobile/base_internal_toolbars.mako
deleted file mode 100644
index 107ca928..00000000
--- a/tailbone/templates/mobile/base_internal_toolbars.mako
+++ /dev/null
@@ -1,20 +0,0 @@
-## -*- coding: utf-8 -*-
-<%inherit file="tailbone:templates/mobile/base.mako" />
-
-<%def name="mobile_body()">
-
-
-
-
- ${self.mobile_usermenu()}
-
- ${self.mobile_header()}
-
- ${self.mobile_page_body()}
-
- ${self.mobile_footer()}
-
-
-
-
-
diff --git a/tailbone/templates/mobile/batch/execute.mako b/tailbone/templates/mobile/batch/execute.mako
deleted file mode 100644
index a6c7c6ef..00000000
--- a/tailbone/templates/mobile/batch/execute.mako
+++ /dev/null
@@ -1,10 +0,0 @@
-## -*- coding: utf-8; -*-
-<%inherit file="/mobile/base.mako" />
-
-<%def name="title()">${index_title} » ${instance_title} » Execute
-
-<%def name="page_title()">${h.link_to(index_title, index_url)} » ${h.link_to(instance_title, instance_url)} » Execute
-
-
- ${form.render()|n}
-
diff --git a/tailbone/templates/mobile/batch/inventory/create.mako b/tailbone/templates/mobile/batch/inventory/create.mako
deleted file mode 100644
index 99c8106d..00000000
--- a/tailbone/templates/mobile/batch/inventory/create.mako
+++ /dev/null
@@ -1,6 +0,0 @@
-## -*- coding: utf-8; -*-
-<%inherit file="/mobile/master/create.mako" />
-
-<%def name="title()">${h.link_to("Inventory", url('mobile.batch.inventory'))} » New Batch
-
-${parent.body()}
diff --git a/tailbone/templates/mobile/batch/inventory/index.mako b/tailbone/templates/mobile/batch/inventory/index.mako
deleted file mode 100644
index 29038208..00000000
--- a/tailbone/templates/mobile/batch/inventory/index.mako
+++ /dev/null
@@ -1,6 +0,0 @@
-## -*- coding: utf-8; -*-
-<%inherit file="/mobile/master/index.mako" />
-
-<%def name="title()">Inventory
-
-${parent.body()}
diff --git a/tailbone/templates/mobile/batch/inventory/view.mako b/tailbone/templates/mobile/batch/inventory/view.mako
deleted file mode 100644
index 2c8f785c..00000000
--- a/tailbone/templates/mobile/batch/inventory/view.mako
+++ /dev/null
@@ -1,24 +0,0 @@
-## -*- coding: utf-8; -*-
-<%inherit file="/mobile/batch/view.mako" />
-
-<%def name="title()">${h.link_to("Inventory", url('mobile.batch.inventory'))} » ${batch.id_str}
-
-${form.render()|n}
-
-% if not batch.executed and not batch.complete:
- Mark Batch as Complete
-% endif
diff --git a/tailbone/templates/mobile/batch/inventory/view_row.mako b/tailbone/templates/mobile/batch/inventory/view_row.mako
deleted file mode 100644
index bfb06dcf..00000000
--- a/tailbone/templates/mobile/batch/inventory/view_row.mako
+++ /dev/null
@@ -1,63 +0,0 @@
-## -*- coding: utf-8; -*-
-<%inherit file="/mobile/batch/view_row.mako" />
-<%namespace file="/mobile/keypad.mako" import="keypad" />
-
-## TODO: this is broken for actual page (header) title
-<%def name="title()">${h.link_to("Inventory", url('mobile.batch.inventory'))} » ${h.link_to(batch.id_str, url('mobile.batch.inventory.view', uuid=batch.uuid))} » ${row.upc.pretty()}
-
-
-
- % if instance.product:
-
${row.brand_name or ""}
- ${row.description} ${row.size}
- ${h.pretty_quantity(row.case_quantity)} ${unit_uom} per CS
- % else:
- ${row.description}
- % endif
-
-
- ${h.image(product_image_url, "product image")}
-
-
- currently:
- % if uom == 'CS':
- ${h.pretty_quantity(row.cases or 0)}
- % else:
- ${h.pretty_quantity(row.units or 0)}
- % endif
- ${uom}
-
-
-% if not batch.executed and not batch.complete:
-
- ${h.form(request.current_route_url())}
- ${h.csrf_token(request)}
- ${h.hidden('row', value=row.uuid)}
- % if allow_cases:
- ${h.hidden('cases')}
- % endif
- ${h.hidden('units')}
-
- <%
- quantity = 1
- if allow_cases:
- if row.cases is not None:
- quantity = row.cases
- elif row.units is not None:
- quantity = row.units
- elif row.units is not None:
- quantity = row.units
- %>
- ${keypad(unit_uom, uom, quantity=quantity, allow_cases=allow_cases)}
-
-
- Save
- Delete
- ${h.link_to("Cancel", url('mobile.batch.inventory.view', uuid=batch.uuid), class_='ui-btn ui-btn-inline ui-corner-all')}
-
-
- ${h.end_form()}
-
-% endif
diff --git a/tailbone/templates/mobile/batch/view.mako b/tailbone/templates/mobile/batch/view.mako
deleted file mode 100644
index ff0bcc38..00000000
--- a/tailbone/templates/mobile/batch/view.mako
+++ /dev/null
@@ -1,32 +0,0 @@
-## -*- coding: utf-8; -*-
-<%inherit file="/mobile/master/view.mako" />
-
-${parent.body()}
-
-% if not batch.executed:
- % if request.has_perm('{}.edit'.format(permission_prefix)):
- % if batch.complete:
- ${h.form(url('mobile.{}.mark_pending'.format(route_prefix), uuid=batch.uuid))}
- ${h.csrf_token(request)}
- ${h.hidden('mark-pending', value='true')}
- ${h.submit('submit', "Mark Batch as Pending")}
- ${h.end_form()}
- % else:
- ${h.form(url('mobile.{}.mark_complete'.format(route_prefix), uuid=batch.uuid))}
- ${h.csrf_token(request)}
- ${h.hidden('mark-complete', value='true')}
- ${h.submit('submit', "Mark Batch as Complete")}
- ${h.end_form()}
- % endif
- % endif
- % if batch.complete and master.mobile_executable and request.has_perm('{}.execute'.format(permission_prefix)):
- % if master.has_execution_options(batch):
- ${h.link_to("Execute Batch", url('mobile.{}.execute'.format(route_prefix), uuid=batch.uuid), class_='ui-btn ui-corner-all')}
- % else:
- ${h.form(url('mobile.{}.execute'.format(route_prefix), uuid=batch.uuid))}
- ${h.csrf_token(request)}
- ${h.submit('submit', "Execute Batch")}
- ${h.end_form()}
- % endif
- % endif
-% endif
diff --git a/tailbone/templates/mobile/batch/view_row.mako b/tailbone/templates/mobile/batch/view_row.mako
deleted file mode 100644
index ad729169..00000000
--- a/tailbone/templates/mobile/batch/view_row.mako
+++ /dev/null
@@ -1,4 +0,0 @@
-## -*- coding: utf-8; -*-
-<%inherit file="/mobile/master/view_row.mako" />
-
-${parent.body()}
diff --git a/tailbone/templates/mobile/datasync.mako b/tailbone/templates/mobile/datasync.mako
deleted file mode 100644
index 2f21a2a2..00000000
--- a/tailbone/templates/mobile/datasync.mako
+++ /dev/null
@@ -1,9 +0,0 @@
-## -*- coding: utf-8 -*-
-<%inherit file="/mobile/base.mako" />
-
-<%def name="title()">DataSync
-
-${h.form(url('datasync.restart'))}
-${h.csrf_token(request)}
-${h.submit('restart', "Restart DataSync Daemon", id='datasync-restart')}
-${h.end_form()}
diff --git a/tailbone/templates/mobile/grids/complete.mako b/tailbone/templates/mobile/grids/complete.mako
deleted file mode 100644
index ebb58334..00000000
--- a/tailbone/templates/mobile/grids/complete.mako
+++ /dev/null
@@ -1,7 +0,0 @@
-## -*- coding: utf-8; -*-
-
-% if grid.filterable:
- ${grid.render_filters()|n}
-% endif
-
-${grid.render_grid()|n}
diff --git a/tailbone/templates/mobile/grids/filters_simple.mako b/tailbone/templates/mobile/grids/filters_simple.mako
deleted file mode 100644
index 1286d99a..00000000
--- a/tailbone/templates/mobile/grids/filters_simple.mako
+++ /dev/null
@@ -1,15 +0,0 @@
-## -*- coding: utf-8; -*-
-
- ${h.form(request.current_route_url(_query=None), method='get')}
-
- % for filtr in grid.iter_filters():
- ${h.hidden('{}.verb'.format(filtr.key), value=filtr.verb)}
-
- % for value, label in filtr.iter_choices():
- ${h.radio(filtr.key, value=value, label=label, checked=value == filtr.value)}
- % endfor
-
- % endfor
-
- ${h.end_form()}
-
diff --git a/tailbone/templates/mobile/grids/grid.mako b/tailbone/templates/mobile/grids/grid.mako
deleted file mode 100644
index b7b029b5..00000000
--- a/tailbone/templates/mobile/grids/grid.mako
+++ /dev/null
@@ -1,36 +0,0 @@
-## -*- coding: utf-8; -*-
-
-
- ${grid.make_webhelpers_grid()}
-
-
-##
-##
-##
-## % for column in grid.iter_visible_columns():
-## ${grid.column_header(column)}
-## % endfor
-##
-##
-##
-## % for i, row in enumerate(grid.iter_rows(), 1):
-##
-## % for column in grid.iter_visible_columns():
-## ${grid.render_cell(row, column)}
-## % endfor
-##
-## % endfor
-##
-##
-
-% if grid.pageable and grid.pager:
-
- ${grid.pager.pager('$link_first $link_previous $link_next $link_last',
- symbol_first='<< first', symbol_last='last >>',
- symbol_previous='< prev', symbol_next='next >',
- link_attr={'class': 'ui-btn ui-corner-all'},
- curpage_attr={'class': 'ui-btn ui-corner-all'},
- dotdot_attr={'class': 'ui-btn ui-corner-all'})|n}
-
-% endif
diff --git a/tailbone/templates/mobile/home.mako b/tailbone/templates/mobile/home.mako
deleted file mode 100644
index 1daafd86..00000000
--- a/tailbone/templates/mobile/home.mako
+++ /dev/null
@@ -1,12 +0,0 @@
-## -*- coding: utf-8 -*-
-<%inherit file="/mobile/base.mako" />
-<%namespace name="base_meta" file="/base_meta.mako" />
-
-<%def name="title()">Home
-
-<%def name="page_title()">
-
-
- ${h.image(image_url, "{} logo".format(capture(base_meta.app_title)), id='logo', width=300)}
-
Welcome to ${base_meta.app_title()}
-
diff --git a/tailbone/templates/mobile/keypad.mako b/tailbone/templates/mobile/keypad.mako
deleted file mode 100644
index 38cb03da..00000000
--- a/tailbone/templates/mobile/keypad.mako
+++ /dev/null
@@ -1,41 +0,0 @@
-## -*- coding: utf-8; -*-
-
-<%def name="keypad(unit_uom, selected_uom, quantity=1, allow_cases=True)">
-
-
-
-
-
- ${h.link_to("7", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}
- ${h.link_to("8", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}
- ${h.link_to("9", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}
-
-
- ${h.link_to("4", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}
- ${h.link_to("5", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}
- ${h.link_to("6", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}
-
-
- ${h.link_to("1", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}
- ${h.link_to("2", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}
- ${h.link_to("3", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}
-
-
- ${h.link_to("0", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}
- ${h.link_to(".", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}
- ${h.link_to("Del", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}
-
-
-
-
-
- ${h.pretty_quantity(1 if quantity is None else quantity)}
-
- % if allow_cases:
- ${h.radio('keypad-uom', value='CS', checked=selected_uom == 'CS', label="CS")}
- % endif
- ${h.radio('keypad-uom', value=unit_uom, checked=selected_uom == unit_uom, label=unit_uom)}
-
-
-
- ${form.render()|n}
-
diff --git a/tailbone/templates/mobile/master/create_row.mako b/tailbone/templates/mobile/master/create_row.mako
deleted file mode 100644
index 7b5dae0c..00000000
--- a/tailbone/templates/mobile/master/create_row.mako
+++ /dev/null
@@ -1,6 +0,0 @@
-## -*- coding: utf-8; -*-
-<%inherit file="/mobile/master/create.mako" />
-
-<%def name="title()">New ${model_title} Row
-
-${parent.body()}
diff --git a/tailbone/templates/mobile/master/edit.mako b/tailbone/templates/mobile/master/edit.mako
deleted file mode 100644
index 3c13a8e4..00000000
--- a/tailbone/templates/mobile/master/edit.mako
+++ /dev/null
@@ -1,10 +0,0 @@
-## -*- coding: utf-8; -*-
-<%inherit file="/mobile/base.mako" />
-
-<%def name="title()">${index_title} » ${instance_title} » Edit
-
-<%def name="page_title()">${h.link_to(index_title, index_url)} » ${h.link_to(instance_title, instance_url)} » Edit
-
-
- ${form.render()|n}
-
diff --git a/tailbone/templates/mobile/master/edit_row.mako b/tailbone/templates/mobile/master/edit_row.mako
deleted file mode 100644
index 93eb12e3..00000000
--- a/tailbone/templates/mobile/master/edit_row.mako
+++ /dev/null
@@ -1,17 +0,0 @@
-## -*- coding: utf-8; -*-
-<%inherit file="/mobile/master/edit.mako" />
-
-<%def name="title()">${index_title} » ${parent_title} » ${instance_title} » Edit
-
-<%def name="page_title()">${h.link_to(index_title, index_url)} » ${h.link_to(parent_title, parent_url)} » ${h.link_to(instance_title, instance_url)} » Edit
-
-
- ${form.render()|n}
-
-
-% if master.mobile_rows_deletable and request.has_perm('{}.delete_row'.format(permission_prefix)):
- ${h.form(url('mobile.{}.delete_row'.format(route_prefix), uuid=parent_instance.uuid, row_uuid=row.uuid))}
- ${h.csrf_token(request)}
- ${h.submit('submit', "Delete this Row")}
- ${h.end_form()}
-% endif
diff --git a/tailbone/templates/mobile/master/index.mako b/tailbone/templates/mobile/master/index.mako
deleted file mode 100644
index f54ac2ae..00000000
--- a/tailbone/templates/mobile/master/index.mako
+++ /dev/null
@@ -1,17 +0,0 @@
-## -*- coding: utf-8; -*-
-## ##############################################################################
-##
-## Default master 'index' template for mobile. Features a somewhat abbreviated
-## data table and (hopefully) exposes a way to filter and sort the data, etc.
-##
-## ##############################################################################
-<%inherit file="/mobile/base.mako" />
-
-<%def name="title()">${index_title}
-
-% if master.mobile_creatable and request.has_perm('{}.create'.format(permission_prefix)):
- ${h.link_to("New {}".format(model_title), url('mobile.{}.create'.format(route_prefix)), class_='ui-btn ui-corner-all')}
-
- ${h.hidden('quick_entry')}
- ${h.text('quick_row_autocomplete_text', placeholder=placeholder, autocomplete='off', data_type='search')}
-
-
Change
-
- % if vendor_use_autocomplete:
-
- ${h.hidden('vendor')}
- ${h.text('new-purchasing-batch-vendor-text', placeholder="Vendor name", autocomplete='off', data_type='search')}
-
-
Change Vendor
-
- % else:
-
-
Vendor
-
- ${h.select('vendor', None, vendor_options)}
-
-
- % endif
-
-
- ${h.hidden('vendor')}
- ${h.text('new-receiving-batch-vendor-text', placeholder="Vendor name", autocomplete='off', **{'data-type': 'search'})}
-
-
Change Vendor
-
-
-
Vendor
-
- ${h.select('vendor', None, vendor_options)}
-
-
-
- ${h.hidden('workflow')}
- ${h.hidden('phase', value='1')}
-
- % if master.allow_from_po:
- Receive from PO
- % endif
-
- % if master.allow_from_scratch:
- Receive from Scratch
- % endif
-
- % if master.allow_truck_dump:
- Receive Truck Dump
- % endif
-
-
-
-% else: ## phase 2
-
- ${h.hidden('workflow')}
- ${h.hidden('phase', value='2')}
-
-
-
Vendor
-
- ${h.hidden('vendor', value=vendor.uuid)}
- ${vendor}
-
-
Please choose a Purchase Order to receive:
-
- % for key, purchase in purchases:
- ${h.link_to(purchase, '#')}
- % endfor
-
- % else:
- (no eligible purchases found)
- % endif
-
- % if master.allow_from_scratch:
- Receive from Scratch
- % endif
-
- ${h.link_to("Cancel", url('mobile.{}'.format(route_prefix)), class_='ui-btn ui-corner-all')}
-
-% endif
-
-${h.end_form()}
diff --git a/tailbone/templates/mobile/receiving/receive_row.mako b/tailbone/templates/mobile/receiving/receive_row.mako
deleted file mode 100644
index 7987e9de..00000000
--- a/tailbone/templates/mobile/receiving/receive_row.mako
+++ /dev/null
@@ -1,151 +0,0 @@
-## -*- coding: utf-8; -*-
-<%inherit file="/mobile/master/view_row.mako" />
-<%namespace file="/mobile/keypad.mako" import="keypad" />
-
-<%def name="title()">Receiving » ${batch.id_str} » ${master.render_product_key_value(row)}
-
-<%def name="page_title()">${h.link_to("Receiving", url('mobile.receiving'))} » ${h.link_to(batch.id_str, url('mobile.receiving.view', uuid=batch.uuid))} » ${master.render_product_key_value(row)}
-
-
-
-
- % if instance.product:
-
${instance.brand_name or ""}
- ${instance.description} ${instance.size or ''}
- % if allow_cases:
- 1 CS = ${h.pretty_quantity(row.case_quantity or 1)} ${unit_uom}
- % endif
- % else:
- ${instance.description}
- % endif
-
- % if product_image_url:
-
- ${h.image(product_image_url, "product image")}
-
- % endif
-
-
-
-
- % if batch.order_quantities_known:
-
- shipped
-
- % if allow_cases:
- ${h.pretty_quantity(row.cases_shipped or 0)} /
- % endif
- ${h.pretty_quantity(row.units_shipped or 0)}
-
-
- % endif
-
- received
-
- % if allow_cases:
- ${h.pretty_quantity(row.cases_received or 0)} /
- % endif
- ${h.pretty_quantity(row.units_received or 0)}
-
-
-
- damaged
-
- % if allow_cases:
- ${h.pretty_quantity(row.cases_damaged or 0)} /
- % endif
- ${h.pretty_quantity(row.units_damaged or 0)}
-
-
- % if allow_expired:
-
- expired
-
- % if allow_cases:
- ${h.pretty_quantity(row.cases_expired or 0)} /
- % endif
- ${h.pretty_quantity(row.units_expired or 0)}
-
-
- % endif
-
-
-
-% if request.session.peek_flash('receiving-warning'):
- % for error in request.session.pop_flash('receiving-warning'):
- ${error}
- % endfor
-% endif
-
-% if not batch.executed and not batch.complete:
-
- ${h.form(request.current_route_url(), class_='receiving-update')}
- ${h.csrf_token(request)}
- ${h.hidden('row', value=row.uuid)}
- ${h.hidden('cases')}
- ${h.hidden('units')}
-
- ## only show quick-receive if we have an identifiable product
- % if quick_receive and instance.product:
- % if quick_receive_all:
- ${quick_receive_text}
- % elif allow_cases:
- Receive 1 CS
-
- ## TODO: probably should make these optional / configurable
- 1 EA
- 3 EA
- 6 EA
-
- Receive 1 ${unit_uom}
- % endif
- % endif
-
- ${keypad(unit_uom, uom, allow_cases=allow_cases)}
-
-
-
- ${h.hidden('quick_receive', value='false')}
- ${h.end_form()}
-
- % if master.mobile_rows_deletable and master.row_deletable(row) and request.has_perm('{}.delete_row'.format(permission_prefix)):
- ${h.form(url('mobile.{}.delete_row'.format(route_prefix), uuid=batch.uuid, row_uuid=row.uuid), class_='receiving-update')}
- ${h.csrf_token(request)}
- ${h.submit('submit', "Delete this Row")}
- ${h.end_form()}
- % endif
-
-% endif
diff --git a/tailbone/templates/mobile/receiving/view_row.mako b/tailbone/templates/mobile/receiving/view_row.mako
deleted file mode 100644
index 53d8820f..00000000
--- a/tailbone/templates/mobile/receiving/view_row.mako
+++ /dev/null
@@ -1,151 +0,0 @@
-## -*- coding: utf-8; -*-
-<%inherit file="/mobile/master/view_row.mako" />
-<%namespace file="/mobile/keypad.mako" import="keypad" />
-
-<%def name="title()">Receiving » ${batch.id_str} » ${master.render_product_key_value(row)}
-
-<%def name="page_title()">${h.link_to("Receiving", url('mobile.receiving'))} » ${h.link_to(batch.id_str, url('mobile.receiving.view', uuid=batch.uuid))} » ${master.render_product_key_value(row)}
-
-
-
-
- % if instance.product:
-
${instance.brand_name or ""}
- ${instance.description} ${instance.size or ''}
- % if allow_cases:
- 1 CS = ${h.pretty_quantity(row.case_quantity or 1)} ${unit_uom}
- % endif
- % else:
- ${instance.description}
- % endif
-
- % if product_image_url:
-
- ${h.image(product_image_url, "product image")}
-
- % endif
-
-
-
-
- % if batch.order_quantities_known:
-
- ordered
-
- % if allow_cases:
- ${h.pretty_quantity(row.cases_ordered or 0)} /
- % endif
- ${h.pretty_quantity(row.units_ordered or 0)}
-
-
- % endif
-
- received
-
- % if allow_cases:
- ${h.pretty_quantity(row.cases_received or 0)} /
- % endif
- ${h.pretty_quantity(row.units_received or 0)}
-
-
-
- damaged
-
- % if allow_cases:
- ${h.pretty_quantity(row.cases_damaged or 0)} /
- % endif
- ${h.pretty_quantity(row.units_damaged or 0)}
-
-
- % if allow_expired:
-
- expired
-
- % if allow_cases:
- ${h.pretty_quantity(row.cases_expired or 0)} /
- % endif
- ${h.pretty_quantity(row.units_expired or 0)}
-
-
- % endif
-
-
-
-% if request.session.peek_flash('receiving-warning'):
- % for error in request.session.pop_flash('receiving-warning'):
- ${error}
- % endfor
-% endif
-
-% if not batch.executed and not batch.complete:
-
- ${h.form(request.current_route_url(), class_='receiving-update')}
- ${h.csrf_token(request)}
- ${h.hidden('row', value=row.uuid)}
- ${h.hidden('cases')}
- ${h.hidden('units')}
-
- ## only show quick-receive if we have an identifiable product
- % if quick_receive and instance.product:
- % if quick_receive_all:
- ${quick_receive_text}
- % elif allow_cases:
- Receive 1 CS
-
- ## TODO: probably should make these optional / configurable
- 1 EA
- 3 EA
- 6 EA
-
- Receive 1 ${unit_uom}
- % endif
- % endif
-
- ${keypad(unit_uom, uom, allow_cases=allow_cases)}
-
-
-
- ${h.hidden('quick_receive', value='false')}
- ${h.end_form()}
-
- % if master.mobile_rows_deletable and master.row_deletable(row) and request.has_perm('{}.delete_row'.format(permission_prefix)):
- ${h.form(url('mobile.{}.delete_row'.format(route_prefix), uuid=batch.uuid, row_uuid=row.uuid), class_='receiving-update')}
- ${h.csrf_token(request)}
- ${h.submit('submit', "Delete this Row")}
- ${h.end_form()}
- % endif
-
-% endif
diff --git a/tailbone/templates/themes/bobcat/base.mako b/tailbone/templates/themes/bobcat/base.mako
deleted file mode 100644
index d67b390f..00000000
--- a/tailbone/templates/themes/bobcat/base.mako
+++ /dev/null
@@ -1,311 +0,0 @@
-## -*- coding: utf-8; -*-
-<%namespace file="/grids/nav.mako" import="grid_index_nav" />
-<%namespace file="/feedback_dialog.mako" import="feedback_dialog" />
-<%namespace name="base_meta" file="/base_meta.mako" />
-
-
-
- ${base_meta.global_title()} » ${capture(self.title)|n}
- ${base_meta.favicon()}
- ${self.header_core()}
-
- % if background_color:
-
- % endif
-
- % if not request.rattail_config.production():
-
- % endif
-
- ${self.head_tags()}
-
-
-
-
-
-
-
-
-
-
-
-
- ## App Logo / Name
-
-
- ## Current Context
-
- % if master:
- »
- % if master.listing:
- ${index_title}
- % else:
- ${h.link_to(index_title, index_url)}
- % if parent_url is not Undefined:
- »
- ${h.link_to(parent_title, parent_url)}
- % elif instance_url is not Undefined:
- »
- ${h.link_to(instance_title, instance_url)}
- % endif
- % if master.viewing and grid_index:
- ${grid_index_nav()}
- % endif
- % endif
- % elif index_title:
- »
- ${index_title}
- % endif
-
-
-
-
- ## Theme Picker
- % if expose_theme_picker and request.has_perm('common.change_app_theme'):
-
- ${h.form(url('change_theme'), method="post")}
- ${h.csrf_token(request)}
- Theme:
-
-
- ${h.select('theme', theme, options=theme_picker_options, id='theme-picker')}
-
-
- ${h.end_form()}
-
- % endif
-
- ## Help Button
- % if help_url is not Undefined and help_url:
-
- ${h.link_to("Help", help_url, target='_blank', class_='button')}
-
- % endif
-
- ## Feedback Button
-
- Feedback
-
-
-
-
-
- ## Page Title
-
-
- % if capture(self.content_title):
-
- % if show_prev_next is not Undefined and show_prev_next:
-
- % if prev_url:
- ${h.link_to("« Older", prev_url, class_='button autodisable')}
- % else:
- ${h.link_to("« Older", '#', class_='button', disabled='disabled')}
- % endif
- % if next_url:
- ${h.link_to("Newer »", next_url, class_='button autodisable')}
- % else:
- ${h.link_to("Newer »", '#', class_='button', disabled='disabled')}
- % endif
-
- % endif
-
-
${self.content_title()}
- % endif
-
-
-
-
- ## Page Body
-
-
- % if request.session.peek_flash('error'):
- % for error in request.session.pop_flash('error'):
-
-
- ${error}
-
- % endfor
- % endif
-
- % if request.session.peek_flash():
- % for msg in request.session.pop_flash():
-
-
- ${msg}
-
- % endfor
- % endif
-
- ${self.body()}
-
-
- ## Feedback Dialog
- ${feedback_dialog()}
-
- ## Footer
-
-
-
${base_meta.global_title()} » ${capture(self.title)|n}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ## Current Context
- % if master:
- % if master.listing:
- ${index_title}
- % else:
- ${h.link_to(index_title, index_url)}
- % if parent_url is not Undefined:
- ${h.link_to(parent_title, parent_url)}
- % elif instance_url is not Undefined:
- ${h.link_to(instance_title, instance_url)}
- % endif
-## % if master.viewing and grid_index:
-## ${grid_index_nav()}
-## % endif
- % endif
- % elif index_title:
- ${index_title}
- % endif
-
- % if capture(self.content_title):
-
-## % if show_prev_next is not Undefined and show_prev_next:
-##
-## % if prev_url:
-## ${h.link_to("« Older", prev_url, class_='button autodisable')}
-## % else:
-## ${h.link_to("« Older", '#', class_='button', disabled='disabled')}
-## % endif
-## % if next_url:
-## ${h.link_to("Newer »", next_url, class_='button autodisable')}
-## % else:
-## ${h.link_to("Newer »", '#', class_='button', disabled='disabled')}
-## % endif
-##
-## % endif
-
- ${self.content_title()}
-
-
-
- % if request.session.peek_flash('error'):
- % for error in request.session.pop_flash('error'):
-
-
- ${error}
-
- % endfor
- % endif
-
- % if request.session.peek_flash():
- % for msg in request.session.pop_flash():
-
-
- ${msg}
-
- % endfor
- % endif
-
- ${self.body()}
-
-
-
-
-
-