From 1c7a48e82729b448f53118fc2e9916ae9bb24225 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 19 Feb 2015 11:06:24 -0300
Subject: [PATCH] Fix popup tx-details/addressbook/txp-details

---
 views/modals/address-book.html | 12 +++++-------
 views/modals/tx-details.html   | 12 ++++++------
 views/modals/txp-details.html  |  6 ++----
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/views/modals/address-book.html b/views/modals/address-book.html
index 3c2f6bfe4..3d23d0d1f 100644
--- a/views/modals/address-book.html
+++ b/views/modals/address-book.html
@@ -1,8 +1,7 @@
 <nav class="tab-bar text-right hide-for-large-up">
   <span ng-click="close()" class="p10 text-white">Close</span>
 </nav>
-<div class="row modal-mobile">
-  <div class="large-12 columns"> 
+<div class="modal-mobile">
     <h1 ng-show="!showForm">Address Book</h1>
     <h1 ng-show="showForm">Add a new entry</h1>
     <p translate class="text-gray m15b" ng-show="!showForm && !hasEntry()">Empty. Create an alias for your addresses</p>
@@ -18,7 +17,7 @@
       <thead class="show-for-large-up">
         <tr>
           <th translate>Entry</th>
-          <th ng-class="{'hide-for-small-only' : $root.wallet.isShared()}" ng-show="$root.wallet.isShared()" translate>Creator</th>
+          <th class="show-for-large-up" ng-class="{'hide-for-small-only' : $root.wallet.isShared()}" ng-show="$root.wallet.isShared()" translate>Creator</th>
           <th class="show-for-large-up" translate>Date</th>
           <th class="show-for-large-up">Visible</th>
         </tr>
@@ -28,10 +27,10 @@
         ng-repeat="(addr, info) in addressBook"
         ng-class="{'addressbook-disabled': info.hidden}">
         <td ng-click="copyToSend(addr)">
-          <b>{{info.label}}</b><br>
-          <span class="address-size">{{::addr}}</span>
+          <b>{{info.label}}</b>
+          <div class="small address-size">{{::addr}}</div>
         </td>
-        <td ng-click="copyToSend(addr)" ng-show="$root.wallet.isShared()" ng-class="{'hide-for-small-only' : $root.wallet.isShared()}">{{$root.wallet.publicKeyRing.nicknameForCopayer(info.copayerId)}}</td>
+        <td class="show-for-large-up" ng-click="copyToSend(addr)" ng-show="$root.wallet.isShared()">{{$root.wallet.publicKeyRing.nicknameForCopayer(info.copayerId)}}</td>
         <td ng-click="copyToSend(addr)" class="show-for-large-up"><time>{{::info.createdTs | amCalendar}}</time></td>
         <td class="show-for-large-up text-center">
           <a ng-click="toggleAddressBookEntry(addr)" title="{{ info.hidden ? 'Enable' : 'Disable'}} address">
@@ -83,6 +82,5 @@
     <a ng-show="!showForm" class="button primary expand" ng-disabled="loading" ng-click="toggleForm()">
       <i class="fi-plus"></i> Add entry
     </a>
-  </div>
   <a class="close-reveal-modal show-for-large-up" ng-click="close()"><i class="fi-x size-18"></i></a>
 </div>
diff --git a/views/modals/tx-details.html b/views/modals/tx-details.html
index 848f795c6..a57d40ffc 100644
--- a/views/modals/tx-details.html
+++ b/views/modals/tx-details.html
@@ -44,13 +44,13 @@
   <p class="text-gray size-14">{{btx.merchant.pr.pd.memo}}</p>
 </div>
 
-<div class="m10v line-b">
-  <span class="label alert" ng-show="!btx.ts && (!btx.confirmations || btx.confirmations == 0)">
-    <span translate>Unconfirmed</span>
+<div class="m10v line-b" ng-show="btx.ts">
+  <i translate>Confirmations: </i>
+  <span class="label radius alert" ng-show="!btx.confirmations || btx.confirmations == 0" translate>
+    Unconfirmed
   </span>
-  <span ng-show="btx.confirmations>0" class="m10v">
-    <i translate>Confirmations:  </i>
-    <p class="label radius">{{btx.confirmations}}</p>
+  <span class="label radius" ng-show="btx.confirmations>0">
+    {{btx.confirmations}}
   </span>
 </div>
 
diff --git a/views/modals/txp-details.html b/views/modals/txp-details.html
index 3b6ccca2e..d0d700a4d 100644
--- a/views/modals/txp-details.html
+++ b/views/modals/txp-details.html
@@ -90,16 +90,14 @@
   <div class="large-5 medium-5 small-5 columns">
     <button class="button warning m0 expand" ng-click="hideTxInfo = true; hideSign = true; reject(tx.ntxid);" 
       ng-disabled="loading" ng-show="!hideReject">
-      <i class="fi-x icon-sign x" ng-show="!loading"></i>  
-      <i class="fi-bitcoin-circle icon-rotate spinner" ng-show="loading"></i>
+      <i class="fi-x icon-sign x"></i>  
       <span translate>Reject</span>
     </button>
   </div>
   <div class="large-5 medium-5 small-5 columns text-right">
     <button class="button primary m0 expand" ng-click="hideTxInfo = true; hideReject = true; sign(tx.ntxid)" 
       ng-disabled="loading" ng-show="!hideSign">
-      <i class="fi-check icon-sign check" ng-show="!loading"></i>  
-      <i class="fi-bitcoin-circle icon-rotate spinner" ng-show="loading"></i>
+      <i class="fi-check icon-sign check"></i>  
       <span translate>Sign</span>
     </button>
   </div>