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

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