Summit

Merge lp:~cjohnston/summit/921179 into lp:summit

  1. 921179
  2. Merge into trunk
Proposed by Chris Johnston
Status: Superseded
Proposed branch: lp:~cjohnston/summit/921179
Merge into: lp:summit
Prerequisite: lp:~dooferlad/summit/wide_view_auto_refresh_always
Diff against target: 19 lines (+2/-0)
1 file modified
summit/schedule/templates/schedule/schedule.html (+2/-0)
To merge this branch: bzr merge lp:~cjohnston/summit/921179
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+102399@code.launchpad.net

This proposal supersedes a proposal from 2012-04-17.

This proposal has been superseded by a proposal from 2012-04-18.

Commit message

Sets autorefresh unless schedule.edit

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) :
review: Approve
Revision history for this message
Tarmac WebDev (tarmac-webdev) wrote :

Attempt to merge into lp:summit failed due to conflicts:

text conflict in summit/schedule/templates/schedule/schedule.html

Revision history for this message
Chris Johnston (cjohnston) :
review: Approve
Revision history for this message
Tarmac WebDev (tarmac-webdev) wrote :

No proposals found for merge of lp:~dooferlad/summit/wide_view_auto_refresh_always into lp:summit.

Unmerged revisions

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 2012-04-17 22:30:41 +0000
3+++ summit/schedule/templates/schedule/schedule.html 2012-04-18 14:18:20 +0000
4@@ -16,6 +16,7 @@
5 <script language="JavaScript" src="/media/schedule/schedule.js"></script>
6 {% endif %}
7
8+{% if not schedule.edit %}
9 <script language="JavaScript">
10
11 function timedRefresh()
12@@ -25,6 +26,7 @@
13 }
14 window.onload = timedRefresh;
15 </script>
16+{% endif %}
17
18 <script type="text/javascript">
19 function updateTimer() {

Subscribers

People subscribed via source and target branches