charmworld

Merge lp:~rharding/charmworld/refresh-heartbeat into lp:charmworld

  1. refresh-heartbeat
  2. Merge into trunk
Proposed by Richard Harding
Status: Merged
Approved by: Richard Harding
Approved revision: 450
Merged at revision: 449
Proposed branch: lp:~rharding/charmworld/refresh-heartbeat
Merge into: lp:charmworld
Diff against target: 23 lines (+5/-0)
2 files modified
charmworld/templates/heartbeat.pt (+4/-0)
charmworld/templates/main.pt (+1/-0)
To merge this branch: bzr merge lp:~rharding/charmworld/refresh-heartbeat
Reviewer Review Type Date Requested Status
Juju Gui Bot continuous-integration Approve
Charmworld Developers Pending
Review via email: mp+194263@code.launchpad.net

Commit message

I'm sick of hitting refresh to watch the queue.

https://codereview.appspot.com/22600043/

R=

Description of the change

I'm sick of hitting refresh to watch the queue.

https://codereview.appspot.com/22600043/

To post a comment you must log in.
Revision history for this message
Richard Harding (rharding) wrote :

Reviewers: mp+194263_code.launchpad.net,

Message:
Please take a look.

Description:
I'm sick of hitting refresh to watch the queue.

https://code.launchpad.net/~rharding/charmworld/refresh-heartbeat/+merge/194263

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/22600043/

Affected files (+7, -0 lines):
   A [revision details]
   M charmworld/templates/heartbeat.pt
   M charmworld/templates/main.pt

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20131106211543-mdy7zo9iywzec4mm
+New revision: <email address hidden>

Index: charmworld/templates/heartbeat.pt
=== modified file 'charmworld/templates/heartbeat.pt'
--- charmworld/templates/heartbeat.pt 2013-07-23 20:53:16 +0000
+++ charmworld/templates/heartbeat.pt 2013-11-07 00:08:32 +0000
@@ -1,4 +1,8 @@
  <html tal:define="main load: main.pt"
metal:use-macro="main.macros['page']">
+<metal:block fill-slot="head_include">
+ <META HTTP-EQUIV="REFRESH" CONTENT="20">
+</metal:block>
+
  <metal:block fill-slot="css_include">
      <style type="text/css">
          .checks th {

Index: charmworld/templates/main.pt
=== modified file 'charmworld/templates/main.pt'
--- charmworld/templates/main.pt 2013-10-10 15:24:30 +0000
+++ charmworld/templates/main.pt 2013-11-07 00:08:32 +0000
@@ -22,6 +22,7 @@
      <script type="text/javascript"

src="${request.scheme}://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js">
      </script>
+ <metal:block metal:define-slot="head_include"></metal:block>
      <metal:block metal:define-slot="js_include"></metal:block>
      <metal:block metal:define-slot="css_include"></metal:block>

lp:~rharding/charmworld/refresh-heartbeat updated
450. By Richard Harding

Find have a /

Revision history for this message
Richard Harding (rharding) wrote :

self reviewing trivial LGTM

https://codereview.appspot.com/22600043/

Revision history for this message
Juju Gui Bot (juju-gui-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmworld/templates/heartbeat.pt'
2--- charmworld/templates/heartbeat.pt 2013-07-23 20:53:16 +0000
3+++ charmworld/templates/heartbeat.pt 2013-11-07 00:18:52 +0000
4@@ -1,4 +1,8 @@
5 <html tal:define="main load: main.pt" metal:use-macro="main.macros['page']">
6+<metal:block fill-slot="head_include">
7+ <META HTTP-EQUIV="REFRESH" CONTENT="20"/>
8+</metal:block>
9+
10 <metal:block fill-slot="css_include">
11 <style type="text/css">
12 .checks th {
13
14=== modified file 'charmworld/templates/main.pt'
15--- charmworld/templates/main.pt 2013-10-10 15:24:30 +0000
16+++ charmworld/templates/main.pt 2013-11-07 00:18:52 +0000
17@@ -22,6 +22,7 @@
18 <script type="text/javascript"
19 src="${request.scheme}://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js">
20 </script>
21+ <metal:block metal:define-slot="head_include"></metal:block>
22 <metal:block metal:define-slot="js_include"></metal:block>
23 <metal:block metal:define-slot="css_include"></metal:block>
24

Subscribers

People subscribed via source and target branches

to all changes: