Merge remote-tracking branch 'refs/remotes/origin/master' into internationalBTCFormatting

Author: jjeffryes

css/obBase.css

@@ -587,20 +587,21 @@ form {
   position: relative;
   background-position: center;
   background-size: cover;
-  border-radius: 3px;
+  background-repeat: no-repeat;
+  border-radius: 2px;
   height: 230px;
   width: 250px;
 }
 
 .itemImg.itemImg-large {
   /* flex row collapses unless a specific height is set */
-  height: 380px;
-  width: 100%;
+  height: 472px;
+  width: 514px;
   border-radius: 0;
 }
 
 .itemImg.itemImg-small {
-  height: 82px;
+  height: 111px;
   width: 121px;
   margin: 0 10px 10px 0;
   border-radius: 1px;
@@ -2583,11 +2584,6 @@ div.chatSearchOut .chatSearchIcon {
   border-top-right-radius: 0;
 }
 
-.btn.btn-back:before,
-.btn.btn-fwd:before {
-  opacity: 0.3;
-}
-
 .btn.btn-back.active:before,
 .btn.btn-fwd.active:before {
   opacity: 1;
@@ -5603,6 +5599,15 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   opacity: 0.7;
 }
 
+#ov1 .disabled-icon {
+  pointer-events: none;
+}
+
+#ov1 .disabled-icon:before,
+#ov1 .disabled [class *= "ion-"]:before {
+  opacity: 0.2;
+}
+
 #ov1 .overflowVisible {
   overflow: visible;
 }
@@ -5872,7 +5877,31 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
 
 #ov1.notFancy .notFancyDarkBackground,
 #ov1.notFancy #obContainer .notFancyDarkBackground {
-  background: #262626;
+  background: #262626 !important;
+}
+
+#ov1.notFancy .disabled,
+#ov1.notFancy #userPage .disabled,
+#ov1.notFancy #obContainer .disabled,
+#ov1.notFancy #overlay .disabled,
+#ov1.notFancy #sideBar .disabled,
+#ov1.notFancy #pageNav .disabled,
+#ov1.notFancy #modalHolder .disabled,
+#ov1.notFancy #messageModal .disabled,
+#ov1.notFancy #statusBar .disabled {
+  opacity: 0.2 !important;
+}
+
+#ov1.notFancy .disabled2,
+#ov1.notFancy #userPage .disabled2,
+#ov1.notFancy #obContainer .disabled2,
+#ov1.notFancy #overlay .disabled2,
+#ov1.notFancy #sideBar .disabled2,
+#ov1.notFancy #pageNav .disabled2,
+#ov1.notFancy #modalHolder .disabled2,
+#ov1.notFancy #messageModal .disabled2,
+#ov1.notFancy #statusBar .disabled2 {
+  opacity: 0.7 !important;
 }
 
 /* add a shadow and a glow, so modal close buttons are still barely visible if the user picks a bad color */

index.html

@@ -81,8 +81,8 @@ <h2 class="txt-center">
       <i class="ion-android-sync spinner fontSize30 spinner-with-logo-icon"></i>
     </div>
     <div class="width100 positionTop">
-      <a class="btn btn-txt rowTop10 marginRight10 pull-right js-indexReload"><i class="ion-android-sync"></i> Reload</a>
-      <a class="btn btn-txt rowTop10 marginRight10 pull-right" href="#home"><i class="ion-home"></i> Load Index</a>
+      <a class="btn btn-txt rowTop10 marginRight10 pull-right js-indexReload"><i class="ion-android-sync"></i> <span class="js-translate" data-translate="Reload"></span></a>
+      <a class="btn btn-txt rowTop10 marginRight10 pull-right" href="#home"><i class="ion-home"></i> <span class="js-translate" data-translate="LoadIndex"></span></a>
     </div>
   </div>
 
@@ -92,6 +92,13 @@ <h2 class="txt-center">
   <script>
     var app = require('./js/main'),
         remote = require('remote');
+
+    window.translateIndex = function(){
+      $('.js-translate').each(function() {
+        $(this).text(polyglot.t($(this).data("translate")));
+      });
+    };
+    translateIndex();
     $('.js-closeIndexModal').on('click', function(){
       $(this).closest('.modal').addClass('hide');
     });

js/languages/en-US.json

@@ -6,6 +6,7 @@
   "EnterMessage": "Enter message...",
   "Recommended": "Recommended",
   "Reload": "Reload",
+  "LoadIndex": "Load Index",
   "You": "You",
   "Skip": "Skip",
   "Done": "Done",

js/languages/pl.json

@@ -6,6 +6,7 @@
     "EnterMessage": "Wprowadź tekst...",
     "Recommended": "Rekomendowane",
     "Reload": "Odśwież",
+    "LoadIndex": "Strona główna",
     "You": "Ja",
     "Skip": "Pomiń",
     "Done": "Gotowe",

js/main.js

@@ -85,6 +85,9 @@ user.on('change:language', function(md, lang) {
   window.lang = lang;
   extendPolyglot(lang);
   localStorage.setItem('lang', lang);
+  //trigger translation function on index
+  window.translateIndex();
+
 });
 
 //keep user and profile urls synced with the server configuration

js/router.js

@@ -13,6 +13,8 @@ var ipcRenderer = require('ipc-renderer'),
 
 module.exports = Backbone.Router.extend({
   initialize: function(options){
+    var self = this;
+      
     var routes;
 
     this.options = options || {};
@@ -48,6 +50,22 @@ module.exports = Backbone.Router.extend({
         this.navigate(translatedRoute, { trigger: true });
       });
     });
+    
+    var originalHistoryBack = history.back;
+    history.back = function() {
+        self.historyAction = 'back';
+        return originalHistoryBack(arguments);
+    }
+
+    var originalHistoryForward = history.forward;
+    history.forward = function() {
+        self.historyAction = 'forward';
+        return originalHistoryForward(arguments);
+    }
+    
+    this.historySize = -1;
+    this.historyPosition = -1;
+    this.historyAction = 'default';
   },
 
   translateRoute: function(route) {
@@ -103,6 +121,32 @@ module.exports = Backbone.Router.extend({
 
     return deferred.promise();
   },
+  
+  execute: function(callback, args, name) {
+    if (this.historyAction == 'default') {
+      this.historyPosition += 1;
+      this.historySize = this.historyPosition;
+    } else if (this.historyAction == 'back') {
+      this.historyPosition -= 1;
+    } else if(this.historyAction == 'forward' && this.previousName != name && name != "index") {
+      //don't increment if the same state is navigated to twice
+      //don't increment on index since that isn't a real state
+      this.historyPosition += 1;
+    }
+    this.historyAction = 'default';
+
+    if (this.historyPosition == this.historySize)
+        $('.js-navFwd').addClass('disabled-icon');
+    else
+        $('.js-navFwd').removeClass('disabled-icon');
+    
+    if (this.historyPosition == 1)
+        $('.js-navBack').addClass('disabled-icon');
+    else
+        $('.js-navBack').removeClass('disabled-icon');
+    
+    if (callback) callback.apply(this, args);
+  },
 
   cleanup: function(){
     "use strict";

js/templates/buyWizard.html

@@ -3,7 +3,7 @@
     <div class="btn-corner btn-cornerTR btn-cornerTROutR btn-flushTop js-closeBuyWizardModal">
       <h2 class="ion-android-close custCol-text clickable"></h2>
     </div>
-    <div class="modal-hero js-buyWizardHero shadow-inner1-light"
+    <div class="modal-hero js-buyWizardHero custCol-text shadow-inner1-light"
          style="background-image: url(<%= ob.serverUrl %>get_image?hash=<%= ob.vendor_offer.listing.item.image_hashes[0] %><%= ob.imageExtension %>), url(imgs/defaultBanner.png);">
       <div class="js-buyWizardMapPlaceholder hide">
         <div class="flexContainer">
@@ -19,28 +19,28 @@ <h2 class="ion-android-close custCol-text clickable"></h2>
       <div class="modal-hero modal-heroFullHeightNoButtons js-buyWizardSpinner hide background1 custCol-primary">
         <div class="width100 txt-center vCentered">
           <div class="txt-col1 ion-android-sync spinner spinner-slow icon-gigantic icon-circle-background1 rowTop50 row20"></div>
-          <h3 class="txt-bright padding30"><%= polyglot.t('CheckExchanges') %> </h3>
+          <h3 class="custCol-text padding30"><%= polyglot.t('CheckExchanges') %> </h3>
         </div>
       </div>
       <div class="modal-hero modal-heroFullHeightNoButtons padding40 js-buyWizardPay hide background1 custCol-primary">
         <div class="width100 row20">
           <img class="blockCenter qrCode js-buyWizardPayQRCode" height="250" width="250" src="imgs/defaultItem.png"/>
         </div>
         <div class="txt-bright pad20">
-          <div class="txt-center row10 textSize20px">
+          <div class="txt-center row10 textSize20px custCol-text">
             <%= polyglot.t('buyFlow.SendBTCtoAddress', {amount: '<span class="js-buyWizardDetailsTotalBTC"></span>'}) %>
           </div>
           <div class="txt-center row10">
-            <a class="textSize16px js-buyWizardPayLink"><span class="js-buyWizardPayURL"></span></a>
+            <a class="textSize16px js-buyWizardPayLink custCol-text"><span class="js-buyWizardPayURL"></span></a>
           </div>
           <div class="txt-center row10">
             <input type="checkbox" class="textSize11px fieldItem thin" id="BuyWizardQRDetailsInput">
-            <label for="BuyWizardQRDetailsInput" class="textSize11px"> <%= polyglot.t('AdditionalPaymentDataInfo') %></label>
+            <label for="BuyWizardQRDetailsInput" class="textSize11px  custCol-text"> <%= polyglot.t('AdditionalPaymentDataInfo') %></label>
           </div>
-          <a class="btn btn-txt btn-wide row10 js-buyWizardPayCopy custCol-secondary"><i class="ion-clipboard"></i> <%= polyglot.t('buyFlow.CopyAddress') %></a>
-          <a class="btn btn-txt btn-wide row10 js-buyWizardPayLink custCol-secondary"><i class="ion-link"></i> <%= polyglot.t('buyFlow.OpenAddress') %></a>
-          <a class="btn btn-txt btn-wide js-buyWizardPayCheck custCol-secondary"><i class="ion-refresh"></i> <%= polyglot.t('buyFlow.RefreshPayment') %></a>
-          <div class="rowTop10 txt-center note">
+          <a class="btn btn-txt btn-wide row10 js-buyWizardPayCopy custCol-secondary  custCol-text"><i class="ion-clipboard"></i> <%= polyglot.t('buyFlow.CopyAddress') %></a>
+          <a class="btn btn-txt btn-wide row10 js-buyWizardPayLink custCol-secondary custCol-text"><i class="ion-link"></i> <%= polyglot.t('buyFlow.OpenAddress') %></a>
+          <a class="btn btn-txt btn-wide js-buyWizardPayCheck custCol-secondary custCol-text"><i class="ion-refresh"></i> <%= polyglot.t('buyFlow.RefreshPayment') %></a>
+          <div class="rowTop10 txt-center note custCol-text">
             <%= polyglot.t('buyFlow.paymentNote') %>
           </div>
         </div>

js/templates/item.html

@@ -166,9 +166,9 @@ <h4><%= polyglot.t('CanBeShippedTo') %></h4>
           <%= polyglot.t('ShippingReturns') %>
         </a>
       </div>
-      <div class="flexContainer flex-border custCol-primary js-description js-tabTarg textOpacity75 minHeight300 <% ob.activeTab !== 'description' && print('hide') %>">
+      <div class="flexContainer flex-border custCol-primary js-description js-tabTarg textOpacity1 minHeight300 <% ob.activeTab !== 'description' && print('hide') %>">
         <div class="flexRow">
-          <div class="rowItem fontSize16 padding30 paddingTop10 lineHeight24 fontWeight400 flexContainer editableContent">
+          <div class="rowItem fontSize16 padding30 paddingTop20 lineHeight24 fontWeight400 flexContainer editableContent">
             <%= ob.vendor_offer.listing.item.displayDescription %>
           </div>
         </div>

js/utils/setTheme.js

@@ -61,9 +61,9 @@ module.exports = function(primaryColor, secondaryColor, backgroundColor, textCol
       "#ov1 #userPage input[type='number'].spinButtons::-webkit-inner-spin-button:before { color: " + textColor + ";}" +
       "#ov1 #userPage input[type='number'].spinButtons::-webkit-inner-spin-button:after { color: " + textColor + ";}" +
       "#ov1 #userPage #obContainer input::-webkit-input-placeholder { color: " + textColor + ";}" +
-      "#ov1 #userPage #pageNav input::-webkit-input-placeholder { color: " + textColor + ";}" +
+      //"#ov1 #userPage #pageNav input::-webkit-input-placeholder { color: " + textColor + ";}" +
       "#ov1 #userPage #obContainer textarea::-webkit-input-placeholder { color: " + textColor + ";}" +
-      "#ov1 #userPage #pageNav textarea::-webkit-input-placeholder { color: " + textColor + ";}" +
+      //"#ov1 #userPage #pageNav textarea::-webkit-input-placeholder { color: " + textColor + ";}" +
       "#ov1 #userPage .txtFieldWrapper-bar:before { color: " + textColor + ";}" +
       "#ov1 #userPage .mainContainer { box-shadow: 0px 10px 20px " + shadeColor2(backgroundColor, -0.3)  + ";  }" +
       "#ov1 #userPage .mainContainer .txtFieldWrapper:before { color: " + textColor + ";  }" +

js/views/homeVw.js

@@ -290,10 +290,10 @@ module.exports = baseVw.extend({
       this.searchItemsText = searchItemsText;
 
       //add action to history
-      Backbone.history.navigate("#home/" + state + "/" + searchItemsText.replace(/ /g, ""));
+      Backbone.history.navigate("#home/" + state + "/" + searchItemsText.replace(/ /g, ""), { replace: true });
     } else {
       //add action to history
-      Backbone.history.navigate("#home/" + state);
+      Backbone.history.navigate("#home/" + state, { replace: true });
     }
 
     this.state = state;