Summit

Merge lp:~cjohnston/summit/utc-clock-topnav into lp:summit

  1. utc-clock-topnav
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Adnane Belmadiaf
Approved revision: 559
Merged at revision: 559
Proposed branch: lp:~cjohnston/summit/utc-clock-topnav
Merge into: lp:summit
Diff against target: 11 lines (+1/-0)
1 file modified
summit/common/templates/base.html (+1/-0)
To merge this branch: bzr merge lp:~cjohnston/summit/utc-clock-topnav
Reviewer Review Type Date Requested Status
Adnane Belmadiaf Approve
Review via email: mp+182594@code.launchpad.net

Commit message

Adds a UTC clock to the topnav

To post a comment you must log in.
Revision history for this message
Adnane Belmadiaf (daker) wrote :

Approve!

review: Approve
Revision history for this message
Andy Doan (doanac) wrote :

On 08/28/2013 05:47 AM, Chris Johnston wrote:
> Chris Johnston has proposed merging lp:~cjohnston/summit/utc-clock-topnav into lp:summit.
>
> Commit message:
> Adds a UTC clock to the topnav
>
> Requested reviews:
> Summit Hackers (summit-hackers)
>
> For more details, see:
> https://code.launchpad.net/~cjohnston/summit/utc-clock-topnav/+merge/182594
>

that's handy.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/common/templates/base.html'
2--- summit/common/templates/base.html 2013-03-10 23:50:50 +0000
3+++ summit/common/templates/base.html 2013-08-28 10:51:26 +0000
4@@ -20,6 +20,7 @@
5 {% endblock %}
6
7 {% block top_nav_login_links %}
8+<iframe src="http://free.timeanddate.com/clock/i2x5srdj/tluk/fn14/fs12/tcefefef/pct/pa2/tt0/tw1/tm1/th1/ts1/ta1/tb2" frameborder="0" width="168" height="18" allowTransparency="true" style="position:absolute; top:0px; right: 1075px; height:20px; border:0; width:175px; border-radius:5px; -webkit-border-radius:5px; -moz-border-radius:5px;"></iframe>
9 {% if user.is_authenticated %}
10 Logged in as:
11 <a id="whoami" class="top-login-item" href="http://launchpad.net/~{{ user.username }}">{{ user.username }}</a>

Subscribers

People subscribed via source and target branches