From 085916f38daf6e7f3a7002b286e4be052b48159c Mon Sep 17 00:00:00 2001 From: Martin Bauer Date: Fri, 1 Nov 2013 18:13:46 +0200 Subject: [PATCH] Fixes - no gallery (makes problems on server) - correct URL in mail - events grid -> tighter display --- blechreiz/database.sqlite | Bin 87040 -> 97280 bytes blechreiz/settings.py | 8 ++++---- blechreiz/urls.py | 6 +++--- .../templates/eventplanner/events_grid.html | 4 ++-- simpleforum/templates/simpleforum/mail.txt | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/blechreiz/database.sqlite b/blechreiz/database.sqlite index 5322a00243cd3cbeaa424375d6f40ee07cd7aa2b..173f17e90fd139b14bab009b4c3588c250251501 100644 GIT binary patch delta 10992 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 delta 5971 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 Shi`u_)IBU)Dg diff --git a/blechreiz/settings.py b/blechreiz/settings.py index 9875c7f..d75a6a6 100644 --- a/blechreiz/settings.py +++ b/blechreiz/settings.py @@ -72,7 +72,7 @@ MEDIA_URL = '/media/' # Don't put anything in this directory yourself; store your static files # in apps' "static/" subdirectories and in STATICFILES_DIRS. # Example: "/var/www/example.com/static/" -STATIC_ROOT = '/' +STATIC_ROOT = PROJECT_PATH + '/static_collection' # URL prefix for static files. # Example: "http://example.com/static/", "http://static.example.com/" @@ -159,9 +159,9 @@ INSTALLED_APPS = ( 'simpleforum', # Messages ( Forum ) 'location_field', # custom location field used in Event Management - 'imagestore', - 'sorl.thumbnail', - 'tagging' + #'imagestore', + #'sorl.thumbnail', + #'tagging' ) IMAGESTORE_TEMPLATE = "website/base.html" diff --git a/blechreiz/urls.py b/blechreiz/urls.py index 03aabfd..fcfb313 100644 --- a/blechreiz/urls.py +++ b/blechreiz/urls.py @@ -6,7 +6,7 @@ import simpleforum.views import eventplanner.urls import musicians.urls -import imagestore.urls +#import imagestore.urls import website.urls @@ -22,5 +22,5 @@ urlpatterns = patterns('', url(r'^messages/$', simpleforum.views.message_view ), url(r'^admin/', include(admin.site.urls) ), url(r'^location_field/', include('location_field.urls')), - url(r'^gallery/', include(imagestore.urls, namespace='imagestore') ), -) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \ No newline at end of file + #url(r'^gallery/', include(imagestore.urls, namespace='imagestore') ), +) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/eventplanner/templates/eventplanner/events_grid.html b/eventplanner/templates/eventplanner/events_grid.html index acaf670..8089b43 100644 --- a/eventplanner/templates/eventplanner/events_grid.html +++ b/eventplanner/templates/eventplanner/events_grid.html @@ -150,7 +150,7 @@ {% for event in events %} {{ event.title }} - {{ event.location }}
{{ event.date | date:"SHORT_DATE_FORMAT" }} + {% if event.location %} {{ event.location }}
{% endif %} {{ event.date | date:"SHORT_DATE_FORMAT" }} {% for p in event.participation %} @@ -225,4 +225,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/simpleforum/templates/simpleforum/mail.txt b/simpleforum/templates/simpleforum/mail.txt index 1a256c4..d614c79 100644 --- a/simpleforum/templates/simpleforum/mail.txt +++ b/simpleforum/templates/simpleforum/mail.txt @@ -5,5 +5,5 @@ Neuer Forumeintrag von {{ messages.0.author.username }}: Im Forum antworten: - http://bauer1.selfip.com/blechreiz/messages - \ No newline at end of file + http://bauer1.selfip.com/messages +