diff --git a/src/js/entry/web.js b/src/js/entry/web.js index b43c21682..72c22e0ce 100644 --- a/src/js/entry/web.js +++ b/src/js/entry/web.js @@ -81,44 +81,44 @@ var appDependencies = [ // Load tabs var tabdefs = [ - require('../tabs/login.controller.js'), - require('../tabs/migrate.controller.js'), - require('../tabs/logout.controller.js'), - require('../tabs/balance.controller.js'), - require('../tabs/history.controller.js'), - require('../tabs/contacts.controller.js'), - require('../tabs/exchange.controller.js'), - require('../tabs/account.controller.js'), - require('../tabs/trust.controller.js'), - require('../tabs/send.controller.js'), - require('../tabs/trade.controller.js'), - require('../tabs/advanced.controller.js'), - require('../tabs/security.controller.js'), - require('../tabs/tx.controller.js'), - require('../tabs/xrp.controller.js'), - require('../tabs/debug.controller.js'), - require('../tabs/btc.controller.js'), - require('../tabs/withdraw.controller.js'), - require('../tabs/usd.controller.js'), - require('../tabs/eur.controller.js'), - require('../tabs/sgd.controller.js'), - require('../tabs/cad.controller.js'), - require('../tabs/gold.controller.js'), - require('../tabs/toujune2015.controller.js'), - require('../tabs/tou.controller.js'), - require('../tabs/privacypolicy.controller.js'), - require('../tabs/jpy.controller.js'), - require('../tabs/hkd.controller.js'), - require('../tabs/mxn.controller.js'), - require('../tabs/404.controller.js'), - require('../tabs/brl.controller.js'), - require('../tabs/settingstrade.controller.js'), - require('../tabs/settingsgateway.controller.js'), - require('../tabs/notifications.controller.js'), + require('../tabs/login.controller.js') + // require('../tabs/migrate.controller.js'), + // require('../tabs/logout.controller.js'), + // require('../tabs/balance.controller.js'), + // require('../tabs/history.controller.js'), + // require('../tabs/contacts.controller.js'), + // require('../tabs/exchange.controller.js'), + // require('../tabs/account.controller.js'), + // require('../tabs/trust.controller.js'), + // require('../tabs/send.controller.js'), + // require('../tabs/trade.controller.js'), + // require('../tabs/advanced.controller.js'), + // require('../tabs/security.controller.js'), + // require('../tabs/tx.controller.js'), + // require('../tabs/xrp.controller.js'), + // require('../tabs/debug.controller.js'), + // require('../tabs/btc.controller.js'), + // require('../tabs/withdraw.controller.js'), + // require('../tabs/usd.controller.js'), + // require('../tabs/eur.controller.js'), + // require('../tabs/sgd.controller.js'), + // require('../tabs/cad.controller.js'), + // require('../tabs/gold.controller.js'), + // require('../tabs/toujune2015.controller.js'), + // require('../tabs/tou.controller.js'), + // require('../tabs/privacypolicy.controller.js'), + // require('../tabs/jpy.controller.js'), + // require('../tabs/hkd.controller.js'), + // require('../tabs/mxn.controller.js'), + // require('../tabs/404.controller.js'), + // require('../tabs/brl.controller.js'), + // require('../tabs/settingstrade.controller.js'), + // require('../tabs/settingsgateway.controller.js'), + // require('../tabs/notifications.controller.js'), // Hidden tabs - require('../tabs/apps.controller.js'), - require('../tabs/su.controller.js') + // require('../tabs/apps.controller.js'), + // require('../tabs/su.controller.js') ]; // Language diff --git a/src/less/ripple/landing.less b/src/less/ripple/landing.less index 722b2eef0..dc87de148 100644 --- a/src/less/ripple/landing.less +++ b/src/less/ripple/landing.less @@ -207,12 +207,16 @@ h4#announcement { } p.heroText { - text-align: center; font-size: 16px; + font-weight: normal; color: @white; - max-width: 600px; + max-width: 800px; margin: auto; - padding: 20px 0 50px; + padding: 20px 0 10px; + + a { + text-decoration: underline !important; + } } .form-group { diff --git a/src/templates/client/layout.jade b/src/templates/client/layout.jade index 76cde4a91..9eb613218 100644 --- a/src/templates/client/layout.jade +++ b/src/templates/client/layout.jade @@ -55,65 +55,4 @@ div#wrapper // Main .container-fluid.main.pageLoading(ng-show="pageLoading") img(src="img/sections.png", class="loader") - .container-fluid.main(ng-if="!showLogin && !pageLoading", id="{{$route.current.tabClass}}", role="main", ng-view) - - // Footer - footer.container(ng-hide="pageLoading", ng-class="{ 'loggedOut': !loginStatus }") - .col-xs-12.col-sm-3 - a(href="https://github.com/ripple/ripple-client/releases", target="_blank", l10n) - | Version: {{version}} - |
{{versionBranch}} - - .col-xs-12.col-sm-9.right-links - a(href="https://rippletrade.com/#/tou", target="_blank", l10n) Terms of Use - a(href="https://rippletrade.com/#/privacypolicy", target="_blank", l10n) Privacy Policy - a(href="https://ripple.com/knowledge_categories/use-ripple-trade/", target="_blank", l10n) Support - a(href="https://ripplelabs.atlassian.net/browse/WC", target="_blank", l10n) Bug reports - a(href="#/lang/en") English - a(href="#/lang/zh_CN") 中文 - a(href="#/lang/ja") 日本語 - - // Language selector - rp-popup - a.last(href="", rp-popup-link, l10n) more... - div.languageSelector(rp-popup-content) - .modal-header - button.close(type="button", data-dismiss="modal", aria-hidden="true") × - .modal-title(l10n) Select a language - .modal-body.row.list - .col-sm-6 - a(href="#/lang/en") English - .col-sm-6 - a(href="#/lang/zh_CN") 中文 - .col-sm-6 - a(href="#/lang/ca") Català - .col-sm-6 - a(href="#/lang/de") Deutsch - .col-sm-6 - a(href="#/lang/es") Español - .col-sm-6 - a(href="#/lang/fr_FR") Français - .col-sm-6 - a(href="#/lang/he_IL") עברית - .col-sm-6 - a(href="#/lang/it") Italiano - .col-sm-6 - a(href="#/lang/ja") 日本語 - .col-sm-6 - a(href="#/lang/ko") 한국말 - .col-sm-6 - a(href="#/lang/nl_NL") Nederlands - .col-sm-6 - a(href="#/lang/nb_NO") Norsk - .col-sm-6 - a(href="#/lang/pl") Polski - .col-sm-6 - a(href="#/lang/pt_BR") Português brasileiro - .col-sm-6 - a(href="#/lang/ro") Român - .col-sm-6 - a(href="#/lang/ru") Русский - .col-sm-6 - a(href="#/lang/sk") Slovenská - .col-sm-6 - a(href="#/lang/tr") Türkçe + .container-fluid.main(ng-if="!showLogin && !pageLoading", id="{{$route.current.tabClass}}", role="main", ng-view) \ No newline at end of file diff --git a/src/templates/tabs/login.jade b/src/templates/tabs/login.jade index 3160d04c4..a5260607d 100644 --- a/src/templates/tabs/login.jade +++ b/src/templates/tabs/login.jade @@ -1,11 +1,28 @@ section.col-xs-12.content(ng-controller="LoginCtrl") //include ../tabs/banner/touannouncement - include ../tabs/banner/announcement .row.auth-form-container(ng-hide="$routeParams.to") .col-xs-12.hidden-xs - .welcomeText(l10n) Welcome to Ripple Trade - hr - p.heroText(l10n) Trade hundreds of assets, from XRP to crypto to gold to fiat. + p.heroText Thank you for using Ripple Trade. While we continue to develop the Ripple ecosystem, we are no longer running Ripple Trade, the wallet application. You can still access your balances and secret key after  + a(href="https://ripple.com/knowledge_center/migrating-your-ripple-trade-account-to-gatehub/") migrating your account to GateHub + | , or at  + a(href="https://ripple.com/knowledge_center/ripple-trade-discontinues-operations/") another wallet provider + | of your choice. If you choose to migrate to GateHub, click, Migrate Wallet to GateHub to get started. + p.heroText Ripple Tradeをご利用頂き誠にありがとうございます。Rippleのエコシステムは引き続き開発し続ける一方で、ウォレットアプリのRipple Tradeは運営を停止いたします。お客様の残高やシークレットキーは   + a(href="https://ripple.com/knowledge_center/migrating-your-ripple-trade-account-to-gatehub/") アカウントをGateHubへ移行、 + | もしくは   + a(href="https://ripple.com/knowledge_center/ripple-trade-discontinues-operations/") その他のウォレットプロバイダー + | に移行後、引き続きアクセスすることができます。GateHubへ移行する場合は、Migrate Wallet to GateHub をクリックし、移行を開始してください。 + p.heroText 感谢您使用Ripple Trade。我们将继续发展Ripple生态系统，但此刻我们将不再运营钱包应用Ripple Trade。您仍然可以在 + a(href="https://ripple.com/knowledge_center/migrating-your-ripple-trade-account-to-gatehub/") 迁移账户至GateHub + | 或您所选择的   + a(href="https://ripple.com/knowledge_center/ripple-trade-discontinues-operations/") 其它钱包服务商 + | 后获取您的资金余额及密匙。若您选择迁移账户至GateHub，请您点击 Migrate Wallet to GateHub 开始迁移。 + p.heroText Ripple Trade를 사용해주셔서 감사합니다. Ripple 에코시스템은 계속해서 발전되지만, 소비자 지갑 웹서비스인 Ripple Trade는 운용을 중단하게됩니다. 고객님의 잔고에는 돈이 계속 남아있으며 접근하기 위해서   + a(href="https://ripple.com/knowledge_center/migrating-your-ripple-trade-account-to-gatehub/") GateHub 으로 이전 + | 하시거나   + a(href="https://ripple.com/knowledge_center/ripple-trade-discontinues-operations/") 다른 지갑제공자 서비스 + | 를 사용하시면 됩니다. GateHub 으로 이전하시길 원하면 여기를 클릭해주세요, Migrate Wallet to GateHub. + .auth-form-wrapper.col-xs-12.col-sm-6.col-md-5.col-lg-4 .loginOverlay(ng-show='loggingIn') img.loader(src='img/main.png', alt='', title='') @@ -18,12 +35,11 @@ section.col-xs-12.content(ng-controller="LoginCtrl") .submit-btn-container a.btn.btn-submit.btn-block.btn-success#migrateBtn(type="submit", ng-click="migrate()") span(l10n) Migrate Wallet to Gatehub - p.learnMore - a(href='https://ripple.com/knowledge_center/migrating-your-ripple-trade-account-to-gatehub', target="_blank", l10n-inc) Learn more about migrating. - button.btn.btn-submit.btn-block.btn-success#loginBtn(type="submit" ng-click="submitForm('login')") - span(l10n) Log In - p.signUpInfo + p.signUpInfo a(href='https://ripple.com/knowledge_center/wallet-providers/', target="_blank", l10n-inc) Learn about wallet providers. + p.learnMore + a(href='https://forum.ripple.com/viewtopic.php?f=1&t=15819', target="_blank", l10n-inc) Learn more about our decision to discontinue Ripple Trade. + input(name='redirect_to', type='hidden', value='{{redirectTo}}') .row.action-login(ng-if="$routeParams.to")