From 071e6700e1137cd445d1ded557d8eef182124a22 Mon Sep 17 00:00:00 2001
From: Gustavo Cortez <cmgustavo83@gmail.com>
Date: Mon, 2 Jun 2014 18:04:13 -0300
Subject: [PATCH] Reorg import forms

---
 index.html               | 12 +++++++-----
 js/controllers/import.js |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index 190afa89d..6ede8aba1 100644
--- a/index.html
+++ b/index.html
@@ -248,19 +248,21 @@
                   <label for="backupText" ng-click="pastetext=!pastetext" class="m10b">&middot; Paste backup plain text code <i class="fi-clipboard"></i></label>
                   <textarea class="form-control" name="backupText" ng-model="backupText" rows="5" ng-show="pastetext"></textarea>
                 </fieldset>
+              </div>
 
-                <div class="large-8 medium-8 columns">
+                <div class="large-6 large-centered medium-6 medium-centered columns">
                   <label for="password">Password <small>Required</small></label>
                   <input type="password" class="form-control" placeholder="Your wallet password" name="password" ng-model="password" required>
                 </div>
-              </div>
             </div>
-            <div class="row">
-              <div class="large-12 columns line-dashed">
+            <div class="row line-dashed">
+              <div class="large-6 medium-6 small-5 columns text-left">
+                <a class="button secondary radius" href="#signin">Go back</a>
+              </div>
+              <div class="large-6 medium-6 small-5 columns text-right">
                 <button type="submit" class="button primary radius right" ng-disabled="importForm.$invalid" loading="Importing">
                   Import backup
                 </button>
-                <a class="button secondary radius" href="#signin">Go back</a>
               </div>
             </div>
           </form>
diff --git a/js/controllers/import.js b/js/controllers/import.js
index 612c4d8ad..c6d9c1fd4 100644
--- a/js/controllers/import.js
+++ b/js/controllers/import.js
@@ -23,6 +23,7 @@ angular.module('copay.import').controller('ImportController',
 
     $scope.import = function(form) {
       if (form.$invalid) {
+        $scope.loading = false;
         $rootScope.$flashMessage = { message: 'There is an error in the form. Please, try again', type: 'error'};
         return;
       }
@@ -33,6 +34,7 @@ angular.module('copay.import').controller('ImportController',
 
       if (!backupFile && !backupText) {
         $rootScope.$flashMessage = { message: 'Please, select your backup file or paste the text', type: 'error'};
+        $scope.loading = false;
         return;
       }