From a2052b3f3ad7b08a91c0309fc76c084e21f15cf9 Mon Sep 17 00:00:00 2001
From: Nick Cardin <nick@cardin.email>
Date: Thu, 1 Sep 2016 12:46:25 -0400
Subject: [PATCH] clean up merge

---
 public/views/tab-export-file.html     | 11 ++++++-----
 public/views/tab-export-qrCode.html   | 24 ++++++++++++------------
 public/views/tab-import-hardware.html | 10 ++++++----
 public/views/tab-import-phrase.html   |  4 +++-
 public/views/tab-send.html            |  3 ++-
 5 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/public/views/tab-export-file.html b/public/views/tab-export-file.html
index 36504222f..6e64f2fce 100644
--- a/public/views/tab-export-file.html
+++ b/public/views/tab-export-file.html
@@ -1,11 +1,12 @@
-<ion-nav-bar class="bar-royal">
-  <ion-nav-title>Export Wallet</ion-nav-title>
-  <ion-nav-buttons side="primary">
+<ion-view>
+  <ion-nav-bar class="bar-royal">
+    <ion-nav-title>{{'Export Wallet' | translate}}</ion-nav-title>
+    <ion-nav-buttons side="primary">
     <button class="button back-button" ui-sref="tabs.preferences.preferencesAdvanced">
       <i class="icon ion-ios-arrow-thin-left"></i>
     </button>
-  </ion-nav-buttons>
-</ion-nav-bar>
+    </ion-nav-buttons>
+  </ion-nav-bar>
 
   <ion-content ng-controller="exportController" ng-init="init()" cache-view="true">
 
diff --git a/public/views/tab-export-qrCode.html b/public/views/tab-export-qrCode.html
index c2b54be2a..b6254e42d 100644
--- a/public/views/tab-export-qrCode.html
+++ b/public/views/tab-export-qrCode.html
@@ -1,25 +1,25 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
-    <ion-nav-title>Export Wallet</ion-nav-title>
+    <ion-nav-title>{{'Export Wallet' | translate}}</ion-nav-title>
     <ion-nav-buttons side="primary">
-      <button class="button back-button" ui-sref="tabs.preferences.preferencesAdvanced">
-        <i class="icon ion-ios-arrow-thin-left"></i>
-      </button>
+    <button class="button back-button" ui-sref="tabs.preferences.preferencesAdvanced">
+      <i class="icon ion-ios-arrow-thin-left"></i>
+    </button>
     </ion-nav-buttons>
   </ion-nav-bar>
 
   <ion-content ng-controller="exportController" ng-init="init()">
 
-    <div class="m20t text-gray" ng-show="supported">
-      <div class="text-center m20b">
-        <qrcode size="220" version="8" error-correction-level="M" data="{{exportWalletInfo}}"></qrcode>
+      <div class="m20t text-gray" ng-show="supported">
+        <div class="text-center m20b">
+          <qrcode size="220" version="8" error-correction-level="M" data="{{exportWalletInfo}}"></qrcode>
+        </div>
+        <div class="text-center size-12 m10" translate>From the destination device, go to Add wallet &gt; Import wallet and scan this QR code</div>
       </div>
-      <div class="text-center size-12 m10" translate>From the destination device, go to Add wallet &gt; Import wallet and scan this QR code</div>
-    </div>
 
-    <div class="m20t text-gray" ng-show="!supported">
-      <div class="text-center size-12 m10" translate>Exporting via QR not supported for this wallet</div>
-    </div>
+      <div class="m20t text-gray" ng-show="!supported">
+        <div class="text-center size-12 m10" translate>Exporting via QR not supported for this wallet</div>
+      </div>
 
   </ion-content>
 </ion-view>
diff --git a/public/views/tab-import-hardware.html b/public/views/tab-import-hardware.html
index 180e1db0c..338be0205 100644
--- a/public/views/tab-import-hardware.html
+++ b/public/views/tab-import-hardware.html
@@ -35,12 +35,15 @@
             </select>
           </label>
 
-          <label class="item item-input item-stacked-label" ng-show="seedSourceId == 'trezor' || seedSourceId == 'ledger'">
+          <label class="item item-input item-stacked-label"
+                 ng-show="seedSourceId == 'trezor' || seedSourceId == 'ledger'">
             <span class="input-label" translate>Account Number</span>
             <input type="number" id="account" ng-model="account" ignore-mouse-wheel>
           </label>
 
-          <ion-toggle ng-show="seedSourceId == 'trezor'" ng-model="isMultisig" toggle-class="toggle-positive">
+          <ion-toggle ng-show="seedSourceId == 'trezor'"
+                      ng-model="isMultisig"
+                      toggle-class="toggle-positive">
             <span translate>Shared Wallet</span>
           </ion-toggle>
 
@@ -62,8 +65,7 @@
         <button translate type="submit" class="button button-block button-positive">
           Import
         </button>
-      </div>
-      <!-- seedoptions show -->
+      </div> <!-- seedoptions show -->
 
     </form>
 
diff --git a/public/views/tab-import-phrase.html b/public/views/tab-import-phrase.html
index 3f64ec521..6207508f7 100644
--- a/public/views/tab-import-phrase.html
+++ b/public/views/tab-import-phrase.html
@@ -82,7 +82,9 @@
         </div>
       </div>
 
-      <button type="submit" class="button button-block button-positive" ng-disabled="importForm12.$invalid" translate>Import</button>
+      <button type="submit"
+        class="button button-block button-positive"
+        ng-disabled="importForm12.$invalid" translate>Import</button>
     </form>
   </ion-content>
 </ion-view>
diff --git a/public/views/tab-send.html b/public/views/tab-send.html
index f362abb05..d9251a946 100644
--- a/public/views/tab-send.html
+++ b/public/views/tab-send.html
@@ -27,7 +27,8 @@
       <div class="item text-center" ng-show="!list[0]" translate>No Wallet - Contact</div>
       <a class="item item-icon-left" ng-repeat="item in list" ng-click="goToAmount(item)">
         <i ng-show="item.isWallet" class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i>
-        <i ng-show="!item.isWallet" class="icon ion-ios-person-outline"></i> {{item.label}}
+        <i ng-show="!item.isWallet" class="icon ion-ios-person-outline"></i>
+        {{item.label}}
       </a>
     </div>
   </ion-content>