diff --git a/.bzrignore b/.bzrignore index 8b13789..13f2ad0 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1 +1 @@ - +dev_setup/mmtest.db diff --git a/dev_setup/__init__.py b/dev_setup/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/dev_setup/__init__.py diff --git a/dev_setup/manage.py b/dev_setup/manage.py new file mode 100755 index 0000000..daae3a9 --- /dev/null +++ b/dev_setup/manage.py @@ -0,0 +1,29 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# Copyright (C) 1998-2010 by the Free Software Foundation, Inc. +# +# This file is part of GNU Mailman. +# +# GNU Mailman 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. +# +# GNU Mailman 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 +# GNU Mailman. If not, see . + +from django.core.management import execute_manager +try: + import settings # Assumed to be in the same directory. +except ImportError: + import sys + sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__) + sys.exit(1) + +if __name__ == "__main__": + execute_manager(settings) diff --git a/dev_setup/settings.py b/dev_setup/settings.py index 95e15ec..38e7b53 100644 --- a/dev_setup/settings.py +++ b/dev_setup/settings.py @@ -95,7 +95,6 @@ ) AUTHENTICATION_BACKENDS = ( - 'mailmanweb.auth.restbackend.RESTBackend', 'django.contrib.auth.backends.ModelBackend', 'social_auth.backends.OpenIDBackend', 'social_auth.backends.browserid.BrowserIDBackend' @@ -149,7 +148,7 @@ #'debug_toolbar', ) LOGIN_URL = '/login-form/' -LOGIN_REDIRECT_URL = '/logged-in/' +LOGIN_REDIRECT_URL = '/mailmanweb/' LOGIN_ERROR_URL = '/login-error/' SOCIAL_AUTH_COMPLETE_URL_NAME = 'socialauth_complete' SOCIAL_AUTH_ASSOCIATE_URL_NAME = 'socialauth_associate_complete' diff --git a/src/mailmanweb/templates/mailmanweb/base.html b/src/mailmanweb/templates/mailmanweb/base.html index cc83014..31b5653 100644 --- a/src/mailmanweb/templates/mailmanweb/base.html +++ b/src/mailmanweb/templates/mailmanweb/base.html @@ -53,4 +53,5 @@ + {% block additionaljs %}{% endblock %} diff --git a/src/mailmanweb/templates/mailmanweb/login.html b/src/mailmanweb/templates/mailmanweb/login.html index d056774..6dadd86 100644 --- a/src/mailmanweb/templates/mailmanweb/login.html +++ b/src/mailmanweb/templates/mailmanweb/login.html @@ -14,9 +14,6 @@ - -
@@ -24,6 +21,13 @@ BrowserID
+ + +{% endblock %} + +{% block additionaljs %} + + - - -{% endblock %} +{% endblock additionaljs %}