Merge branch 'master' of https://github.com/bitpay/copay

www/views/includes/cardActivity.html

@@ -8,7 +8,7 @@
     <div class="tx-title">
       <div class="ellipsis">
         <div class="tx-message ellipsis">{{tx.merchant.name || 'Unknown Merchant'}}</div>
-        <div class="tx-location ellipsis" ng-show="tx.merchant.city && tx.merchant.state">{{tx.merchant.location}}</div>
+        <div class="tx-location ellipsis">{{tx.merchant.location}}</div>
         <div ng-show="tx.pending && tx.transactionId" class="size-12 tx-amount--pending">
           <div ng-click="bitpayCard.viewOnBlockchain(tx.transactionId)">View Confirmation Status</div>
         </div>
@@ -19,8 +19,8 @@
         {{tx.price | currency:bitpayCard.currencySymbol:2 }}
       </span>
       <div>
-        <time class="tx-time" ng-if="createdWithinPastDay(tx)">{{tx.timestamp | amTimeAgo}}</time>
-        <time class="tx-time" ng-if="!createdWithinPastDay(tx)">{{tx.timestamp | amDateFormat:'MMM D, YYYY'}}</time>
+        <time class="tx-time" ng-if="createdWithinPastDay(tx)">{{tx.date | amTimeAgo}}</time>
+        <time class="tx-time" ng-if="!createdWithinPastDay(tx)">{{tx.date | amDateFormat:'MMM D, YYYY'}}</time>
       </div>
     </span>
   </div>

www/views/includes/checkBar.html

@@ -0,0 +1,10 @@
+<div id="check-bar">
+  <div class="check-bar list">
+    <div ng-class="fillClass" class="initial-bar-default initial-bar"></div>
+    <div class="base-bar"></div>
+    <div class="custom-checkbox" ng-repeat="option in options track by $index" ng-class="{'head': option.head}">
+      <label>{{option.label}}</label>
+      <ion-checkbox ng-model="option.selected" ng-change="getFillClass(option.level)"></ion-checkbox>
+    </div>
+  </div>
+</div>

www/views/includes/incomingDataMenu.html

@@ -3,7 +3,7 @@
 
   <div ng-if="type === 'url'">
     <div class="incoming-data-menu__item head">
-      <div class="incoming-data-menu__header">Website</div>
+      <div class="incoming-data-menu__header" translate>Website</div>
       <div class="incoming-data-menu__url">
         <div class="incoming-data-menu__url__icon">
           <img ng-hide="https" src="img/icon-lock-x.svg" style="height: 22px;">
@@ -16,17 +16,17 @@
     </div>
     <a class="incoming-data-menu__item item item-icon-right" ng-click="goToUrl(data)">
       <img src="img/icon-link-external.svg">
-      <div class="incoming-data-menu__item__text">Open website</div>
+      <div class="incoming-data-menu__item__text" translate>Open website</div>
       <i class="icon bp-arrow-right"></i>
     </a>
-    <a class="incoming-data-menu__cancel item" ng-click="hide()">
+    <a class="incoming-data-menu__cancel item" ng-click="hide()" translate>
       Cancel
     </a>
   </div>
 
   <div ng-if="type === 'bitcoinAddress'">
     <div class="incoming-data-menu__item head">
-      <div class="incoming-data-menu__header">Bitcoin Address</div>
+      <div class="incoming-data-menu__header" translate>Bitcoin Address</div>
       <div class="incoming-data-menu__url">
         <div class="incoming-data-menu__url__icon">
           <img src="img/icon-bitcoin-small.svg">
@@ -38,27 +38,27 @@
     </div>
     <a class="incoming-data-menu__item item item-icon-right" ng-click="addToAddressBook(data)">
       <img src="img/icon-contacts.svg">
-      <div class="incoming-data-menu__item__text">Add as a contact</div>
+      <div class="incoming-data-menu__item__text" translate>Add as a contact</div>
       <i class="icon bp-arrow-right"></i>
     </a>
     <a class="incoming-data-menu__item item item-icon-right" ng-click="sendPaymentToAddress(data)">
       <img src="img/icon-send-alt.svg">
-      <div class="incoming-data-menu__item__text">Send payment to this address</div>
+      <div class="incoming-data-menu__item__text" translate>Send payment to this address</div>
       <i class="icon bp-arrow-right"></i>
     </a>
     <a class="incoming-data-menu__item item item-icon-right" copy-to-clipboard="data">
       <img src="img/icon-paperclip.svg">
-      <div class="incoming-data-menu__item__text">Copy to clipboard</div>
+      <div class="incoming-data-menu__item__text" translate>Copy to clipboard</div>
       <i class="icon bp-arrow-right"></i>
     </a>
-    <a class="incoming-data-menu__cancel item" ng-click="hide()">
+    <a class="incoming-data-menu__cancel item" ng-click="hide()" translate>
       Cancel
     </a>
   </div>
 
   <div ng-if="type === 'text'">
     <div class="incoming-data-menu__item head">
-      <div class="incoming-data-menu__header">Text</div>
+      <div class="incoming-data-menu__header" translate>Text</div>
       <div class="incoming-data-menu__url">
         <div class="incoming-data-menu__url__text" style="border: 0;">
           {{data}}
@@ -67,17 +67,17 @@
     </div>
     <a class="incoming-data-menu__item item item-icon-right" copy-to-clipboard="data">
       <img src="img/icon-paperclip.svg">
-      <div class="incoming-data-menu__item__text">Copy to clipboard</div>
+      <div class="incoming-data-menu__item__text" translate>Copy to clipboard</div>
       <i class="icon bp-arrow-right"></i>
     </a>
-    <a class="incoming-data-menu__cancel item" ng-click="hide()">
+    <a class="incoming-data-menu__cancel item" ng-click="hide()" translate>
       Cancel
     </a>
   </div>
 
   <div ng-if="type === 'privateKey'">
     <div class="incoming-data-menu__item head">
-      <div class="incoming-data-menu__header">Private Key</div>
+      <div class="incoming-data-menu__header" translate>Private Key</div>
       <div class="incoming-data-menu__url">
         <div class="incoming-data-menu__url__text" style="border: 0;">
           {{data}}
@@ -86,15 +86,15 @@
     </div>
     <a class="incoming-data-menu__item item item-icon-right" ng-click="scanPaperWallet(data)">
       <img src="img/icon-import.svg">
-      <div class="incoming-data-menu__item__text">Sweep paper wallet</div>
+      <div class="incoming-data-menu__item__text" translate>Sweep paper wallet</div>
       <i class="icon bp-arrow-right"></i>
     </a>
     <a class="incoming-data-menu__item item item-icon-right" copy-to-clipboard="data">
       <img src="img/icon-paperclip.svg">
-      <div class="incoming-data-menu__item__text">Copy to clipboard</div>
+      <div class="incoming-data-menu__item__text" translate>Copy to clipboard</div>
       <i class="icon bp-arrow-right"></i>
     </a>
-    <a class="incoming-data-menu__cancel item" ng-click="hide()">
+    <a class="incoming-data-menu__cancel item" ng-click="hide()" translate>
       Cancel
     </a>
   </div>

www/views/includes/logOptions.html

@@ -0,0 +1,21 @@
+<action-sheet action-sheet-show="show" class="log-options">
+  <img class="back-arrow" src="img/icon-back-arrow.svg" ng-click="hide()">
+  <div class="header" translate="">Log options</div>
+  <div ng-include="'views/includes/checkBar.html'"></div>
+  <a class="item item-icon-left entry no-border" copy-to-clipboard="onCopy()" ng-click="hide()">
+    <i class="icon ion-clipboard"></i>
+    <div class="entry-inner">
+      <div class="entry-details">
+        <div class="entry-name" translate>Copy to clipboard</div>
+      </div>
+    </div>
+  </a>
+  <a class="item item-icon-left entry no-border" ng-click="onSend(); hide()" ng-show="isCordova">
+    <i class="icon ion-ios-email-outline"></i>
+    <div class="entry-inner">
+      <div class="entry-details">
+        <div class="entry-name" translate>Send by email</div>
+      </div>
+    </div>
+  </a>
+</action-sheet>