Helipad

Merge lp:~cjohnston/helipad/gfx-remove-future-urls into lp:helipad/graphics

  1. gfx-remove-future-urls
  2. Merge into graphics
Proposed by Chris Johnston
Status: Merged
Approved by: Francis Ginther
Approved revision: 35
Merged at revision: 35
Proposed branch: lp:~cjohnston/helipad/gfx-remove-future-urls
Merge into: lp:helipad/graphics
Diff against target: 54 lines (+0/-8)
4 files modified
templates/graphics/graphics_layout.html (+0/-4)
templates/graphics/guitoolkits.html (+0/-1)
templates/graphics/nexuiz.html (+0/-1)
templates/graphics/openarena.html (+0/-2)
To merge this branch: bzr merge lp:~cjohnston/helipad/gfx-remove-future-urls
Reviewer Review Type Date Requested Status
Francis Ginther Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+190521@code.launchpad.net

Commit message

Remove future proofing required prior to the Django 1.5 switch

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:35
http://10.97.0.26:8080/job/helipad-graphics-ci/41/
Executed test runs:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/helipad-graphics-ci/41/rebuild

review: Approve (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Approve.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/graphics/graphics_layout.html'
2--- templates/graphics/graphics_layout.html 2013-09-23 13:28:57 +0000
3+++ templates/graphics/graphics_layout.html 2013-10-11 02:49:47 +0000
4@@ -1,9 +1,6 @@
5 {% extends "layout.html" %}
6-{% load url from future %}
7
8 {% load staticfiles %}
9-{% load url from future %}
10-
11
12 {% block extra_headers %}
13 <link href='http://6df403e3d98e2ac67ac2-180150c581869d2c4c18db9c9e3179c4.r40.cf1.rackcdn.com/nv.d3.css' rel='stylesheet' type='text/css' / >
14@@ -13,7 +10,6 @@
15 <link href='{% static "graphics/css/phoronix.css" %}' rel='stylesheet' type='text/css' />
16 {% endblock %}
17
18-
19 {% block sub_nav_links %}
20 <li {% ifequal url.1 'openarena' %}class="active"{% endifequal %}><a class="sub-nav-item" href='{% url "openarena" %}'>openarena</a></li>
21 <li {% ifequal url.1 'guitoolkits' %}class="active"{% endifequal %}><a class="sub-nav-item" href='{% url "guitoolkits" %}'>gui-toolkits</a></li>
22
23=== modified file 'templates/graphics/guitoolkits.html'
24--- templates/graphics/guitoolkits.html 2013-09-27 14:48:51 +0000
25+++ templates/graphics/guitoolkits.html 2013-10-11 02:49:47 +0000
26@@ -1,6 +1,5 @@
27 {% extends "graphics/graphics_layout.html" %}
28 {% load dashboard_extras staticfiles %}
29-{% load url from future %}
30
31 {% block page_name %}Gui-Toolkit graphics benchmarking for xmir{% endblock %}
32
33
34=== modified file 'templates/graphics/nexuiz.html'
35--- templates/graphics/nexuiz.html 2013-09-24 15:17:57 +0000
36+++ templates/graphics/nexuiz.html 2013-10-11 02:49:47 +0000
37@@ -1,6 +1,5 @@
38 {% extends "graphics/graphics_layout.html" %}
39 {% load dashboard_extras staticfiles %}
40-{% load url from future %}
41
42 {% block page_name %}Nexuiz graphics benchmarking for xmir{% endblock %}
43
44
45=== modified file 'templates/graphics/openarena.html'
46--- templates/graphics/openarena.html 2013-10-07 14:01:30 +0000
47+++ templates/graphics/openarena.html 2013-10-11 02:49:47 +0000
48@@ -1,7 +1,5 @@
49 {% extends "graphics/graphics_layout.html" %}
50 {% load dashboard_extras staticfiles %}
51-{% load url from future %}
52-
53
54 {% block page_name %}Openarena graphics benchmarking for xmir{% endblock %}
55

Subscribers

People subscribed via source and target branches

to all changes: