diff --git a/app/views/includes/foot.jade b/app/views/includes/foot.jade index 0569542..5ed9cd8 100755 --- a/app/views/includes/foot.jade +++ b/app/views/includes/foot.jade @@ -4,6 +4,7 @@ //script(type='text/javascript', src='/lib/jquery/jquery.min.js') //script(type='text/javascript', src='/lib/bootstrap/dist/js/bootstrap.min.js') +script(type='text/javascript', src='/lib/momentjs/moment.js') //AngularJS script(type='text/javascript', src='/lib/angular/angular.js') diff --git a/bower.json b/bower.json index 5b4d499..cac4318 100644 --- a/bower.json +++ b/bower.json @@ -1,17 +1,17 @@ { - "name": "Mystery", - "version": "0.0.1", - "dependencies": { - "angular": "latest", - "angular-resource": "latest", - "angular-cookies": "latest", - "angular-mocks": "latest", - "angular-route": "latest", - "bootstrap": "3.0.3", - "angular-bootstrap": "0.9.0", - "angular-ui-utils": "0.1.0", - "angular-qrcode": "latest", - "angular-animate": "latest" - - } + "name": "Mystery", + "version": "0.0.1", + "dependencies": { + "angular": "latest", + "angular-resource": "latest", + "angular-cookies": "latest", + "angular-mocks": "latest", + "angular-route": "latest", + "bootstrap": "3.0.3", + "angular-bootstrap": "0.9.0", + "angular-ui-utils": "0.1.0", + "angular-qrcode": "latest", + "angular-animate": "latest", + "momentjs": "~2.5.0" + } } diff --git a/package.json b/package.json index 2736ff8..01608f0 100644 --- a/package.json +++ b/package.json @@ -61,6 +61,7 @@ "should": "~2.1.1", "view-helpers": "latest", "socket.io": "~0.9.16", + "moment": "~2.5.0", "sinon": "~1.7.3" }, "devDependencies": { diff --git a/public/css/common.css b/public/css/common.css index 3a97c4b..8853a57 100644 --- a/public/css/common.css +++ b/public/css/common.css @@ -118,3 +118,54 @@ body { .fader.ng-enter-active { opacity: 1; } + + + +.badge { + padding: 1px 9px 2px; + font-size: 12.025px; + font-weight: bold; + white-space: nowrap; + color: #ffffff; + background-color: #999999; + -webkit-border-radius: 9px; + -moz-border-radius: 9px; + border-radius: 9px; +} +.badge:hover { + color: #ffffff; + text-decoration: none; + cursor: pointer; +} +.badge-error { + background-color: #b94a48; +} +.badge-error:hover { + background-color: #953b39; +} +.badge-warning { + background-color: #f89406; +} +.badge-warning:hover { + background-color: #c67605; +} +.badge-success { + background-color: #468847; +} +.badge-success:hover { + background-color: #356635; +} +.badge-info { + background-color: #3a87ad; +} +.badge-info:hover { + background-color: #2d6987; +} +.badge-inverse { + background-color: #333333; +} +.badge-inverse:hover { + background-color: #1a1a1a; +} + + diff --git a/public/js/controllers/index.js b/public/js/controllers/index.js index 30de7da..9d56f5e 100755 --- a/public/js/controllers/index.js +++ b/public/js/controllers/index.js @@ -21,6 +21,11 @@ angular.module('mystery.system').controller('IndexController', ['$scope', 'Globa $scope.blocks.unshift(block); }); + $scope.human_since = function(time) { + var m = moment.unix(time); + return m.max().fromNow(); + } + $scope.index = function() { Blocks.get({ limit: BLOCKS_DISPLAYED diff --git a/public/views/index.html b/public/views/index.html index c2c4495..b926829 100644 --- a/public/views/index.html +++ b/public/views/index.html @@ -3,14 +3,18 @@

New transactions

-