From 3823110c57f6442d23283599eedf8094551b2bb1 Mon Sep 17 00:00:00 2001 From: Sverre Johansen Date: Tue, 10 Nov 2009 19:53:26 +0100 Subject: Added bootstrap.py for zc.buildout --- bootstrap.py | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 bootstrap.py diff --git a/bootstrap.py b/bootstrap.py new file mode 100644 index 0000000..b964024 --- /dev/null +++ b/bootstrap.py @@ -0,0 +1,121 @@ +############################################################################## +# +# Copyright (c) 2006 Zope Corporation and Contributors. +# All Rights Reserved. +# +# This software is subject to the provisions of the Zope Public License, +# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. +# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED +# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS +# FOR A PARTICULAR PURPOSE. +# +############################################################################## +"""Bootstrap a buildout-based project + +Simply run this script in a directory containing a buildout.cfg. +The script accepts buildout command-line options, so you can +use the -c option to specify an alternate configuration file. + +$Id$ +""" + +import os, shutil, sys, tempfile, urllib2 +from optparse import OptionParser + +tmpeggs = tempfile.mkdtemp() + +is_jython = sys.platform.startswith('java') + +# parsing arguments +parser = OptionParser() +parser.add_option("-v", "--version", dest="version", + help="use a specific zc.buildout version") +parser.add_option("-d", "--distribute", + action="store_true", dest="distribute", default=False, + help="Use Disribute rather than Setuptools.") + +parser.add_option("-c", None, action="store", dest="config_file", + help=("Specify the path to the buildout configuration " + "file to be used.")) + +options, args = parser.parse_args() + +# if -c was provided, we push it back into args for buildout' main function +if options.config_file is not None: + args += ['-c', options.config_file] + +if options.version is not None: + VERSION = '==%s' % options.version +else: + VERSION = '' + +USE_DISTRIBUTE = options.distribute +args = args + ['bootstrap'] + +to_reload = False +try: + import pkg_resources + if not hasattr(pkg_resources, '_distribute'): + to_reload = True + raise ImportError +except ImportError: + ez = {} + if USE_DISTRIBUTE: + exec urllib2.urlopen('http://python-distribute.org/distribute_setup.py' + ).read() in ez + ez['use_setuptools'](to_dir=tmpeggs, download_delay=0, no_fake=True) + else: + exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py' + ).read() in ez + ez['use_setuptools'](to_dir=tmpeggs, download_delay=0) + + if to_reload: + reload(pkg_resources) + else: + import pkg_resources + +if sys.platform == 'win32': + def quote(c): + if ' ' in c: + return '"%s"' % c # work around spawn lamosity on windows + else: + return c +else: + def quote (c): + return c + +cmd = 'from setuptools.command.easy_install import main; main()' +ws = pkg_resources.working_set + +if USE_DISTRIBUTE: + requirement = 'distribute' +else: + requirement = 'setuptools' + +if is_jython: + import subprocess + + assert subprocess.Popen([sys.executable] + ['-c', quote(cmd), '-mqNxd', + quote(tmpeggs), 'zc.buildout' + VERSION], + env=dict(os.environ, + PYTHONPATH= + ws.find(pkg_resources.Requirement.parse(requirement)).location + ), + ).wait() == 0 + +else: + assert os.spawnle( + os.P_WAIT, sys.executable, quote (sys.executable), + '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout' + VERSION, + dict(os.environ, + PYTHONPATH= + ws.find(pkg_resources.Requirement.parse(requirement)).location + ), + ) == 0 + +ws.add_entry(tmpeggs) +ws.require('zc.buildout' + VERSION) +import zc.buildout.buildout +zc.buildout.buildout.main(args) +shutil.rmtree(tmpeggs) -- cgit v1.2.3 From 166b5637e89881faed9abde976e64773e314f921 Mon Sep 17 00:00:00 2001 From: Sverre Johansen Date: Tue, 10 Nov 2009 23:35:57 +0100 Subject: Updated buildout to Django 1.1 and added testrunner --- buildout.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildout.cfg b/buildout.cfg index fc36b3c..65e3421 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -4,8 +4,9 @@ eggs = pkginfo [django] recipe = djangorecipe -version = 1.0.2 +version = 1.1.1 settings = development eggs = ${buildout:eggs} +test = djangopypi project = chishop wsgi = true -- cgit v1.2.3 From bece29c1e73e85b87340f9d06f4193242d5a8f0a Mon Sep 17 00:00:00 2001 From: Sverre Johansen Date: Tue, 10 Nov 2009 23:44:06 +0100 Subject: Added registration through django-registration --- chishop/settings.py | 12 ++++++++++++ chishop/templates/base.html | 11 ++++++++++- chishop/templates/registration/activate.html | 8 ++++++++ chishop/templates/registration/activation_complete.html | 9 +++++++++ chishop/templates/registration/activation_email.txt | 6 ++++++ chishop/templates/registration/activation_email_subject.txt | 1 + chishop/templates/registration/login.html | 8 ++++++++ chishop/templates/registration/logout.html | 7 +++++++ chishop/templates/registration/registration_complete.html | 8 ++++++++ chishop/templates/registration/registration_form.html | 8 ++++++++ chishop/urls.py | 5 ++++- 11 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 chishop/templates/registration/activate.html create mode 100644 chishop/templates/registration/activation_complete.html create mode 100644 chishop/templates/registration/activation_email.txt create mode 100644 chishop/templates/registration/activation_email_subject.txt create mode 100644 chishop/templates/registration/login.html create mode 100644 chishop/templates/registration/logout.html create mode 100644 chishop/templates/registration/registration_complete.html create mode 100644 chishop/templates/registration/registration_form.html diff --git a/chishop/settings.py b/chishop/settings.py index 00cf06d..39ddec7 100644 --- a/chishop/settings.py +++ b/chishop/settings.py @@ -16,6 +16,9 @@ DJANGOPYPI_RELEASE_UPLOAD_TO = 'dists' # change to False if you do not want Django's default server to serve static pages LOCAL_DEVELOPMENT = True +ACCOUNT_ACTIVATION_DAYS = 7 +LOGIN_REDIRECT_URL = "/" + MANAGERS = ADMINS DATABASE_ENGINE = '' @@ -77,6 +80,14 @@ MIDDLEWARE_CLASSES = ( ROOT_URLCONF = 'urls' +TEMPLATE_CONTEXT_PROCESSORS = ( + "django.core.context_processors.auth", + "django.core.context_processors.debug", + "django.core.context_processors.i18n", + "django.core.context_processors.media", + "django.core.context_processors.request", +) + TEMPLATE_DIRS = ( # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". # Always use forward slashes, even on Windows. @@ -92,5 +103,6 @@ INSTALLED_APPS = ( 'django.contrib.admin', 'django.contrib.markup', 'django.contrib.admindocs', + 'registration', 'djangopypi', ) diff --git a/chishop/templates/base.html b/chishop/templates/base.html index cc21bf5..2863343 100644 --- a/chishop/templates/base.html +++ b/chishop/templates/base.html @@ -20,6 +20,16 @@ {% block site_logo %}{% endblock %}

{% block site_name_header %}{% endblock %}

+ +
+ {% if user.is_authenticated %} + Welcome, {{user.username}}. + Log out + {% else %} + Login / + Register + {% endif %} +
@@ -60,4 +70,3 @@ - diff --git a/chishop/templates/registration/activate.html b/chishop/templates/registration/activate.html new file mode 100644 index 0000000..bc67771 --- /dev/null +++ b/chishop/templates/registration/activate.html @@ -0,0 +1,8 @@ +{% extends "base_site.html" %} + +{% block content %} +

Activation Failed

+

+ Activation with key {{activation_key}} failed. +

+{% endblock %} diff --git a/chishop/templates/registration/activation_complete.html b/chishop/templates/registration/activation_complete.html new file mode 100644 index 0000000..553cf2c --- /dev/null +++ b/chishop/templates/registration/activation_complete.html @@ -0,0 +1,9 @@ +{% extends "base_site.html" %} + +{% block main_content %} +

Activation complete.

+

+ Hello {{account}}, you are registered. + here to get back to the main page. +

+{% endblock %} diff --git a/chishop/templates/registration/activation_email.txt b/chishop/templates/registration/activation_email.txt new file mode 100644 index 0000000..0a25329 --- /dev/null +++ b/chishop/templates/registration/activation_email.txt @@ -0,0 +1,6 @@ +Welcome to Chishop. + +Please click here to activate your account: +http://{{site}}/accounts/activate/{{activation_key}}/ + +Account has to be activated within {{expiration_days}} days. diff --git a/chishop/templates/registration/activation_email_subject.txt b/chishop/templates/registration/activation_email_subject.txt new file mode 100644 index 0000000..93618cc --- /dev/null +++ b/chishop/templates/registration/activation_email_subject.txt @@ -0,0 +1 @@ +Account Activation - {{ site }} diff --git a/chishop/templates/registration/login.html b/chishop/templates/registration/login.html new file mode 100644 index 0000000..6c7f799 --- /dev/null +++ b/chishop/templates/registration/login.html @@ -0,0 +1,8 @@ +{% extends "base_site.html" %} + +{% block content %} +
+ {{form.as_p}} + +
+{% endblock %} diff --git a/chishop/templates/registration/logout.html b/chishop/templates/registration/logout.html new file mode 100644 index 0000000..06483a8 --- /dev/null +++ b/chishop/templates/registration/logout.html @@ -0,0 +1,7 @@ +{% extends "base_site.html" %} + +{% block main_content %} +

+ {%trans "Logged out."%} +

+{% endblock %} diff --git a/chishop/templates/registration/registration_complete.html b/chishop/templates/registration/registration_complete.html new file mode 100644 index 0000000..d9a19cf --- /dev/null +++ b/chishop/templates/registration/registration_complete.html @@ -0,0 +1,8 @@ +{% extends "base_site.html" %} + +{% block content %} +

Registration complete

+

+ An activation mail has been sent to you. +

+{% endblock %} diff --git a/chishop/templates/registration/registration_form.html b/chishop/templates/registration/registration_form.html new file mode 100644 index 0000000..719a875 --- /dev/null +++ b/chishop/templates/registration/registration_form.html @@ -0,0 +1,8 @@ +{% extends "base_site.html" %} + +{% block content %} +

Register

+
+ {{form.as_p}} + +{% endblock %} diff --git a/chishop/urls.py b/chishop/urls.py index b9f3e65..ab2e8a9 100644 --- a/chishop/urls.py +++ b/chishop/urls.py @@ -18,6 +18,9 @@ urlpatterns += patterns("", url(r'^admin/doc/', include("django.contrib.admindocs.urls")), url(r'^admin/(.*)', admin.site.root), + # Registration + url(r'^accounts/', include('registration.backends.default.urls')), + + # The Chishop url(r'', include("djangopypi.urls")) ) - -- cgit v1.2.3 From 23407b8d0e701f284749275bdb050f300e1b3dfb Mon Sep 17 00:00:00 2001 From: Sverre Johansen Date: Tue, 10 Nov 2009 23:45:56 +0100 Subject: Added django-registration 0.8 alpha requirement to buildout --- buildout.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/buildout.cfg b/buildout.cfg index 65e3421..3b5500a 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -1,6 +1,8 @@ [buildout] parts = django +find-links = http://bitbucket.org/ubernostrum/django-registration/downloads/django-registration-0.8-alpha-1.tar.gz eggs = pkginfo + django-registration==0.8-alpha-1 [django] recipe = djangorecipe -- cgit v1.2.3 From ecbd3d1b492d4e7c4887ca24879946209843c692 Mon Sep 17 00:00:00 2001 From: Sverre Johansen Date: Tue, 10 Nov 2009 23:46:45 +0100 Subject: Force buildout to unzip all eggs --- buildout.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/buildout.cfg b/buildout.cfg index 3b5500a..04e0acf 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -1,6 +1,7 @@ [buildout] parts = django find-links = http://bitbucket.org/ubernostrum/django-registration/downloads/django-registration-0.8-alpha-1.tar.gz +unzip = true eggs = pkginfo django-registration==0.8-alpha-1 -- cgit v1.2.3 From feb6afd526a41e2f5d3625e109cb3eed25070ef6 Mon Sep 17 00:00:00 2001 From: Sverre Johansen Date: Wed, 11 Nov 2009 00:03:43 +0100 Subject: Added spacing in base template --- chishop/templates/base.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chishop/templates/base.html b/chishop/templates/base.html index 2863343..76483ce 100644 --- a/chishop/templates/base.html +++ b/chishop/templates/base.html @@ -24,10 +24,10 @@
{% if user.is_authenticated %} Welcome, {{user.username}}. - Log out + Log out {% else %} - Login / - Register + Log in / + Register {% endif %}
-- cgit v1.2.3 From 403fae9f8ad14cd1596920ac37fa454b065e5905 Mon Sep 17 00:00:00 2001 From: Sverre Johansen Date: Wed, 11 Nov 2009 15:02:56 +0100 Subject: Set REGISTRATION_OPEN in settings --- chishop/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/chishop/settings.py b/chishop/settings.py index 39ddec7..77f21cd 100644 --- a/chishop/settings.py +++ b/chishop/settings.py @@ -16,6 +16,7 @@ DJANGOPYPI_RELEASE_UPLOAD_TO = 'dists' # change to False if you do not want Django's default server to serve static pages LOCAL_DEVELOPMENT = True +REGISTRATION_OPEN = True ACCOUNT_ACTIVATION_DAYS = 7 LOGIN_REDIRECT_URL = "/" -- cgit v1.2.3 From ef5dab30fd4451d3ee9db6504537fe4746882faa Mon Sep 17 00:00:00 2001 From: Sverre Johansen Date: Wed, 11 Nov 2009 15:05:53 +0100 Subject: Added distutils register support --- djangopypi/views.py | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/djangopypi/views.py b/djangopypi/views.py index 784651b..e004a19 100644 --- a/djangopypi/views.py +++ b/djangopypi/views.py @@ -42,15 +42,17 @@ from django.conf import settings from django.http import Http404, HttpResponse, HttpResponseBadRequest from django.http import QueryDict, HttpResponseForbidden from django.shortcuts import render_to_response -from djangopypi.models import Project, Classifier, Release, UPLOAD_TO -from djangopypi.forms import ProjectForm, ReleaseForm from django.template import RequestContext from django.utils.datastructures import MultiValueDict from django.utils.translation import ugettext_lazy as _ from django.core.files.uploadedfile import SimpleUploadedFile from django.contrib.auth import authenticate, login -from djangopypi.http import HttpResponseNotImplemented -from djangopypi.http import HttpResponseUnauthorized +from registration.backends import get_backend +from registration.forms import RegistrationForm + +from djangopypi.models import Project, Classifier, Release, UPLOAD_TO +from djangopypi.forms import ProjectForm, ReleaseForm +from djangopypi.http import HttpResponseNotImplemented, HttpResponseUnauthorized from djangopypi.utils import decode_fs @@ -140,12 +142,33 @@ def register_or_upload(request, post_data, files): return submit_project_or_release(user, post_data, files) +def create_user(request, post_data, files): + """Create new user from a distutil client request""" + form = RegistrationForm({"username": post_data["name"], + "email": post_data["email"], + "password1": post_data["password"], + "password2": post_data["password"]}) + if not form.is_valid(): + # Dist Utils requires error msg in HTTP status: "HTTP/1.1 400 msg" + # Which is HTTP/WSGI incompatible, so we're just returning a empty 400. + return HttpResponseBadRequest() + + backend = get_backend("registration.backends.default.DefaultBackend") + if not backend.registration_allowed(request): + return HttpResponseBadRequest() + new_user = backend.register(request, **form.cleaned_data) + return HttpResponse("OK\n", status=200, mimetype='text/plain') + + ACTIONS = { # file_upload is the action used with distutils ``sdist`` command. "file_upload": register_or_upload, # submit is the :action used with distutils ``register`` command. "submit": register_or_upload, + + # user is the action used when registering a new user + "user": create_user, } -- cgit v1.2.3 From 6a11745f64c30e5ce21b83a0c77a07491b6342df Mon Sep 17 00:00:00 2001 From: Sverre Johansen Date: Wed, 11 Nov 2009 15:17:21 +0100 Subject: Added Registration Closed template --- chishop/templates/registration/registration_closed.html | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 chishop/templates/registration/registration_closed.html diff --git a/chishop/templates/registration/registration_closed.html b/chishop/templates/registration/registration_closed.html new file mode 100644 index 0000000..c92e80b --- /dev/null +++ b/chishop/templates/registration/registration_closed.html @@ -0,0 +1,8 @@ +{% extends "base_site.html" %} + +{% block content %} +

Registration Closed

+

+ Registration is disabled. +

+{% endblock %} -- cgit v1.2.3 From 6110c094b763567b0f2281b182c0f46e1bd6adb0 Mon Sep 17 00:00:00 2001 From: Sverre Johansen Date: Wed, 11 Nov 2009 15:38:48 +0100 Subject: Changed install instructions to use zc.buildout. --- README | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/README b/README index bf6511b..0773175 100644 --- a/README +++ b/README @@ -8,27 +8,23 @@ ChiShop/DjangoPyPI Installation ============ -First you have to install the dependencies:: +Install dependencies:: - $ python setup.py build - # python setup.py install # (run as root) + $ python bootstrap.py --distribute + $ ./bin/buildout Initial configuration --------------------- :: - $ cd chipshop/ - - $ $EDITOR settings.py - - $ python manage.py syncdb + $ $EDITOR chishop/settings.py + $ ./bin/django syncdb Run the PyPI server ------------------- :: - $ python manage.py runserver - + $ ./bin/django runserver Please note that ``chishop/media/dists`` has to be writable by the user the web-server is running as. -- cgit v1.2.3 From 2c42e8d21803f2c0deb40b60b7749e6f19d84152 Mon Sep 17 00:00:00 2001 From: Sverre Johansen Date: Wed, 11 Nov 2009 15:40:32 +0100 Subject: Moved app templates into project. Makes sense to keep the templates in the main folder as long as they are not independent from the project (they seldome are anyway). --- chishop/templates/djangopypi/pypi.html | 16 +++++++++ chishop/templates/djangopypi/pypi_show_links.html | 39 ++++++++++++++++++++++ chishop/templates/djangopypi/show_links.html | 7 ++++ chishop/templates/djangopypi/show_version.html | 5 +++ chishop/templates/djangopypi/simple.html | 5 +++ djangopypi/templates/djangopypi/pypi.html | 16 --------- .../templates/djangopypi/pypi_show_links.html | 39 ---------------------- djangopypi/templates/djangopypi/show_links.html | 7 ---- djangopypi/templates/djangopypi/show_version.html | 5 --- djangopypi/templates/djangopypi/simple.html | 5 --- 10 files changed, 72 insertions(+), 72 deletions(-) create mode 100644 chishop/templates/djangopypi/pypi.html create mode 100644 chishop/templates/djangopypi/pypi_show_links.html create mode 100644 chishop/templates/djangopypi/show_links.html create mode 100644 chishop/templates/djangopypi/show_version.html create mode 100644 chishop/templates/djangopypi/simple.html delete mode 100644 djangopypi/templates/djangopypi/pypi.html delete mode 100644 djangopypi/templates/djangopypi/pypi_show_links.html delete mode 100644 djangopypi/templates/djangopypi/show_links.html delete mode 100644 djangopypi/templates/djangopypi/show_version.html delete mode 100644 djangopypi/templates/djangopypi/simple.html diff --git a/chishop/templates/djangopypi/pypi.html b/chishop/templates/djangopypi/pypi.html new file mode 100644 index 0000000..f98cf44 --- /dev/null +++ b/chishop/templates/djangopypi/pypi.html @@ -0,0 +1,16 @@ +{% extends "base_site.html" %} + +{% block bread_crumbs_1 %}{% endblock %} + +{% block content %} + + +{% for dist in dists %} + + + + +{% endfor %} +
UpdatedPackageSummary
{{ dist.updated|date:"d/m/y" }} + {{ dist.name }}{{ dist.summary|truncatewords:10 }}
+{% endblock %} diff --git a/chishop/templates/djangopypi/pypi_show_links.html b/chishop/templates/djangopypi/pypi_show_links.html new file mode 100644 index 0000000..6b239d1 --- /dev/null +++ b/chishop/templates/djangopypi/pypi_show_links.html @@ -0,0 +1,39 @@ +{% extends "base_site.html" %} + +{% block content %} +

+{{ project.summary }} +

+{% load safemarkup %} +{{ project.description|saferst }} + +
+ + + {% for release in releases %} + + + + + + + + + {% endfor %} +
FilenamePlatformTypeVersionUploaded OnSize
{{ release.filename }}{{ release.platform }}{{ release.type }}{{ release.pyversion }}{{ release.upload_time }}{{ release.distribution.size|filesizeformat }}
+
+ +{% endblock %} + diff --git a/chishop/templates/djangopypi/show_links.html b/chishop/templates/djangopypi/show_links.html new file mode 100644 index 0000000..57a1268 --- /dev/null +++ b/chishop/templates/djangopypi/show_links.html @@ -0,0 +1,7 @@ +Links for {{ dist_name }} +

Links for {{ dist_name }}

+ +{% for release in releases %} +{{ release.filename }}
+{% endfor %} + diff --git a/chishop/templates/djangopypi/show_version.html b/chishop/templates/djangopypi/show_version.html new file mode 100644 index 0000000..d3b393a --- /dev/null +++ b/chishop/templates/djangopypi/show_version.html @@ -0,0 +1,5 @@ +Links for {{ dist_name }} {{ version }} +

Links for {{ dist_name }} {{ version }}

+ +{{ release.filename }}
+ diff --git a/chishop/templates/djangopypi/simple.html b/chishop/templates/djangopypi/simple.html new file mode 100644 index 0000000..6a21d5c --- /dev/null +++ b/chishop/templates/djangopypi/simple.html @@ -0,0 +1,5 @@ +Simple Index +{% for dist in dists %} +{{ dist.name }}
+{% endfor %} + diff --git a/djangopypi/templates/djangopypi/pypi.html b/djangopypi/templates/djangopypi/pypi.html deleted file mode 100644 index f98cf44..0000000 --- a/djangopypi/templates/djangopypi/pypi.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "base_site.html" %} - -{% block bread_crumbs_1 %}{% endblock %} - -{% block content %} - - -{% for dist in dists %} - - - - -{% endfor %} -
UpdatedPackageSummary
{{ dist.updated|date:"d/m/y" }} - {{ dist.name }}{{ dist.summary|truncatewords:10 }}
-{% endblock %} diff --git a/djangopypi/templates/djangopypi/pypi_show_links.html b/djangopypi/templates/djangopypi/pypi_show_links.html deleted file mode 100644 index 6b239d1..0000000 --- a/djangopypi/templates/djangopypi/pypi_show_links.html +++ /dev/null @@ -1,39 +0,0 @@ -{% extends "base_site.html" %} - -{% block content %} -

-{{ project.summary }} -

-{% load safemarkup %} -{{ project.description|saferst }} - -
- - - {% for release in releases %} - - - - - - - - - {% endfor %} -
FilenamePlatformTypeVersionUploaded OnSize
{{ release.filename }}{{ release.platform }}{{ release.type }}{{ release.pyversion }}{{ release.upload_time }}{{ release.distribution.size|filesizeformat }}
-
- -{% endblock %} - diff --git a/djangopypi/templates/djangopypi/show_links.html b/djangopypi/templates/djangopypi/show_links.html deleted file mode 100644 index 57a1268..0000000 --- a/djangopypi/templates/djangopypi/show_links.html +++ /dev/null @@ -1,7 +0,0 @@ -Links for {{ dist_name }} -

Links for {{ dist_name }}

- -{% for release in releases %} -{{ release.filename }}
-{% endfor %} - diff --git a/djangopypi/templates/djangopypi/show_version.html b/djangopypi/templates/djangopypi/show_version.html deleted file mode 100644 index d3b393a..0000000 --- a/djangopypi/templates/djangopypi/show_version.html +++ /dev/null @@ -1,5 +0,0 @@ -Links for {{ dist_name }} {{ version }} -

Links for {{ dist_name }} {{ version }}

- -{{ release.filename }}
- diff --git a/djangopypi/templates/djangopypi/simple.html b/djangopypi/templates/djangopypi/simple.html deleted file mode 100644 index 6a21d5c..0000000 --- a/djangopypi/templates/djangopypi/simple.html +++ /dev/null @@ -1,5 +0,0 @@ -Simple Index -{% for dist in dists %} -{{ dist.name }}
-{% endfor %} - -- cgit v1.2.3 From 25f50a4fadb18a9085cc5e7d038b8e582f41b32e Mon Sep 17 00:00:00 2001 From: Sverre Johansen Date: Wed, 11 Nov 2009 15:54:24 +0100 Subject: Fixed activation template blockname --- chishop/templates/registration/activation_complete.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chishop/templates/registration/activation_complete.html b/chishop/templates/registration/activation_complete.html index 553cf2c..c8e8aca 100644 --- a/chishop/templates/registration/activation_complete.html +++ b/chishop/templates/registration/activation_complete.html @@ -1,9 +1,9 @@ {% extends "base_site.html" %} -{% block main_content %} +{% block content %}

Activation complete.

- Hello {{account}}, you are registered. - here to get back to the main page. + Hello {{user}}, you are registered. + Go here to get back to the main page.

{% endblock %} -- cgit v1.2.3 From 53f7ecd50a22f560812dc2db4c32dfe839fe75b7 Mon Sep 17 00:00:00 2001 From: Sverre Johansen Date: Wed, 11 Nov 2009 15:56:45 +0100 Subject: Made settings.py default --- buildout.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildout.cfg b/buildout.cfg index 04e0acf..160db4c 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -8,7 +8,7 @@ eggs = pkginfo [django] recipe = djangorecipe version = 1.1.1 -settings = development +settings = settings eggs = ${buildout:eggs} test = djangopypi project = chishop -- cgit v1.2.3 From 8990f1186516132d768ff6a86b2d789a1c3db7aa Mon Sep 17 00:00:00 2001 From: Sverre Johansen Date: Wed, 11 Nov 2009 15:58:23 +0100 Subject: Added email config to settings.py --- chishop/settings.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/chishop/settings.py b/chishop/settings.py index 77f21cd..ee286b5 100644 --- a/chishop/settings.py +++ b/chishop/settings.py @@ -20,6 +20,10 @@ REGISTRATION_OPEN = True ACCOUNT_ACTIVATION_DAYS = 7 LOGIN_REDIRECT_URL = "/" +EMAIL_HOST = '' +DEFAULT_FROM_EMAIL = '' +SERVER_EMAIL = DEFAULT_FROM_EMAIL + MANAGERS = ADMINS DATABASE_ENGINE = '' -- cgit v1.2.3