diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | chimere/actions.py | 9 | ||||
| -rw-r--r-- | chimere/admin.py | 8 | ||||
| -rw-r--r-- | chimere/forms.py | 3 | ||||
| -rw-r--r-- | chimere/migrations/0001_initial.py | 1 | ||||
| -rw-r--r-- | chimere/migrations/0002_rename_models.py | 9 | ||||
| -rw-r--r-- | chimere/models.py | 2 | ||||
| -rw-r--r-- | chimere/views.py | 12 | ||||
| -rw-r--r-- | example_project/settings.py.example | 2 | ||||
| -rw-r--r-- | example_project/urls.py | 1 |
10 files changed, 29 insertions, 21 deletions
@@ -3,6 +3,7 @@ *.bak *.mo *.ignore -chimere/settings.py +example_project/settings.py chimere/static/icons/* chimere/static/upload/* +chimere_env/ diff --git a/chimere/actions.py b/chimere/actions.py index 6f82028..ee57b28 100644 --- a/chimere/actions.py +++ b/chimere/actions.py @@ -20,10 +20,9 @@ """ Actions available in the main interface """ -from django.utils.translation import ugettext_lazy as _ +from django.conf import settings from django.contrib.auth import models - -from chimere.settings import EXTRA_URL, EMAIL_HOST, INSTALLED_APPS +from django.utils.translation import ugettext_lazy as _ class Action: def __init__(self, id, path, label): @@ -35,9 +34,9 @@ actions = [(Action('view', '', _('View')), []), Action('edit_route', 'edit_route', _('Add a new route'))), ),] -if 'chimere.rss' in INSTALLED_APPS: +if 'chimere_rss' in settings.INSTALLED_APPS: actions.append((Action('rss', 'rss', _('RSS feeds')), [])) -if EMAIL_HOST: +if settings.EMAIL_HOST: actions.append((Action('contact', 'contact', _('Contact us')), []),) diff --git a/chimere/admin.py b/chimere/admin.py index 2ad749c..63bdda3 100644 --- a/chimere/admin.py +++ b/chimere/admin.py @@ -21,15 +21,15 @@ Settings for administration pages """ -from chimere import settings +from django.conf import settings +from django.contrib import admin + from chimere.models import Category, Icon, SubCategory, Marker, \ PropertyModel, News, Route, Area, ColorTheme, Color, RouteFile from chimere.forms import MarkerAdminForm, RouteAdminForm, AreaAdminForm,\ NewsAdminForm, CategoryAdminForm from chimere.widgets import TextareaWidget -from django.contrib import admin - def get_areas_for_user(user): """ Getting subcats for a specific user @@ -51,7 +51,7 @@ class MarkerAdmin(admin.ModelAdmin): list_display = ('name', 'status') list_filter = ('status', 'categories') exclude = ['height', 'width'] - if 'chimere.rss' in settings.INSTALLED_APPS: + if 'chimere_rss' in settings.INSTALLED_APPS: exclude.append('available_date') form = MarkerAdminForm diff --git a/chimere/forms.py b/chimere/forms.py index 3691408..06845d7 100644 --- a/chimere/forms.py +++ b/chimere/forms.py @@ -21,14 +21,13 @@ Forms """ from django import forms +from django.conf import settings from django.contrib.gis.db import models from django.utils.translation import ugettext as _ from django.contrib.auth.models import User, Permission, ContentType from django.contrib.admin.widgets import AdminDateWidget from django.core.mail import EmailMessage, BadHeaderError -from chimere import settings - from chimere.models import Marker, Route, PropertyModel, Property, Area,\ News, Category, SubCategory, RouteFile from chimere.widgets import AreaField, PointField, TextareaWidget diff --git a/chimere/migrations/0001_initial.py b/chimere/migrations/0001_initial.py index 3ba693f..93d61e4 100644 --- a/chimere/migrations/0001_initial.py +++ b/chimere/migrations/0001_initial.py @@ -93,6 +93,7 @@ class Migration(SchemaMigration): ('height', self.gf('django.db.models.fields.IntegerField')(null=True, blank=True)), ('width', self.gf('django.db.models.fields.IntegerField')(null=True, blank=True)), ('start_date', self.gf('django.db.models.fields.DateField')(null=True, blank=True)), + ('available_date', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)), ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), )) db.send_create_signal('chimere', ['Marker']) diff --git a/chimere/migrations/0002_rename_models.py b/chimere/migrations/0002_rename_models.py index 84a91b8..32aabc7 100644 --- a/chimere/migrations/0002_rename_models.py +++ b/chimere/migrations/0002_rename_models.py @@ -19,6 +19,10 @@ class Migration(SchemaMigration): db.rename_table('main_route', 'chimere_route') db.rename_table('main_propertymodel', 'chimere_propertymodel') db.rename_table('main_property', 'chimere_property') + db.rename_table('main_area', 'chimere_area') + db.rename_table('main_marker_categories', 'chimere_marker_categories') + db.rename_table('main_route_categories', 'chimere_route_categories') + db.rename_table('main_subcategory_areas', 'chimere_subcategory_areas') def backwards(self, orm): db.rename_table('chimere_news', 'main_news') @@ -33,6 +37,10 @@ class Migration(SchemaMigration): db.rename_table('chimere_route', 'main_route') db.rename_table('chimere_propertymodel', 'main_propertymodel') db.rename_table('chimere_property', 'main_property') + db.rename_table('chimere_area', 'main_area') + db.rename_table('chimere_marker_categories', 'main_marker_categories') + db.rename_table('chimere_route_categories', 'main_route_categories') + db.rename_table('chimere_subcategory_areas', 'main_subcategory_areas') models = { 'chimere.area': { @@ -75,6 +83,7 @@ class Migration(SchemaMigration): }, 'chimere.marker': { 'Meta': {'object_name': 'Marker', 'db_table': "'main_marker'"}, + 'available_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), 'categories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False'}), 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), 'height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), diff --git a/chimere/models.py b/chimere/models.py index 8c80fab..f28fb28 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -210,7 +210,7 @@ class Marker(models.Model): end_date = models.DateField(_(u"End date"), blank=True, null=True, help_text=_(u"Not mandatory. Set it only if you have a multi-day "\ u"event. Format YYYY-MM-DD")) - if 'chimere.rss' in settings.INSTALLED_APPS: + if 'chimere_rss' in settings.INSTALLED_APPS: available_date = models.DateTimeField(_(u"Available Date"), blank=True, null=True) route = models.ForeignKey(u"Route", blank=True, null=True) diff --git a/chimere/views.py b/chimere/views.py index 24948ad..90fa821 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -24,16 +24,16 @@ Views of the project import datetime from itertools import groupby -from django.utils.translation import ugettext as _ -from django.shortcuts import render_to_response -from django.template import loader -from django.http import HttpResponseRedirect, HttpResponse +from django.conf import settings from django.core import serializers -from django.utils.http import urlquote from django.db.models import Q +from django.http import HttpResponseRedirect, HttpResponse +from django.shortcuts import render_to_response +from django.template import loader from django.utils import simplejson +from django.utils.http import urlquote +from django.utils.translation import ugettext as _ -from chimere import settings from chimere.actions import actions from chimere.models import Category, SubCategory, PropertyModel, \ Marker, Route, News, SimpleArea, Area, Color, TinyUrl, RouteFile diff --git a/example_project/settings.py.example b/example_project/settings.py.example index 5f993ab..2715d02 100644 --- a/example_project/settings.py.example +++ b/example_project/settings.py.example @@ -132,7 +132,7 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.doc.XViewMiddleware', ) -ROOT_URLCONF = 'chimere.urls' +ROOT_URLCONF = 'example_project.urls' TEMPLATE_DIRS = [ # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". diff --git a/example_project/urls.py b/example_project/urls.py index 8644a5d..84a7e13 100644 --- a/example_project/urls.py +++ b/example_project/urls.py @@ -28,7 +28,6 @@ urlpatterns = patterns('django.views.static', (r'^%s(?P<path>.*)' % settings.MEDIA_URL[1:], 'serve', {'document_root': settings.MEDIA_ROOT}), ) - urlpatterns += staticfiles_urlpatterns() urlpatterns += patterns('', |