Merge pull request #107 from cmgustavo/feature/03-details

WIP: reorder main menu. Renamed home for addresses. Fix header titles
This commit is contained in:
Matias Alejo Garcia 2014-04-20 21:22:59 -03:00
commit 5dc27c2ef4
6 changed files with 18 additions and 19 deletions

View file

@ -5,7 +5,7 @@ angular.module('copay',[
'mm.foundation',
'monospaced.qrcode',
'copay.header',
'copay.home',
'copay.addresses',
'copay.transactions',
'copay.send',
'copay.backup',
@ -18,7 +18,7 @@ angular.module('copay',[
]);
angular.module('copay.header', []);
angular.module('copay.home', []);
angular.module('copay.addresses', []);
angular.module('copay.transactions', []);
angular.module('copay.send', []);
angular.module('copay.backup', []);

View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copay.home').controller('HomeController',
angular.module('copay.addresses').controller('AddressesController',
function($scope, $rootScope, $location, Socket, controllerUtils) {
$scope.title = 'Home';
$scope.oneAtATime = true;

View file

@ -3,13 +3,13 @@
angular.module('copay.header').controller('HeaderController',
function($scope, $rootScope, $location, walletFactory, controllerUtils) {
$scope.menu = [{
'title': 'Home',
'icon': 'fi-home',
'link': '#/home'
}, {
'title': 'Copayers',
'icon': 'fi-torsos-all',
'link': '#/peer'
}, {
'title': 'Addresses',
'icon': 'fi-address-book',
'link': '#/addresses'
}, {
'title': 'Transactions',
'icon': 'fi-loop',

View file

@ -15,8 +15,8 @@ angular
.when('/setup', {
templateUrl: 'setup.html'
})
.when('/home', {
templateUrl: 'home.html'
.when('/addresses', {
templateUrl: 'addresses.html'
})
.when('/join/:id', {
templateUrl: 'join.html'