Helipad

Merge lp:~cjohnston/helipad/graphics-1-5-urls into lp:helipad/graphics

  1. graphics-1-5-urls
  2. Merge into graphics
Proposed by Chris Johnston
Status: Merged
Approved by: Francis Ginther
Approved revision: 27
Merged at revision: 27
Proposed branch: lp:~cjohnston/helipad/graphics-1-5-urls
Merge into: lp:helipad/graphics
Diff against target: 121 lines (+31/-27)
4 files modified
templates/graphics/graphics_layout.html (+4/-3)
templates/graphics/guitoolkits.html (+16/-15)
templates/graphics/nexuiz.html (+6/-5)
templates/graphics/openarena.html (+5/-4)
To merge this branch: bzr merge lp:~cjohnston/helipad/graphics-1-5-urls
Reviewer Review Type Date Requested Status
Francis Ginther Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+184145@code.launchpad.net

Commit message

Add future support to URLs for Django 1.5

Description of the change

To prepare for a switch to Django 1.5 we need to 'future proof' the URLs..

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

PASSED: Continuous integration, rev:27
http://s-jenkins:8080/job/helipad-graphics-ci/20/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/helipad-graphics-ci/20/rebuild

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

Verified that all urls are moved to the new format as documented here:
https://docs.djangoproject.com/en/dev/releases/1.5/

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-08-16 18:53:01 +0000
3+++ templates/graphics/graphics_layout.html 2013-09-05 17:01:30 +0000
4@@ -1,4 +1,5 @@
5 {% extends "layout.html" %}
6+{% load url from future %}
7
8 {% load staticfiles %}
9
10@@ -12,7 +13,7 @@
11
12
13 {% block sub_nav_links %}
14-<li {% ifequal url.1 'openarena' %}class="active"{% endifequal %}><a class="sub-nav-item" href='{% url openarena %}'>openarena</a></li>
15-<li {% ifequal url.1 'guitoolkits' %}class="active"{% endifequal %}><a class="sub-nav-item" href='{% url guitoolkits %}'>gui-toolkits</a></li>
16-<li {% ifequal url.1 'nexuiz' %}class="active"{% endifequal %}><a class="sub-nav-item" href='{% url nexuiz %}'>nexuiz</a></li>
17+<li {% ifequal url.1 'openarena' %}class="active"{% endifequal %}><a class="sub-nav-item" href='{% url "openarena" %}'>openarena</a></li>
18+<li {% ifequal url.1 'guitoolkits' %}class="active"{% endifequal %}><a class="sub-nav-item" href='{% url "guitoolkits" %}'>gui-toolkits</a></li>
19+<li {% ifequal url.1 'nexuiz' %}class="active"{% endifequal %}><a class="sub-nav-item" href='{% url "nexuiz" %}'>nexuiz</a></li>
20 {% endblock %}
21
22=== modified file 'templates/graphics/guitoolkits.html'
23--- templates/graphics/guitoolkits.html 2013-08-22 19:24:53 +0000
24+++ templates/graphics/guitoolkits.html 2013-09-05 17:01:30 +0000
25@@ -1,5 +1,6 @@
26 {% extends "graphics/graphics_layout.html" %}
27 {% load dashboard_extras staticfiles %}
28+{% load url from future %}
29
30 {% block page_name %}Gui-Toolkit graphics benchmarking for xmir{% endblock %}
31
32@@ -7,21 +8,21 @@
33 <div class='grid_15'>
34 <script>
35 gtk_charts= [
36- ["{% url graphics_api_result_filter_resolution 'Scaling' 'ps-intel' '1024x768' %}", 'chart_intel_qgear_scale'],
37- ["{% url graphics_api_result_filter_resolution ' + Gears' 'ps-intel' '1024x768' %}", 'chart_intel_qgear_gears'],
38- ["{% url graphics_api_result_filter_resolution 'GtkComboBox' 'ps-intel' '1024x768' %}", 'chart_intel_gtk_combo_box'],
39- ["{% url graphics_api_result_filter_resolution 'Pixbufs' 'ps-intel' '1024x768' %}", 'chart_intel_gtk_pixbufs'],
40- ["{% url graphics_api_result_filter_resolution 'GtkRadioButton' 'ps-intel' '1024x768' %}", 'chart_intel_gtk_radio_button'],
41- ["{% url graphics_api_result_filter_resolution 'Scaling' 'ps-radeon' '1024x768' %}", 'chart_radeon_qgear_scale'],
42- ["{% url graphics_api_result_filter_resolution ' + Gears' 'ps-radeon' '1024x768' %}", 'chart_radeon_qgear_gears'],
43- ["{% url graphics_api_result_filter_resolution 'GtkComboBox' 'ps-radeon' '1024x768' %}", 'chart_radeon_gtk_combo_box'],
44- ["{% url graphics_api_result_filter_resolution 'Pixbufs' 'ps-radeon' '1024x768' %}", 'chart_radeon_gtk_pixbufs'],
45- ["{% url graphics_api_result_filter_resolution 'GtkRadioButton' 'ps-radeon' '1024x768' %}", 'chart_radeon_gtk_radio_button'],
46- ["{% url graphics_api_result_filter_resolution 'Scaling' 'ps-nvidia' '1024x768' %}", 'chart_nvidia_qgear_scale'],
47- ["{% url graphics_api_result_filter_resolution ' + Gears' 'ps-nvidia' '1024x768' %}", 'chart_nvidia_qgear_gears'],
48- ["{% url graphics_api_result_filter_resolution 'GtkComboBox' 'ps-nvidia' '1024x768' %}", 'chart_nvidia_gtk_combo_box'],
49- ["{% url graphics_api_result_filter_resolution 'Pixbufs' 'ps-nvidia' '1024x768' %}", 'chart_nvidia_gtk_pixbufs'],
50- ["{% url graphics_api_result_filter_resolution 'GtkRadioButton' 'ps-nvidia' '1024x768' %}", 'chart_nvidia_gtk_radio_button']]
51+ ["{% url "graphics_api_result_filter_resolution" 'Scaling' 'ps-intel' '1024x768' %}", 'chart_intel_qgear_scale'],
52+ ["{% url "graphics_api_result_filter_resolution" ' + Gears' 'ps-intel' '1024x768' %}", 'chart_intel_qgear_gears'],
53+ ["{% url "graphics_api_result_filter_resolution" 'GtkComboBox' 'ps-intel' '1024x768' %}", 'chart_intel_gtk_combo_box'],
54+ ["{% url "graphics_api_result_filter_resolution" 'Pixbufs' 'ps-intel' '1024x768' %}", 'chart_intel_gtk_pixbufs'],
55+ ["{% url "graphics_api_result_filter_resolution" 'GtkRadioButton' 'ps-intel' '1024x768' %}", 'chart_intel_gtk_radio_button'],
56+ ["{% url "graphics_api_result_filter_resolution" 'Scaling' 'ps-radeon' '1024x768' %}", 'chart_radeon_qgear_scale'],
57+ ["{% url "graphics_api_result_filter_resolution" ' + Gears' 'ps-radeon' '1024x768' %}", 'chart_radeon_qgear_gears'],
58+ ["{% url "graphics_api_result_filter_resolution" 'GtkComboBox' 'ps-radeon' '1024x768' %}", 'chart_radeon_gtk_combo_box'],
59+ ["{% url "graphics_api_result_filter_resolution" 'Pixbufs' 'ps-radeon' '1024x768' %}", 'chart_radeon_gtk_pixbufs'],
60+ ["{% url "graphics_api_result_filter_resolution" 'GtkRadioButton' 'ps-radeon' '1024x768' %}", 'chart_radeon_gtk_radio_button'],
61+ ["{% url "graphics_api_result_filter_resolution" 'Scaling' 'ps-nvidia' '1024x768' %}", 'chart_nvidia_qgear_scale'],
62+ ["{% url "graphics_api_result_filter_resolution" ' + Gears' 'ps-nvidia' '1024x768' %}", 'chart_nvidia_qgear_gears'],
63+ ["{% url "graphics_api_result_filter_resolution" 'GtkComboBox' 'ps-nvidia' '1024x768' %}", 'chart_nvidia_gtk_combo_box'],
64+ ["{% url "graphics_api_result_filter_resolution" 'Pixbufs' 'ps-nvidia' '1024x768' %}", 'chart_nvidia_gtk_pixbufs'],
65+ ["{% url "graphics_api_result_filter_resolution" 'GtkRadioButton' 'ps-nvidia' '1024x768' %}", 'chart_nvidia_gtk_radio_button']]
66
67 for(var gtk_chart in gtk_charts){
68 create_phoronix_chart(gtk_charts[gtk_chart][0], gtk_charts[gtk_chart][1])
69
70=== modified file 'templates/graphics/nexuiz.html'
71--- templates/graphics/nexuiz.html 2013-08-26 14:27:20 +0000
72+++ templates/graphics/nexuiz.html 2013-09-05 17:01:30 +0000
73@@ -1,5 +1,6 @@
74 {% extends "graphics/graphics_layout.html" %}
75 {% load dashboard_extras staticfiles %}
76+{% load url from future %}
77
78 {% block page_name %}Nexuiz graphics benchmarking for xmir{% endblock %}
79
80@@ -7,11 +8,11 @@
81 <div class='grid_15'>
82 <script>
83 benchmark_charts= [
84- ["{% url graphics_api_result_filter_resolution 'Nexuiz-Resolution: 1024 x 768 - HDR: Yes' 'ps-' '1024x768' %}", 'chart_all_400'],
85- ["{% url graphics_api_result_filter_resolution 'Nexuiz-Resolution: 1024 x 768 - HDR: No' 'ps-' '1024x768' %}", 'chart2_all_400'],
86- ["{% url graphics_api_result_filter_resolution 'Nexuiz-Resolution: 1024 x 768' 'ps-intel' '1024x768' %}", 'chart_intel_400'],
87- ['{% url graphics_api_result_filter_resolution "Nexuiz-Resolution: 1024 x 768" "ps-radeon" "1024x768" %}', 'chart_radeon_400'],
88- ['{% url graphics_api_result_filter_resolution "Nexuiz-Resolution: 1024 x 768" "ps-nvidia" "1024x768" %}', 'chart_nvidia_400'],
89+ ["{% url "graphics_api_result_filter_resolution" 'Nexuiz-Resolution: 1024 x 768 - HDR: Yes' 'ps-' '1024x768' %}", 'chart_all_400'],
90+ ["{% url "graphics_api_result_filter_resolution" 'Nexuiz-Resolution: 1024 x 768 - HDR: No' 'ps-' '1024x768' %}", 'chart2_all_400'],
91+ ["{% url "graphics_api_result_filter_resolution" 'Nexuiz-Resolution: 1024 x 768' 'ps-intel' '1024x768' %}", 'chart_intel_400'],
92+ ['{% url "graphics_api_result_filter_resolution" "Nexuiz-Resolution: 1024 x 768" "ps-radeon" "1024x768" %}', 'chart_radeon_400'],
93+ ['{% url "graphics_api_result_filter_resolution" "Nexuiz-Resolution: 1024 x 768" "ps-nvidia" "1024x768" %}', 'chart_nvidia_400'],
94 ]
95
96 for(var benchmark_chart in benchmark_charts){
97
98=== modified file 'templates/graphics/openarena.html'
99--- templates/graphics/openarena.html 2013-08-22 19:24:53 +0000
100+++ templates/graphics/openarena.html 2013-09-05 17:01:30 +0000
101@@ -1,15 +1,16 @@
102 {% extends "graphics/graphics_layout.html" %}
103 {% load dashboard_extras staticfiles %}
104+{% load url from future %}
105
106 {% block page_name %}Openarena graphics benchmarking for xmir{% endblock %}
107
108 {% block content %}
109 <div class='grid_15'>
110 <script>
111- oa_charts= [['{% url graphics_api_result_filter_resolution "openarena" "ps" "1024x768" %}', 'chart_all_400'],
112- ['{% url graphics_api_result_filter_resolution "openarena" "ps-intel" "1024x768" %}', 'chart_intel'],
113- ['{% url graphics_api_result_filter_resolution "openarena" "ps-radeon" "1024x768" %}', 'chart_radeon'],
114- ['{% url graphics_api_result_filter_resolution "openarena" "ps-nvidia" "1024x768" %}', 'chart_nvidia']]
115+ oa_charts= [['{% url "graphics_api_result_filter_resolution" "openarena" "ps" "1024x768" %}', 'chart_all_400'],
116+ ['{% url "graphics_api_result_filter_resolution" "openarena" "ps-intel" "1024x768" %}', 'chart_intel'],
117+ ['{% url "graphics_api_result_filter_resolution" "openarena" "ps-radeon" "1024x768" %}', 'chart_radeon'],
118+ ['{% url "graphics_api_result_filter_resolution" "openarena" "ps-nvidia" "1024x768" %}', 'chart_nvidia']]
119
120 for(var oa_chart in oa_charts){
121 create_phoronix_chart(oa_charts[oa_chart][0], oa_charts[oa_chart][1])

Subscribers

People subscribed via source and target branches

to all changes: