From a9eb53e90fdcf971a8ea65fd3bc8be55c9f3cc03 Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Tue, 29 Apr 2014 18:20:44 -0300
Subject: [PATCH 1/4] various style and wording fixes

---
 index.html                     |  10 +++++-----
 js/services/controllerUtils.js |   5 +++++
 js/services/video.js           |   3 +++
 sound/online.wav               | Bin 0 -> 28440 bytes
 4 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 sound/online.wav

diff --git a/index.html b/index.html
index ec8c250b0..159462e12 100644
--- a/index.html
+++ b/index.html
@@ -20,8 +20,7 @@
             <div class="large-9 medium-9 columns text-center p10t" ng-show="$root.wallet">
               <div class="large-4 medium-4 columns line-dashed-v">
                 <a href="#/peer" class="has-tip" tooltip-placement="bottom" tooltip="{{$root.wallet.id}}">
-                  <span ng-if="!$root.wallet.name && $root.wallet.id">{{$root.wallet.id}}</span>
-                  <span ng-if="$root.wallet.name">{{$root.wallet.name}}</span>
+                  <strong><span>{{$root.getWalletDisplay()}}</span></strong>
                 </a> 
                 <a class="button radius small-icon" href="#" title="Signout" ng-click="signout()"><i class="fi-power"></i></a>
               </div>
@@ -99,9 +98,10 @@
 
   <div id="footer" data-ng-controller="FooterController" ng-show="$root.wallet">
     <link rel="stylesheet" ng-href="{{theme}}">
-    <div class="large-4 columns">
-      <span class="size-12">Copayers 
-        {{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}}</span> 
+    <div class="row">
+      <span class="size-12">
+        {{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}} wallet
+      </span> 
     </div>
     <div class="large-8 columns text-right">
       <a class="size-12" ng-if="themes.length > 1" ng-click="change_theme(th)" ng-repeat="th in themes">{{th}} {{$last ? '' : '&middot; '}}</a>
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index 45883f719..3d262e8ae 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -12,6 +12,11 @@ angular.module('copay.controllerUtils')
       return trusted;
     };
 
+    $rootScope.getWalletDisplay = function() {
+      var w = $rootScope.wallet;
+      return w && (w.name || w.id);
+    };
+
     root.logout = function() {
       console.log('### DELETING WALLET'); //TODO
       $rootScope.wallet = null;
diff --git a/js/services/video.js b/js/services/video.js
index fde16d506..367296934 100644
--- a/js/services/video.js
+++ b/js/services/video.js
@@ -7,6 +7,7 @@ var Video = function() {
 
   this.mediaConnections = {};
   this.localStream = null;
+  this.onlineSound = new Audio('../../sound/online.wav');
 };
 
 Video.prototype.setOwnPeer = function(peer, wallet, cb) {
@@ -50,10 +51,12 @@ Video.prototype.callPeer = function(peerID, cb) {
 };
 
 Video.prototype._addCall = function(mediaConnection, cb) {
+  var self = this;
   var peerID = mediaConnection.peer;
 
   // Wait for stream on the call, then set peer video display
   mediaConnection.on('stream', function(stream) {
+    self.onlineSound.play();
     cb(null, peerID, URL.createObjectURL(stream));
   });
 
diff --git a/sound/online.wav b/sound/online.wav
new file mode 100644
index 0000000000000000000000000000000000000000..ada1c71fbbb3c80a781e6c6e8e9fbeb4eae6edfd
GIT binary patch
literal 28440
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

literal 0
HcmV?d00001


From fb8a52fd6ab9c2aa3a081ad5173df2b9de71fd7e Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Tue, 29 Apr 2014 19:12:14 -0300
Subject: [PATCH 2/4] basic video footer

---
 css/main.css | 18 +++++++++---------
 index.html   | 45 ++++++++++++++++++++++++---------------------
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/css/main.css b/css/main.css
index c107abb29..91bf186d0 100644
--- a/css/main.css
+++ b/css/main.css
@@ -14,11 +14,11 @@ html, body {height: 100%;}
 #wrap {min-height: 100%;}
 
 #main {overflow:auto;
-	padding-bottom: 30px;}  /* must be same height as the footer */
+	padding-bottom: 91px;}  /* must be same height as the footer */
 
 #footer {position: relative;
-	margin-top: -30px; /* negative value of footer height */
-	height: 30px;
+	margin-top: -91px; /* negative value of footer height */
+	height: 91px;
 	clear:both;
   padding: 5px 2rem;
 }
@@ -257,17 +257,17 @@ hr { margin: 2.25rem 0;}
 }
 
 .video-small {
-  width: 120px;
-  height: 120px;
-  margin: 20px;
+  width: 80px;
+  height: 80px;
+  border-radius: 1rem;
   display: inline;
-  float:left;
+  float: right;
 }
 .online {
-  border: 10px solid green;
+  border: 3px solid green;
 }
 .offline {
-  border: 10px solid gray;
+  border: 3px solid gray;
 }
 
 .tx-copayers {
diff --git a/index.html b/index.html
index 159462e12..db2906105 100644
--- a/index.html
+++ b/index.html
@@ -99,13 +99,33 @@
   <div id="footer" data-ng-controller="FooterController" ng-show="$root.wallet">
     <link rel="stylesheet" ng-href="{{theme}}">
     <div class="row">
-      <span class="size-12">
-        {{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}} wallet
-      </span> 
+      <div class="large-2 columns">
+        <strong><div>{{$root.getWalletDisplay()}}</div></strong>
+        <span class="size-12">
+          {{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}} wallet
+        </span> 
+      </div>
+      <div class="large-2 columns" style="float:right;"
+          ng-repeat="copayer in $root.wallet.getRegisteredPeerIds()">
+        <video 
+          ng-class="($root.wallet.getOnlinePeerIDs().indexOf(copayer) != -1) ? 'online' : 'offline'"
+          class="video-small"
+          autoplay ng-show="$root.videoSrc[copayer]" 
+          ng-src="{{$root.getVideoURL(copayer)}}"
+          id="{{copayer + '-video'}}" muted="true"
+          title="{{copayer + (copayer == $root.wallet.network.peerId?' (You)':'')}}" ></video>
+        <img ng-show="!$root.videoSrc[copayer]" 
+          ng-class="($root.wallet.getOnlinePeerIDs().indexOf(copayer) != -1) ? 'online' : 'offline'"
+          class="video-small"
+          src="./img/satoshi.gif" 
+          title="{{copayer + (copayer == $root.wallet.network.peerId?' (You)':'')}}" />
+      </div>
     </div>
-    <div class="large-8 columns text-right">
+    <!--
+    <div class="large-2 columns text-right">
       <a class="size-12" ng-if="themes.length > 1" ng-click="change_theme(th)" ng-repeat="th in themes">{{th}} {{$last ? '' : '&middot; '}}</a>
     </div>
+    -->
   </div>
 
     <!-- Templates -->
@@ -230,23 +250,6 @@
           {{$root.wallet.requiredCopayers}} copayers needed for signing transactions
         </div>
       </div>
-      <div class="row">
-        <div class="large-4 columns"
-          ng-repeat="copayer in $root.wallet.getRegisteredPeerIds()">
-          <video 
-            ng-class="($root.wallet.getOnlinePeerIDs().indexOf(copayer) != -1) ? 'online' : 'offline'"
-            class="video-small"
-            autoplay ng-show="$root.videoSrc[copayer]" 
-            ng-src="{{$root.getVideoURL(copayer)}}"
-            id="{{copayer + '-video'}}" muted="true"
-            title="{{copayer + (copayer == $root.wallet.network.peerId?' (You)':'')}}" ></video>
-          <img ng-show="!$root.videoSrc[copayer]" 
-            ng-class="($root.wallet.getOnlinePeerIDs().indexOf(copayer) != -1) ? 'online' : 'offline'"
-            class="video-small"
-            src="./img/satoshi.gif" 
-            title="{{copayer + (copayer == $root.wallet.network.peerId?' (You)':'')}}" />
-        </div>
-      </div>
     </script>
     
     

From 93620fa6c013a7920728bb029a5b5b52c0689aa6 Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Tue, 29 Apr 2014 19:26:12 -0300
Subject: [PATCH 3/4] remove peer tab

---
 css/main.css                   |  2 +-
 index.html                     | 13 +------------
 js/controllers/header.js       |  7 ++-----
 js/services/controllerUtils.js |  2 +-
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/css/main.css b/css/main.css
index 91bf186d0..74c7ab950 100644
--- a/css/main.css
+++ b/css/main.css
@@ -52,7 +52,7 @@ html, body {height: 100%;}
 }
 
 .top-bar-section ul li {
-  width: 20%;
+  width: 25%;
 }
 
 .header {
diff --git a/index.html b/index.html
index db2906105..8f80d275f 100644
--- a/index.html
+++ b/index.html
@@ -43,7 +43,7 @@
 
           <section class="top-bar-section {{isCollapsed && 'hide_menu' || 'show_menu'}}">
             <ul>
-              <li data-ng-repeat="item in menu" ui-route="/{{item.link}}" class="large-2 text-center" data-ng-class="{active: isActive(item)}">
+              <li data-ng-repeat="item in menu" ui-route="/{{item.link}}" class="text-center" data-ng-class="{active: isActive(item)}">
                 <a href="{{item.link}}"> <i class="{{item.icon}}"></i> {{item.title}}</a>
               </li>
             </ul>
@@ -243,17 +243,6 @@
       </div>
     </script>
 
-    <script type="text/ng-template" id="peer.html">
-      <div class="row"  ng-if="$root.wallet.requiredCopayers > $root.wallet.network.connectedCopayers().length">
-        <div class="large-12 columns p70l">
-          <p class="text-info"> <i class="fi-alert size-28"></i> 
-          {{$root.wallet.requiredCopayers}} copayers needed for signing transactions
-        </div>
-      </div>
-    </script>
-    
-    
-
     <!-- ADDRESS -->
     <script type="text/ng-template" id="addresses.html">
       <div class="addresses" data-ng-controller="AddressesController">
diff --git a/js/controllers/header.js b/js/controllers/header.js
index 6dd683696..f9cf9e1a6 100644
--- a/js/controllers/header.js
+++ b/js/controllers/header.js
@@ -2,11 +2,8 @@
 
 angular.module('copay.header').controller('HeaderController',
   function($scope, $rootScope, $location, walletFactory, controllerUtils) {
-    $scope.menu = [{
-      'title': 'Copayers',
-      'icon': 'fi-torsos-all',
-      'link': '#/peer'
-    }, {
+    $scope.menu = [
+    {
       'title': 'Addresses',
       'icon': 'fi-address-book',
       'link': '#/addresses'
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index 3d262e8ae..bfdc3909e 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -59,7 +59,7 @@ angular.module('copay.controllerUtils')
       });
       w.on('created', function(myPeerID) {
         video.setOwnPeer(myPeerID, w, handlePeerVideo);
-        $location.path('peer');
+        $location.path('addresses');
         $rootScope.wallet = w;
         root.updateBalance();
       });

From d0c408553d0cc3a89e18f3a3670f418a405b7dab Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Tue, 29 Apr 2014 19:31:59 -0300
Subject: [PATCH 4/4] merge conflicts

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 8f80d275f..35f5f3ca2 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
             </div>
             <div class="large-9 medium-9 columns text-center p10t" ng-show="$root.wallet">
               <div class="large-4 medium-4 columns line-dashed-v">
-                <a href="#/peer" class="has-tip" tooltip-placement="bottom" tooltip="{{$root.wallet.id}}">
+                <a href="#/addresses" class="has-tip" tooltip-placement="bottom" tooltip="{{$root.wallet.id}}">
                   <strong><span>{{$root.getWalletDisplay()}}</span></strong>
                 </a> 
                 <a class="button radius small-icon" href="#" title="Signout" ng-click="signout()"><i class="fi-power"></i></a>