Merge branch 'master' into shahrizal/japanui_fix

Author: shahrizal-binary

scripts/config/pages.pl

@@ -62,7 +62,7 @@ sub all_pages {
 
         ['jptrading',    'bet/japan',       'default', 'Sharp Prices. Smart Trading.'],
         ['trading',      'bet/static',      'default', 'Sharp Prices. Smart Trading.'],
-        ['trading_beta', 'bet/beta/static', 'default', 'Sharp Prices. Smart Trading.'],
+        ['trading_beta', 'bet/beta/static', 'default', 'Sharp Prices. Smart Trading.', 'ja'],
 
         ['new_account/virtualws',        'new_account/virtualws',       'default', 'Create New Account'],
         ['new_account/realws',           'new_account/realws',          'default', 'Real Money Account Opening'],

src/javascript/binary/websocket_pages/trade/beta/event.js

@@ -166,7 +166,7 @@ var TradingEvents_Beta = (function () {
                     processForgetTicks_Beta();
                     // get ticks for current underlying
                     Tick.request(underlying);
-                    displayTooltip(Defaults.get('market'), underlying);
+                    displayTooltip_Beta(Defaults.get('market'), underlying);
                 }
             });
         }

src/javascript/binary/websocket_pages/trade/beta/process.js

@@ -82,7 +82,7 @@ function processMarketUnderlying_Beta() {
 
     Contract_Beta.getContracts(underlying);
 
-    displayTooltip(Defaults.get('market'), underlying);
+    displayTooltip_Beta(Defaults.get('market'), underlying);
 }
 
 /*
@@ -95,12 +95,13 @@ function processContract_Beta(contracts) {
         var container = document.getElementById('contract_confirmation_container'),
             message_container = document.getElementById('confirmation_message'),
             confirmation_error = document.getElementById('confirmation_error'),
+            confirmation_error_contents = document.getElementById('confirmation_error_contents'),
             contracts_list = document.getElementById('contracts_list');
         container.style.display = 'block';
         contracts_list.style.display = 'none';
         message_container.hide();
         confirmation_error.show();
-        confirmation_error.innerHTML = contracts.error.message + ' <a href="javascript:;" onclick="TradePage_Beta.reload();">' + text.localize('Please reload the page') + '</a>';
+        confirmation_error_contents.innerHTML = contracts.error.message + ' <a href="javascript:;" onclick="TradePage_Beta.reload();">' + text.localize('Please reload the page') + '</a>';
         return;
     }
 

src/javascript/binary/websocket_pages/trade/beta/purchase.js

@@ -26,6 +26,7 @@ var Purchase_Beta = (function () {
             profit = document.getElementById('contract_purchase_profit'),
             spots = document.getElementById('contract_purchase_spots'),
             confirmation_error = document.getElementById('confirmation_error'),
+            confirmation_error_contents = document.getElementById('confirmation_error_contents'),
             contracts_list = document.getElementById('contracts_list'),
             button = document.getElementById('contract_purchase_button');
 
@@ -38,7 +39,7 @@ var Purchase_Beta = (function () {
             container.style.display = 'block';
             message_container.hide();
             confirmation_error.show();
-            confirmation_error.innerHTML = (/ClientUnwelcome/.test(error.code) ? error['message'] + '<a class="pjaxload" href="' + page.url.url_for('user/authenticatews') + '"> ' + text.localize('Authorise your account.' + '</a>') : error['message']);
+            confirmation_error_contents.innerHTML = (/ClientUnwelcome/.test(error.code) ? error['message'] + '<a class="pjaxload" href="' + page.url.url_for('user/authenticatews') + '"> ' + text.localize('Authorise your account.' + '</a>') : error['message']);
         } else {
             var guideBtn = document.getElementById('guideBtn');
             if(guideBtn) {

src/javascript/binary/websocket_pages/trade/common.js

@@ -960,6 +960,33 @@ function updatePurchaseStatus_Beta(final_price, pnl, contract_status){
     label_value(profit, isWin ? Content.localize().textProfit : Content.localize().textLoss, addComma(Math.round((final_price - pnl) * 100) / 100));
 }
 
+function displayTooltip_Beta(market, symbol){
+    'use strict';
+    var tip = document.getElementById('symbol_tip'),
+        markets = document.getElementById('contract_markets').value;
+    if (!market || !symbol) return;
+    if (market.match(/^volidx/) || symbol.match(/^R/) || market.match(/^random_index/) || market.match(/^random_daily/)){
+        tip.show();
+        tip.setAttribute('target', page.url.url_for('/get-started/volidx-markets'));
+    } else {
+      tip.hide();
+    }
+    if (market.match(/^otc_index/) || symbol.match(/^OTC_/) || market.match(/stock/) || markets.match(/stocks/)){
+        tip.show();
+        tip.setAttribute('target', page.url.url_for('/get-started/otc-indices-stocks'));
+    }
+    if (market.match(/^random_index/) || symbol.match(/^R_/)){
+        tip.setAttribute('target', page.url.url_for('/get-started/volidx-markets', '#volidx-indices'));
+    }
+    if (market.match(/^random_daily/) || symbol.match(/^RDB/) || symbol.match(/^RDMO/) || symbol.match(/^RDS/)){
+        tip.setAttribute('target', page.url.url_for('/get-started/volidx-markets', '#volidx-quotidians'));
+    }
+    if (market.match(/^smart_fx/) || symbol.match(/^WLD/)){
+        tip.show();
+        tip.setAttribute('target', page.url.url_for('/get-started/smart-indices', '#world-fx-indices'));
+    }
+}
+
 function label_value(label_elem, label, value, no_currency) {
     var currency = TUser.get().currency;
     label_elem.innerHTML = label;

src/sass/static/trade_beta.scss

@@ -360,10 +360,13 @@
         #contract_purchase_new_trade {
             margin: 10px auto;
         }
-        #confirmation_error {
+        #confirmation_error_contents {
             padding: 20px;
             font-style: italic;
             vertical-align: middle;
+            border: 1px solid $COLOR_GRAY;
+            border-top: none;
+            line-height: 1.5em;
         }
         .price_comment, .contract_error, #contract_purchase_balance {
             background-color: $COLOR_GRAY;
@@ -485,7 +488,7 @@
     }
     #contract_confirmation_container {
         @include BIDIR_VALUE(text-align, left, right);
-        #contract_purchase_heading {
+        #contract_purchase_heading, #confirmation_error_heading {
             font-size: 18px;
             line-height: 35px;
             margin-bottom: 0px;
@@ -839,6 +842,9 @@
                         border: 0;
                     }
                 }
+                #tab_asset_index-content .ui-tabs-panel {
+                    border: none;
+                }
                 #portfolio #portfolio-content > div, #tab_trading_times-content > p {
                     margin: 0 10px 10px;
                 }

src/templates/bet/beta/static.html.tt

@@ -22,10 +22,6 @@
             </div>
             <div class="gr-4 gr-6-p gr-hide-m align-end">
                 <div id="guideBtn"></div>
-                <div id="app-container">
-                    <a href="https://itunes.apple.com/app/apple-store/id1091187567?pt=117911266&ct=trading_page&mt=8" target="_blank" id="appstore"></a>
-                    <a href="https://goo.gl/5KmSsU" target="_blank" id="androidApp"></a>
-                </div>
             </div>
         </div>
 
@@ -238,7 +234,10 @@
                                     <div class="invisible" id="contract_purchase_balance"></div>
                                 </div>
                             </div>
-                            <div id="confirmation_error"></div>
+                            <div id="confirmation_error">
+                                <h3 id="confirmation_error_heading">[% l('There was an error') %]</h3>
+                                <div id="confirmation_error_contents" class="center-text"></div>
+                            </div>
                         </div>
                         <div id="confirmation_message_endelement"></div>
                     </div>