From 31025dfd893b8f6385aab21dbde3235e10cf8a03 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Mon, 21 Jul 2014 17:57:43 -0300
Subject: [PATCH] Transactions proposals.

---
 css/main.css            | 35 +++++++++++++++++++++++++++++++++++
 views/transactions.html | 32 +++++++++++++++-----------------
 2 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/css/main.css b/css/main.css
index 27bb6b8b9..a92b64945 100644
--- a/css/main.css
+++ b/css/main.css
@@ -187,6 +187,41 @@ body, html{
   padding: 10px;
 }
 
+.last-transactions-content .box-status {
+  text-align: center;
+  font-size: 14;
+}
+
+.last-transactions-content .box-copayer {
+  width: 80px;
+  margin-right: 20px;
+  float: left;
+}
+
+.last-transactions-content .box-copayer .icon-inactive {
+  color: #4C5B69;
+}
+
+.last-transactions-content .box-copayer .icon-active {
+  color: #ccc;
+}
+
+.last-transactions-content .box-copayer .icon-active-check {
+  color: #3FBC9C;
+}
+
+.last-transactions-content .box-copayer .icon-active-x {
+  color: #C0392B;
+}
+
+.box-note {
+  text-align: center;
+  clear: both;
+  font-style: italic;
+  color: gray;
+  margin-bottom: 10px;
+}
+
 .button-setup a {
   display: block;
   padding: 30px 20px;
diff --git a/views/transactions.html b/views/transactions.html
index bee37cf2a..05a55a77e 100644
--- a/views/transactions.html
+++ b/views/transactions.html
@@ -1,14 +1,14 @@
 <div class="transactions" data-ng-controller="TransactionsController">
   <div class="row" ng-show='$root.wallet.isReady()'>
     <div class="large-12 columns" ng-show="wallet.totalCopayers > 1">
-      <h4> Transaction proposals <small>({{txs.length}})</small></h4>
+      <h1> Transaction proposals <small>({{txs.length}})</small></h1>
 
       <ul class="inline-list">
         <li> <a class="text-gray size-12" ng-click="show(true)" ng-disabled="loading || onlyPending" loading="Updating" ng-class="{'active' : onlyPending}"> [ Pending ] </a> </li>
         <li> <a class="text-gray size-12" ng-click="show()" ng-disabled="loading || !onlyPending" loading="Updating" ng-class="{'active' : !onlyPending}"> [ All ] </a> </li>
       </ul>
-      <div class="panel radius pending" ng-repeat="tx in txs | paged">
-        <div class="txheader row m10">
+      <div class="last-transactions" ng-repeat="tx in txs | paged">
+        <div class="last-transactions-header row">
           <div class="large-8 medium-8 small-12 columns">
             <div class="row" ng-repeat="out in tx.outs">
               <div class="large-3 medium-3 small-3 columns ellipsis">
@@ -24,30 +24,28 @@
           </div>
         </div>
 
-        <div class="tx-copayers">
+        <div class="last-transactions-content">
           <div class="box-note large-12" ng-show="tx.comment">
             "{{tx.comment}}" - {{$root.wallet.publicKeyRing.nicknameForCopayer(tx.creator)}}
           </div>
 
-          <div class="box-copayers" ng-repeat="(cId, actions) in tx.peerActions">
-            <figure class="left">
+          <div class="box-copayer" ng-repeat="(cId, actions) in tx.peerActions">
               <a href="/transactions" class="has-tip" tooltip-popup-delay="1000" tooltip="{{cId === $root.wallet.getMyCopayerId() ? 'You' : $root.wallet.publicKeyRing.nicknameForCopayer(cId)}}">
-                <img src="./img/satoshi.gif" alt="{{cId}}" width="200">
+                <img class="copayer-ico br100" src="./img/satoshi.gif" alt="{{cId}}">
               </a>
-            </figure>
             <div class="box-status">
               <span ng-repeat="(action, ts) in actions">
-                <a ng-if="action == 'create'" href="/transactions" class="has-tip" tooltip-popup-delay="1000" tooltip="Created {{ts | amTimeAgo}}">
-                  <i class="fi-crown size-12 icon-status icon-active"></i>
+                <a ng-if="action == 'create'" href="/transactions" tooltip-popup-delay="1000" tooltip="Created {{ts | amTimeAgo}}">
+                  <i class="fi-crown icon-status icon-active"></i>
                 </a>
-                <a ng-if="action == 'seen'" href="/transactions" class="has-tip" tooltip-popup-delay="1000" tooltip="Seen {{ts | amTimeAgo}}">
-                  <i class="fi-eye size-12 icon-status icon-active"></i>
+                <a ng-if="action == 'seen'" href="/transactions" tooltip-popup-delay="1000" tooltip="Seen {{ts | amTimeAgo}}">
+                  <i class="fi-eye icon-status icon-active"></i>
                 </a>
-                <a ng-if="action == 'sign'" href="/transactions" class="has-tip" tooltip-popup-delay="1000" tooltip="Signed {{ts | amTimeAgo}}">
-                  <i class="fi-check size-12 icon-status icon-active-check"></i>
+                <a ng-if="action == 'sign'" href="/transactions" tooltip-popup-delay="1000" tooltip="Signed {{ts | amTimeAgo}}">
+                  <i class="fi-check icon-status icon-active-check"></i>
                 </a>
-                <a ng-if="action == 'rejected'" href="/transactions" class="has-tip" tooltip-popup-delay="1000" tooltip="Rejected {{ts | amTimeAgo}}">
-                  <i class="fi-x size-12 icon-status icon-active-x"></i>
+                <a ng-if="action == 'rejected'" href="/transactions" tooltip-popup-delay="1000" tooltip="Rejected {{ts | amTimeAgo}}">
+                  <i class="fi-x icon-status icon-active-x"></i>
                 </a>
               </span>
             </div>
@@ -58,7 +56,7 @@
           </div>
         </div>
 
-        <div class="row m10">
+        <div class="row last-transactions-footer">
           <div class="large-5 medium-5 columns" ng-show="!tx.sentTs">
             <div ng-show="!tx.signedByUs && !tx.rejectedByUs  && !tx.finallyRejected && tx.missingSignatures">
               <button class="secondary radius m10r"  ng-click="sign(tx.ntxid)" ng-disabled="loading" loading="Signing">