Merge pull request #2125 from bechi/bugs/waiting-copayers

fix layout bugs

js/controllers/copayers.js

@@ -4,7 +4,7 @@ angular.module('copayApp.controllers').controller('CopayersController',
   function($scope, $rootScope, $timeout, go) {
     $scope.init = function() {
       var w = $rootScope.wallet;
-      $rootScope.title = 'Waiting copayers for ' + $rootScope.wallet.getName();
+      $rootScope.title = 'Share this secret with your copayers';
       $scope.loading = false;
       $scope.secret = $rootScope.wallet.getSecret();
 

views/copayers.html

@@ -1,34 +1,30 @@
 <div ng-controller="CopayersController" ng-init="init()">
-  <div class="row hide-for-large-up">
-    <div class="medium-12 small-12 columns">
-      <h1 translate>
-        Waiting copayers...
-      </h1>
+  <div class="row">
+    <div class="large-12 medium-12 small-12 columns">
+      <h1 class="hide-for-large-up size-18">{{$root.title}}</h1> 
     </div>
   </div>
   <div class="row">
     <div class="large-12 columns">
       <div ng-if="!$root.wallet.isComplete()">
         <div class="panel oh">
-          <h2 class="line-b">
-            Share this secret with your other copayers 
-            <div class="right size-10">
-              <span ng-if="!$root.wallet.isShared()">Personal Wallet</span>
-              <span ng-if="$root.wallet.isShared()">
-                Multisignature wallet [{{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ]
-              </span>
-              <span ng-if="$root.wallet.isTestnet()"> in TESTNET</span>
-            </div>
-          </h2>
           <div class="text-center">
             <qrcode size="250" data="{{secret}}"></qrcode>
           </div>
-          <div class="secret m20t">
+          <div class="secret m10v">
             {{secret}} 
           </div>
+          <div class="size-10 line-t text-center">
+            <h2 class="m10t">{{$root.wallet.getName()}}</h2>
+            <span class="text-gray">
+            [{{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ]
+            </span>
+            <span ng-if="$root.wallet.isTestnet()"> in TESTNET</span>
+          </div>
         </div>
       </div>
       <div class="panel oh">
+        <h3>Waiting for copayers</h3>
         <div ng-include="'views/includes/copayers.html'"></div> 
         <div class="copay-box" ng-if="!$root.wallet.isComplete()">
           <span ng-include="'views/includes/photo.html'"></span>