Merge pull request #11 from JDonadio/fix/navigation-bar

Fix navigation buttons, titles, translation

public/views/add.html

@@ -1,11 +1,11 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar>
+    <ion-nav-title>{{'Add wallet' | translate}}</ion-nav-title>
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ui-sref="tabs.home">
+      <button class="button no-border" ng-click="$ionicGoBack()">
-        Close
+        {{'Close' | translate}}
       </button>
     </ion-nav-buttons>
-    <ion-nav-title>Add wallet</ion-nav-title>
   </ion-nav-bar>
 
   <ion-content>

public/views/amount.html

@@ -1,22 +1,16 @@
 <ion-view>
-
+  <ion-nav-bar>
-  <ion-nav-bar class="bar-stable">
-    <ion-nav-title>Enter Amount</ion-nav-title>
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ui-sref="tabs.send">
+      <button class="button no-border" ng-click="$ionicGoBack()">
-        <i class="icon ion-chevron-left"></i> Back
+        <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>
 
-  <ion-pane>
   <ion-content class="calculator" scroll="false" class="amount" ng-controller="amountController" ng-init="init()">
 
     <div class="card">
-
+      <div class="item item-divider" translate>Recipient</div>
-      <div class="item item-divider">
-        Recipient
-      </div>
 
       <div class="item item-text-wrap item-icon-left">
         <i class="icon ion-ios-person-outline"></i>
@@ -25,17 +19,13 @@
     </div>
 
     <div class="card">
-      <div class="item item-divider">
+      <div class="item item-divider" translate>Amount</div>
-        Amount
-      </div>
-
 
       <div class="item item-text-wrap item-button-right">
-
         <a class="postfix" ng-click="toggleAlternative()" ng-show="showAlternativeAmount">{{alternativeIsoCode}}</a>
         <a class="postfix" ng-click="toggleAlternative()" ng-show="!showAlternativeAmount">{{unitName}}</a>
 
-          <div class="text-light text-black m15b" ng-class="{'size-28': smallFont, 'size-36': !smallFont}"> <span>  {{amount || "0.00" }}</div>
+        <div class="text-light text-black m15b" ng-class="{'size-28': smallFont, 'size-36': !smallFont}"><span>  {{amount || "0.00" }}</div>
         <div class="text-light text-black" ng-class="{'size-16': smallFont, 'size-17': !smallFont}" ng-show="!showAlternativeAmount">
           {{globalResult}} <span class="label gray text-white radius">{{amountResult || '0.00'}} {{alternativeIsoCode}}</span>
         </div>
@@ -85,5 +75,4 @@
       </div>
     </div>
   </ion-content>
-  </ion-pane>
 </ion-view>

public/views/confirm.html

@@ -1,13 +1,8 @@
 <ion-view>
-
+  <ion-nav-bar>
-  <ion-pane>
+    <ion-nav-back-button>
-    <ion-nav-bar class="bar-stable">
+      {{'Back' | translate}}
-      <ion-nav-title>Confirm</ion-nav-title>
+    </ion-nav-back-button>
-      <ion-nav-buttons side="primary">
-        <button class="button no-border" ui-sref="tabs.send">
-          <i class="icon ion-chevron-left"></i> Back
-        </button>
-      </ion-nav-buttons>
   </ion-nav-bar>
 
   <ion-content scroll="false" ng-controller="confirmController" ng-init="init()">

public/views/tab-receive.html

@@ -1,6 +1,6 @@
 <ion-view>
-  <ion-nav-bar class="bar-stable">
+  <ion-nav-bar>
-    <ion-nav-title>Receive</ion-nav-title>
+    <ion-nav-title>{{'Receive' | translate}}</ion-nav-title>
   </ion-nav-bar>
 
   <ion-content ng-controller="tabReceiveController" ng-init="init()">

public/views/tab-send.html

@@ -1,16 +1,12 @@
 <ion-view>
-
+  <ion-nav-bar>
-  <ion-nav-bar class="bar-stable">
+    <ion-nav-title>{{'Send' | translate}}</ion-nav-title>
-    <ion-nav-title>Send</ion-nav-title>
   </ion-nav-bar>
 
   <ion-content ng-controller="tabSendController" ng-init="init()">
-
-
     <div class="card">
-      <div class="item item-divider">
+      <div class="item item-divider" translate>Recipient</div>
-        Recipient
+
-      </div>
       <div class="list list-inset">
         <label class="item item-input">
           <i class="icon ion-search placeholder-icon"></i>
@@ -25,7 +21,7 @@
 
     <div class="card" ng-if="list[0]">
       <div class="item item-divider item-icon-right">
-        Contacts & Wallets
+        <span translate>Contacts & Wallets</span>
         <i class="icon ion-person-add" ng-click="openAddressbookModal()"></i>
       </div>
       <div class="item text-center" ng-show="!list[0]" translate>No Wallet - Contact</div>

src/js/controllers/amount.js

@@ -1,7 +1,7 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('amountController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, txFormatService) {
+angular.module('copayApp.controllers').controller('amountController', function($rootScope, $scope, $filter, $timeout, $ionicHistory, $ionicScrollDelegate, $ionicNavBarDelegate, gettextCatalog, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, txFormatService) {
-
+  $ionicNavBarDelegate.title(gettextCatalog.getString('Enter Amount'));
 
   var unitToSatoshi;
   var satToUnit;
@@ -63,7 +63,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
 
     // in SAT ALWAYS
     if ($stateParams.toAmount) {
-      $scope.amount = (($stateParams.toAmount) * satToUnit).toFixed(unitDecimals) ;
+      $scope.amount = (($stateParams.toAmount) * satToUnit).toFixed(unitDecimals);
     }
 
 
@@ -188,13 +188,9 @@ angular.module('copayApp.controllers').controller('amountController', function($
     var amount = $scope.showAlternativeAmount ? fromFiat(_amount).toFixed(unitDecimals) : _amount.toFixed(unitDecimals);
 
     $state.transitionTo('send.confirm', {
-      toAmount:amount * unitToSatoshi,
+      toAmount: amount * unitToSatoshi,
       toAddress: $scope.toAddress,
       toName: $scope.toName,
     });
   };
-
-  $scope.cancel = function() {
-    $state.transitionTo('tabs.send');
-  };
 });

src/js/controllers/confirm.js

@@ -1,7 +1,7 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, $ionicPopup, txStatus, gettext, txFormatService, ongoingProcess, $ionicModal) {
+angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, $ionicNavBarDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, $ionicPopup, txStatus, gettext, txFormatService, ongoingProcess, $ionicModal) {
-
+  $ionicNavBarDelegate.title(gettextCatalog.getString('Confirm'));
   var cachedTxp = {};
   var isChromeApp = platformInfo.isChromeApp;
 

src/js/routes.js

@@ -361,7 +361,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         abstract: true,
         template: '<ion-nav-view name="send"></ion-nav-view>'
       })
-
       .state('send.amount', {
         url: '/amount/:toAddress/:toName',
         views: {