From 307cf8ce27a579bbc51b6e46f4a55a3bbd941a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Gait=C3=A1n?= Date: Mon, 22 Sep 2014 00:11:08 -0300 Subject: [PATCH 1/6] moved templates inside the app --- README.md | 38 -------------- README.rst | 49 ++++++++++++++++++ .../__init__.py | 0 .../context_processor.py | 0 .../models.py | 0 .../static/bootstrap/css/bootstrap-theme.css | 0 .../bootstrap/css/bootstrap-theme.min.css | 0 .../static/bootstrap/css/bootstrap.css | 0 .../static/bootstrap/css/bootstrap.min.css | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../static/bootstrap/js/bootstrap.js | 0 .../static/bootstrap/js/bootstrap.min.js | 0 .../templates}/base.html | 0 .../templates}/registration/form_field.html | 0 .../templates}/registration/logged_out.html | 0 .../templates}/registration/login.html | 0 .../registration/password_change_done.html | 0 .../registration/password_change_form.html | 0 .../registration/password_reset_complete.html | 0 .../registration/password_reset_confirm.html | 0 .../registration/password_reset_done.html | 0 .../registration/password_reset_form.html | 0 .../templatetags/__init__.py | 0 .../templatetags/registration_bootstrap.py | 0 27 files changed, 49 insertions(+), 38 deletions(-) delete mode 100644 README.md create mode 100644 README.rst rename {app_sample => registration_bootstrap3}/__init__.py (100%) rename {app_sample => registration_bootstrap3}/context_processor.py (100%) rename {app_sample => registration_bootstrap3}/models.py (100%) rename {app_sample => registration_bootstrap3}/static/bootstrap/css/bootstrap-theme.css (100%) rename {app_sample => registration_bootstrap3}/static/bootstrap/css/bootstrap-theme.min.css (100%) rename {app_sample => registration_bootstrap3}/static/bootstrap/css/bootstrap.css (100%) rename {app_sample => registration_bootstrap3}/static/bootstrap/css/bootstrap.min.css (100%) rename {app_sample => registration_bootstrap3}/static/bootstrap/fonts/glyphicons-halflings-regular.eot (100%) rename {app_sample => registration_bootstrap3}/static/bootstrap/fonts/glyphicons-halflings-regular.svg (100%) rename {app_sample => registration_bootstrap3}/static/bootstrap/fonts/glyphicons-halflings-regular.ttf (100%) rename {app_sample => registration_bootstrap3}/static/bootstrap/fonts/glyphicons-halflings-regular.woff (100%) rename {app_sample => registration_bootstrap3}/static/bootstrap/js/bootstrap.js (100%) rename {app_sample => registration_bootstrap3}/static/bootstrap/js/bootstrap.min.js (100%) rename {templates => registration_bootstrap3/templates}/base.html (100%) rename {templates => registration_bootstrap3/templates}/registration/form_field.html (100%) rename {templates => registration_bootstrap3/templates}/registration/logged_out.html (100%) rename {templates => registration_bootstrap3/templates}/registration/login.html (100%) rename {templates => registration_bootstrap3/templates}/registration/password_change_done.html (100%) rename {templates => registration_bootstrap3/templates}/registration/password_change_form.html (100%) rename {templates => registration_bootstrap3/templates}/registration/password_reset_complete.html (100%) rename {templates => registration_bootstrap3/templates}/registration/password_reset_confirm.html (100%) rename {templates => registration_bootstrap3/templates}/registration/password_reset_done.html (100%) rename {templates => registration_bootstrap3/templates}/registration/password_reset_form.html (100%) rename {app_sample => registration_bootstrap3}/templatetags/__init__.py (100%) rename {app_sample => registration_bootstrap3}/templatetags/registration_bootstrap.py (100%) diff --git a/README.md b/README.md deleted file mode 100644 index 3f0c0ca..0000000 --- a/README.md +++ /dev/null @@ -1,38 +0,0 @@ -# Django Registration Bootstrap - -##Simple sample using bootstrap from twitter in forms of Django - -Using Bootstrap from Twitter version 3.0.3 - -And Django version 1.6.1 - -http://twitter.github.com/bootstrap - -To run, just download and do runserver: -``` shell - python manage.py runserver 8000 -``` - -username: demo -password: demo - -# Screenshots - -![home](https://raw.github.com/ebertti/django-registration-bootstrap/master/screenshot/home_pt.png) - -![login](https://raw.github.com/ebertti/django-registration-bootstrap/master/screenshot/loggin_pt.png) -![login error](https://raw.github.com/ebertti/django-registration-bootstrap/master/screenshot/loggin_error_pt.png) - -![password change](https://raw.github.com/ebertti/django-registration-bootstrap/master/screenshot/password_change_pt.png) -![password change error](https://raw.github.com/ebertti/django-registration-bootstrap/master/screenshot/password_change_error_pt.png) - -![password reset](https://raw.github.com/ebertti/django-registration-bootstrap/master/screenshot/password_reset_pt.png) -![password reset error](https://raw.github.com/ebertti/django-registration-bootstrap/master/screenshot/password_reset_error_pt.png) - - - -## Changelog - -2014-01-16 by EBertti - -- Update Bootstrat to 3.0.3 and Django to 1.6.1 diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..9f2f2db --- /dev/null +++ b/README.rst @@ -0,0 +1,49 @@ +Django Registration Bootstrap +============================= + +Simple sample using bootstrap from twitter in forms of Django +------------------------------------------------------------- + +Using Bootstrap from Twitter version 3.0.3 + +And Django version 1.6.1 + +http://twitter.github.com/bootstrap + +To run, just download and do runserver: +``shell python manage.py runserver 8000`` + +username: demo password: demo + +Screenshots +=========== + +.. figure:: https://raw.github.com/ebertti/django-registration-bootstrap/master/screenshot/home_pt.png + :align: center + :alt: home + + home +|login| |login error| + +|password change| |password change error| + +|password reset| |password reset error| + +Changelog +--------- + +2014-01-16 by EBertti + +- Update Bootstrat to 3.0.3 and Django to 1.6.1 + +.. |login| image:: https://raw.github.com/ebertti/django-registration-bootstrap/master/screenshot/loggin_pt.png +.. |login +error| image:: https://raw.github.com/ebertti/django-registration-bootstrap/master/screenshot/loggin_error_pt.png +.. |password +change| image:: https://raw.github.com/ebertti/django-registration-bootstrap/master/screenshot/password_change_pt.png +.. |password change +error| image:: https://raw.github.com/ebertti/django-registration-bootstrap/master/screenshot/password_change_error_pt.png +.. |password +reset| image:: https://raw.github.com/ebertti/django-registration-bootstrap/master/screenshot/password_reset_pt.png +.. |password reset +error| image:: https://raw.github.com/ebertti/django-registration-bootstrap/master/screenshot/password_reset_error_pt.png diff --git a/app_sample/__init__.py b/registration_bootstrap3/__init__.py similarity index 100% rename from app_sample/__init__.py rename to registration_bootstrap3/__init__.py diff --git a/app_sample/context_processor.py b/registration_bootstrap3/context_processor.py similarity index 100% rename from app_sample/context_processor.py rename to registration_bootstrap3/context_processor.py diff --git a/app_sample/models.py b/registration_bootstrap3/models.py similarity index 100% rename from app_sample/models.py rename to registration_bootstrap3/models.py diff --git a/app_sample/static/bootstrap/css/bootstrap-theme.css b/registration_bootstrap3/static/bootstrap/css/bootstrap-theme.css similarity index 100% rename from app_sample/static/bootstrap/css/bootstrap-theme.css rename to registration_bootstrap3/static/bootstrap/css/bootstrap-theme.css diff --git a/app_sample/static/bootstrap/css/bootstrap-theme.min.css b/registration_bootstrap3/static/bootstrap/css/bootstrap-theme.min.css similarity index 100% rename from app_sample/static/bootstrap/css/bootstrap-theme.min.css rename to registration_bootstrap3/static/bootstrap/css/bootstrap-theme.min.css diff --git a/app_sample/static/bootstrap/css/bootstrap.css b/registration_bootstrap3/static/bootstrap/css/bootstrap.css similarity index 100% rename from app_sample/static/bootstrap/css/bootstrap.css rename to registration_bootstrap3/static/bootstrap/css/bootstrap.css diff --git a/app_sample/static/bootstrap/css/bootstrap.min.css b/registration_bootstrap3/static/bootstrap/css/bootstrap.min.css similarity index 100% rename from app_sample/static/bootstrap/css/bootstrap.min.css rename to registration_bootstrap3/static/bootstrap/css/bootstrap.min.css diff --git a/app_sample/static/bootstrap/fonts/glyphicons-halflings-regular.eot b/registration_bootstrap3/static/bootstrap/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from app_sample/static/bootstrap/fonts/glyphicons-halflings-regular.eot rename to registration_bootstrap3/static/bootstrap/fonts/glyphicons-halflings-regular.eot diff --git a/app_sample/static/bootstrap/fonts/glyphicons-halflings-regular.svg b/registration_bootstrap3/static/bootstrap/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from app_sample/static/bootstrap/fonts/glyphicons-halflings-regular.svg rename to registration_bootstrap3/static/bootstrap/fonts/glyphicons-halflings-regular.svg diff --git a/app_sample/static/bootstrap/fonts/glyphicons-halflings-regular.ttf b/registration_bootstrap3/static/bootstrap/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from app_sample/static/bootstrap/fonts/glyphicons-halflings-regular.ttf rename to registration_bootstrap3/static/bootstrap/fonts/glyphicons-halflings-regular.ttf diff --git a/app_sample/static/bootstrap/fonts/glyphicons-halflings-regular.woff b/registration_bootstrap3/static/bootstrap/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from app_sample/static/bootstrap/fonts/glyphicons-halflings-regular.woff rename to registration_bootstrap3/static/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/app_sample/static/bootstrap/js/bootstrap.js b/registration_bootstrap3/static/bootstrap/js/bootstrap.js similarity index 100% rename from app_sample/static/bootstrap/js/bootstrap.js rename to registration_bootstrap3/static/bootstrap/js/bootstrap.js diff --git a/app_sample/static/bootstrap/js/bootstrap.min.js b/registration_bootstrap3/static/bootstrap/js/bootstrap.min.js similarity index 100% rename from app_sample/static/bootstrap/js/bootstrap.min.js rename to registration_bootstrap3/static/bootstrap/js/bootstrap.min.js diff --git a/templates/base.html b/registration_bootstrap3/templates/base.html similarity index 100% rename from templates/base.html rename to registration_bootstrap3/templates/base.html diff --git a/templates/registration/form_field.html b/registration_bootstrap3/templates/registration/form_field.html similarity index 100% rename from templates/registration/form_field.html rename to registration_bootstrap3/templates/registration/form_field.html diff --git a/templates/registration/logged_out.html b/registration_bootstrap3/templates/registration/logged_out.html similarity index 100% rename from templates/registration/logged_out.html rename to registration_bootstrap3/templates/registration/logged_out.html diff --git a/templates/registration/login.html b/registration_bootstrap3/templates/registration/login.html similarity index 100% rename from templates/registration/login.html rename to registration_bootstrap3/templates/registration/login.html diff --git a/templates/registration/password_change_done.html b/registration_bootstrap3/templates/registration/password_change_done.html similarity index 100% rename from templates/registration/password_change_done.html rename to registration_bootstrap3/templates/registration/password_change_done.html diff --git a/templates/registration/password_change_form.html b/registration_bootstrap3/templates/registration/password_change_form.html similarity index 100% rename from templates/registration/password_change_form.html rename to registration_bootstrap3/templates/registration/password_change_form.html diff --git a/templates/registration/password_reset_complete.html b/registration_bootstrap3/templates/registration/password_reset_complete.html similarity index 100% rename from templates/registration/password_reset_complete.html rename to registration_bootstrap3/templates/registration/password_reset_complete.html diff --git a/templates/registration/password_reset_confirm.html b/registration_bootstrap3/templates/registration/password_reset_confirm.html similarity index 100% rename from templates/registration/password_reset_confirm.html rename to registration_bootstrap3/templates/registration/password_reset_confirm.html diff --git a/templates/registration/password_reset_done.html b/registration_bootstrap3/templates/registration/password_reset_done.html similarity index 100% rename from templates/registration/password_reset_done.html rename to registration_bootstrap3/templates/registration/password_reset_done.html diff --git a/templates/registration/password_reset_form.html b/registration_bootstrap3/templates/registration/password_reset_form.html similarity index 100% rename from templates/registration/password_reset_form.html rename to registration_bootstrap3/templates/registration/password_reset_form.html diff --git a/app_sample/templatetags/__init__.py b/registration_bootstrap3/templatetags/__init__.py similarity index 100% rename from app_sample/templatetags/__init__.py rename to registration_bootstrap3/templatetags/__init__.py diff --git a/app_sample/templatetags/registration_bootstrap.py b/registration_bootstrap3/templatetags/registration_bootstrap.py similarity index 100% rename from app_sample/templatetags/registration_bootstrap.py rename to registration_bootstrap3/templatetags/registration_bootstrap.py From 965c205c4068e15973c42d96c8c4e2381a99d124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Gait=C3=A1n?= Date: Mon, 22 Sep 2014 00:11:54 -0300 Subject: [PATCH 2/6] renamed app in the example project --- project_sample/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project_sample/settings.py b/project_sample/settings.py index e54742a..17f698e 100644 --- a/project_sample/settings.py +++ b/project_sample/settings.py @@ -37,7 +37,7 @@ 'django.contrib.messages', 'django.contrib.staticfiles', 'django.contrib.sites', - 'app_sample', + 'registration_bootstrap3', ) MIDDLEWARE_CLASSES = ( From c6bacf31ffaffc04782d7d838831639d81d30398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Gait=C3=A1n?= Date: Mon, 22 Sep 2014 00:13:16 -0300 Subject: [PATCH 3/6] index url is declared in the project, not in the app --- registration_bootstrap3/templates/base.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/registration_bootstrap3/templates/base.html b/registration_bootstrap3/templates/base.html index 4ea8fa8..bc7b965 100644 --- a/registration_bootstrap3/templates/base.html +++ b/registration_bootstrap3/templates/base.html @@ -29,11 +29,11 @@ - {{ site.name }} + {{ site.name }}
From d2a5d4b3b1fc3f12f7d54f7e8ed54b0adf218dfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Gait=C3=A1n?= Date: Mon, 22 Sep 2014 00:13:47 -0300 Subject: [PATCH 4/6] gitignore --- .gitignore | 53 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e2b40e4..f49b576 100755 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,49 @@ -/.idea -*.pyc -*.pyo -*.bd \ No newline at end of file +# preciosa +site_media +datasets +backups +local_settings.py +waliki_data +.nose* +.noseids +*.db +*.sqlite3 +*.swp +docs/_build/* + +*.py[cod] + +# C extensions +*.so + +# Packages +*.egg +*.egg-info +dist +build +eggs +parts +bin +var +sdist +develop-eggs +.installed.cfg +lib +lib64 + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox +nosetests.xml + +# Translations +*.mo + +# Mr Developer +.mr.developer.cfg +.project +.pydevproject +.ropeproject From 40a8e04f6e673b98caf03b2d5e8f309201657e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Gait=C3=A1n?= Date: Mon, 22 Sep 2014 00:14:26 -0300 Subject: [PATCH 5/6] packaging as django-registration-bootstrap3 --- registration_bootstrap3/__init__.py | 1 + setup.py | 43 +++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100755 setup.py diff --git a/registration_bootstrap3/__init__.py b/registration_bootstrap3/__init__.py index e69de29..11d27f8 100644 --- a/registration_bootstrap3/__init__.py +++ b/registration_bootstrap3/__init__.py @@ -0,0 +1 @@ +__version__ = '0.1' diff --git a/setup.py b/setup.py new file mode 100755 index 0000000..5d652d1 --- /dev/null +++ b/setup.py @@ -0,0 +1,43 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import registration_bootstrap3 as app + +try: + from setuptools import setup +except ImportError: + from distutils.core import setup + +version = app.__version__ + +readme = open('README.rst').read() + + +setup( + name='django-registration-bootstrap3', + version=version, + description="""Custom HTML template for django-registration app made using Bootstrap from Twitter""", + long_description=readme, + author=u'Ezequiel Bertti', + author_email='ebertti@gmail.com', + url='https://github.com/ebertti/django-registration-bootstrap', + packages=[ + 'registration_bootstrap3', + ], + include_package_data=True, + license="BSD", + zip_safe=False, + keywords='django registration bootstrap auth users', + classifiers=[ + 'Development Status :: 2 - Pre-Alpha', + 'Framework :: Django', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: BSD License', + 'Natural Language :: English', + 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', + ], +) From d783998737cf6acfd67392ce266e510ffb1c94f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Gait=C3=A1n?= Date: Mon, 22 Sep 2014 00:17:41 -0300 Subject: [PATCH 6/6] basic install instructions --- README.rst | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/README.rst b/README.rst index 9f2f2db..34e762c 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,28 @@ Django Registration Bootstrap ============================= +Install it +---------- + +.. code-block:: bash + + $ pip install https://github.com/ebertti/django-registration-bootstrap/archive/master.zip + +Into the settings file, add the following to ``INSTALLED_APPS``: + +.. code-block:: python + + INSTALLED_APPS = ( + # ... everything else + + # Add the templates via INSTALLED_APPS + 'registration_bootstrap3', + ) + + + + + Simple sample using bootstrap from twitter in forms of Django -------------------------------------------------------------