diff --git a/tailbone/forms2/__init__.py b/tailbone/forms/__init__.py similarity index 100% rename from tailbone/forms2/__init__.py rename to tailbone/forms/__init__.py diff --git a/tailbone/forms2/core.py b/tailbone/forms/core.py similarity index 99% rename from tailbone/forms2/core.py rename to tailbone/forms/core.py index 1da56d7e..a6795c24 100644 --- a/tailbone/forms2/core.py +++ b/tailbone/forms/core.py @@ -646,9 +646,9 @@ class Form(object): def render(self, template=None, **kwargs): if not template: if self.readonly: - template = '/forms2/form_readonly.mako' + template = '/forms/form_readonly.mako' else: - template = '/forms2/form.mako' + template = '/forms/form.mako' context = kwargs context['form'] = self return render(template, context) @@ -686,7 +686,7 @@ class Form(object): return self.deform_form - def render_deform(self, dform=None, template='/forms2/deform.mako', **kwargs): + def render_deform(self, dform=None, template='/forms/deform.mako', **kwargs): if dform is None: dform = self.make_deform_form() @@ -704,7 +704,7 @@ class Form(object): context['request'] = self.request context['readonly_fields'] = self.readonly_fields context['render_field_readonly'] = self.render_field_readonly - return render('/forms2/deform.mako', context) + return render('/forms/deform.mako', context) def field_visible(self, field): if self.hidden and self.hidden.get(field): diff --git a/tailbone/forms2/types.py b/tailbone/forms/types.py similarity index 100% rename from tailbone/forms2/types.py rename to tailbone/forms/types.py diff --git a/tailbone/forms2/widgets.py b/tailbone/forms/widgets.py similarity index 100% rename from tailbone/forms2/widgets.py rename to tailbone/forms/widgets.py diff --git a/tailbone/templates/forms2/deform.mako b/tailbone/templates/forms/deform.mako similarity index 100% rename from tailbone/templates/forms2/deform.mako rename to tailbone/templates/forms/deform.mako diff --git a/tailbone/templates/forms2/form.mako b/tailbone/templates/forms/form.mako similarity index 100% rename from tailbone/templates/forms2/form.mako rename to tailbone/templates/forms/form.mako diff --git a/tailbone/templates/forms2/form_readonly.mako b/tailbone/templates/forms/form_readonly.mako similarity index 100% rename from tailbone/templates/forms2/form_readonly.mako rename to tailbone/templates/forms/form_readonly.mako diff --git a/tailbone/views/auth.py b/tailbone/views/auth.py index 2d2a79a5..1ea2ea0d 100644 --- a/tailbone/views/auth.py +++ b/tailbone/views/auth.py @@ -33,7 +33,7 @@ from deform import widget as dfwidget from pyramid.httpexceptions import HTTPForbidden from webhelpers2.html import tags, literal -from tailbone import forms2 as forms +from tailbone import forms from tailbone.db import Session from tailbone.views import View from tailbone.auth import login_user, logout_user diff --git a/tailbone/views/batch/core.py b/tailbone/views/batch/core.py index e482e4e2..aaab74be 100644 --- a/tailbone/views/batch/core.py +++ b/tailbone/views/batch/core.py @@ -49,7 +49,7 @@ from pyramid.response import FileResponse from pyramid_deform import SessionFileUploadTempStore from webhelpers2.html import HTML, tags -from tailbone import forms2 as forms, grids +from tailbone import forms, grids from tailbone.db import Session from tailbone.views import MasterView from tailbone.progress import SessionProgress diff --git a/tailbone/views/common.py b/tailbone/views/common.py index 55909d33..3cfaffa6 100644 --- a/tailbone/views/common.py +++ b/tailbone/views/common.py @@ -39,7 +39,7 @@ from pyramid import httpexceptions from pyramid.response import Response import tailbone -from tailbone import forms2 as forms +from tailbone import forms from tailbone.db import Session from tailbone.views import View diff --git a/tailbone/views/exports.py b/tailbone/views/exports.py index 9e842616..e35ea788 100644 --- a/tailbone/views/exports.py +++ b/tailbone/views/exports.py @@ -35,7 +35,7 @@ from rattail.db import model from pyramid.response import FileResponse from webhelpers2.html import HTML, tags -from tailbone import forms2 as forms +from tailbone import forms from tailbone.views import MasterView diff --git a/tailbone/views/handheld.py b/tailbone/views/handheld.py index 73c2efb1..87c5131b 100644 --- a/tailbone/views/handheld.py +++ b/tailbone/views/handheld.py @@ -34,7 +34,7 @@ from rattail.util import OrderedDict import colander from webhelpers2.html import tags -from tailbone import forms2 as forms +from tailbone import forms from tailbone.db import Session from tailbone.views.batch import FileBatchMasterView diff --git a/tailbone/views/inventory.py b/tailbone/views/inventory.py index ec879d54..e7da7f9a 100644 --- a/tailbone/views/inventory.py +++ b/tailbone/views/inventory.py @@ -40,7 +40,7 @@ import colander from deform import widget as dfwidget from webhelpers2.html import HTML, tags -from tailbone import forms2 as forms, grids +from tailbone import forms, grids from tailbone.views import MasterView from tailbone.views.batch import BatchMasterView diff --git a/tailbone/views/master.py b/tailbone/views/master.py index 588976f8..9cc2ade0 100644 --- a/tailbone/views/master.py +++ b/tailbone/views/master.py @@ -50,7 +50,7 @@ from pyramid.renderers import get_renderer, render_to_response, render from pyramid.response import FileResponse from webhelpers2.html import HTML, tags -from tailbone import forms2 as forms, grids, diffs +from tailbone import forms, grids, diffs from tailbone.views import View from tailbone.progress import SessionProgress diff --git a/tailbone/views/products.py b/tailbone/views/products.py index 48b445d7..f8e0124f 100644 --- a/tailbone/views/products.py +++ b/tailbone/views/products.py @@ -45,7 +45,7 @@ from deform import widget as dfwidget from pyramid import httpexceptions from webhelpers2.html import tags, HTML -from tailbone import forms2 as forms, grids +from tailbone import forms, grids from tailbone.db import Session from tailbone.views import MasterView, AutocompleteView from tailbone.progress import SessionProgress diff --git a/tailbone/views/purchasing/batch.py b/tailbone/views/purchasing/batch.py index 2e3378ff..4f5dd54c 100644 --- a/tailbone/views/purchasing/batch.py +++ b/tailbone/views/purchasing/batch.py @@ -36,7 +36,7 @@ from deform import widget as dfwidget from pyramid import httpexceptions from webhelpers2.html import tags -from tailbone import forms2 as forms +from tailbone import forms from tailbone.views.batch import BatchMasterView diff --git a/tailbone/views/purchasing/receiving.py b/tailbone/views/purchasing/receiving.py index 671dbee2..d240b20e 100644 --- a/tailbone/views/purchasing/receiving.py +++ b/tailbone/views/purchasing/receiving.py @@ -39,7 +39,7 @@ import colander import formencode as fe from webhelpers2.html import tags -from tailbone import forms2 as forms, grids +from tailbone import forms, grids from tailbone.views.purchasing import PurchasingBatchView diff --git a/tailbone/views/shifts/lib.py b/tailbone/views/shifts/lib.py index a8c9dfae..b8f5e9ee 100644 --- a/tailbone/views/shifts/lib.py +++ b/tailbone/views/shifts/lib.py @@ -40,7 +40,7 @@ import colander from deform import widget as dfwidget from webhelpers2.html import tags, HTML -from tailbone import forms2 as forms +from tailbone import forms from tailbone.db import Session from tailbone.views import View diff --git a/tailbone/views/users.py b/tailbone/views/users.py index 0e00e5f2..9be9a2f8 100644 --- a/tailbone/views/users.py +++ b/tailbone/views/users.py @@ -38,7 +38,7 @@ import colander from deform import widget as dfwidget from webhelpers2.html import HTML, tags -from tailbone import forms2 as forms +from tailbone import forms from tailbone.db import Session from tailbone.views import MasterView from tailbone.views.principal import PrincipalMasterView, PermissionsRenderer diff --git a/tailbone/views/vendors/catalogs.py b/tailbone/views/vendors/catalogs.py index 6c3ff3c1..dff5b095 100644 --- a/tailbone/views/vendors/catalogs.py +++ b/tailbone/views/vendors/catalogs.py @@ -37,7 +37,7 @@ import colander from deform import widget as dfwidget from webhelpers2.html import tags -from tailbone import forms2 as forms +from tailbone import forms from tailbone.db import Session from tailbone.views.batch import FileBatchMasterView