Merge lp:~rharding/charmworld/refresh-heartbeat into lp:charmworld
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 |
Related bugs: |
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
Description of the change
I'm sick of hitting refresh to watch the queue.
To post a comment you must log in.
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): templates/ heartbeat. pt templates/ main.pt
A [revision details]
M charmworld/
M charmworld/
Index: [revision details] 20131106211543- mdy7zo9iywzec4m m
=== 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-
+New revision: <email address hidden>
Index: charmworld/ templates/ heartbeat. pt templates/ heartbeat. pt' templates/ heartbeat. pt 2013-07-23 20:53:16 +0000 templates/ heartbeat. pt 2013-11-07 00:08:32 +0000 macro=" main.macros[ 'page'] "> "head_include" > "REFRESH" CONTENT="20"> "css_include" >
=== modified file 'charmworld/
--- charmworld/
+++ charmworld/
@@ -1,4 +1,8 @@
<html tal:define="main load: main.pt"
metal:use-
+<metal:block fill-slot=
+ <META HTTP-EQUIV=
+</metal:block>
+
<metal:block fill-slot=
<style type="text/css">
.checks th {
Index: charmworld/ templates/ main.pt templates/ main.pt' templates/ main.pt 2013-10-10 15:24:30 +0000 templates/ main.pt 2013-11-07 00:08:32 +0000 javascript"
=== modified file 'charmworld/
--- charmworld/
+++ charmworld/
@@ -22,6 +22,7 @@
<script type="text/
src="${ request. scheme} ://ajax. googleapis. com/ajax/ libs/jquery/ 1.7.2/jquery. min.js" > slot="head_ include" ></metal: block> slot="js_ include" ></metal: block> slot="css_ include" ></metal: block>
</script>
+ <metal:block metal:define-
<metal:block metal:define-
<metal:block metal:define-