Merge lp:~salgado/summit/fix-auto-refresh into lp:summit

Proposed by Guilherme Salgado
Status: Merged
Merged at revision: 30
Proposed branch: lp:~salgado/summit/fix-auto-refresh
Merge into: lp:summit
Prerequisite: lp:~salgado/summit/linaro-only-daily-schedule
Diff against target: 29 lines (+1/-3)
2 files modified
summit/schedule/templates/schedule/schedule.html (+1/-2)
summit/templates/base.html (+0/-1)
To merge this branch: bzr merge lp:~salgado/summit/fix-auto-refresh
Reviewer Review Type Date Requested Status
Dave Walker (community) Approve
Review via email: mp+36437@code.launchpad.net

Description of the change

Fix the auto-refresh of the daily schedule page, which was broken during the migration to the new theme.

Oh, and I removed the body_extra block from base.html because it's misleading and not used anywhere.

To post a comment you must log in.
Revision history for this message
Dave Walker (davewalker) wrote :

Good catch! Merging, thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/schedule/templates/schedule/schedule.html'
2--- summit/schedule/templates/schedule/schedule.html 2010-03-05 10:33:36 +0000
3+++ summit/schedule/templates/schedule/schedule.html 2010-09-23 13:23:03 +0000
4@@ -85,12 +85,11 @@
5 var timeoutPeriod = 5*60*1000; // 5 minutes
6 setTimeout("location.reload(true);", timeoutPeriod);
7 }
8+ window.onload = timedRefresh;
9 </script>
10 {% endif %}
11 {% endblock %}
12
13-{% block body_extra %}{% if schedule.nextonly or autoreload %} onload="javascript:timedRefresh();"{% endif %}{% endblock %}
14-
15 {% block content %}
16 {% if schedule.edit %}
17 {% else %}
18
19=== modified file 'summit/templates/base.html'
20--- summit/templates/base.html 2010-09-20 20:07:24 +0000
21+++ summit/templates/base.html 2010-09-23 13:23:03 +0000
22@@ -40,7 +40,6 @@
23 {% endblock %}
24
25 {% block content %}
26-{% block body_extra %}{% endblock %}
27 {% endblock %}
28
29 {% block general %}

Subscribers

People subscribed via source and target branches