diff --git a/dss/urls.py b/dss/urls.py index ca802ff..7558938 100644 --- a/dss/urls.py +++ b/dss/urls.py @@ -1,5 +1,6 @@ from django.conf.urls import patterns, include, url from django.contrib import admin +from django.views.generic import TemplateView from dss import settings @@ -11,12 +12,12 @@ admin.autodiscover() urlpatterns = patterns('', url(r'^admin/', include(admin.site.urls)), - (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/static/img/favicon.ico'}), - (r'^channel\.html$', 'django.views.generic.simple.redirect_to', {'url': '/static/html/fb_channel.html'}), - (r'^privacy\.html$', 'django.views.generic.simple.redirect_to', {'url': '/static/html/privacy.html'}), - (r'^robots\.txt', 'django.views.generic.simple.redirect_to', {'url': '/static/html/robots.txt'}), - (r'^tos\.html$', 'django.views.generic.simple.redirect_to', {'url': '/static/html/tos.html'}), - (r'^test\.html$', 'django.views.generic.simple.redirect_to', {'url': '/static/html/test.html'}), + #(r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/static/img/favicon.ico'}), + (r'^channel\.html$', TemplateView.as_view(template_name='boiler/fb_channel.html')), + (r'^privacy\.html$', TemplateView.as_view(template_name='boiler/privacy.html')), + (r'^robots\.txt', TemplateView.as_view(template_name='boiler/robots.txt')), + (r'^tos\.html$', TemplateView.as_view(template_name='boiler/tos.html')), + (r'^test\.html$', TemplateView.as_view(template_name='boiler/test.html')), (r'^500', 'django.views.defaults.server_error'), (r'^grappelli/', include('grappelli.urls')), url(r'^accounts/', include('allauth.urls')), diff --git a/templates/account/logout.html b/templates/account/logout.html index 4406d5c..57f85bb 100644 --- a/templates/account/logout.html +++ b/templates/account/logout.html @@ -4,6 +4,7 @@ {% block content %}

{% trans "Signed Out" %}

{% trans "You have signed out." %}

+ {% if user.is_authenticated %}

Authenticated

{% else %} @@ -12,11 +13,9 @@ {% endblock %} {% block footerscripts %} - {% endblock %} \ No newline at end of file diff --git a/static/html/fb_channel.html b/templates/boiler/fb_channel.html similarity index 100% rename from static/html/fb_channel.html rename to templates/boiler/fb_channel.html diff --git a/static/html/privacy.html b/templates/boiler/privacy.html similarity index 100% rename from static/html/privacy.html rename to templates/boiler/privacy.html diff --git a/static/html/robots.txt b/templates/boiler/robots.txt similarity index 93% rename from static/html/robots.txt rename to templates/boiler/robots.txt index 0527cf5..42d7a30 100644 --- a/static/html/robots.txt +++ b/templates/boiler/robots.txt @@ -1,4 +1,4 @@ -User-agent: * -Disallow: -Disallow: /media/ -Disallow: /ajax/ +User-agent: * +Disallow: +Disallow: /media/ +Disallow: /ajax/ diff --git a/static/html/test.html b/templates/boiler/test.html similarity index 98% rename from static/html/test.html rename to templates/boiler/test.html index f480dff..f666b43 100644 --- a/static/html/test.html +++ b/templates/boiler/test.html @@ -1,22 +1,22 @@ - - - - - Two structured audio properties - - - - - - - - - - - - -

Audio property with type declaration as structured property.

- + + + + + Two structured audio properties + + + + + + + + + + + + +

Audio property with type declaration as structured property.

+ \ No newline at end of file diff --git a/static/html/test2.html b/templates/boiler/test2.html similarity index 98% rename from static/html/test2.html rename to templates/boiler/test2.html index ac7e5d1..5167233 100644 --- a/static/html/test2.html +++ b/templates/boiler/test2.html @@ -1,22 +1,22 @@ - - - - - Two structured audio properties - - - - - - - - - - - - -

Audio property with type declaration as structured property.

- + + + + + Two structured audio properties + + + + + + + + + + + + +

Audio property with type declaration as structured property.

+ \ No newline at end of file diff --git a/static/html/tos.html b/templates/boiler/tos.html similarity index 100% rename from static/html/tos.html rename to templates/boiler/tos.html diff --git a/templates/views/HeaderView.html b/templates/views/HeaderView.html index ff81596..f936eb0 100644 --- a/templates/views/HeaderView.html +++ b/templates/views/HeaderView.html @@ -12,10 +12,10 @@
  • Releases
  • Events
    • {% if user.is_authenticated %} -
  • Logout  +
  • Logout 
    • {% else %} -
  • Login/Signup Login/Signup 
    • {% endif %}