Merge remote-tracking branch 'upstream' into server-configs

Author: rmisio

css/obBase.css

@@ -477,6 +477,32 @@ form {
   flex-grow: 1;
 }
 
+.listingType {
+  background-color: #252525;
+  color: #ffffff;
+  position: absolute;
+  padding: 6px;
+  top: 40px;
+  right: 40px;
+  font-size: 11px;
+  font-weight: 500;
+  transition: top .3s cubic-bezier(0, 0, 0.2, 1);
+}
+
+.listingDoesNotShipToYou {
+  background-color: rgba(37, 37, 37, 0.65); 
+  /*border-radius: 20px;*/
+  height: 20px; 
+  left: 32px;
+  line-height: 20px; 
+  padding: 8px 4px; 
+  position: absolute; 
+  text-align: center; 
+  top: calc(50% - 32px); 
+  width: 242px; 
+  transition: top .3s cubic-bezier(0, 0, 0.2, 1);
+}
+
 .noPointerEvents {
   pointer-events: none;
 }
@@ -533,6 +559,17 @@ form {
   padding-top: 20px;
 }
 
+.userPage-subViews .gridItem:hover > .listingType,
+.homeView .gridItem:hover > .listingType {
+  opacity: 1;
+  top: 26px;
+}
+
+.userPage-subViews .gridItem:hover > .listingDoesNotShipToYou,
+.homeView .gridItem:hover > .listingDoesNotShipToYou {
+  top: calc(50% - 46px);
+}
+
 .userPage-subViews .gridItem:hover .gridItemControls,
 .homeView .gridItem:hover .gridItemControls{
   opacity: 1;
@@ -707,7 +744,7 @@ label.fieldItem {
 }
 
 [class |= "flexCol"] > .fieldItem {
-  margin: 0 -1px -1px 0;
+  margin: 0 -2px -2px 0; /* prevent collum overflows */
 }
 
 .table {
@@ -4045,6 +4082,14 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   top: 100%;
 }
 
+.tooltip.tooltip-box2:hover:after {
+  height: auto;
+  width: 200px;
+  white-space: normal;
+  bottom: auto;
+  top: 100%;
+}
+
 .tooltip.tooltip-box.tooltip-boxUp:hover:after {
   bottom: 120%;
 }
@@ -4313,7 +4358,53 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
 
 }
 
-/* protect customize controls from custom page styles */
+.violatorTR {
+  /* sets triangle to be in the top right corner */
+  /* must be given equal height and width properties */
+  /* text or icons inside the violator should have positionTopRight and a right and top margin or padding based on the violator size */
+  position: absolute;
+  top: 0;
+  right: 0;
+  -webkit-clip-path: polygon(50% 0, 100% 0, 100% 50%);
+  z-index: 1; /* this shouldn't need to be higher. Make it the last element in its container */
+  text-align: center;
+}
+
+.violator1 {
+  width: 50px;
+  height: 50px;
+  background: #215175; /* this should be overridden with a color class */
+  color: #fff;
+}
+
+.violatorTxt{
+  /* use on content of a violator to rotate it to match the violator */
+  display: block;
+  transform: rotate(45deg);
+}
+
+.listingTypeDigital:before {
+  color: #EFEF4C;
+  content: "\f137";
+  font-family: Ionicons;
+  font-size: 12px;
+}
+
+.listingTypePhysical:before {
+  color: #805C17;
+  content: "\f318";
+  font-family: Ionicons;
+  font-size: 12px;
+}
+
+.listingTypeService:before {
+  color: #DEDEDE;
+  content: "\f2ad";
+  font-family: Ionicons;
+  font-size: 12px;
+}
+
+  /* protect customize controls from custom page styles */
 #ov1 #customizeControls .labelWrap {
   height: 40px;
   border-radius: 0;
@@ -4569,11 +4660,13 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
 #ov1 .positionBottom {
   position: absolute;
   bottom: 0;
+  right: 0;
 }
 
 #ov1 .positionTop {
   position: absolute;
   top: 0;
+  right: 0;
 }
 
 #ov1 .positionTopRight {

imgs/helpdesk-icon.png

@@ -123,6 +123,10 @@ App.prototype.setUnreadChatMessageCount = function(count) {
   }
 };
 
+App.prototype.intlNumFormat = function(numberToFormat, maxDigits){
+  return new Intl.NumberFormat(window.lang, {maximumFractionDigits: maxDigits}).format(numberToFormat);
+};
+
 App.getApp = function() {
   if (!_app) {
     throw new Error('The app instance was never instantiated and is therefore not available.');
@@ -131,4 +135,4 @@ App.getApp = function() {
   return _app;
 };
 
-module.exports = App;
+module.exports = App;

js/App.js

@@ -50,6 +50,8 @@
   "ViewListing": "View Listing",
   "Unfollow": "Unfollow",
   "ConfirmUnfollow": "Confirm Unfollow",
+  "AddModerator": "Add as Moderator",
+  "RemoveModerator": "Remove as Moderator",
   "About": "About",
   "Version": "Version %{version}",
   "NoDescriptionAdded": "No description added",
@@ -96,7 +98,8 @@
   "ReturnPolicyPlaceholder": "Enter return policy...",
   "CategoryPlaceholder": "Enter category",
   "CategoryHelperText": "Categories are used to group and organize listing within your store.",
-  "KeywordsHelperText": "Adding tags helps your listing to be discovered in the market. You can only have one of each tag, and a maximum of 10 tags",
+  "KeywordsPlaceholder": "Enter One or More Tags",
+  "KeywordsHelperText": "Adding tags helps your listing to be discovered in the market. You can only have one of each tag, and a maximum of 10 tags, separated by commas or the enter key.",
   "ExpirationDateHelperText": "Set a date for the listing to automatically be pulled from your store.",
   "ClearExpirationDate": "Clear Expiration Date",
   "ReturnPolicy": "Return Policy",
@@ -232,7 +235,9 @@
   "SearchForCategory": "Search for category",
   "Moderators": "Moderators",
   "CurrentModerators": "Current Moderators",
-  "AddModerators": "Add New Moderators",
+  "AddModerators": "Add Moderators",
+  "ManualAddModerator": "Add Moderators by GUID",
+  "ManualAddModeratorHelp": "Enter the GUIDs of one or more moderators, separated by commas, here. The GUID is on the right side of their About tab on their page. Adding the GUID of a user that is not a moderator will have no effect, that GUID will be ignored.",
   "DeselectToRemoveModerator": "Deselect the moderators you want to remove",
   "SelectToAddModerator": "Select the moderators you want to add",
   "Categories": "Categories",
@@ -325,10 +330,11 @@
   "ServerChangeWarningHeadline": "Caution: Record Your Settings",
   "ServerChangeWarning": "We recommend you make a copy of your previous settings, shown below. Your previous username and password will no longer be available beyond this point.",
   "ModeratorFee": "Fee:",
-  "PriceForOne": "Price per single item, file, or service.",
+  "PriceForOne": "Price per single item, file, or service. Based on the listing's base price and the current exchange rate of BTC. This may not match the order total, which is based on the exchange rate of BTC at the time you purchased this listing.",
   "Avatar": "Avatar",
   "AdditionalPaymentData": "Additional payment data",
   "AdditionalPaymentDataInfo": "Include name of purchase and order number in payment QR code?",
+  "ShippableHelp": "This product can be shipped to one of your currently saved addresses. Add more addresses in the Settings/Addresses section to be able to purchase more listings.",
   "firewall": {
     "Open": "Open",
     "Restricted": "Restricted",
@@ -492,7 +498,8 @@
     "UpdatingOrder": "Updating your transaction",
     "UpdateComplete": "Your transaction update is complete",
     "UpdateFailed": "Your transaction update did not complete. Open the transaction and try again",
-    "UpdateInvalid": "Your transaction update returned invalid data. Open the transaction and try again"
+    "UpdateInvalid": "Your transaction update returned invalid data. Open the transaction and try again",
+    "ExportCSV": "Export to CSV"
   },
   "errorMessages": {
     "saveError": "Data could not be saved.",
@@ -513,7 +520,8 @@
     "tooManyPhotosBody": "Some or all of your photos were prevented from being uploaded because you would exceeded the maximum allowable amount.",
     "badJSON": "The JSON data returned from the server was malformed",
     "refundAlreadySent": "The refund has already been successfully sent for this order",
-    "serverTimeout": "No response was received from the server. It may be unreachable or taking a very long time to respond."
+    "serverTimeout": "No response was received from the server. It may be unreachable or taking a very long time to respond.",
+    "noData": "No data is available for the options you have selected."
   },
   "pageConnectingMessages": {
     "listingConnect": "Connecting to listing ${listing}",

js/languages/en-US.json

@@ -1,6 +1,7 @@
 var __ = require('underscore'),
     Backbone = require('backbone'),
     getBTPrice = require('../utils/getBitcoinPrice'),
+    app = require('../App').getApp(),
     countriesMd = require('./countriesMd'),
     autolinker = require( '../utils/customLinker');
 
@@ -246,21 +247,21 @@ module.exports = window.Backbone.Model.extend({
         newAttributes.internationalShippingBTC = vendorInternationalShippingInBitCoin;
 
         if(userCCode != 'BTC'){
-          newAttributes.price = (vendorPrice*vendToUserBTCRatio).toFixed(2);
+          newAttributes.price = vendorPrice*vendToUserBTCRatio;
           newAttributes.displayPrice = new Intl.NumberFormat(window.lang, {
             style: 'currency',
             minimumFractionDigits: 2,
             maximumFractionDigits: 2,
             currency: userCCode
           }).format(newAttributes.price);
-          newAttributes.domesticShipping = (vendorDomesticShipping*vendToUserBTCRatio).toFixed(2);
+          newAttributes.domesticShipping = vendorDomesticShipping*vendToUserBTCRatio;
           newAttributes.displayDomesticShipping = new Intl.NumberFormat(window.lang, {
             style: 'currency',
             minimumFractionDigits: 2,
             maximumFractionDigits: 2,
             currency: userCCode
           }).format(newAttributes.domesticShipping);
-          newAttributes.internationalShipping = (vendorInternationalShipping*vendToUserBTCRatio).toFixed(2);
+          newAttributes.internationalShipping = vendorInternationalShipping*vendToUserBTCRatio;
           newAttributes.displayInternationalShipping = new Intl.NumberFormat(window.lang, {
             style: 'currency',
             minimumFractionDigits: 2,
@@ -269,11 +270,11 @@ module.exports = window.Backbone.Model.extend({
           }).format(newAttributes.internationalShipping);
         } else {
           newAttributes.price = vendorPriceInBitCoin;
-          newAttributes.displayPrice = vendorPriceInBitCoin.toFixed(4) + " BTC";
+          newAttributes.displayPrice = app.intlNumFormat(vendorPriceInBitCoin, 4) + " BTC";
           newAttributes.domesticShipping = vendorDomesticShippingInBitCoin;
-          newAttributes.displayDomesticShipping = vendorDomesticShippingInBitCoin.toFixed(4) + " BTC";
+          newAttributes.displayDomesticShipping = app.intlNumFormat(vendorDomesticShippingInBitCoin, 4) + " BTC";
           newAttributes.internationalShipping = vendorInternationalShippingInBitCoin;
-          newAttributes.displayInternationalShipping = vendorInternationalShippingInBitCoin.toFixed(4) + " BTC";
+          newAttributes.displayInternationalShipping = app.intlNumFormat(vendorInternationalShippingInBitCoin, 4) + " BTC";
         }
         //set to random so a change event is always fired
         newAttributes.priceSet = Math.random();

js/models/itemMd.js

@@ -1,5 +1,6 @@
 var __ = require('underscore'),
     Backbone = require('backbone'),
+    app = require('../App').getApp(),
     getBTPrice = require('../utils/getBitcoinPrice');
 
 module.exports = Backbone.Model.extend({
@@ -50,7 +51,7 @@ module.exports = Backbone.Model.extend({
         vendorBitCoinPrice = Number(vendorPrice / btAve);
         //if vendor and user currency codes are the same, multiply by one to avoid rounding errors
         vendToUserBTCRatio = (userCCode == vendorCCode) ? 1 : window.currentBitcoin/vendorCurrencyInBitcoin;
-        newAttributes.vendorBTCPrice = vendorBitCoinPrice.toFixed(4);
+        newAttributes.vendorBTCPrice = vendorBitCoinPrice;
 
         if(userCCode != 'BTC'){
           newAttributes.displayPrice = new Intl.NumberFormat(window.lang, {
@@ -60,7 +61,7 @@ module.exports = Backbone.Model.extend({
             currency: userCCode
           }).format(vendorPrice*vendToUserBTCRatio);
         } else {
-          newAttributes.displayPrice = vendorBitCoinPrice.toFixed(4) + " BTC";
+          newAttributes.displayPrice = app.intlNumFormat(vendorBitCoinPrice, 4) + " BTC";
         }
         //set to random so a change event is always fired
         newAttributes.priceSet = Math.random();

js/models/itemShortMd.js

@@ -1,5 +1,6 @@
 var __ = require('underscore'),
-    Backbone = require('backbone');
+    Backbone = require('backbone'),
+    app = require('../App').getApp();
 
 module.exports = window.Backbone.Model.extend({
   defaults: {
@@ -25,10 +26,7 @@ module.exports = window.Backbone.Model.extend({
         maximumFractionDigits: 2,
         currency: response.cCode
       }).format(response.btc_total*response.btAve);
-    } else {
-      response.displayPrice = response.btc_total.toFixed(4) + " BTC";
     }
-
     return response;
   }
 });

js/models/orderShortMd.js

@@ -88,7 +88,7 @@ module.exports = Backbone.Model.extend({
             "offset": 5
         },
         {
-            "name":"(GMT +5:30) Bombay, Calcutta, Madras, New Delhi",
+            "name":"(GMT +5:30) Mumbai, Kolkata, Chennai, New Delhi",
             "offset": 5.5
         },
         {

js/models/timezonesMd.js

@@ -69,6 +69,8 @@ module.exports = Backbone.Router.extend({
   },
 
   translateRoute: function(route) {
+    if(!route) throw new Error('You must provide a route');
+    
     var guid = "",
         handle = "",
         state = "",

js/router.js

@@ -30,7 +30,7 @@
                 <% } else { %>
                   <%= ob.displayDomesticShipping %>
                   <% if(ob.userCurrencyCode != 'BTC'){ %>
-                  <div class="textOpacity75 textSize12px letterSpacing02">(<%= Number(ob.domesticShippingBTC.toFixed(4)) %> BTC)</div>
+                  <div class="textOpacity75 textSize12px letterSpacing02">(<%= ob.intlNumFormat(ob.domesticShippingBTC, 4) %> BTC)</div>
                   <% } %>
                 <% } %>
               <% } else { %>
@@ -39,7 +39,7 @@
                 <% } else { %>
                   <%= ob.displayInternationalShipping %>
                   <% if(ob.userCurrencyCode != 'BTC'){ %>
-                  <div class="textOpacity75 textSize12px letterSpacing02">(<%= Number(ob.internationalShippingBTC.toFixed(4)) %> BTC)</div>
+                  <div class="textOpacity75 textSize12px letterSpacing02">(<%= ob.intlNumFormat(ob.internationalShippingBTC, 4) %> BTC)</div>
                   <% } %>
                 <% } %>
               <% } %>