Merge lp:~stephen-stewart/snapweb/the-sun-is-the-same-in-a-relative-way into lp:~snappy-dev/snapweb/trunk

Proposed by Stephen Stewart
Status: Merged
Approved by: Sergio Schvezov
Approved revision: 151
Merged at revision: 145
Proposed branch: lp:~stephen-stewart/snapweb/the-sun-is-the-same-in-a-relative-way
Merge into: lp:~snappy-dev/snapweb/trunk
Prerequisite: lp:~stephen-stewart/snapweb/icons-icons-icons
Diff against target: 136 lines (+74/-4)
6 files modified
package.json (+1/-0)
www/src/css/infobar.css (+11/-0)
www/src/js/templates/layout-infobar.hbs (+5/-0)
www/src/js/templates/layout.hbs (+1/-0)
www/src/js/views/layout-infobar.js (+49/-0)
www/src/js/views/layout.js (+7/-4)
To merge this branch: bzr merge lp:~stephen-stewart/snapweb/the-sun-is-the-same-in-a-relative-way
Reviewer Review Type Date Requested Status
Sergio Schvezov Approve
Review via email: mp+259933@code.launchpad.net

Commit message

add a clock as per design doc

To post a comment you must log in.
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

We should probably find someone who can review the actual code ;-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'package.json'
--- package.json 2015-05-26 21:20:54 +0000
+++ package.json 2015-05-26 21:20:54 +0000
@@ -35,6 +35,7 @@
35 "karma-jasmine-ajax": "^0.1.12",35 "karma-jasmine-ajax": "^0.1.12",
36 "karma-phantomjs-launcher": "~0.1.4",36 "karma-phantomjs-launcher": "~0.1.4",
37 "lodash": "~3.3.1",37 "lodash": "~3.3.1",
38 "moment": "^2.10.3",
38 "normalize.css": "^3.0.3",39 "normalize.css": "^3.0.3",
39 "postcss-bem-linter": "git://github.com/necolas/postcss-bem-linter",40 "postcss-bem-linter": "git://github.com/necolas/postcss-bem-linter",
40 "postcss-custom-media": "^3.0.0",41 "postcss-custom-media": "^3.0.0",
4142
=== added file 'www/src/css/infobar.css'
--- www/src/css/infobar.css 1970-01-01 00:00:00 +0000
+++ www/src/css/infobar.css 2015-05-26 21:20:54 +0000
@@ -0,0 +1,11 @@
1/** @define b-infobar; weak */
2
3.b-infobar {
4 padding:8px 0;
5 font-size:12px;
6}
7
8.b-infobar__datetime {
9 float:right;
10 display:inline-block;
11}
012
=== added file 'www/src/js/templates/layout-infobar.hbs'
--- www/src/js/templates/layout-infobar.hbs 1970-01-01 00:00:00 +0000
+++ www/src/js/templates/layout-infobar.hbs 2015-05-26 21:20:54 +0000
@@ -0,0 +1,5 @@
1<div class="b-layout__container">
2 <div class="b-infobar__datetime">
3 {{datetime}}
4 </div>
5</div>
06
=== modified file 'www/src/js/templates/layout.hbs'
--- www/src/js/templates/layout.hbs 2015-05-05 11:20:39 +0000
+++ www/src/js/templates/layout.hbs 2015-05-26 21:20:54 +0000
@@ -1,4 +1,5 @@
1<div class="b-layout__alerts"></div>1<div class="b-layout__alerts"></div>
2<div class="b-layout__banner"></div>2<div class="b-layout__banner"></div>
3<div class="b-layout__infobar"></div>
3<div class="b-layout__main"></div>4<div class="b-layout__main"></div>
4<div class="b-layout__footer"></div>5<div class="b-layout__footer"></div>
56
=== added file 'www/src/js/views/layout-infobar.js'
--- www/src/js/views/layout-infobar.js 1970-01-01 00:00:00 +0000
+++ www/src/js/views/layout-infobar.js 2015-05-26 21:20:54 +0000
@@ -0,0 +1,49 @@
1// infobar view
2var _ = require('lodash');
3var $ = require('jquery');
4var moment = require('moment');
5var Backbone = require('backbone');
6Backbone.$ = $;
7var Marionette = require('backbone.marionette');
8var template = require('../templates/layout-infobar.hbs');
9
10module.exports = Marionette.ItemView.extend({
11
12 initialize: function() {
13 },
14
15 ui: {
16 'datetime': '.b-infobar__datetime'
17 },
18
19 className: 'b-infobar',
20
21 template : function(data) {
22 return template(data);
23 },
24
25 serializeData: function() {
26 return {
27 datetime: this.getDatetime
28 };
29 },
30
31 onDomRefresh: function() {
32 this.updateClock();
33 },
34
35 onBeforeDestroy: function() {
36 clearTimeout(this.timeoutID);
37 },
38
39 getDatetime: function() {
40 return moment().format('ddd, MMMM Do YYYY, h:mm:ss a');
41 },
42
43 updateClock: function() {
44 var now = this.getDatetime();
45 this.ui.datetime.text(now);
46 this.timeoutID = setTimeout(_.bind(this.updateClock, this), 1000);
47 }
48
49});
050
=== modified file 'www/src/js/views/layout.js'
--- www/src/js/views/layout.js 2015-05-05 11:20:39 +0000
+++ www/src/js/views/layout.js 2015-05-26 21:20:54 +0000
@@ -6,6 +6,7 @@
6var Marionette = require('backbone.marionette');6var Marionette = require('backbone.marionette');
7var Radio = require('backbone.radio');7var Radio = require('backbone.radio');
8var BannerView = require('./layout-banner.js');8var BannerView = require('./layout-banner.js');
9var InfobarView = require('./layout-infobar.js');
9var FooterView = require('./layout-footer.js');10var FooterView = require('./layout-footer.js');
10var NotificationsView = require('./alerts.js');11var NotificationsView = require('./alerts.js');
11var template = require('../templates/layout.hbs');12var template = require('../templates/layout.hbs');
@@ -26,6 +27,7 @@
2627
27 onRender: function() {28 onRender: function() {
28 this.showChildView('bannerRegion', new BannerView());29 this.showChildView('bannerRegion', new BannerView());
30 this.showChildView('infobarRegion', new InfobarView());
29 this.showChildView('footerRegion', new FooterView());31 this.showChildView('footerRegion', new FooterView());
30 },32 },
3133
@@ -40,9 +42,10 @@
40 },42 },
4143
42 regions: {44 regions: {
43 bannerRegion: '.b-layout__banner',45 bannerRegion: '.b-layout__banner',
44 mainRegion: '.b-layout__main',46 infobarRegion: '.b-layout__infobar',
45 footerRegion: '.b-layout__footer',47 mainRegion: '.b-layout__main',
46 alertsRegion: '.b-layout__alerts'48 footerRegion: '.b-layout__footer',
49 alertsRegion: '.b-layout__alerts'
47 }50 }
48});51});

Subscribers

People subscribed via source and target branches