Skip to content

Commit

Permalink
- Moved to GitHub (https://github.com/Pylons/deform).
Browse files Browse the repository at this point in the history
- Added tox.ini for testing purposes.
  • Loading branch information
mcdonc committed Feb 16, 2011
1 parent be69b40 commit 7b8a521
Show file tree
Hide file tree
Showing 16 changed files with 177 additions and 214 deletions.
130 changes: 19 additions & 111 deletions .gitignore
@@ -1,111 +1,19 @@
deform/static/scripts/jquery-autocomplete/changelog.txt
deform/static/scripts/jquery-autocomplete/demo/bg.gif
deform/static/scripts/jquery-autocomplete/demo/emails.php
deform/static/scripts/jquery-autocomplete/demo/emails.phps
deform/static/scripts/jquery-autocomplete/demo/images.php
deform/static/scripts/jquery-autocomplete/demo/images/Amsterdam Van-Gogh Museum.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Amsterdam.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Antwerpen Rubenshaus.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Antwerpen.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Appenzell.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Arnhem Historisches Museum.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Bled.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Bled_Die Burg von Bled.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Bogojina_Die Pfarrkirche.jpg
deform/static/scripts/jquery-autocomplete/demo/images/BolognaBasilicadiSanPetronio.jpg
deform/static/scripts/jquery-autocomplete/demo/images/BolognaFontanadelNettuno.jpg
deform/static/scripts/jquery-autocomplete/demo/images/BolognaPiazzaMaggiore.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Bolsward Martinikerk.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Bolsward Stadhuis.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Bolsward.jpg
deform/static/scripts/jquery-autocomplete/demo/images/BordeauxND.jpg
deform/static/scripts/jquery-autocomplete/demo/images/BordeauxPlaceB.jpg
deform/static/scripts/jquery-autocomplete/demo/images/BotanischerGartenZuerich.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Bouillon.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Gent Hotel de Ville2.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Gent.jpg
deform/static/scripts/jquery-autocomplete/demo/images/GenuaStrand.jpg
deform/static/scripts/jquery-autocomplete/demo/images/GenuabeiNacht.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Giessbachfaelle Brienz.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Giethoorn.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Gnesen.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Gornij Grad_KATHEDRALE.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Gossensass.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Grad_Burg Grad2.jpg
deform/static/scripts/jquery-autocomplete/demo/images/GrandDixence.jpg
deform/static/scripts/jquery-autocomplete/demo/images/GrenoblePanorama.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Groningen.jpg
deform/static/scripts/jquery-autocomplete/demo/images/GrottenvonReclere.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Guebwiller.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Kamnik_Die Franziskaner Bibliothek.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Karlsbad Muehlbrunnkolonnade.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Kazimierz.jpg
deform/static/scripts/jquery-autocomplete/demo/images/KirchbergAltesRathaus1.jpg
deform/static/scripts/jquery-autocomplete/demo/images/KlagenfurtDom.jpg
deform/static/scripts/jquery-autocomplete/demo/images/KleineMeerjungfreu.jpg
deform/static/scripts/jquery-autocomplete/demo/images/LazienkiparkWarschau.jpg
deform/static/scripts/jquery-autocomplete/demo/images/LeHavreHafen.jpg
deform/static/scripts/jquery-autocomplete/demo/images/LeMans.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Lednice.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Leeuwarden Fries Museum.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Leeuwarden.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Lelystad.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Lemmer.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Leper Halles aux draps.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Leuven Museum fuer Kirchenkunst.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Leuven.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Luxemburg.jpg
deform/static/scripts/jquery-autocomplete/demo/images/LuzernAltstadt.jpg
deform/static/scripts/jquery-autocomplete/demo/images/LuzernPicassoMuseum.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Lyon.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Maastricht Onze Lieve Vrou...jpg
deform/static/scripts/jquery-autocomplete/demo/images/Maastricht St Servaasbasiliek.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Maastricht Walmuur.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Maastricht.jpg
deform/static/scripts/jquery-autocomplete/demo/images/MagiatalMaggia.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Mailand3.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Metlika_Bela Krajina Museum.jpg
deform/static/scripts/jquery-autocomplete/demo/images/MilanoCastelloSforzesco.jpg
deform/static/scripts/jquery-autocomplete/demo/images/MilanoDom.jpg
deform/static/scripts/jquery-autocomplete/demo/images/MilazzoBurg.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Novo Mesto_Das Museum.jpg
deform/static/scripts/jquery-autocomplete/demo/images/ObervellachBurgFalkenstein.jpg
deform/static/scripts/jquery-autocomplete/demo/images/OdenseeAndersen.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Olimje_Kirche und Apotheke in Olimje.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Olomouc.jpg
deform/static/scripts/jquery-autocomplete/demo/images/OlympischesMuseumLausanne.jpg
deform/static/scripts/jquery-autocomplete/demo/images/OrleansMaisonJeannedArc.jpg
deform/static/scripts/jquery-autocomplete/demo/images/OrleansParcFloraldelaSource.jpg
deform/static/scripts/jquery-autocomplete/demo/images/OstiaAntica.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Ostrow Tumski.jpg
deform/static/scripts/jquery-autocomplete/demo/images/PoertschachSchlossLeonstain.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Portoroz.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Posen.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Postojna.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Prag Altstaedter Ring.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Prag Waldsteinpalais.jpg
deform/static/scripts/jquery-autocomplete/demo/images/RouenNotreDame.jpg
deform/static/scripts/jquery-autocomplete/demo/images/Salzbergwerk Bex.jpg
deform/static/scripts/jquery-autocomplete/demo/images/SalzbergwerkWieliczka.jpg
deform/static/scripts/jquery-autocomplete/demo/images/SalzburgFestungHohensalzburg.jpg
deform/static/scripts/jquery-autocomplete/demo/images/SalzburgResidenz.jpg
deform/static/scripts/jquery-autocomplete/demo/images/WienMuseumsQuartier.jpg
deform/static/scripts/jquery-autocomplete/demo/images/WienMusikverein.jpg
deform/static/scripts/jquery-autocomplete/demo/images/WienRiesenrad.jpg
deform/static/scripts/jquery-autocomplete/demo/images/WienRingstrasse.jpg
deform/static/scripts/jquery-autocomplete/demo/index.html
deform/static/scripts/jquery-autocomplete/demo/indicator.gif
deform/static/scripts/jquery-autocomplete/demo/json.html
deform/static/scripts/jquery-autocomplete/demo/localdata.js
deform/static/scripts/jquery-autocomplete/demo/main.css
deform/static/scripts/jquery-autocomplete/demo/search.php
deform/static/scripts/jquery-autocomplete/demo/search.phps
deform/static/scripts/jquery-autocomplete/jquery.autocomplete.css
deform/static/scripts/jquery-autocomplete/jquery.autocomplete.js
deform/static/scripts/jquery-autocomplete/jquery.autocomplete.pack.js
deform/static/scripts/jquery-autocomplete/lib/jquery.ajaxQueue.js
deform/static/scripts/jquery-autocomplete/lib/jquery.bgiframe.min.js
deform/static/scripts/jquery-autocomplete/lib/jquery.js
deform/static/scripts/jquery-autocomplete/lib/thickbox-compressed.js
deform/static/scripts/jquery-autocomplete/lib/thickbox.css
deform/static/scripts/jquery-autocomplete/todo
*.egg
*.egg-info
*.pyc
*$py.class
*.pt.py
*.txt.py
*~
.coverage
.tox/
nosetests.xml
env26/
env25/
env24/
env27/
jyenv/
pypyenv/
build/
dist/
deform/coverage.xml
4 changes: 4 additions & 0 deletions CHANGES.txt
Expand Up @@ -4,6 +4,10 @@ Changes
Next release
------------

- Moved to GitHub (https://github.com/Pylons/deform).

- Added tox.ini for testing purposes.

- Fix select dropdown behavior on Firefox by fixing CSS (closes
http://bugs.repoze.org/issue152).

Expand Down
4 changes: 2 additions & 2 deletions COPYRIGHT.txt
@@ -1,5 +1,5 @@
Copyright (c) 2010 `Agendaless Consulting and Contributors
Copyright (c) 2011 `Agendaless Consulting and Contributors
<http://www.agendaless.com>`_, All Rights Reserved

Portions (c) 2010 `Wufoo <http://wufoo.com>`_, All Rights Reserved
Portions (c) 2011 `Wufoo <http://wufoo.com>`_, All Rights Reserved

4 changes: 2 additions & 2 deletions README.txt
@@ -1,6 +1,6 @@
Deform
======

A Python HTML form library. Please see `http://docs.repoze.org/deform
<http://docs.repoze.org/deform>`_ for the documentation.
A Python HTML form library. Please see
http://docs.pylonsproject.org/deform/dev/ for the documentation.

2 changes: 2 additions & 0 deletions docs/.gitignore
@@ -0,0 +1,2 @@
_themes/
_build/
62 changes: 40 additions & 22 deletions docs/Makefile
Expand Up @@ -9,7 +9,7 @@ PAPER =
# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS = -d .build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
ALLSPHINXOPTS = -d _build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .

.PHONY: help clean html web pickle htmlhelp latex changes linkcheck

Expand All @@ -23,48 +23,66 @@ help:
@echo " linkcheck to check all external links for integrity"

clean:
-rm -rf .build/*
-rm -rf _build/*

html:
mkdir -p .build/html .build/doctrees
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) .build/html
html: _themes/
mkdir -p _build/html _build/doctrees
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
@echo
@echo "Build finished. The HTML pages are in .build/html."
@echo "Build finished. The HTML pages are in _build/html."

text:
mkdir -p _build/text _build/doctrees
$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) _build/text
@echo
@echo "Build finished. The HTML pages are in _build/text."

pickle:
mkdir -p .build/pickle .build/doctrees
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) .build/pickle
mkdir -p _build/pickle _build/doctrees
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) _build/pickle
@echo
@echo "Build finished; now you can process the pickle files or run"
@echo " sphinx-web .build/pickle"
@echo " sphinx-web _build/pickle"
@echo "to start the sphinx-web server."

web: pickle

htmlhelp:
mkdir -p .build/htmlhelp .build/doctrees
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) .build/htmlhelp
htmlhelp: _themes
mkdir -p _build/htmlhelp _build/doctrees
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp
@echo
@echo "Build finished; now you can run HTML Help Workshop with the" \
".hhp project file in .build/htmlhelp."
".hhp project file in _build/htmlhelp."

latex:
mkdir -p .build/latex .build/doctrees
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) .build/latex
mkdir -p _build/latex _build/doctrees
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) _build/latex
cp _static/*.png _build/latex
./convert_images.sh
cp _static/latex-warning.png _build/latex
cp _static/latex-note.png _build/latex
@echo
@echo "Build finished; the LaTeX files are in .build/latex."
@echo "Build finished; the LaTeX files are in _build/latex."
@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
"run these through (pdf)latex."

changes:
mkdir -p .build/changes .build/doctrees
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) .build/changes
mkdir -p _build/changes _build/doctrees
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) _build/changes
@echo
@echo "The overview file is in .build/changes."
@echo "The overview file is in _build/changes."

linkcheck:
mkdir -p .build/linkcheck .build/doctrees
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) .build/linkcheck
mkdir -p _build/linkcheck _build/doctrees
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) _build/linkcheck
@echo
@echo "Link check complete; look for any errors in the above output " \
"or in .build/linkcheck/output.txt."
"or in _build/linkcheck/output.txt."

epub:
$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) _build/epub
@echo
@echo "Build finished. The epub file is in _build/epub."

_themes:
git clone git://github.com/Pylons/pylons_sphinx_theme.git _themes
10 changes: 4 additions & 6 deletions docs/app.rst
@@ -1,11 +1,11 @@
Example App
===========

An example is worth a thousand words. Here's an example `repoze.bfg
<http://bfg.repoze.org>`_ application demonstrating how one might use
An example is worth a thousand words. Here's an example `Pyramid
<http://pylonsproject.org>`_ application demonstrating how one might use
:mod:`deform` to render a form.

.. warning:: :mod:`deform` is not dependent on :mod:`repoze.bfg` at
.. warning:: :mod:`deform` is not dependent on :mod:`Pyramid` at
all; we use BFG in the examples below only to facilitate
demonstration of an actual end-to-end working application that uses
Deform.
Expand All @@ -16,7 +16,7 @@ Here's the Python code:
:linenos:
from paste.httpserver import serve
from repoze.bfg.configuration import Configurator
from pyramid.config import Configurator
from colander import MappingSchema
from colander import SequenceSchema
Expand Down Expand Up @@ -76,10 +76,8 @@ Here's the Python code:
if __name__ == '__main__':
settings = dict(reload_templates=True)
config = Configurator(settings=settings)
config.begin()
config.add_view(form_view, renderer='form.pt')
config.add_static_view('static', 'deform:static')
config.end()
app = config.make_wsgi_app()
serve(app)
Expand Down
21 changes: 10 additions & 11 deletions docs/basics.rst
Expand Up @@ -97,12 +97,11 @@ Here's a schema that will help us meet those requirements:
schema = Schema()
The schemas used by Deform come from a package named :term:`Colander`.
The canonical documentation for Colander exists at
`http://docs.repoze.org/colander <http://docs.repoze.org/colander>`_.
To compose complex schemas, you'll need to read it to get comfy with
the documentation of the default Colander data types. But for now, we
can play it by ear.
The schemas used by Deform come from a package named :term:`Colander`. The
canonical documentation for Colander exists at
http://docs.pylonsproject.org/colander/dev . To compose complex schemas,
you'll need to read it to get comfy with the documentation of the default
Colander data types. But for now, we can play it by ear.

For ease of reading, we've actually defined *three* schemas above, but
we coalesce them all into a single schema instance as ``schema`` in
Expand All @@ -123,8 +122,7 @@ Schema Node Objects
documentation about schema nodes in order to prevent you from
needing to switch away from this page to another while trying to
learn about forms. But you can also get much the same information
at `http://docs.repoze.org/colander
<http://docs.repoze.org/colander>`_
at http://docs.pylonsproject.org/colander/dev/

A schema is composed of one or more *schema node* objects, each
typically of the class :class:`colander.SchemaNode`, usually in a
Expand Down Expand Up @@ -206,8 +204,9 @@ which has a *type* value of :class:`colander.Sequence`.
Creating Schemas Without Using a Class Statement (Imperatively)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

See `http://docs.repoze.org/colander/basics.html#defining-a-schema-imperatively
<http://docs.repoze.org/colander/basics.html#defining-a-schema-imperatively>`_
See
`http://docs.pylonsproject.org/colander/dev/basics.html#defining-a-schema-imperatively
<http://docs.pylonsproject.org/colander/dev/basics.html#defining-a-schema-imperatively>`_
for information about how to create schemas without using a ``class``
statement.

Expand Down Expand Up @@ -359,7 +358,7 @@ as the page which serves up the form itself. For example, the URL
``close.png`` image in the ``static/images`` directory in the
:mod:`deform` package and ``/static/scripts/deform.js`` as
``image/png`` content . How you arrange to do this is dependent on
your web framework. It's done in :mod:`repoze.bfg` imperative
your web framework. It's done in :mod:`Pyramid` imperative
configuration via:

.. code-block:: python
Expand Down
10 changes: 5 additions & 5 deletions docs/components.rst
Expand Up @@ -34,11 +34,11 @@ as follows:
is used.

.. note:: The `Colander documentation
<http://docs.repoze.org/colander>` is a resource useful to Deform
developers. In particular, it details how a :term:`schema` is
created and used. Deform schemas are Colander schemas. The
Colander documentation about how they work applies to creating
Deform schemas as well.
<http://docs.pylonsproject.org/colander/dev/>` is a resource useful to
Deform developers. In particular, it details how a :term:`schema` is
created and used. Deform schemas are Colander schemas. The Colander
documentation about how they work applies to creating Deform schemas as
well.

A widget is related to one or more :term:`schema node` type objects.
For example, a notional "TextInputWidget" may be responsible for
Expand Down

0 comments on commit 7b8a521

Please sign in to comment.