BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
parent 1369917f83 5267c2ad48
commit 5dc27c2ef4
6 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
css/main.css
View File

@ -86,7 +86,7 @@ body {
color: #111; color: #111;
}*/ }*/
.home .panel { .addresses .panel {
font-size: 0.9rem; font-size: 0.9rem;
} }
@ -118,7 +118,7 @@ body {
border: none; border: none;
} }
.home .panel:hover { .addresses .panel:hover {
background: #efefef; background: #efefef;
} }

15
index.html
View File

@ -208,9 +208,9 @@
<!-- HOME --> <!-- ADDRESS -->
<script type="text/ng-template" id="home.html"> <script type="text/ng-template" id="addresses.html">
<div class="home" data-ng-controller="HomeController"> <div class="addresses" data-ng-controller="AddressesController">
<div ng-show='$root.wallet.publicKeyRing.isComplete()'> <div ng-show='$root.wallet.publicKeyRing.isComplete()'>
<h3>Address</h3> <h3>Address</h3>
<div class="row"> <div class="row">
@ -221,8 +221,7 @@
<qrcode size="160" data="{{selectedAddr}}"></qrcode> <qrcode size="160" data="{{selectedAddr}}"></qrcode>
<p class="m10t" ng-repeat="addr in addrs" ng-if="selectedAddr==addr"> <strong> {{balanceByAddr[addr]}} BTC </strong> </p> <p class="m10t" ng-repeat="addr in addrs" ng-if="selectedAddr==addr"> <strong> {{balanceByAddr[addr]}} BTC </strong> </p>
</div> </div>
<div class="large-1 columns"> </div> <div class="large-3 columns text-center">
<div class="large-2 columns">
<p> Create a New <strong> Address </strong> </p> <p> Create a New <strong> Address </strong> </p>
<button class="secondary round expand" ng-click="newAddr()"> Create </button> <button class="secondary round expand" ng-click="newAddr()"> Create </button>
</div> </div>
@ -343,7 +342,7 @@
<div class="send" data-ng-controller="SendController"> <div class="send" data-ng-controller="SendController">
<div class="row" ng-show='$root.wallet.publicKeyRing.isComplete()'> <div class="row" ng-show='$root.wallet.publicKeyRing.isComplete()'>
<div class="small-6 large-centered columns"> <div class="small-6 large-centered columns">
<h1>{{title}}</h1> <h3>{{title}}</h3>
<form name="sendForm" ng-submit="submitForm(sendForm)" novalidate> <form name="sendForm" ng-submit="submitForm(sendForm)" novalidate>
<div class="row"> <div class="row">
<div class="large-12 columns"> <div class="large-12 columns">
@ -391,7 +390,7 @@
<!-- BACKUP --> <!-- BACKUP -->
<script type="text/ng-template" id="backup.html"> <script type="text/ng-template" id="backup.html">
<div class="backup" data-ng-controller="BackupController"> <div class="backup" data-ng-controller="BackupController">
<h2>{{title}}</h2> <h3>{{title}}</h3>
<div class="row text-center"> <div class="row text-center">
<div class="large-4 columns"> <div class="large-4 columns">
<a class="panel box-backup" ng-click="download()"> <a class="panel box-backup" ng-click="download()">
@ -448,7 +447,7 @@
<script src="js/services/controllerUtils.js"></script> <script src="js/services/controllerUtils.js"></script>
<script src="js/controllers/header.js"></script> <script src="js/controllers/header.js"></script>
<script src="js/controllers/home.js"></script> <script src="js/controllers/addresses.js"></script>
<script src="js/controllers/transactions.js"></script> <script src="js/controllers/transactions.js"></script>
<script src="js/controllers/send.js"></script> <script src="js/controllers/send.js"></script>
<script src="js/controllers/backup.js"></script> <script src="js/controllers/backup.js"></script>

4
js/app.js
View File

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

2
js/controllers/home.js → js/controllers/addresses.js
View File

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

8
js/controllers/header.js
View File

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

4
js/routes.js
View File

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