Merge branch 'master' into bugs/ui

views/includes/copayer.html

@@ -1,17 +1,9 @@
-<div ng-controller="VideoController">
-  <div class="video-box" ng-repeat="copayer in copayersList()">
-    <video
-      ng-if="hasVideo(copayer)"
-      peer="{{copayer}}" avatar autoplay
-      ng-class="true || isConnected(copayer) ? 'online' : 'offline'"
-      ng-src="{{getVideoURL(copayer)}}"></video>
-
+<div ng-controller="CopayersController">
+  <div class="copay-box" ng-repeat="copayer in copayersList()">
     <img
-      class="br100 no-video"
-      ng-if="!hasVideo(copayer)"
-      ng-class="true || isConnected(copayer) ? 'online' : 'offline'"
+      class="br100 online"
       src="./img/satoshi.gif"
-      alt="{{copayer}}"
+      alt="{{copayer.peerId}}"
       width="70">
 
     <div

views/includes/peer-list.html

@@ -1,55 +1,22 @@
-<div ng-controller="VideoController" class="copayers">
-  <div>
-    <h3>
-      <i class="fi-torsos-all size-21 m20r"></i>
-      Copayers
-      <small class="m15l">
-        {{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}}
-      </small>
-    </h3>
-  </div>
-  
+<div ng-controller="CopayersController" class="copayers">
+  <h3>
+    <i class="fi-torsos-all size-21 m20r"></i>
+    Copayers
+    <small class="m15l">
+      {{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}}
+    </small>
+  </h3>
 
-  <ul class="copayer-list" ng-repeat="copayer in copayers">
-    <li class="ellipsis">
-      <video
-        ng-if="hasVideo(copayer)"
-        peer="{{copayer}}" avatar autoplay
-        ng-class="isConnected(copayer) ? 'online' : 'offline'"
-        ng-src="{{getVideoURL(copayer)}}"></video>
+  <div class="copay-box-small" ng-repeat="copayer in copayers">
+    <img
+      class="br100 online"
+      src="./img/satoshi.gif"
+      alt="{{copayer.peerId}}"
+      width="30">
 
-      <img 
-        class="br100 oh no-video m20r"
-        ng-if="!hasVideo(copayer)"
-        ng-class="isConnected(copayer) ? 'online' : 'offline'"
-        src="./img/satoshi.gif"
-        alt="{{copayer}}"
-        width="70">
-
-      <span ng-show="copayer.index == 0">Me</span>
-      <span ng-show="copayer.index > 0">{{copayer.nick}}</span>
-      <span class="btn-copy" clip-copy="copayer.peerId"></span>
-    </li>
-  </ul>
-  <div class="copayer-list-small-height" ng-repeat="copayer in copayers">
-    <span class="left" class="has-tip" tooltip-placement="top" tooltip="{{copayer.nick}}">
-      <video
-        ng-if="hasVideo(copayer)"
-        peer="{{copayer}}" avatar autoplay
-        ng-class="isConnected(copayer) ? 'online' : 'offline'"
-        ng-src="{{getVideoURL(copayer)}}"></video>
-
-      <img 
-        class="br100 oh no-video m20r"
-        ng-if="!hasVideo(copayer)"
-        ng-class="isConnected(copayer) ? 'online' : 'offline'"
-        src="./img/satoshi.gif"
-        alt="{{copayer}}"
-        width="70">
-
-      <!-- <span ng-show="copayer.index == 0">Me</span>
-      <span ng-show="copayer.index > 0">{{copayer.nick}}</span>
-      <span class="btn-copy" clip-copy="copayer.peerId"></span> -->
-    </span>
-  </div>
+    <div class="ellipsis" tooltip-placement="top" tooltip="{{copayer.nick}}">
+      <small class="text-gray" ng-show="copayer.index == 0">Me</small>
+      <small class="text-gray" ng-show="copayer.index > 0">{{copayer.nick}}</small>
+    </div>
+  </div> 
 </div>

views/includes/sidebar.html

@@ -24,10 +24,9 @@
         class="has-tip"
         data-options="disable_for_touch:true"
         tooltip-popup-delay='500'
-        tooltip="{{totalBalanceBTC |noFractionNumber:8}} BTC"
+        tooltip="{{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}"
         tooltip-trigger="mouseenter"
-        tooltip-placement="bottom">{{totalBalance || 0
-        |noFractionNumber}} {{$root.unitName}} 
+        tooltip-placement="bottom">{{totalBalance || 0 |noFractionNumber}} {{$root.unitName}}
       </span>
       <br>
       Locked &nbsp;
@@ -38,7 +37,7 @@
         class="has-tip"
         data-options="disable_for_touch:true"
         tooltip-popup-delay='500'
-        tooltip="{{lockedBalanceBTC |noFractionNumber:8}} BTC"
+        tooltip="{{lockedBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}"
         tooltip-trigger="mouseenter"
         tooltip-placement="bottom">{{lockedBalance || 0|noFractionNumber}} {{$root.unitName}}
       </span> &nbsp;<i class="fi-info medium" tooltip="Balance locked in pending transaction proposals" tooltip-placement="bottom"></i>