mirror of
https://github.com/fergalmoran/dss.git
synced 2026-01-02 23:13:58 +00:00
Upgraded to django 1.5.1
This commit is contained in:
Fergal Moran
13
dss/urls.py
13
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')),
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
{% block content %}
|
||||
<h1>{% trans "Signed Out" %}</h1>
|
||||
<p>{% trans "You have signed out." %}</p>
|
||||
|
||||
{% if user.is_authenticated %}
|
||||
<h1>Authenticated</h1>
|
||||
{% else %}
|
||||
@@ -12,11 +13,9 @@
|
||||
|
||||
{% endblock %}
|
||||
{% block footerscripts %}
|
||||
<!--
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function () {
|
||||
//window.location.href="/";
|
||||
window.location.href="/";
|
||||
});
|
||||
-->
|
||||
</script>
|
||||
{% endblock %}
|
||||
@@ -1,4 +1,4 @@
|
||||
User-agent: *
|
||||
Disallow:
|
||||
Disallow: /media/
|
||||
Disallow: /ajax/
|
||||
User-agent: *
|
||||
Disallow:
|
||||
Disallow: /media/
|
||||
Disallow: /ajax/
|
||||
@@ -1,22 +1,22 @@
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head prefix="og: http://ogp.me/ns#">
|
||||
<meta charset="utf-8">
|
||||
<title>Two structured audio properties</title>
|
||||
<meta property="og:title" content='Brawther "back to basics"'>
|
||||
<meta property="og:site_name" content="Deep South Sounds">
|
||||
<meta property="og:type" content="audio.song">
|
||||
<meta property="og:url" content="http://examples.opengraphprotocol.us/audio-array.html">
|
||||
<meta property="og:image"
|
||||
content="http://ext-test.deepsouthsounds.com:8000/media/mix-images/Deepsouthsounds/brawther.jpg">
|
||||
<meta property="og:image:width" content="50">
|
||||
<meta property="og:image:height" content="50">
|
||||
<meta property="og:image:type" content="image/png">
|
||||
<meta property="og:audio"
|
||||
content="http://ext-test.deepsouthsounds.com:8000/media/mixes/Deepsouthsounds/Brawther - BackToBasics Podcast 01.mp3">
|
||||
<meta property="og:audio:type" content="audio/mpeg">
|
||||
</head>
|
||||
<body>
|
||||
<p>Audio property with type declaration as structured property.</p>
|
||||
</body>
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head prefix="og: http://ogp.me/ns#">
|
||||
<meta charset="utf-8">
|
||||
<title>Two structured audio properties</title>
|
||||
<meta property="og:title" content='Brawther "back to basics"'>
|
||||
<meta property="og:site_name" content="Deep South Sounds">
|
||||
<meta property="og:type" content="audio.song">
|
||||
<meta property="og:url" content="http://examples.opengraphprotocol.us/audio-array.html">
|
||||
<meta property="og:image"
|
||||
content="http://ext-test.deepsouthsounds.com:8000/media/mix-images/Deepsouthsounds/brawther.jpg">
|
||||
<meta property="og:image:width" content="50">
|
||||
<meta property="og:image:height" content="50">
|
||||
<meta property="og:image:type" content="image/png">
|
||||
<meta property="og:audio"
|
||||
content="http://ext-test.deepsouthsounds.com:8000/media/mixes/Deepsouthsounds/Brawther - BackToBasics Podcast 01.mp3">
|
||||
<meta property="og:audio:type" content="audio/mpeg">
|
||||
</head>
|
||||
<body>
|
||||
<p>Audio property with type declaration as structured property.</p>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,22 +1,22 @@
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head prefix="og: http://ogp.me/ns#">
|
||||
<meta charset="utf-8">
|
||||
<title>Two structured audio properties</title>
|
||||
<meta property="og:title" content='Brawther "back to basics"'>
|
||||
<meta property="og:site_name" content="Deep South Sounds">
|
||||
<meta property="og:type" content="audio.song">
|
||||
<meta property="og:url" content="http://ext-test.deepsouthsounds.com:8000/static/html/test1.html">
|
||||
<meta property="og:image"
|
||||
content="http://ext-test.deepsouthsounds.com:8000/media/mix-images/Deepsouthsounds/brawther.jpg">
|
||||
<meta property="og:image:width" content="50">
|
||||
<meta property="og:image:height" content="50">
|
||||
<meta property="og:image:type" content="image/png">
|
||||
<meta property="og:audio"
|
||||
content="http://ext-test.deepsouthsounds.com:8000/media/mixes/Deepsouthsounds/Brawther - BackToBasics Podcast 01.mp3">
|
||||
<meta property="og:audio:type" content="audio/mpeg">
|
||||
</head>
|
||||
<body>
|
||||
<p>Audio property with type declaration as structured property.</p>
|
||||
</body>
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head prefix="og: http://ogp.me/ns#">
|
||||
<meta charset="utf-8">
|
||||
<title>Two structured audio properties</title>
|
||||
<meta property="og:title" content='Brawther "back to basics"'>
|
||||
<meta property="og:site_name" content="Deep South Sounds">
|
||||
<meta property="og:type" content="audio.song">
|
||||
<meta property="og:url" content="http://ext-test.deepsouthsounds.com:8000/static/html/test1.html">
|
||||
<meta property="og:image"
|
||||
content="http://ext-test.deepsouthsounds.com:8000/media/mix-images/Deepsouthsounds/brawther.jpg">
|
||||
<meta property="og:image:width" content="50">
|
||||
<meta property="og:image:height" content="50">
|
||||
<meta property="og:image:type" content="image/png">
|
||||
<meta property="og:audio"
|
||||
content="http://ext-test.deepsouthsounds.com:8000/media/mixes/Deepsouthsounds/Brawther - BackToBasics Podcast 01.mp3">
|
||||
<meta property="og:audio:type" content="audio/mpeg">
|
||||
</head>
|
||||
<body>
|
||||
<p>Audio property with type declaration as structured property.</p>
|
||||
</body>
|
||||
</html>
|
||||
@@ -12,10 +12,10 @@
|
||||
<li><a href="/releases">Releases</a></li>
|
||||
<li><a href="/events">Events</a></li>
|
||||
{% if user.is_authenticated %}
|
||||
<li><a class="no-click" href="{% url account_logout %}" id="logout">Logout <i class="icon-eject icon-black"></i></a>
|
||||
<li><a class="no-click" href="{% url "account_logout" %}" id="logout">Logout <i class="icon-eject icon-black"></i></a>
|
||||
</li>
|
||||
{% else %}
|
||||
<li><a href="{% url account_login %}" class="no-click" id="login">Login/Signup <i
|
||||
<li><a href="{% url "account_login" %}" class="no-click" id="login">Login/Signup <i
|
||||
class="icon-music icon-black"></i></a></li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
|
||||
Reference in New Issue
Block a user