From e19185139e15d173a6f65443ba204b81482861db Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 7 Oct 2014 16:37:22 -0300
Subject: [PATCH 1/3] Import backup from a plain text only for iOS

---
 css/src/main.css         |  1 +
 js/controllers/import.js | 13 +++++++------
 views/import.html        | 20 +++++++++++++++++---
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/css/src/main.css b/css/src/main.css
index efae2e357..d0a1881d3 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -167,6 +167,7 @@ a:hover {
 .join input, 
 .setup input,
 .import input,
+.import textarea, 
 .settings input {
   background: #2C3E50 !important;
   -moz-box-shadow:    inset 0px 0px 3px 0px rgba(0,0,0,0.10) !important;
diff --git a/js/controllers/import.js b/js/controllers/import.js
index 58b3227f9..4c10279e4 100644
--- a/js/controllers/import.js
+++ b/js/controllers/import.js
@@ -1,12 +1,13 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('ImportController',
-  function($scope, $rootScope, $location, walletFactory, controllerUtils, Passphrase, notification) {
+  function($scope, $rootScope, $location, walletFactory, controllerUtils, Passphrase, notification, isMobile) {
     controllerUtils.redirIfLogged();
 
     $scope.title = 'Import a backup';
     $scope.importStatus = 'Importing wallet - Reading backup...';
     $scope.hideAdv = true;
+    $scope.is_iOS = isMobile.iOS();
 
     var reader = new FileReader();
 
@@ -69,10 +70,6 @@ angular.module('copayApp.controllers').controller('ImportController',
       $scope.choosefile = !$scope.choosefile;
     };
 
-    $scope.openPasteArea = function() {
-      $scope.pastetext = !$scope.pastetext;
-    };
-
     $scope.getFile = function() {
       // If we use onloadend, we need to check the readyState.
       reader.onloadend = function(evt) {
@@ -93,9 +90,10 @@ angular.module('copayApp.controllers').controller('ImportController',
       }
 
       var backupFile = $scope.file;
+      var backupText = form.backupText.$modelValue;
       var password = form.password.$modelValue;
 
-      if (!backupFile) {
+      if (!backupFile && !backupText) {
         $scope.loading = false;
         notification.error('Error', 'Please, select your backup file');
         $scope.loading = false;
@@ -105,5 +103,8 @@ angular.module('copayApp.controllers').controller('ImportController',
       if (backupFile) {
         reader.readAsBinaryString(backupFile);
       }
+      else {
+        _importBackup(backupText);
+      }
     };
   });
diff --git a/views/import.html b/views/import.html
index d88c49353..60515968f 100644
--- a/views/import.html
+++ b/views/import.html
@@ -15,9 +15,23 @@
         <h1 class="text-white line-sidebar-b">{{title|translate}}</h1>
         <form name="importForm" ng-submit="import(importForm)" novalidate>
           <fieldset>
-            <legend for="backupFile" class="m10b"> <span translate>Choose backup file from your computer</span> <i class="fi-laptop"></i></legend>
-            <input type="file" class="form-control" 
-            placeholder="{{'Select a backup file'|translate}}" name="backupFile" ng-model="backupFile" ng-file-select>
+            <div ng-show="!is_iOS">
+              <legend for="backupFile" class="m10b"> 
+                <span translate>Choose backup file from your computer</span> <i class="fi-laptop"></i>
+              </legend>
+              <input type="file" class="form-control" 
+                placeholder="{{'Select a backup file'|translate}}" name="backupFile" ng-model="backupFile" ng-file-select>
+            </div>
+
+            <div ng-show="is_iOS">
+            <label for="backupText" class="m10b"> 
+              <span translate>Paste backup plain text code</span> <i class="fi-clipboard"></i>
+            </label>
+            <textarea class="form-control" 
+              name="backupText" 
+              ng-model="backupText" 
+              rows="5"></textarea>
+            </div>
 
 
             <label for="password"><span translate>Password</span> <small translate>Required</small></label>

From 923455ab31d189a15e94998699944d33b5f276a8 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 7 Oct 2014 18:35:22 -0300
Subject: [PATCH 2/3] Fix style for small devices

---
 css/src/mobile.css | 16 ++++++++++++++++
 views/import.html  |  9 +++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/css/src/mobile.css b/css/src/mobile.css
index 158b9f5b4..b36b42fbe 100644
--- a/css/src/mobile.css
+++ b/css/src/mobile.css
@@ -171,5 +171,21 @@
     margin-bottom: 0;
   }
 
+  .button, button {
+    padding: 1rem 1.2rem 1.0625rem;
+  }
+
+  form {
+    margin: 0;
+  }
+
+  .box-setup {
+    margin-bottom: 50px;
+  }
+
+  .footer-setup {
+    margin-bottom: 50px;
+  }
+
 }
 
diff --git a/views/import.html b/views/import.html
index 60515968f..839950501 100644
--- a/views/import.html
+++ b/views/import.html
@@ -14,7 +14,6 @@
       <div class="box-setup">
         <h1 class="text-white line-sidebar-b">{{title|translate}}</h1>
         <form name="importForm" ng-submit="import(importForm)" novalidate>
-          <fieldset>
             <div ng-show="!is_iOS">
               <legend for="backupFile" class="m10b"> 
                 <span translate>Choose backup file from your computer</span> <i class="fi-laptop"></i>
@@ -34,18 +33,17 @@
             </div>
 
 
-            <label for="password"><span translate>Password</span> <small translate>Required</small></label>
+            <label for="password" class="m10b"><span translate>Password</span> <small translate>Required</small></label>
             <input type="password" class="form-control" 
             placeholder="{{'Your wallet password'|translate}}" name="password" ng-model="password" required>
 
             <a class="expand small"  ng-click="hideAdv=!hideAdv">
-      		  <i class="fi-widget m3r"></i>
+              <i class="fi-widget m3r"></i>
               <span translate ng-hide="!hideAdv">Show</span> 
               <span translate ng-hide="hideAdv">Hide</span> 
               <span translate>advanced options</span>
             </a>
 
-
             <div ng-hide="hideAdv" class="m10t">
               <label>
               <input type="checkbox" class="form-control"
@@ -61,14 +59,13 @@
             </div>
           
 
-          </fieldset>
           <div data-alert ng-show="skipFields">
             <i class="size-18 fi-alert"></i> 
             <span translate>Skipping fields: {{skipFields}}</span>
           </div>
       
 
-          <div class="text-right">
+          <div class="text-right m20t">
             <a class="back-button text-white m20r" href="#!/">&laquo; <span translate>Back</span></a>
             <button translate type="submit" class="button primary m0" ng-disabled="importForm.$invalid">
               Import backup

From 97c262fb6cd8295eaf13d37fb10ffd9700ae5e3c Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 7 Oct 2014 18:38:14 -0300
Subject: [PATCH 3/3] Fix minor styles

---
 css/src/main.css                | 10 +++-------
 views/addresses.html            | 12 ++++++------
 views/create.html               | 11 ++++++-----
 views/includes/transaction.html |  8 +++-----
 views/join.html                 | 12 ++++--------
 views/open.html                 |  2 +-
 views/settings.html             |  2 +-
 views/transactions.html         | 20 ++++++++++----------
 8 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/css/src/main.css b/css/src/main.css
index d0a1881d3..1e79a0145 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -266,7 +266,6 @@ a:hover {
 .box-setup {
   padding: 20px 30px;
   background: #34495E;
-  margin-bottom: 20px;
 }
 
 .box-setup label small.has-error {
@@ -417,7 +416,8 @@ table.last-transactions-content {
 .m5b {margin-bottom: 5px;}
 .m5r {margin-right: 5px;}
 .m10b {margin-bottom: 10px;}
-.m15b {margin-bottom: 20px;}
+.m15b {margin-bottom: 15px;}
+.m20b {margin-bottom: 20px;}
 .m10r {margin-right: 10px;}
 .m15l {margin-left: 15px;}
 .m15t {margin-top: 15px;}
@@ -484,7 +484,7 @@ table.last-transactions-content {
 }
 
 .line-dashed {
-  border-top: 1px dashed #ccc;
+  border-top: 1px dashed #3C5269;
   margin: 1rem 0;
   padding: 1rem 0;
   overflow: hidden;
@@ -922,10 +922,6 @@ button.gray:focus,
   color: #2C3E50;
 }
 
-button, .button, p {
-  margin: 0;
-}
-
 .side-nav {padding: 0;}
 
 .side-nav li {
diff --git a/views/addresses.html b/views/addresses.html
index 688f3d628..4f5ee7c23 100644
--- a/views/addresses.html
+++ b/views/addresses.html
@@ -25,9 +25,9 @@
                 <span ng-if="$root.updatingBalance">
                     <i class="fi-bitcoin-circle icon-rotate spinner"></i>
                 </span>
-                <p class="size-14" ng-if="!$root.updatingBalance">
+                <span class="size-14" ng-if="!$root.updatingBalance">
                   <b>{{addr.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
-                </p>
+                </span>
               </div>
               <div class="large-1 columns show-for-large-up" ng-click="openAddressModal(addr)">
                 <a class="size-12" href=""> Show QR</a>
@@ -40,12 +40,12 @@
                 <small translate class="m0 label" ng-if="addr.isChange">change</small>
               </div>
             <div class="text-left">
-              <p class="small-12 columns m15t" ng-if="$root.updatingBalance">
+              <span class="small-12 columns m15t" ng-if="$root.updatingBalance">
                   <i class="fi-bitcoin-circle icon-rotate spinner"></i>
-              </p>
-              <p class="size-14" ng-if="!$root.updatingBalance">
+              </span>
+              <span class="size-14" ng-if="!$root.updatingBalance">
                   <b>{{addr.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
-              </p>
+              </span>
             </div>
           </a> <!-- end of panel mobile --> 
         </div>
diff --git a/views/create.html b/views/create.html
index 6524c6d44..860789b8c 100644
--- a/views/create.html
+++ b/views/create.html
@@ -12,8 +12,10 @@
         </div>
         <div class="large-8 columns line-dashed-setup-v">
           <div class="box-setup oh">
-            <img src="img/step-1.png" alt="Step 1" width="157" class="right m15t" ng-if="!isSetupWalletPage && !isMobile">
-            <img src="img/step-2.png" alt="Step 2" width="157" class="right m15t" ng-if="isSetupWalletPage && !isMobile">
+            <img src="img/step-1.png" alt="Step 1" width="157" class="right
+            m15t hide-for-small-only" ng-if="!isSetupWalletPage && !isMobile">
+            <img src="img/step-2.png" alt="Step 2" width="157" class="right
+            m15t hide-for-small-only" ng-if="isSetupWalletPage && !isMobile">
             <h1 translate class="text-secondary line-sidebar-b">Create new wallet</h1>
             <label ng-show="!isSetupWalletPage"><span translate>Wallet name</span>
               <input type="text" placeholder="{{'Family vacation funds'|translate}}" class="form-control" ng-model="walletName">
@@ -43,7 +45,7 @@
               </div>
 
               <a class="expand small" ng-click="hideAdv=!hideAdv">
-              	<i class="fi-widget m3r"></i>
+                <i class="fi-widget m3r"></i>
                 <span translate ng-hide="!hideAdv">Show</span> 
                 <span translate ng-hide="hideAdv">Hide</span> 
                 <span translate>advanced options</span>
@@ -52,7 +54,6 @@
                 <input id="network-name" type="checkbox" ng-model="networkName" ng-true-value="testnet" ng-false-value="livenet" class="form-control" ng-checked="networkName == 'testnet' ? true : false">
                 <label for="network-name" translate>Use test network</label>
 
-                <p>
                 <input type="text" placeholder="BIP32 master extended private key (hex)" name="private" ng-model="private">
               </div>
 
@@ -77,7 +78,7 @@
               </div>
             </div>
             <p translate class="comment" ng-show="totalCopayers>1 && !isSetupWalletPage">(*) The limits are imposed by the bitcoin network.</p>
-            <div class="text-right">
+            <div class="text-right m20t">
               <a ng-show="!isSetupWalletPage" class="back-button m20r" href="#!/">&laquo; <span translate>Back</span></a>
               <a ng-show="isSetupWalletPage" class="back-button m20r" ng-click="setupWallet()">&laquo; <span translate>Back</span></a>
               <button translate ng-show="isSetupWalletPage" type="submit" class="button secondary m0" ng-disabled="setupForm.$invalid || loading">
diff --git a/views/includes/transaction.html b/views/includes/transaction.html
index 344c7c962..810867104 100644
--- a/views/includes/transaction.html
+++ b/views/includes/transaction.html
@@ -34,7 +34,7 @@
     </div>
 
     <div class="large-3 medium-4 columns text-right hide-for-small-only">
-      <p class="size-12">{{tx.createdTs | amCalendar}}</p>
+      <span class="size-12">{{tx.createdTs | amCalendar}}</span>
     </div>
   </div>
 </div>
@@ -88,11 +88,9 @@
       </a>
     </div>
 
-    <div class="text-center">
-      <p class="size-12 text-gray ellipsis">
+      <div class="text-center m5t size-12 text-gray ellipsis">
         {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}
-      </p>
-    </div>
+      </div>
   </div>
 </div>
 
diff --git a/views/join.html b/views/join.html
index 48885172f..6388fcf3d 100644
--- a/views/join.html
+++ b/views/join.html
@@ -13,7 +13,7 @@
           <h1 translate class="text-primary line-sidebar-b">Join a Wallet in Creation</h1>
           <form name="joinForm" ng-submit="join(joinForm)" novalidate>
 
-            <label for="connectionId"><span translate>Wallet Secret</span> 
+            <label for="connectionId" class="m10b"><span translate>Wallet Secret</span> 
               <small translate class="has-error" ng-show="joinForm.connectionId.$invalid
                 && !joinForm.connectionId.$pristine">Wallet Secret is not valid!</small>
               <small translate data-options="disable_for_touch:true"
@@ -55,7 +55,7 @@
               </div>
             </div>
 
-            <label translate for="joinPassword">User information</label>
+            <label translate for="joinPassword" class="m10b">User information</label>
             <input id="joinPassword" type="text" class="form-control" 
             placeholder="{{'Your name (optional)'|translate}}" name="nickname" ng-model="nickname">
             <input type="password" class="form-control"
@@ -67,7 +67,7 @@
               numbers and symbols</span>" tooltip-trigger="focus" 
               tooltip-placement="top" required>
 
-            <div class="pr line-sidebar-b">
+            <div class="pr">
               <input type="password" 
               placeholder="{{'Repeat password'|translate}}"
               name="joinPasswordConfirm"
@@ -95,14 +95,10 @@
               >
             </div>
  
-            <div class="text-right">
+            <div class="text-right m20t">
               <a href="#!/" class="back-button text-primary m20r">&laquo; <span translate>Back</span></a>
               <button translate type="submit" class="button primary m0" ng-disabled="joinForm.$invalid || loading">Join</button>
             </div>
-
-         
-
-
           </form>
         </div>
     </div>
diff --git a/views/open.html b/views/open.html
index e7ca352a1..14b4b249a 100644
--- a/views/open.html
+++ b/views/open.html
@@ -20,7 +20,7 @@
           </select>
           <input type="password" class="form-control" 
           placeholder="{{'Your password'|translate}}" name="openPassword" ng-model="openPassword" required>
-          <div class="text-right">
+          <div class="text-right m20t">
             <a href="#!/" class="back-button text-white m20r">&laquo; <span translate>Back</span></a>
             <button translate type="submit" class="button white m0" ng-disabled="openForm.$invalid || loading">Open</button>
           </div>
diff --git a/views/settings.html b/views/settings.html
index 9db16b529..6c5374b55 100644
--- a/views/settings.html
+++ b/views/settings.html
@@ -24,7 +24,7 @@
               Insight API server is open-source software. You can run your own instances, check <a href="http://insight.is" target="_blank">Insight API Homepage</a>
             </p>
           </fieldset>
-          <div class="text-right">
+          <div class="text-right m20t">
             <a class="back-button text-white m20r" href="#!/">&laquo; <span translate>Back</span></a>
             <button translate type="submit" class="button primary m0 ng-binding" ng-disabled="setupForm.$invalid || loading" disabled="disabled" ng-click="save()">
               Save
diff --git a/views/transactions.html b/views/transactions.html
index 521e1037a..fccb57ffe 100644
--- a/views/transactions.html
+++ b/views/transactions.html
@@ -53,8 +53,8 @@
           </div>
           <div class="last-transactions-content">
             <div class="large-5 medium-5 small-12 columns">
-              <div ng-repeat="vin in btx.vinSimple">
-                <small class="right m5t"
+              <div ng-repeat="vin in btx.vinSimple" class="m5b">
+                <small class="right"
                   ng-class="{'has-tip': vin.valueAlt}"
                   data-options="disable_for_touch:true"
                   tooltip-popup-delay='500'
@@ -64,9 +64,9 @@
                   >
                   {{vin.value| noFractionNumber}} {{$root.wallet.settings.unitName}}
                 </small>
-                <p class="ellipsis text-gray size-12">
+                <div class="ellipsis text-gray size-12">
                   <contact address="{{vin.addr}}" tooltip-popup-delay="500" tooltip tooltip-placement="right" />
-                </p>
+                </div>
               </div>
             </div>
             <div class="large-1 medium-1 hide-for-small-only columns text-center">
@@ -76,8 +76,8 @@
               <i class="fi-arrow-down"></i>
             </div>
             <div class="large-6 medium-6 small-12 columns">
-              <div ng-repeat="vout in btx.voutSimple">
-                <small class="right m5t"
+              <div ng-repeat="vout in btx.voutSimple" class="m5b">
+                <small class="right"
                   ng-class="{'has-tip': vout.valueAlt}"
                   data-options="disable_for_touch:true"
                   tooltip-popup-delay='500'
@@ -86,17 +86,17 @@
                   tooltip-placement="left"
                   >
                   {{vout.value| noFractionNumber}} {{$root.wallet.settings.unitName}}</small>
-                <p class="ellipsis text-gray size-12">
+                <div class="ellipsis text-gray size-12">
                   <contact address="{{vout.addr}}" tooltip-popup-delay="500" tooltip tooltip-placement="right" />
-                </p>
+                </div>
               </div>
             </div>
           </div>
           <div class="last-transactions-footer">
             <div class="row collapse">
               <div class="large-6 medium-6 small-6 columns">
-                <p class="size-12"><span translate>Fee</span>: {{btx.fees | noFractionNumber}} {{$root.wallet.settings.unitName}}</p>
-                <p class="size-12"><span translate>Confirmations</span>: {{btx.confirmations || 0}}</p>
+                <div class="size-12"><span translate>Fee</span>: {{btx.fees | noFractionNumber}} {{$root.wallet.settings.unitName}}</div>
+                <div class="size-12"><span translate>Confirmations</span>: {{btx.confirmations || 0}}</div>
               </div>
               <div class="large-6 medium-6 small-6 columns text-right">
                 <p class="label size-14"><span translate>Total</span>: {{btx.valueOut| noFractionNumber}} {{$root.wallet.settings.unitName}}</p>