Merge branch 'master' of https://github.com/OpenBazaar/OpenBazaar-Client

Conflicts:
	js/templates/userPage.html

Author: Dekker3D

css/obBase.css

@@ -417,6 +417,7 @@ form {
 .flexRow [class |= "flexCol"] {
   box-sizing: border-box;
   position: relative;
+  overflow: hidden;
 }
 
 .flexRow.pad [class |= "flexCol"] {
@@ -1502,7 +1503,6 @@ removed because I don't think we're using the trick to hide the borders any more
 .flex-border > .flexRow > [class |= "flexCol"] {
   border-right: 1px solid rgba(255,255,255,0.08);
   border-bottom: 1px solid rgba(255,255,255,0.08);
-  padding: 0 1px 1px 0;
 }
 
 .flex-border > .flexRow > [class |= "flexCol"].pad10 {
@@ -1808,6 +1808,44 @@ margin: auto;
   background-color: rgba(33,117,47,1);
 }
 
+.btn.btn-discoverToggle {
+  box-shadow: none;
+  border-radius: 0;
+  border: solid 1px #2378AA;
+  opacity: 1;
+  font-weight: 500;
+  font-size: 13px;
+  transition: none;
+  letter-spacing: 0;
+  height: auto;
+  padding: 4px 22px;
+  background-color: transparent;
+}
+
+.btn.btn-discoverToggle .toggle-txt {
+  opacity: .25;
+  transition: opacity .25s cubic-bezier(0, 0, 0.2, 1);
+}
+
+.btn.btn-discoverToggle:active,
+.btn.btn-discoverToggle.active {
+  border-bottom: solid 2px #106DA3;
+  box-shadow: none;
+  opacity: 1;
+}
+
+.btn.btn-discoverToggle:hover {
+  opacity: 1;
+}
+
+.btn.btn-discoverToggle:hover > .toggle-txt {
+  opacity: 1;
+}
+
+.btn.btn-discoverToggle.active .toggle-txt {
+  opacity: 1;
+}
+
 .btn:active,
 .btn.active,
 .btn.btn-c1:active,
@@ -2461,6 +2499,13 @@ div.chatSearchOut .chatSearchIcon {
   float: left;
 }
 
+.btn-togWrapper.btn-toWrapper-discoverToggle {
+  float: none;
+  position: absolute;
+  right: 0;
+  bottom: -2px;
+}
+
 #userPage .btn-togWrapper {
   border: 1px solid rgb(74,72,72);
 }
@@ -2506,6 +2551,19 @@ div.chatSearchOut .chatSearchIcon {
   border-bottom-left-radius: 0;
 }
 
+.btn-toWrapper-discoverToggle .btn.btn-togLeft {
+  border-radius: 0;
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  border-right: 0;
+}
+
+.btn-toWrapper-discoverToggle .btn.btn-togRight {
+  border-radius: 0;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+
 .btn.btn-flushTop {
   border-top-left-radius: 0;
   border-top-right-radius: 0;
@@ -3619,13 +3677,17 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   transition: left 0.5s ease;
 }
 
-.spinner-with-logo i {
+.spinner-with-logo .spinner-with-logo-icon {
   position: absolute;
-  top: 17px;
-  left: 18px;
+  top: 16px;
+  left: 17px;
   opacity: .90;
 }
 
+.spinner-with-logo .spinner-with-logo-icon:before {
+  padding-top: 1px;
+}
+
 #ov1.chatOpen .spinner-with-logo {
   left: calc(50% - 115.5px);
 }
@@ -3888,6 +3950,38 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   position: absolute;
 }
 
+.discoverToggleHelper {
+  top: -40px;
+  width: auto;
+  max-width: 300px;
+  background: rgba(37,37,37,.95);
+  border-radius: 3px;
+  color: #fff;
+  padding: 8px 10px;
+  position: absolute;
+  z-index: 10;
+  height: 16px;
+  font-size: 11px;
+  right: 0;
+  line-height: 16px;
+  opacity: 1;
+  white-space: nowrap;
+  pointer-events: none;
+  margin-top: 2px;
+}
+
+.discoverToggleHelper:after {
+  content: " ";
+  width: 0;
+  height: 0;
+  border-style: solid;
+  border-width: 10px 10px 0 10px;
+  border-color: rgba(37,37,37,.95) transparent transparent transparent;
+  position: absolute; 
+  bottom: -10px;
+  right: 48px;
+}
+
 .tooltip {
   position: relative;
 }
@@ -3928,6 +4022,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   width: 400px;
   white-space: normal;
   bottom: auto;
+  top: 100%;
 }
 
 .tooltip.tooltip-box.tooltip-boxUp:hover:after {
@@ -4006,7 +4101,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
 
 .cropit-image-preview.cropit-avatar {
   background: url('../imgs/defaultUser.png');
-  background-size: cover;  
+  background-size: cover;
 }
 
 #userPage .headerCropper .bar.navBar {
@@ -4232,13 +4327,13 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   position: fixed;
   bottom: 0;
   z-index: 10;
-  width: 100%;  
+  width: 100%;
 }
 
 #statusBar .statusMessageWrap {
   height: 0px;
   overflow: hidden;
-  transition: opacity 1.5s, height 1s;   
+  transition: opacity 1.5s, height 1s;
 }
 
 #statusBar .statusMessageWrap.slideUp {
@@ -4256,7 +4351,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   background: #000;
   border-bottom: 1px solid #222;
   position: relative;
-  top: -1px; 
+  top: -1px;
 }
 
 .page-connect-modal {
@@ -4280,6 +4375,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
 }
 
 .page-connect-modal .spinner-with-logo .icon-no-connection {
+  top: 18px;
   left: 22px;
 }
 
@@ -4288,8 +4384,8 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   right: 0;
   left: 0;
   top: 50%;
-  max-width: 600px;  
-  margin-top: 90px;  
+  max-width: 600px;
+  margin-top: 90px;
   margin-left: auto;
   margin-right: auto;
   text-align: center;
@@ -4836,6 +4932,10 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   margin-right: 15px;
 }
 
+#ov1  .marginRight20 {
+  margin-right: 20px;
+}
+
 #ov1  .marginLeftNeg115 {
   margin-left: -115px;
 }
@@ -5555,6 +5655,11 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   height: auto;
 }
 
+#ov1 .editableContent img {
+  max-width: 100%;
+  max-height: 100%;
+}
+
 /* add formChecked class after form has been checked for validity */
 #ov1 .invalid,
 #ov1 .formChecked input[type="text"].fieldItem:invalid,

index.html

@@ -76,7 +76,7 @@ <h2 class="txt-center">
   <!-- the loading modal must be on top of the page nav or the reload button is hidden -->
   <div id="loadingModal" class="modal modal-opaque js-loadingModal top0">
     <div class="spinner-with-logo fullCentered">
-      <i class="ion-android-sync spinner fontSize30"></i>
+      <i class="ion-android-sync spinner fontSize30 spinner-with-logo-icon"></i>
     </div>
     <div class="rowTop20">
       <a class="btn btn-txt btn-corner btn-cornerTR js-indexReload"><i class="ion-android-sync"></i> Reload</a>

js/App.js

@@ -1,4 +1,6 @@
-var Socket = require('./utils/Socket'),
+var ipcRenderer = require('ipc-renderer'),
+    Socket = require('./utils/Socket'),
+    $ = require('jquery'),
     ServerConfigMd = require('./models/serverConfigMd'),
     _app;
 
@@ -9,6 +11,9 @@ function App() {
   if (_app) return _app;
 
   _app = this;
+  this._awayCounts = null;
+  this._notifUnread = 0;
+  this._chatMessagesUnread = 0;
 
   // TODO: what is wrong with the localStorage adapter??? shouldn't need
   // to manually provide the data to the model. All that should be needed
@@ -99,17 +104,37 @@ App.prototype.playNotificationSound = function() {
   }
 
   this._notificationSound.play();
-},
+};
 
 App.prototype.showOverlay = function() {
   this._$overlay = this._$overlay || $('#overlay');
   this._$overlay.removeClass('hide');
-},
+};
 
 App.prototype.hideOverlay = function() {
   this._$overlay = this._$overlay || $('#overlay');
   this._$overlay.addClass('hide');
-},
+};
+
+App.prototype.setUnreadCounts = function(notif, chat) {
+  this._notifUnread = typeof notif === 'number' ? notif : this._notifUnread;
+  this._chatMessagesUnread = typeof chat === 'number' ? chat : this._chatMessagesUnread;
+
+  this._awayCounts = this._notifUnread + this._chatMessagesUnread;
+  ipcRenderer.send('set-badge', this._awayCounts || '');
+};
+
+App.prototype.setUnreadNotifCount = function(count) {
+  if (typeof count !== 'undefined' && count !== null) {
+    this.setUnreadCounts(parseInt(count));
+  }
+};
+
+App.prototype.setUnreadChatMessageCount = function(count) {
+  if (typeof count !== 'undefined' && count !== null) {
+    this.setUnreadCounts(null, parseInt(count));
+  }
+};
 
 App.getApp = function() {
   if (!_app) {

js/config.js

@@ -1,5 +1,5 @@
 // App specific configuration
-var testnet = false, //change to false to use main net
+var testnet = localStorage.getItem('testnet') == 'true' ? true : false, //change to false to use main net
     bitcoinValidationRegexMainnet = "^[13][a-km-zA-HJ-NP-Z1-9]{25,34}$",
     bitcoinValidationRegexTestnet = "^[2mn][a-km-zA-HJ-NP-Z1-9]{25,34}$",
     bitcoinValidationRegex = testnet ? bitcoinValidationRegexTestnet : bitcoinValidationRegexMainnet;
@@ -20,5 +20,9 @@ module.exports = {
     cases:           'j',
     settings:        'g',
     addressBar:      'l'
+  },
+  
+  setTestnet: function(testNetBoolean){
+    localStorage.setItem('testnet', testNetBoolean);
   }
-}
+};

js/languages/en-US.json

@@ -23,7 +23,7 @@
   "of": "of",
   "Sell": "Sell",
   "New": "New",
-  "HighlightToStyle": "You can use basic HTML, but HTML link and image tags are disabled. Plain text http:// links, @handles, and #searchTags will be clickable.",
+  "HighlightToStyle": "Highlight text to style",
   "Excellent": "Excellent",
   "Good": "Good",
   "Poor": "Poor",
@@ -71,12 +71,14 @@
   "Welcome": "Welcome",
   "CreateStore": "Become a Store",
   "GoToMyPage": "My Page",
-  "ShowOnlyFollowerListings": "Filtered Listings",
-  "ShowOnlyFollowerListingsTooltip": "Only view listings from stores you follow",
-  "ShowAllListingsTooltip": "View random listings from around the network",
-  "ViewUnfilteredListings": "View Unfiltered Listings",
-  "AllListingsWarning": "By deactivating filtered listings your Discover feed will be populated with random listings from around the network. \n \n Please keep in mind that these listings may contain adult or illicit content and/or photos that may be offensive. \n \n If at any point you want to go back to filtered listings, you can simply toggle the setting back to On and your Discover feed will only display listings from stores you follow.",
-  "ShowUnlfilteredListings": "Show Unfiltered Listings",
+  "Random": "Random",
+  "ShowOnlyFollowerListings": "Personalized",
+  "TryRandom": "Try random mode to discover more",
+  "ShowOnlyFollowerListingsTooltip": "View listings from stores I follow",
+  "ShowAllListingsTooltip": "View random listings on the network",
+  "ViewUnfilteredListings": "View Random Listings",
+  "AllListingsWarning": "By deactivating personalized listings your Discover feed will be populated with random listings on the network. \n \n Please keep in mind that these listings may contain adult or illicit content and/or photos that may be offensive. \n \n If at any point you want to go back to viewing personalized listings, you can simply toggle the setting and your Discover feed will go back to normal.",
+  "ShowUnlfilteredListings": "Show Random Listings",
   "SearchForItemsPlaceholder": "Type #games, #shoes or any #tag...",
   "SearchForPagesPlaceholder": "Search by name or keyword",
   "SearchFeedPlaceholder": "Type a keyword...",
@@ -133,19 +135,25 @@
   "AddShipToRegion": "Shipping Region",
   "AddShipToRegionNote": "Adds All Nations in a Region",
   "SelectRegion": "Add an Optional Region",
+  "AllRegions": "All countries",
+  "EuropeanUnion": "European Union",
+  "EuropeanEconomicArea": "European Economic Area",
   "Optional": "Optional",
   "Customize": "Customize",
   "Save": "Save",
   "Change": "Change",
   "Changes": "Changes",
   "SaveChanges": "Save Changes",
   "YourName": "Your name",
+  "UseTestnet": "Use Testnet",
+  "UseTestnetHelp": "If set to true, your client will use Testnet bitcoin addresses. Only set to true if your server was started with the -t testnet flag.",
   "TestnetAddress": "Testnet Address",
+  "TestnetAddressHelp": "Your client is set to use the Testnet, and will only allow Testnet addresses. To use the mainnet, and real Bitcoin, turn off the Testnet in Settings/Advanced, and make sure your server was not started with the -t testnet flag.",
   "MustTestnetAddress": "Must be a Testnet Address",
-  "BitcoinAddress": "Bitcoin Address",
+  "BitcoinAddress": "Current Refund Address",
   "BitcoinReturnAddress": "Enter your Bitcoin Address",
   "BitcoinReturnAddressPlaceholder": "Enter Bitcoin address...",
-  "BitcoinReturnAddressInfo": "If a refund is issued, the funds will need to be sent to a Bitcoin address. Please provide an address to your Wallet below. You <b>must be able to access this address later</b> to receive a refund.",
+  "BitcoinReturnAddressInfo": "If a refund is issued, the funds will need to be sent to a Bitcoin address. Please provide an address to your Wallet below. You must be able to access this address later to receive a refund.",
   "LocalCurrency": "Local Currency",
   "TimeZone": "Time Zone",
   "ShipToName": "Recipient Name",
@@ -475,7 +483,7 @@
     "TotalInTransaction": "Transaction:",
     "StartDisputeFlag": "Dispute Started",
     "CloseDisputeFlag": "Dispute Ended",
-    "PayoutOnlyBuyer": "Closing this dispute will return 100% of the funds to the buyer.",
+    "PayoutOnlyBuyer": "Closing this dispute will return all of the funds to the buyer, minus the Moderator fee, because the seller has not yet given their bitcoin payout address.",
     "UpdatingOrder": "Updating your transaction",
     "UpdateComplete": "Your transaction update is complete",
     "UpdateFailed": "Your transaction update did not complete. Open the transaction and try again",