Fixes
- no gallery (makes problems on server) - correct URL in mail - events grid -> tighter display
This commit is contained in:
parent
82de9eaa84
commit
085916f38d
Binary file not shown.
|
@ -72,7 +72,7 @@ MEDIA_URL = '/media/'
|
||||||
# Don't put anything in this directory yourself; store your static files
|
# Don't put anything in this directory yourself; store your static files
|
||||||
# in apps' "static/" subdirectories and in STATICFILES_DIRS.
|
# in apps' "static/" subdirectories and in STATICFILES_DIRS.
|
||||||
# Example: "/var/www/example.com/static/"
|
# Example: "/var/www/example.com/static/"
|
||||||
STATIC_ROOT = '/'
|
STATIC_ROOT = PROJECT_PATH + '/static_collection'
|
||||||
|
|
||||||
# URL prefix for static files.
|
# URL prefix for static files.
|
||||||
# Example: "http://example.com/static/", "http://static.example.com/"
|
# Example: "http://example.com/static/", "http://static.example.com/"
|
||||||
|
@ -159,9 +159,9 @@ INSTALLED_APPS = (
|
||||||
'simpleforum', # Messages ( Forum )
|
'simpleforum', # Messages ( Forum )
|
||||||
'location_field', # custom location field used in Event Management
|
'location_field', # custom location field used in Event Management
|
||||||
|
|
||||||
'imagestore',
|
#'imagestore',
|
||||||
'sorl.thumbnail',
|
#'sorl.thumbnail',
|
||||||
'tagging'
|
#'tagging'
|
||||||
)
|
)
|
||||||
|
|
||||||
IMAGESTORE_TEMPLATE = "website/base.html"
|
IMAGESTORE_TEMPLATE = "website/base.html"
|
||||||
|
|
|
@ -6,7 +6,7 @@ import simpleforum.views
|
||||||
|
|
||||||
import eventplanner.urls
|
import eventplanner.urls
|
||||||
import musicians.urls
|
import musicians.urls
|
||||||
import imagestore.urls
|
#import imagestore.urls
|
||||||
import website.urls
|
import website.urls
|
||||||
|
|
||||||
|
|
||||||
|
@ -22,5 +22,5 @@ urlpatterns = patterns('',
|
||||||
url(r'^messages/$', simpleforum.views.message_view ),
|
url(r'^messages/$', simpleforum.views.message_view ),
|
||||||
url(r'^admin/', include(admin.site.urls) ),
|
url(r'^admin/', include(admin.site.urls) ),
|
||||||
url(r'^location_field/', include('location_field.urls')),
|
url(r'^location_field/', include('location_field.urls')),
|
||||||
url(r'^gallery/', include(imagestore.urls, namespace='imagestore') ),
|
#url(r'^gallery/', include(imagestore.urls, namespace='imagestore') ),
|
||||||
) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||||
|
|
|
@ -150,7 +150,7 @@
|
||||||
{% for event in events %}
|
{% for event in events %}
|
||||||
<tr class="eventRow">
|
<tr class="eventRow">
|
||||||
<td class="center" > <a href="{{ event.pk }}" > {{ event.title }} </a> </td>
|
<td class="center" > <a href="{{ event.pk }}" > {{ event.title }} </a> </td>
|
||||||
<td class="center infoColumn" > {{ event.location }}<br/> {{ event.date | date:"SHORT_DATE_FORMAT" }} </td>
|
<td class="center infoColumn" > {% if event.location %} {{ event.location }}<br/> {% endif %} {{ event.date | date:"SHORT_DATE_FORMAT" }} </td>
|
||||||
|
|
||||||
|
|
||||||
{% for p in event.participation %}
|
{% for p in event.participation %}
|
||||||
|
@ -225,4 +225,4 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -5,5 +5,5 @@ Neuer Forumeintrag von {{ messages.0.author.username }}:
|
||||||
|
|
||||||
|
|
||||||
Im Forum antworten:
|
Im Forum antworten:
|
||||||
http://bauer1.selfip.com/blechreiz/messages
|
http://bauer1.selfip.com/messages
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue