From 100b901581f40fd44e23bdebee729285a894434c Mon Sep 17 00:00:00 2001 From: Mario Colque Date: Thu, 9 Jan 2014 14:53:28 -0300 Subject: [PATCH] reusing the blocklist template. Parsing new model --- public/js/config.js | 2 +- public/js/controllers/blocks.js | 8 +------- public/views/blocks/list.html | 21 ++++++++++++++------- public/views/blocks/list_date.html | 10 ---------- 4 files changed, 16 insertions(+), 25 deletions(-) delete mode 100644 public/views/blocks/list_date.html diff --git a/public/js/config.js b/public/js/config.js index 35fe383..1b06b84 100755 --- a/public/js/config.js +++ b/public/js/config.js @@ -14,7 +14,7 @@ angular.module('mystery').config(['$routeProvider', templateUrl: 'views/blocks/list.html' }). when('/blocks-date/:blockDate', { - templateUrl: 'views/blocks/list_date.html' + templateUrl: 'views/blocks/list.html' }). otherwise({ redirectTo: '/' diff --git a/public/js/controllers/blocks.js b/public/js/controllers/blocks.js index 98e8801..002aea0 100644 --- a/public/js/controllers/blocks.js +++ b/public/js/controllers/blocks.js @@ -3,13 +3,7 @@ angular.module('mystery.blocks').controller('BlocksController', ['$scope', '$routeParams', '$location', 'Global', 'Block', 'Blocks', function ($scope, $routeParams, $location, Global, Block, Blocks) { $scope.global = Global; - $scope.list_blocks = function() { - Blocks.query(function(blocks) { - $scope.blocks = blocks; - }); - }; - - $scope.list_blocks_date = function() { + $scope.list = function() { Blocks.query({ blockDate: $routeParams.blockDate }, function(blocks) { diff --git a/public/views/blocks/list.html b/public/views/blocks/list.html index f258705..656793f 100644 --- a/public/views/blocks/list.html +++ b/public/views/blocks/list.html @@ -1,10 +1,17 @@ -
+
-
    -
  • - {{block.hash}} {{block.time}} -
  • -
-
\ No newline at end of file + + + + + + + + + + + +
HashSolved at
{{block.hash}}{{block.time}}
+
diff --git a/public/views/blocks/list_date.html b/public/views/blocks/list_date.html deleted file mode 100644 index 349857c..0000000 --- a/public/views/blocks/list_date.html +++ /dev/null @@ -1,10 +0,0 @@ -
- - -