Merge branch 'ref/design' of github.com:matiu/copay into ref/design

public/views/add.html

@@ -1,7 +1,9 @@
 <ion-view view-title="Add wallet">
-  <ion-nav-buttons side="primary">
-    <a href ui-sref="tabs.home" class="button button-clear button-dark">Close</a>
-  </ion-nav-buttons>
+  <ion-nav-bar class="bar-stable">
+    <ion-nav-buttons side="primary">
+      <a href ui-sref="tabs.home" class="button button-clear button-dark">Close</a>
+    </ion-nav-buttons>
+  </ion-nav-bar>
 
   <ion-content>
     <ion-list>
@@ -23,4 +25,3 @@
 
   </ion-content>
 </ion-view>
-

public/views/backup.html

@@ -2,7 +2,7 @@
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Backup Flow</ion-nav-title>
     <ion-nav-buttons side="primary" ng-show="(step != 1 && step != 4)">
-     <button class="button" ng-click="goToStep(1); goBack()">
+     <button class="button" ng-click="goBack()">
        <i class="ion-arrow-left-c"></i> Back
      </button>
     </ion-nav-buttons>

public/views/export.html

@@ -3,7 +3,7 @@
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Export Wallet</ion-nav-title>
     <ion-nav-buttons side="primary">
-     <button class="button" href ui-sref="preferencesAdvanced">
+     <button class="button" href ui-sref="wallet.preferencesAdvanced">
        <i class="ion-arrow-left-c"></i> Back
      </button>
     </ion-nav-buttons>

public/views/preferences.html

@@ -12,10 +12,10 @@
       <div class="item item-divider">
         Preferences
       </div>
-      <div class="item item-icon-right" href ui-sref="preferencesAlias">
+      <div class="item item-icon-right" href ui-sref="wallet.preferencesAlias">
         <span translate>Wallet Name</span>
         <span class="item-note">
-          {{alias||walletName}}
+          {{alias||wallet.walletName}}
         </span>
         <i class="icon ion-ios-arrow-right"></i>
       </div>
@@ -34,29 +34,29 @@
       <div class="item" ng-show="index.isPrivKeyExternal">
         <span translate>Hardware wallet</span>
         <span class="item-note">
-          {{externalSource}}
+          {{wallet.externalSource}}
         </span>
       </div>
-      <div class="item item-icon-right"  href ui-sref="preferencesColor">
-        <span ng-style="{'color': backgroundColor}">&block;</span>
+      <div class="item item-icon-right"  href ui-sref="wallet.preferencesColor">
+        <span ng-style="{'color': wallet.color}">&block;</span>
         <span translate>Wallet Color</span>
         <span class="item-note">
-          {{index.alias||index.walletName}}
+          {{wallet.alias||wallet.walletName}}
         </span>
         <i class="icon ion-ios-arrow-right"></i>
       </div>
-      <div class="item item-icon-right" href ui-sref="preferencesEmail">
+      <div class="item item-icon-right" href ui-sref="wallet.preferencesEmail">
         <span translate>Email Notifications</span>
         <span class="item-note">
-          <span ng-if="!index.preferences.email" translate>Disabled</span>
-          <span ng-if="index.preferences.email">{{index.preferences.email}}</span>
+          <span ng-if="!wallet.email" translate>Disabled</span>
+          <span ng-if="wallet.email">{{wallet.email}}</span>
         </span>
         <i class="icon ion-ios-arrow-right"></i>
       </div>
       <div class="item item-divider">
         Security
       </div>
-      <div class="item item-icon-right" href ui-sref="backup" ng-hide="index.isPrivKeyExternal">
+      <div class="item item-icon-right" href ui-sref="wallet.backup" ng-hide="index.isPrivKeyExternal">
         <span translate>Backup</span>
         <i class="icon ion-ios-arrow-right"></i>
       </div>
@@ -65,14 +65,14 @@
           <span class="toggle-label" translate>Request Spending Password</span>
         </ion-toggle>
       </div>
-      <div class="item item-icon-right" href ui-sref="deleteWords" ng-show ="!deleted">
+      <div class="item item-icon-right" href ui-sref="wallet.deleteWords" ng-show ="!deleted">
         <span translate>Delete recovery phrase</span>
         <i class="icon ion-ios-arrow-right"></i>
       </div>
       <div class="item item-divider">
         Advanced
       </div>
-      <div class="item item-icon-right" href ui-sref="preferencesAdvanced">
+      <div class="item item-icon-right" href ui-sref="wallet.preferencesAdvanced">
         <span translate>Advanced</span>
         <i class="icon ion-ios-arrow-right"></i>
       </div>

public/views/preferencesAdvanced.html

@@ -2,7 +2,7 @@
   <ion-nav-bar class="bar-stable">
   <ion-nav-title>Advanced Preferences</ion-nav-title>
     <ion-nav-buttons side="primary">
-       <button class="button" href ui-sref="preferences">
+       <button class="button" href ui-sref="wallet.preferences">
          <i class="ion-arrow-left-c"></i> Back
        </button>
     </ion-nav-buttons>
@@ -11,27 +11,27 @@
     <div class="list">
       <div class="item item-divider">
       </div>
-      <div class="item item-icon-right" href ui-sref="information">
+      <div class="item item-icon-right" href ui-sref="wallet.information">
         <span translate>Wallet Information</span>
         <i class="icon ion-ios-arrow-right"></i>
       </div>
-      <div class="item item-icon-right" ng-show="index.network == 'livenet'" href ui-sref="paperWallet">
+      <div class="item item-icon-right" ng-show="index.network == 'livenet'" href ui-sref="wallet.paperWallet">
         <span translate>Sweep paper wallet</span>
         <i class="icon ion-ios-arrow-right"></i>
       </div>
-      <div class="item item-icon-right" href ui-sref="export">
+      <div class="item item-icon-right" href ui-sref="wallet.export">
         <span translate>Export Wallet</span>
         <i class="icon ion-ios-arrow-right"></i>
       </div>
-      <div class="item item-icon-right" href ui-sref="preferencesBwsUrl">
+      <div class="item item-icon-right" href ui-sref="wallet.preferencesBwsUrl">
         <span translate>Wallet Service URL</span>
         <i class="icon ion-ios-arrow-right"></i>
       </div>
-      <div class="item item-icon-right" href ui-sref="preferencesHistory">
+      <div class="item item-icon-right" href ui-sref="wallet.preferencesHistory">
         <span translate>Transaction History</span>
         <i class="icon ion-ios-arrow-right"></i>
       </div>
-      <div class="item item-icon-right" href ui-sref="delete">
+      <div class="item item-icon-right" href ui-sref="wallet.delete">
         <span translate>Delete Wallet</span>
         <i class="icon ion-ios-arrow-right"></i>
       </div>

public/views/preferencesAlias.html

@@ -2,7 +2,7 @@
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Alias</ion-nav-title>
     <ion-nav-buttons side="primary">
-     <button class="button" href ui-sref="preferences">
+     <button class="button" href ui-sref="wallet.preferences">
        <i class="ion-arrow-left-c"></i> Back
      </button>
     </ion-nav-buttons>

public/views/preferencesBwsUrl.html

@@ -2,7 +2,7 @@
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Wallet Service URL</ion-nav-title>
     <ion-nav-buttons side="primary">
-     <button class="button" href ui-sref="preferencesAdvanced">
+     <button class="button" href ui-sref="wallet.preferencesAdvanced">
        <i class="ion-arrow-left-c"></i> Back
      </button>
     </ion-nav-buttons>

public/views/preferencesColor.html

@@ -2,7 +2,7 @@
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Color</ion-nav-title>
     <ion-nav-buttons side="primary">
-     <button class="button" href ui-sref="preferences">
+     <button class="button" href ui-sref="wallet.preferences">
        <i class="ion-arrow-left-c"></i> Back
      </button>
     </ion-nav-buttons>

public/views/preferencesDeleteWallet.html

@@ -2,7 +2,7 @@
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Delete Wallet</ion-nav-title>
     <ion-nav-buttons side="primary">
-     <button class="button" href ui-sref="preferencesAdvanced">
+     <button class="button" href ui-sref="wallet.preferencesAdvanced">
        <i class="ion-arrow-left-c"></i> Back
      </button>
     </ion-nav-buttons>

public/views/preferencesDeleteWords.html

@@ -2,7 +2,7 @@
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Delete Recovery Phrase</ion-nav-title>
     <ion-nav-buttons side="primary">
-     <button class="button" href ui-sref="preferences">
+     <button class="button" href ui-sref="wallet.preferences">
        <i class="ion-arrow-left-c"></i> Back
      </button>
     </ion-nav-buttons>
@@ -13,9 +13,9 @@
         {{error|translate}}
       </div>
       <div translate>Warning!</div>
-      <div ng-show="!index.needsBackup" translate>Once you have copied your wallet recovery phrase down, it is recommended to delete it from this device.</div>
-      <div ng-show="index.needsBackup" translate>Need to do backup</div>
-      <div ng-show="!index.needsBackup">
+      <div ng-show="!needsBackup" translate>Once you have copied your wallet recovery phrase down, it is recommended to delete it from this device.</div>
+      <div ng-show="needsBackup" translate>Need to do backup</div>
+      <div ng-show="!needsBackup">
           <button class="button button-block button-stable" ng-click="delete()" translate>Delete Recovery Phrase</button>
       </div>
     </div>

public/views/preferencesEmail.html

@@ -2,7 +2,7 @@
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Email Notifications</ion-nav-title>
     <ion-nav-buttons side="primary">
-     <button class="button" href ui-sref="preferences">
+     <button class="button" href ui-sref="wallet.preferences">
        <i class="ion-arrow-left-c"></i> Back
      </button>
     </ion-nav-buttons>

public/views/preferencesHistory.html

@@ -2,7 +2,7 @@
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Transaction History</ion-nav-title>
     <ion-nav-buttons side="primary">
-     <button class="button" href ui-sref="preferencesAdvanced">
+     <button class="button" href ui-sref="wallet.preferencesAdvanced">
        <i class="ion-arrow-left-c"></i> Back
      </button>
     </ion-nav-buttons>

public/views/preferencesInformation.html

@@ -1,9 +1,8 @@
-
 <ion-view>
   <ion-nav-bar class="bar-stable">
-  <ion-nav-title>Wallet Information</ion-nav-title>
+    <ion-nav-title>Wallet Information</ion-nav-title>
     <ion-nav-buttons side="primary">
-       <button class="button" href ui-sref="preferencesAdvanced">
+       <button class="button" href ui-sref="wallet.preferencesAdvanced">
          <i class="ion-arrow-left-c"></i> Back
        </button>
     </ion-nav-buttons>

public/views/tab-settings.html

@@ -1,5 +1,7 @@
 <ion-view>
-  <ion-nav-title>Global Settings</ion-nav-title>
+  <ion-nav-bar class="bar-stable">
+    <ion-nav-title>Global Settings</ion-nav-title>
+  </ion-nav-bar>
   <ion-content class="has-header" ng-controller="tabSettingsController" cache-view="false" ng-init="init()">
     <div class="item item-divider">
     </div>

public/views/walletDetails.html

@@ -14,9 +14,7 @@
     </ion-nav-buttons>
   </ion-nav-bar>
 
-  <ion-content delegate-handle="my-handle" overflow-scroll="true">
-    <button class="button button-icon icon ion-ios-settings" href ui-sref="wallet.preferences"></button>
-
+  <ion-content class="has-header" delegate-handle="my-handle" overflow-scroll="true">
     <div ng-show="!wallet">
       No Wallet
       <a href ui-sref="tabs.home" class="button">