From 8caffb8632997eef922a9b7650d944c6cc8149d9 Mon Sep 17 00:00:00 2001
From: Gregg Zigler <gregg@bitpay.com>
Date: Fri, 17 Jul 2015 14:48:46 -0700
Subject: [PATCH] simplify html, improve localizability by using Recipients as
 label

---
 public/views/includes/output.html      | 10 ++--------
 public/views/includes/transaction.html | 18 +++++++-----------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/public/views/includes/output.html b/public/views/includes/output.html
index 82f324b62..30779518d 100644
--- a/public/views/includes/output.html
+++ b/public/views/includes/output.html
@@ -1,11 +1,9 @@
 <div class="ng-animate-disabled row collapse line-b" ng-class="text-gray">
   <li ng-if="output.summary" class="line-b p10 oh" ng-click="expand(output.parent)">
-    <span class="text-gray" translate>To</span>:
-    <span class="right enable_text_select" ng-if="output.summary.length>1">{{output.summary.length}}
-        <span class="enable_text_select" translate>recipients</span>
+    <span class="text-gray" translate>Recipients</span>:
+    <span class="right enable_text_select">{{output.summary.length}}
         <i class="icon-arrow-down size-24"></i>
     </span>
-    <span class="right enable_text_select" ng-if="output.summary.length==1">{{output.summary[0].toAddress}}</span>
   </li>
   <li ng-if="!output.summary" class="line-b p10 oh" ng-click="copyAddress(output.toAddress)">
     <span class="text-gray" translate>To</span>:
@@ -17,10 +15,6 @@
       <span class="label gray radius enable_text_select">{{output.alternativeAmountStr}}</span>
     </span>
   </li>
-  <li class="line-b p10 oh" ng-if="output.summary && output.summary.length==1 && output.summary[0].message" ng-click="expand(output.parent)">
-    <span class="text-gray" translate>Note</span>:
-    <span class="right enable_text_select">{{output.summary[0].message}}</span>
-  </li>
   <li class="line-b p10 oh" ng-click="expand(output.parent)">
     <span class="text-gray" translate>Note</span>:
     <span class="right enable_text_select">{{output.message}}</span>
diff --git a/public/views/includes/transaction.html b/public/views/includes/transaction.html
index 2ad5ecab5..a5438e714 100644
--- a/public/views/includes/transaction.html
+++ b/public/views/includes/transaction.html
@@ -11,20 +11,16 @@
         <time class="right size-12 text-gray m5t">{{ (tx.ts || tx.createdOn ) * 1000 | amTimeAgo}}</time>
       </div>
       <div class="ellipsis size-14">
-        <span translate>To</span>:
-        <span ng-if="tx.merchant">
-          <span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.merchant.domain}}</span>
-          <span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.merchant.domain}}</span>
-        </span>
-        <span ng-if="tx.outputs && tx.outputs.recipientCount>1">
+        <span ng-if="tx.outputs">
+          <span translate>Recipients</span>:
           <span>{{tx.outputs.recipientCount}}</span>
-          <span translate>recipients</span>
-        </span>
-        <span ng-if="tx.outputs && tx.outputs.recipientCount==1">
-          <contact address="{{tx.outputs[0].summary[0].toAddress}}" ng-hide="tx.merchant"> </contact>
-          {{tx.outputs[0].summary[0].toAddress}}
         </span>
         <span ng-if="!tx.outputs">
+          <span translate>To</span>:
+          <span ng-if="tx.merchant">
+            <span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.merchant.domain}}</span>
+            <span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.merchant.domain}}</span>
+          </span>
           <contact address="{{tx.toAddress}}" ng-hide="tx.merchant"> </contact>
           {{tx.toAddress}}
         </span>