Permalink
Browse files

Fix Bug 822364: Remove old URLs from urlconfs.

  • Loading branch information...
Osmose committed Jan 8, 2013
1 parent 07cd081 commit d5b67e21056c4f2db4cd8b497799b71bd85732b8
Showing with 8 additions and 22 deletions.
  1. +7 −7 flicks/base/templates/base.html
  2. +1 −1 flicks/base/templates/home.html
  3. +0 −6 flicks/base/urls.py
  4. +0 −4 flicks/urls.py
  5. +0 −4 flicks/videos/urls.py
@@ -23,7 +23,7 @@
<!--[if lt IE 9]>
<script src="{{ MEDIA_URL }}js/libs/html5.js"></script>
<![endif]-->
-
+
<link rel="stylesheet" media="all" type="text/css" href="//www.mozilla.org/tabzilla/media/css/tabzilla.css">
{% block site_css %}
@@ -55,7 +55,7 @@
data-token="{{ csrf_token }}"
{% block body_data %}{% endblock %}>
<div id="page">
-
+
{% include "shared/header.html" %}
<div class="content-wrapper">
@@ -67,15 +67,15 @@
{% block footer %}
<footer id="footer">
<div class="wrap">
-
+
<aside class="sponsors">
<h4>Our Sponsors</h4>
<ul>
<li><a href="http://vimeo.com" rel="external"><img src="/media/img/sponsors/sponsor-vimeo.png" alt="Vimeo" width="100" height="30"></a></li>
<li><a href="http://panavision.com" rel="external"><img src="/media/img/sponsors/sponsor-panavision.png" alt="Panavision" width="100" height="52"></a></li>
</ul>
</aside>
-
+
<div class="util">
<nav id="nav-social-foot" class="nav-social">
<h4>{{ _('Share Firefox Flicks') }}</h4>
@@ -85,18 +85,18 @@ <h4>{{ _('Share Firefox Flicks') }}</h4>
<li><a href="http://twitter.com/firefoxflicks" title="Twitter" class="twitter">Twitter</a></li>
</ul>
</nav>
-
+
<aside class="firefoxos">
<h4>{{ _('Learn about Firefox OS') }}</h4>
<p><a href="http://www.mozilla.org/firefoxos/">{{ _('Firefox OS') }}</a></p>
</aside>
</div>
-
+
<nav id="nav-fineprint">
<ul>
<li><a href="http://www.mozilla.org/en-US/privacy-policy.html">{{ _('Privacy Policy') }}</a></li>
<li><a href="http://www.mozilla.org/about/legal.html">{{ _('Legal') }}</a></li>
- <li><a href="{{ url('flicks.base.partners') }}">{{ _('Partners') }}</a></li>
+ <li><a href="#">{{ _('Partners') }}</a></li>
<li><a href="#">{{ _('Other Languages') }}</a></li>
</ul>
</nav>
@@ -105,7 +105,7 @@ <h3>
and get answers to all your other questions.
{% endtrans %}
</p>
- <p><a href="{{ url('flicks.base.faq') }}" class="button">{{ _('Read the FAQ') }}</a></p>
+ <p><a href="#" class="button">{{ _('Read the FAQ') }}</a></p>
</div>
</div>
View
@@ -4,10 +4,4 @@
urlpatterns = patterns('',
url(r'^/?$', views.home, name='flicks.base.home'),
- url(r'^creative/?$', views.creative, name='flicks.base.creative'),
- url(r'^faq/?$', views.faq, name='flicks.base.faq'),
- url(r'^judges/?$', views.judges, name='flicks.base.judges'),
- url(r'^partners/?$', views.partners, name='flicks.base.partners'),
- url(r'^prizes/?$', views.prizes, name='flicks.base.prizes'),
- url(r'^rules/?$', views.rules, name='flicks.base.rules'),
)
View
@@ -28,10 +28,6 @@ def error_page(request, template, status=None):
urlpatterns = patterns('',
url(r'', include('flicks.base.urls')),
url(r'', include('flicks.videos.urls')),
- url(r'^users/', include('flicks.users.urls')),
-
- url(r'^logout$', 'django.contrib.auth.views.logout', {'next_page': '/'},
- name='logout'),
url(r'^admin/', include(admin.site.urls)),
)
View
@@ -3,12 +3,8 @@
from flicks.videos import views
urlpatterns = patterns('',
- url(r'^winners/?$', views.winners, name='flicks.videos.winners'),
- url(r'^recent/?$', views.recent, name='flicks.videos.recent'),
url(r'^video/(?P<video_id>\d+)$', views.details,
name='flicks.videos.details'),
- url(r'^add_view/?$', views.ajax_add_view,
- name='flicks.videos.add_view'),
url(r'^video/noir/$', views.promo_video_noir,
name='flicks.videos.promo_video_noir'),
url(r'^video/dance/$', views.promo_video_dance,

0 comments on commit d5b67e2

Please sign in to comment.