From c66fb1445796f8bf5508773d4487e428aabcdaf4 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Fri, 3 Dec 2010 23:46:14 +0100 Subject: moved settings --- coip/extensions/templatetags/permdisplay.py | 21 +++++++ coip/settings.py | 86 +++++++++++++++++++++++++++++ dev-django-admin.sh | 2 +- settings.py | 86 ----------------------------- templates/apps/name/acls.html | 14 +++++ 5 files changed, 122 insertions(+), 87 deletions(-) create mode 100644 coip/extensions/templatetags/permdisplay.py create mode 100644 coip/settings.py delete mode 100644 settings.py create mode 100644 templates/apps/name/acls.html diff --git a/coip/extensions/templatetags/permdisplay.py b/coip/extensions/templatetags/permdisplay.py new file mode 100644 index 0000000..a2b347d --- /dev/null +++ b/coip/extensions/templatetags/permdisplay.py @@ -0,0 +1,21 @@ +from django import template + +register = template.Library() + +MOMENT = 120 # duration in seconds within which the time difference + # will be rendered as 'a moment ago' + +perms = {'r':'read', + 'w':'write', + 'd':'delete', + 'i':'insert', + 'l':'list'} + +def permdisplay(perm): + if perm: + return "can %s" % (' '.join([perms[p] for p in perm])) + else: + return "can do nothing" + +permdisplay.is_safe = True +register.filter(permdisplay) \ No newline at end of file diff --git a/coip/settings.py b/coip/settings.py new file mode 100644 index 0000000..02f3ce5 --- /dev/null +++ b/coip/settings.py @@ -0,0 +1,86 @@ +# Django settings for coip project. + +DEBUG = True +TEMPLATE_DEBUG = DEBUG + +ADMINS = ( + # ('Your Name', 'your_email@domain.com'), +) + +BASE_DIR = "/home/leifj/work/sunet.se/coip" +MANAGERS = ADMINS +DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. +DATABASE_NAME = '%s/sqlite.db' % BASE_DIR # Or path to database file if using sqlite3. +DATABASE_USER = '' # Not used with sqlite3. +DATABASE_PASSWORD = '' # Not used with sqlite3. +DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. +DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. + +# Local time zone for this installation. Choices can be found here: +# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name +# although not all choices may be available on all operating systems. +# If running in a Windows environment this must be set to the same as your +# system time zone. +TIME_ZONE = 'Europe/Stockholm' + +# Language code for this installation. All choices can be found here: +# http://www.i18nguy.com/unicode/language-identifiers.html +LANGUAGE_CODE = 'us-en' + +SITE_ID = 1 + +# If you set this to False, Django will make some optimizations so as not +# to load the internationalization machinery. +USE_I18N = True + +MEDIA_ROOT = "%s/site-media" % BASE_DIR +ADMIN_MEDIA_ROOT = "/usr/lib/pymodules/python2.5/django/contrib/admin/media" +MEDIA_URL = '/site-media/' +ADMIN_MEDIA_PREFIX = '/admin-media/' + +# Make this unique, and don't share it with anybody. +SECRET_KEY = '!=ren*@$dklhfm$3#$h=a2g4r3)ra#+al)9kwi4&rpylr$3xnf' + +# List of callables that know how to import templates from various sources. +TEMPLATE_LOADERS = ( + 'django.template.loaders.filesystem.load_template_source', + 'django.template.loaders.app_directories.load_template_source', +# 'django.template.loaders.eggs.load_template_source', +) + +MIDDLEWARE_CLASSES = ( + 'django.middleware.common.CommonMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.auth.middleware.RemoteUserMiddleware', +) + +AUTHENTICATION_BACKENDS = ( + 'django.contrib.auth.backends.RemoteUserBackend', + 'django.contrib.auth.backends.ModelBackend', +) + +ROOT_URLCONF = 'coip.urls' + +TEMPLATE_DIRS = ( + # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". + # Always use forward slashes, even on Windows. + # Don't forget to use absolute paths, not relative paths. + "%s/templates" % BASE_DIR +) + +INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.sites', + 'django.contrib.admin', + 'django.contrib.humanize', + 'django_extensions', + 'coip.extensions', + 'coip.apps.name', + 'coip.apps.membership', + 'coip.apps.invitation', + 'coip.apps.userprofile', + 'coip.apps.link', +) diff --git a/dev-django-admin.sh b/dev-django-admin.sh index 4ee21f8..e30882e 100755 --- a/dev-django-admin.sh +++ b/dev-django-admin.sh @@ -1 +1 @@ -env PYTHONPATH=`pwd`:$PHTHONPATH DJANGO_SETTINGS_MODULE=settings django-admin $* +env PYTHONPATH=`pwd`:$PHTHONPATH DJANGO_SETTINGS_MODULE=coip.settings django-admin $* diff --git a/settings.py b/settings.py deleted file mode 100644 index 02f3ce5..0000000 --- a/settings.py +++ /dev/null @@ -1,86 +0,0 @@ -# Django settings for coip project. - -DEBUG = True -TEMPLATE_DEBUG = DEBUG - -ADMINS = ( - # ('Your Name', 'your_email@domain.com'), -) - -BASE_DIR = "/home/leifj/work/sunet.se/coip" -MANAGERS = ADMINS -DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. -DATABASE_NAME = '%s/sqlite.db' % BASE_DIR # Or path to database file if using sqlite3. -DATABASE_USER = '' # Not used with sqlite3. -DATABASE_PASSWORD = '' # Not used with sqlite3. -DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. -DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. - -# Local time zone for this installation. Choices can be found here: -# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name -# although not all choices may be available on all operating systems. -# If running in a Windows environment this must be set to the same as your -# system time zone. -TIME_ZONE = 'Europe/Stockholm' - -# Language code for this installation. All choices can be found here: -# http://www.i18nguy.com/unicode/language-identifiers.html -LANGUAGE_CODE = 'us-en' - -SITE_ID = 1 - -# If you set this to False, Django will make some optimizations so as not -# to load the internationalization machinery. -USE_I18N = True - -MEDIA_ROOT = "%s/site-media" % BASE_DIR -ADMIN_MEDIA_ROOT = "/usr/lib/pymodules/python2.5/django/contrib/admin/media" -MEDIA_URL = '/site-media/' -ADMIN_MEDIA_PREFIX = '/admin-media/' - -# Make this unique, and don't share it with anybody. -SECRET_KEY = '!=ren*@$dklhfm$3#$h=a2g4r3)ra#+al)9kwi4&rpylr$3xnf' - -# List of callables that know how to import templates from various sources. -TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.load_template_source', - 'django.template.loaders.app_directories.load_template_source', -# 'django.template.loaders.eggs.load_template_source', -) - -MIDDLEWARE_CLASSES = ( - 'django.middleware.common.CommonMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.RemoteUserMiddleware', -) - -AUTHENTICATION_BACKENDS = ( - 'django.contrib.auth.backends.RemoteUserBackend', - 'django.contrib.auth.backends.ModelBackend', -) - -ROOT_URLCONF = 'coip.urls' - -TEMPLATE_DIRS = ( - # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. - "%s/templates" % BASE_DIR -) - -INSTALLED_APPS = ( - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.sites', - 'django.contrib.admin', - 'django.contrib.humanize', - 'django_extensions', - 'coip.extensions', - 'coip.apps.name', - 'coip.apps.membership', - 'coip.apps.invitation', - 'coip.apps.userprofile', - 'coip.apps.link', -) diff --git a/templates/apps/name/acls.html b/templates/apps/name/acls.html new file mode 100644 index 0000000..89bbdc2 --- /dev/null +++ b/templates/apps/name/acls.html @@ -0,0 +1,14 @@ +{% extends "edit.html" %} +{% load permdisplay %} +{% block beforeform %} +

Permissions on {{name}}

+ +{% for ace in acl %} + + + + + +{% endfor %} +
Members of {{ace.dst}} ({{ace.dst.short}}){{ace.data|permdisplay}}
+{% endblock %} \ No newline at end of file -- cgit v1.1