From 1e1f39e3b26f6845157121f588e1848eebaed92a Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 5 Nov 2014 17:33:51 -0300
Subject: [PATCH] fix layout history, manage and settings

---
 views/history.html | 36 +++++++++++++--------
 views/manage.html  | 80 +++++++++++++++++++++++-----------------------
 views/more.html    |  2 +-
 3 files changed, 64 insertions(+), 54 deletions(-)

diff --git a/views/history.html b/views/history.html
index 74eaec1bc..d67cb1cc2 100644
--- a/views/history.html
+++ b/views/history.html
@@ -1,5 +1,6 @@
 <div class="transactions" data-ng-controller="HistoryController" data-ng-init="update()">
   <div ng-show='$root.wallet.isReady()'>
+    <h1 class="hide-for-large-up">{{$root.title}}</h1> 
     <div ng-if="loading" class="m20b">
       <i class="fi-bitcoin-circle icon-rotate spinner"></i> 
       <span translate>Loading...</span>
@@ -15,20 +16,29 @@
         <div class="panel oh" 
           ng-repeat="btx in blockchain_txs | orderBy: 'time':true" ng-click="btx.showDetails = !btx.showDetails">
           <div class="row size-14">
-            <div class="large-2 medium-3 small-12 columns">
-              <span ng-hide="btx.ts">&nbsp;</span>
-              <time ng-if="btx.ts">{{btx.ts | amCalendar}}</time>
-              <span class="label alert" ng-show="!btx.ts && (!btx.confirmations || btx.confirmations == 0)">
-                <span translate>Unconfirmed</span>
-              </span>
+            <div class="large-2 medium-2 small-12 columns">
+              <div class="tx-date">
+                <time ng-if="btx.ts">{{btx.ts | amCalendar}}</time>
+                <span class="label alert" ng-show="!btx.ts && (!btx.confirmations || btx.confirmations == 0)">
+                  <span translate>Unconfirmed</span>
+                </span>
+              </div>
             </div>
 
-            <div class="large-2 medium-3 small-6 columns text-right">
-              <div ng-class="{
+            <div class="large-2 medium-3 small-5 columns text-right">
+              <div class="tx-amount" ng-class="{
                 'text-primary' : btx.action == 'received',
                 'text-warning': btx.action == 'sent', 
                 'text-gray': btx.action == 'moved'}">
                 <b>{{btx.amount| noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
+              </div>
+            </div>
+            
+            <div class="large-1 medium-1 small-2 columns text-center">
+              <div ng-class="{
+                'text-primary' : btx.action == 'received',
+                'text-warning': btx.action == 'sent', 
+                'text-gray': btx.action == 'moved'}">
                 <i class="m15h" 
                   ng-class="{
                   'fi-arrow-left' : btx.action == 'received',
@@ -37,13 +47,13 @@
               </div>
             </div>
 
-            <div class="large-3 medium-3 small-6 columns text-gray">
-              <span ng-hide="btx.labelTo">&nbsp;</span>
-              <span ng-show="btx.labelTo">{{btx.labelTo}}</span>
+            <div class="large-3 medium-3 small-5 columns text-gray">
+              <span class="ellipsis">{{btx.labelTo || btx.addressTo}}</span>
             </div>
 
-            <div class="large-4 medium-3 small-12 columns text-gray"> 
-              <span ng-show="btx.comment"><i class="fi-comment-quotes"></i> {{btx.comment}} </span>
+            <div class="large-3 medium-3 small-12 columns text-gray"> 
+              <div class="tx-comment" ng-show="btx.comment">
+                <i class="fi-comment-quotes"></i> {{btx.comment}}</div>
             </div>
 
             <div class="large-1 columns show-for-large-up text-gray text-right" ng-init="btx.showDetails = false">
diff --git a/views/manage.html b/views/manage.html
index d010c8138..95e4cf5ef 100644
--- a/views/manage.html
+++ b/views/manage.html
@@ -1,49 +1,49 @@
 <div class="backup" ng-controller="ManageController">
   <h1 class="hide-for-large-up">{{$root.title}}</h1>
-  <div class="row collapse">
-    <div class="large-12 columns">
-      <div class="large-4 columns" >
-        <div class="panel text-center" ui-route="{{create}}">
-          <div><i class="size-72 fi-plus text-gray"></i></div>
-          <p class="text-gray">Create a new Wallet</p>
-          <a href="#!/create" class="button primary radius" title="Create"> {{'Create' | translate }} </a>
-        </div>    
-      </div>
-      <div class="large-4 columns" ui-route="{{create}}">
-        <div class="panel text-center">
-          <div><i class="size-72 fi-torsos-all text-gray"></i></div>
-          <p class="text-gray">Join an existent Wallet</p>
-          <a href="#!/join" class="button secondary radius" title="Join"> {{'Join' | translate }} </a>
-        </div>    
-      </div>
-      <div class="large-4 columns" ui-route="{{create}}">
-        <div class="panel text-center">
-          <div><i class="size-72 fi-download text-gray"></i></div>
-          <p class="text-gray">Import a Wallet to Copay</p>
-          <a href="#!/import" class="button black radius" title="Import"> {{'Import wallet' | translate }}</a>
-        </div>    
-      </div>
+  <div class="row">
+    <div class="large-4 columns" >
+      <div class="panel text-center" ui-route="{{create}}">
+        <div><i class="size-72 fi-plus text-gray"></i></div>
+        <p class="text-gray">Create a new Wallet</p>
+        <a href="#!/create" class="button primary radius" title="Create"> {{'Create' | translate }} </a>
+      </div>    
+    </div>
+    <div class="large-4 columns" ui-route="{{create}}">
+      <div class="panel text-center">
+        <div><i class="size-72 fi-torsos-all text-gray"></i></div>
+        <p class="text-gray">Join an existent Wallet</p>
+        <a href="#!/join" class="button secondary radius" title="Join"> {{'Join' | translate }} </a>
+      </div>    
+    </div>
+    <div class="large-4 columns" ui-route="{{create}}">
+      <div class="panel text-center">
+        <div><i class="size-72 fi-download text-gray"></i></div>
+        <p class="text-gray">Import a Wallet to Copay</p>
+        <a href="#!/import" class="button black radius" title="Import"> {{'Import wallet' | translate }}</a>
+      </div>    
     </div>
   </div>
 
+  <div class="line-dashed-h m30v"></div>
 
-  <div class="large-12 columns line-dashed-h m30v"></div>
-  <div class="oh large-12 columns panel">
-    <h3><i class="fi-download m10r"></i> <span translate>Backup Profile</span> </h3>
-    <p translate class="large-8 columns text-gray">It's important to backup your profile so that you can recover it in case of disaster. The backup will include all your profile's wallets</p>
-    <div class="large-4 columns">
-      <a translate class="button primary m0" ng-click="downloadBackup()"
-        ng-show="!isSafari">Backup profile</a>
-      <a translate class="button primary m0" ng-click="viewBackup()"
-        ng-show="isSafari && !hideViewBackup">View profile backup</a>
-    </div>
-    <div ng-show="backupPlainText">
-      <textarea readonly rows="5">{{backupPlainText}}</textarea>
-      <div class="show-for-large-up">
-        <span translate class="size-12">Copy to clipboard</span> <span class="btn-copy" clip-copy="backupPlainText"> </span>
-      </div>
-      <div class="hide-for-large-up">
-        <span translate class="size-12">Copy this text as it is in a safe place (notepad or email)</span>
+  <div class="row">
+    <div class="large-12 columns">
+      <div class="panel">
+        <h2><i class="fi-download m10r"></i> <span translate>Backup Profile</span></h2>
+        <p translate class="text-gray">It's important to backup your profile so that you can recover it in case of disaster. The backup will include all your profile's wallets</p>
+        <a translate class="button primary m0" ng-click="downloadBackup()"
+          ng-show="!isSafari">Backup profile</a>
+        <a translate class="button primary m0" ng-click="viewBackup()"
+          ng-show="isSafari && !hideViewBackup">View profile backup</a>
+        <div ng-show="backupPlainText">
+          <textarea rows="5">{{backupPlainText}}</textarea>
+          <div class="show-for-large-up">
+            <span translate class="size-12">Copy to clipboard</span> <span class="btn-copy" clip-copy="backupPlainText"> </span>
+          </div>
+          <div class="hide-for-large-up">
+            <span translate class="size-12">Copy this text as it is in a safe place (notepad or email)</span>
+          </div>
+        </div>
       </div>
     </div>
   </div>
diff --git a/views/more.html b/views/more.html
index 5dbfd4122..108151341 100644
--- a/views/more.html
+++ b/views/more.html
@@ -1,5 +1,5 @@
 <div class="backup" ng-controller="MoreController">
-  <h1 class="hide-for-large-up">{{$root.title}} </h1>
+  <h1 class="hide-for-large-up">{{$root.title}}</h1>
   <div class="row">
     <form name="settingsForm">
       <div class="large-6 medium-6 columns">