From f329284210e4395029096e499a77c4bedacb0ca4 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 27 Nov 2014 11:42:40 -0300
Subject: [PATCH] Fix layout on Safari when click on sidebar and then on send

---
 js/controllers/join.js      |  4 ++--
 views/includes/scanner.html | 15 +++++++++++++++
 views/join.html             | 24 ++++++------------------
 views/send.html             | 32 ++++++++++----------------------
 4 files changed, 33 insertions(+), 42 deletions(-)
 create mode 100644 views/includes/scanner.html

diff --git a/js/controllers/join.js b/js/controllers/join.js
index 799b28447..89d33da99 100644
--- a/js/controllers/join.js
+++ b/js/controllers/join.js
@@ -1,10 +1,10 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('JoinController',
-  function($scope, $rootScope, $timeout, controllerUtils, notification) {
+  function($scope, $rootScope, $timeout, isMobile, controllerUtils, notification) {
     $rootScope.fromSetup = false;
     $scope.loading = false;
-    $scope.isMobile = !!window.cordova;
+    $scope.isMobile = isMobile.any();
     $rootScope.title = 'Join shared wallet';
 
     // QR code Scanner
diff --git a/views/includes/scanner.html b/views/includes/scanner.html
new file mode 100644
index 000000000..0a6e372af
--- /dev/null
+++ b/views/includes/scanner.html
@@ -0,0 +1,15 @@
+<div class="text-centered">
+  <canvas id="qr-canvas" width="200" height="150"></canvas>
+  <div ng-show="isMobile">
+    <div id="file-input-wrapper" class="btn btn-primary">
+      <span class="pull-left text-centered">
+        <i class="glyphicon glyphicon-refresh icon-rotate"></i>
+        <span translate>Get QR code</span>
+      </span>
+      <input id="qrcode-camera" type="file" capture="camera" accept="image/*">
+    </div>
+  </div>
+  <div ng-hide="isMobile">
+    <video id="qrcode-scanner-video" width="300" height="225" ng-hide="isMobile"></video>
+  </div>
+</div>
diff --git a/views/join.html b/views/join.html
index 734f81d5e..b7bd203e6 100644
--- a/views/join.html
+++ b/views/join.html
@@ -36,7 +36,7 @@
 
 
               <div class="pr">
-                <input id="connectionId" type="text" class="columns" placeholder="{{'Paste wallet secret here'|translate}}" name="connectionId" ng-model="connectionId" wallet-secret required auto-focus>
+                <input id="connectionId" type="text" class="columns" placeholder="{{'Paste wallet secret here'|translate}}" name="connectionId" ng-model="connectionId" wallet-secret required>
                 <div ng-hide="showScanner || disableScanner">
                   <a class="postfix button black" ng-click="openScanner()"><i class="fi-camera">&nbsp;</i></a>
                 </div>
@@ -45,23 +45,11 @@
                 </div>
               </div>
 
-              <div id="scanner" class="row" ng-if="showScanner">
-                <div class="text-centered">
-                  <canvas id="qr-canvas" width="200" height="150"></canvas>
-                  <div ng-show="isMobile">
-                    <div id="file-input-wrapper" class="btn btn-primary">
-                      <span class="pull-left text-centered">
-                        <i class="glyphicon glyphicon-refresh icon-rotate"></i>
-                        <span translate>Get QR code</span>
-                      </span>
-                      <input id="qrcode-camera" type="file" capture="camera" accept="image/*">
-                    </div>
-                  </div>
-                  <div ng-hide="isMobile">
-                    <video id="qrcode-scanner-video" width="300" height="225" ng-hide="isMobile"></video>
-                  </div>
-                </div>
-              </div>
+              <div id="scanner" 
+                class="row" 
+                ng-if="showScanner"
+                ng-include="'views/includes/scanner.html'"></div>
+              
             </div>
 
             <div class="line-dashed-h"></div>
diff --git a/views/send.html b/views/send.html
index 61ea1a389..0d1373a38 100644
--- a/views/send.html
+++ b/views/send.html
@@ -16,10 +16,11 @@
         <h1 class="hide-for-large-up">{{$root.title}}</h1>
       </div>
     </div>
+
     <div class="row">
       <div class="large-12 columns">
+        <form name="sendForm" ng-submit="submitForm(sendForm)" novalidate>
           <div class="panel">
-          <form name="sendForm" ng-submit="submitForm(sendForm)" novalidate>
             <p class="text-warning size-16"
             ng-show="error">
             <i class="fi-alert"></i> 
@@ -31,8 +32,6 @@
             {{success|translate}}
             </p>
 
-
-
             <div class="row collapse">
               <label for="address" class="left">
                 <span translate>To</span> 
@@ -61,23 +60,11 @@
                 </div>
               </div>
 
-            </div>
-            <div id="scanner" ng-if="showScanner">
-              <div class="text-centered">
-                <canvas id="qr-canvas" width="200" height="150"></canvas>
-                <div ng-show="isMobile">
-                  <div id="file-input-wrapper" class="btn btn-primary">
-                    <span class="pull-left text-centered">
-                      <i class="glyphicon glyphicon-refresh icon-rotate"></i>
-                      <span translate>Get QR code</span>
-                    </span>
-                    <input id="qrcode-camera" type="file" capture="camera" accept="image/*">
-                  </div>
-                </div>
-                <div ng-hide="isMobile">
-                  <video id="qrcode-scanner-video" width="300" height="225" ng-hide="isMobile"></video>
-                </div>
-              </div>
+              <div id="scanner" 
+                class="row" 
+                ng-if="showScanner"
+                ng-include="'views/includes/scanner.html'"></div>
+              
             </div>
 
             <div class="row">
@@ -188,10 +175,11 @@
                 </button>
               </div>
             </div>
-          </form>
-        </div>
+          </div>
+        </form>
       </div>
     </div><!--  end of row -->
+   
     <div class="row m20b" ng-show="$root.alternativeConversionRate > 0">
       <div class="large-12 columns size-12">
         <i class="fi-bitcoin-circle"></i>