aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFélix Sipma <gueux@gueux.org>2013-06-16 12:19:02 +0200
committerFélix Sipma <gueux@gueux.org>2013-06-16 12:19:02 +0200
commita54c66487ed370c257437bca3002fee8510f0023 (patch)
treeadf68c196b885552086a4384b94f63324ba88dc1
parent9258ae7c74553793df0eb5196575f4b7e5f68552 (diff)
versions in requirements.txt, upgrade Django to 1.5
-rw-r--r--requirements.txt18
-rw-r--r--videodb/templates/base.html36
-rw-r--r--videodb/templates/videodb/login.html4
-rw-r--r--videodb/templates/videodb/logout.html4
-rw-r--r--videodb/templates/videodb/movie_confirm_delete.html2
-rw-r--r--videodb/templates/videodb/movie_detail.html22
-rw-r--r--videodb/templates/videodb/movie_list.html4
7 files changed, 43 insertions, 47 deletions
diff --git a/requirements.txt b/requirements.txt
index 6805595..842178a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,12 +1,12 @@
-Django
-django-dajax
-South
-sorl-thumbnail
-Pillow
--e git+https://github.com/toastdriven/django-haystack.git#egg=django-haystack
-Whoosh
+Django==1.5.1
+django-dajax==0.9.2
+South==0.8.1
+sorl-thumbnail==11.12
+Pillow==2.0.0
+django-haystack==2.0.0
+Whoosh==2.4.1
# IMDbPY==4.9
-e hg+https://bitbucket.org/alberanid/imdbpy#egg=imdbpy
-pytz
-python-magic
+pytz==2013b
+python-magic==0.4.3
-e git+https://github.com/paltman/pymediainfo#egg=pymediainfo
diff --git a/videodb/templates/base.html b/videodb/templates/base.html
index 2b3cb63..f603223 100644
--- a/videodb/templates/base.html
+++ b/videodb/templates/base.html
@@ -38,14 +38,14 @@
<li class="dropdown">
<a href="#" class="menu" class="dropdown-toggle" data-toggle="dropdown">{% trans "List" %}<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="{% url movie_all %}" class="">{% trans "All" %}</a></li>
- <li><a href="{% url movie_not_seen %}" class=""><i class="icon-eye-close"></i> {% trans "Not seen" %}</a></li>
- <li><a href="{% url movie_latest %}" class="">{% trans "Latest" %}</a></li>
+ <li><a href="{% url "movie_all" %}" class="">{% trans "All" %}</a></li>
+ <li><a href="{% url "movie_not_seen" %}" class=""><i class="icon-eye-close"></i> {% trans "Not seen" %}</a></li>
+ <li><a href="{% url "movie_latest" %}" class="">{% trans "Latest" %}</a></li>
</ul>
</li>
- <li><a href="{% url movie_add %}">{% trans "Add" %}</a></li>
+ <li><a href="{% url "movie_add" %}">{% trans "Add" %}</a></li>
{% else %}
- <li><a href="{% url home %}" class="">{% trans "List" %}</a></li>
+ <li><a href="{% url "home" %}" class="">{% trans "List" %}</a></li>
{% endif %}
{% if user.is_authenticated %}
@@ -53,23 +53,23 @@
<a href="#" class="menu" class="dropdown-toggle" data-toggle="dropdown">{{ user }}<b class="caret"></b></a>
<ul class="dropdown-menu">
{% comment %}
- <li><a href="{% url acct_email %}"><i class="icon-wrench"></i> {% trans "Account settings" %}</a></li>
+ <li><a href="{% url "acct_email" %}"><i class="icon-wrench"></i> {% trans "Account settings" %}</a></li>
{% endcomment %}
- <li><a href="{% url userprofile_detail user.id %}"><i class="icon-user"></i> {% trans "My profile" %}</a></li>
+ <li><a href="{% url "userprofile_detail" user.id %}"><i class="icon-user"></i> {% trans "My profile" %}</a></li>
<li><a href="#"><i class="icon-wrench"></i> {% trans "Account settings" %}</a></li>
{% if user.is_staff %}
<li><a href="/admin/"><i class="icon-cog"></i> {% trans "Admin" %}</a></li>
{% endif %}
<li class="divider"></li>
- <li><a href="{% url django.contrib.auth.views.logout %}?next={{request.path}}"><i class="icon-off"></i> {% trans "Logout" %}</a></li>
+ <li><a href="{% url "django.contrib.auth.views.logout" %}?next={{request.path}}"><i class="icon-off"></i> {% trans "Logout" %}</a></li>
</ul>
</li>
{% else %}
- <li><a href="{% url django.contrib.auth.views.login %}?next={{request.path}}">{% trans "Log In" %}</a></li>
+ <li><a href="{% url "django.contrib.auth.views.login" %}?next={{request.path}}">{% trans "Log In" %}</a></li>
{% comment %}
- <li><a href="{% url login %}">{% trans "Log In" %}</a></li>
+ <li><a href="{% url "login" %}">{% trans "Log In" %}</a></li>
<li><p>{% trans "or" %}</p></li>
- <li><a href="{% url acct_signup %}">{% trans "Sign Up" %}</a></li>
+ <li><a href="{% url "acct_signup" %}">{% trans "Sign Up" %}</a></li>
{% endcomment %}
{% endif %}
@@ -77,15 +77,15 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Forms<b class="caret"></b></a>
<ul class="dropdown-menu">
- <a href="{% url test_bootstrap.views.test_form %}?layout=vertical">Vertical</a>
- <a href="{% url test_bootstrap.views.test_form %}?layout=horizontal">Horizontal</a>
- <a href="{% url test_bootstrap.views.test_form_inline %}?layout=inline">Inline</a>
- <a href="{% url test_bootstrap.views.test_form_inline %}?layout=search">Search</a>
- <a href="{% url test_bootstrap.views.test_form_with_template %}?layout=horizontal">Using template</a>
+ <a href="{% url "test_bootstrap.views.test_form" %}?layout=vertical">Vertical</a>
+ <a href="{% url "test_bootstrap.views.test_form" %}?layout=horizontal">Horizontal</a>
+ <a href="{% url "test_bootstrap.views.test_form_inline" %}?layout=inline">Inline</a>
+ <a href="{% url "test_bootstrap.views.test_form_inline" %}?layout=search">Search</a>
+ <a href="{% url "test_bootstrap.views.test_form_with_template" %}?layout=horizontal">Using template</a>
</ul>
</li>
- <li><a href="{% url tabs %}">Tabs</a></li>
- <li><a href="{% url contact %}">Contact</a></li>
+ <li><a href="{% url "tabs" %}">Tabs</a></li>
+ <li><a href="{% url "contact" %}">Contact</a></li>
{% endcomment %}
</ul>
</div>
diff --git a/videodb/templates/videodb/login.html b/videodb/templates/videodb/login.html
index d20aaa7..f219c30 100644
--- a/videodb/templates/videodb/login.html
+++ b/videodb/templates/videodb/login.html
@@ -1,8 +1,6 @@
{% extends "base.html" %}
{% load i18n %}
-{% load url from future %}
-
{% block head_title %}{% trans "Login" %}{% endblock %}
{% block body_title %}{% trans "Login" %}{% endblock %}
@@ -33,4 +31,4 @@
</fieldset>
</form>
-{% endblock %} \ No newline at end of file
+{% endblock %}
diff --git a/videodb/templates/videodb/logout.html b/videodb/templates/videodb/logout.html
index 8f21da8..c8dd546 100644
--- a/videodb/templates/videodb/logout.html
+++ b/videodb/templates/videodb/logout.html
@@ -1,8 +1,6 @@
{% extends "base.html" %}
{% load i18n %}
-{% load url from future %}
-
{% block head_title %}{% trans "Logout" %}{% endblock %}
{% block body_title %}{% trans "Really logout?" %}{% endblock %}
@@ -17,4 +15,4 @@
</fieldset>
</form>
-{% endblock %} \ No newline at end of file
+{% endblock %}
diff --git a/videodb/templates/videodb/movie_confirm_delete.html b/videodb/templates/videodb/movie_confirm_delete.html
index 30cd254..272c965 100644
--- a/videodb/templates/videodb/movie_confirm_delete.html
+++ b/videodb/templates/videodb/movie_confirm_delete.html
@@ -10,7 +10,7 @@
{% block content %}
- <form class="form-horizontal" enctype="multipart/form-data" method="POST" action="{% url movie_delete object.id %}">{% csrf_token %}
+ <form class="form-horizontal" enctype="multipart/form-data" method="POST" action="{% url "movie_delete" object.id %}">{% csrf_token %}
<fieldset class="form-actions">
<button type="submit" class="btn btn-primary">{% trans "Submit" %}</button>
<button type="reset" class="btn">{% trans "Cancel" %}</button>
diff --git a/videodb/templates/videodb/movie_detail.html b/videodb/templates/videodb/movie_detail.html
index 736b321..4d941ea 100644
--- a/videodb/templates/videodb/movie_detail.html
+++ b/videodb/templates/videodb/movie_detail.html
@@ -99,7 +99,7 @@
<td>{% trans "Directors" %}</td>
<td>
{% for d in movie.director.all %}
- <div><a href='{% url movie_list %}?director__person__pk__iexact={{ d.person.pk }}'>{{ d.person.name }} ({{ d.person.personID }})</a></div>
+ <div><a href='{% url "movie_list" %}?director__person__pk__iexact={{ d.person.pk }}'>{{ d.person.name }} ({{ d.person.personID }})</a></div>
{% for n in d.note.all %}
<div>{{ n.note }}</div>
{% endfor %}
@@ -109,17 +109,17 @@
</tr>
<tr>
<td>{% trans "Rating" %}</td>
- <td><a href='{% url movie_list %}?rating__gte={{ movie.rating }}'>{{ movie.rating }}</a></td>
+ <td><a href='{% url "movie_list" %}?rating__gte={{ movie.rating }}'>{{ movie.rating }}</a></td>
</tr>
<tr>
<td>{% trans "Year" %}</td>
- <td><a href='{% url movie_list %}?year__gte={{ movie.year }}'>{{ movie.year }}</a></td>
+ <td><a href='{% url "movie_list" %}?year__gte={{ movie.year }}'>{{ movie.year }}</a></td>
</tr>
<tr>
<td>{% trans "Writers" %}</td>
<td>
{% for w in movie.writer.all %}
- <div><a href='{% url movie_list %}?writer__pk__iexact={{ w.pk }}'>{{ w.name }} ({{ w.personID }})</a></div>
+ <div><a href='{% url "movie_list" %}?writer__pk__iexact={{ w.pk }}'>{{ w.name }} ({{ w.personID }})</a></div>
{% endfor %}
</td>
</tr>
@@ -127,7 +127,7 @@
<td>{% trans "Production companies" %}</td>
<td>
{% for c in movie.production_company.all %}
- <div><a href='{% url movie_list %}?production_company__pk__iexact={{ c.pk }}'>{{ c.name }} ({{ c.companyID }})</a></div>
+ <div><a href='{% url "movie_list" %}?production_company__pk__iexact={{ c.pk }}'>{{ c.name }} ({{ c.companyID }})</a></div>
{% endfor %}
</td>
</tr>
@@ -135,7 +135,7 @@
<td>{% trans "Languages" %}</td>
<td>
{% for l in movie.language.all %}
- <div><a href='{% url movie_list %}?language__name__iexact={{ l.name }}'>{{ l.name }}</a></div>
+ <div><a href='{% url "movie_list" %}?language__name__iexact={{ l.name }}'>{{ l.name }}</a></div>
{% endfor %}
</td>
</tr>
@@ -143,7 +143,7 @@
<td>{% trans "Countries" %}</td>
<td>
{% for c in movie.country.all %}
- <div><a href='{% url movie_list %}?country__name__iexact={{ c.name }}'>{{ c.name }}</a></div>
+ <div><a href='{% url "movie_list" %}?country__name__iexact={{ c.name }}'>{{ c.name }}</a></div>
{% endfor %}
</td>
</tr>
@@ -151,7 +151,7 @@
<td>{% trans "Genres" %}</td>
<td>
{% for g in movie.genre.all %}
- <div><a href='{% url movie_list %}?genre__name__iexact={{ g.name }}'>{{ g.name }}</a></div>
+ <div><a href='{% url "movie_list" %}?genre__name__iexact={{ g.name }}'>{{ g.name }}</a></div>
{% endfor %}
</td>
</tr>
@@ -160,14 +160,14 @@
<td>
{% for r in movie.runtime.all %}
<div>
- <a href='{% url movie_list %}?runtime__runtime__lte={{ r.runtime }}'>{{ r.runtime }} min</a>{% if r.version %} ({{ r.version }}){% endif %}
+ <a href='{% url "movie_list" %}?runtime__runtime__lte={{ r.runtime }}'>{{ r.runtime }} min</a>{% if r.version %} ({{ r.version }}){% endif %}
</div>
{% endfor %}
</td>
</tr>
<tr>
<td>{% trans "Creation date" %}</td>
- <td><a href='{% url movie_list %}?pub_date__gte={{ movie.pub_date|date:"Y-m-d H:i" }}'>{{ movie.pub_date }}</a></td>
+ <td><a href='{% url "movie_list" %}?pub_date__gte={{ movie.pub_date|date:"Y-m-d H:i" }}'>{{ movie.pub_date }}</a></td>
</tr>
</tbody>
</table>
@@ -265,7 +265,7 @@
<tbody>
{% for a in movie.actor.all %}
<tr>
- <td><a href='{% url movie_list %}?actor__person__pk__iexact={{ a.person.pk }}'>{{ a.person.name }} ({{ a.person.personID }})</a></td>
+ <td><a href='{% url "movie_list" %}?actor__person__pk__iexact={{ a.person.pk }}'>{{ a.person.name }} ({{ a.person.personID }})</a></td>
<td>
{% for c in a.character.all %}
<div>
diff --git a/videodb/templates/videodb/movie_list.html b/videodb/templates/videodb/movie_list.html
index 2388d38..a2c2655 100644
--- a/videodb/templates/videodb/movie_list.html
+++ b/videodb/templates/videodb/movie_list.html
@@ -21,8 +21,8 @@
<a href={{ movie.get_absolute_url }}>{{ movie.title }}
</div>
<div class="list_info">
- [<a href='{% url movie_list %}?year__gte={{ movie.year }}'>{{ movie.year }}</a>;
- {% for d in movie.director.all %}{% if forloop.first %}{% else %}, {% endif %}<a href='{% url movie_list %}?director__person__pk__iexact={{ d.person.pk }}'>{{ d.person.name }}</a>{% endfor %}]
+ [<a href='{% url "movie_list" %}?year__gte={{ movie.year }}'>{{ movie.year }}</a>;
+ {% for d in movie.director.all %}{% if forloop.first %}{% else %}, {% endif %}<a href='{% url "movie_list" %}?director__person__pk__iexact={{ d.person.pk }}'>{{ d.person.name }}</a>{% endfor %}]
</div>
</td>
{% if forloop.counter|divisibleby:5 %}