Merge pull request #1642 from bechi/bugs/ui-09

Bugs/ui 09

css/src/main.css

@@ -382,8 +382,8 @@ a:hover {
 table.last-transactions-content {
   padding: 0;
   border: 0;
-  background-color: #fff;
+  background-color: #F8F8FB;
-  margin: 0;
+  margin: 15px 0;
 }
 
 .last-transactions-content .box-status {
@@ -532,6 +532,7 @@ a.button-setup {
 .p15 {padding:15px;}
 .p20 {padding:20px;}
 .p10 {padding:10px;}
+.p10b {padding-bottom:10px;}
 .m30v {margin: 30px 0;}
 .m10h {margin:0 10px;}
 .m10v {margin:10px 0;}
@@ -560,22 +561,17 @@ a.button-setup {
 }
 
 .line {
-  border-top: 1px solid #f2f2f2;
+  border-top: 1px solid #F8F8FB;
-  margin: 0.5rem 0 1rem;
-}
-
-.line-sidebar {
-  border-top: 1px solid #34495E;
   margin: 0.7rem 0;
 }
 
-.line-sidebar-t {
+.line-t {
-  border-top: 1px solid #3C5269;
+  border-top: 1px solid #F8F8FB;
   padding-top: 0.5rem;
 }
 
-.line-sidebar-b {
+.line-b {
-  border-bottom: 1px solid #3C5269;
+  border-bottom: 1px solid #F8F8FB;
   padding-bottom: 0.5rem;
 }
 

js/controllers/head.js

@@ -16,6 +16,20 @@ angular.module('copayApp.controllers').controller('HeadController', function($sc
     controllerUtils.logout();
   };
 
+  $scope.refresh = function() {
+    var w = $rootScope.wallet;
+    if (!w) return;
+
+    if (w.isReady()) {
+      w.sendWalletReady();
+      if ($rootScope.addrInfos.length > 0) {
+        controllerUtils.clearBalanceCache(w);
+        controllerUtils.updateBalance(w, function() {
+          $rootScope.$digest();
+        });
+      }
+    }
+  };
 
   // Ensures a graceful disconnect
   window.onbeforeunload = function() {

views/history.html

@@ -7,9 +7,9 @@
     <div ng-if="!blockchain_txs[0].txid && !loading">
       <em><strong translate>No transactions yet.</strong></em>
     </div>
-    <div class="panel large-12 columns" ng-repeat="btx in blockchain_txs | orderBy: 'time':true">
+    <div class="panel large-12 columns" ng-repeat="btx in blockchain_txs | orderBy: 'time':true" ng-click="btx.showDetails = !btx.showDetails">
-      <div class="row collapse">
+      <div class="row collapse size-12">
-        <div class="large-2 medium-2 small-4 columns">
+        <div class="large-3 medium-3 small-4 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)">
@@ -17,7 +17,7 @@
           </span>
         </div>
 
-        <div class="large-3 medium-3 small-5 columns">
+        <div class="large-2 medium-2 small-5 columns">
           {{btx.amount| noFractionNumber}} {{$root.wallet.settings.unitName}}
           {{btx.action}} 
         </div>
@@ -31,11 +31,11 @@
           <span ng-show="btx.comment">{{btx.comment}}</span>
         </div>
 
-        <div class="large-1 medium-1 small-4 columns size-10 text-right"
+        <div class="large-1 medium-1 small-1 columns text-right"
           ng-init="btx.showDetails = false">
-          <a ng-click="btx.showDetails = !btx.showDetails">
+          <a>
-            <i ng-if="!btx.showDetails" class="icon-arrow-down2"></i>
+            <i ng-if="!btx.showDetails" class="icon-arrow-down4"></i>
-            <i ng-if="btx.showDetails" class="icon-arrow-up2"></i>
+            <i ng-if="btx.showDetails" class="icon-arrow-up4 size-12"></i>
           </a>
         </div>
       </div>
@@ -43,7 +43,7 @@
         <table class="last-transactions-content" ng-if="btx.actionList.0">
           <tbody>
           <tr ng-repeat="c in btx.actionList">
-            <td class="copayer-name" width="100%">{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}
+            <td class="copayer-name text-gray" width="100%">{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}
             </td>
             <td>
               <i ng-if="c.actions.create" class="fi-crown icon-status icon-active"></i>
@@ -61,14 +61,10 @@
           </tr> 
           </tbody>
         </table>
-        <div class="line-sidebar-t m10t">
+        <div class="line"></div>
-          <small class="ellipsis">Transaction ID: 
+        <div class="size-12 text-gray">
-            <a
+            <span class="left hide-for-small-only">Transaction ID: {{btx.txid}} </span>
-              href="http://{{getShortNetworkName()}}.insight.is/tx/{{btx.txid}}"
+            <a href="http://{{getShortNetworkName()}}.insight.is/tx/{{btx.txid}}" target="_blank" class="right"> More details <i class="icon-arrow-right2 vm"></i> </a>
-              target="_blank">
-              {{btx.txid}}
-            </a>
-          </small>
         </div>
       </div>
     </div>

views/includes/head.html

@@ -17,6 +17,11 @@
   </ul>
 </div>
 <div class="right">
-  <a class="button tiny pri radius oh" href="#!/manage" title="Manage wallets"><i class="fi-plus"></i> {{'Manage wallets' | translate }}</a>
+  <a class="button tiny secondary radius oh" href="#!/manage" title="Manage wallets"><i class="fi-plus"></i> {{'Manage wallets' | translate }}</a>
+</div>
+<div class="right m20r m5t">
+  <a ng-click="refresh()" class="size-18 text-gray">
+    <i class="fi-refresh right"></i>
+  </a>
 </div>
 

views/includes/sidebar.html

@@ -7,9 +7,6 @@
       <div class="oh m5t m10r"> 
         <div class="right size-10">[ {{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ]</div>
         <div class="name-wallet">
-          <a ng-click="refresh()">
-            <i class="fi-refresh right"></i>
-          </a>
           <div class="ellipsis">{{$root.wallet.getName()}}</div>
         </div> 
       </div>