From cac41de4f078d00105002dcdd6ce2c511285e4d6 Mon Sep 17 00:00:00 2001 From: mDuo13 Date: Mon, 17 Aug 2020 15:21:31 -0700 Subject: [PATCH 1/4] Mention lxml requirement in readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f031ef063b..5e9d5e3fba 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ The [XRP Ledger Dev Portal](https://xrpl.org) is the authoritative source for XR To build the site locally: -1. Install [**Dactyl**](https://github.com/ripple/dactyl): +1. Install [**Dactyl**](https://github.com/ripple/dactyl) and `lxml`: - sudo pip3 install dactyl + sudo pip3 install dactyl lxml 2. Clone the repo and change into its directory: From ea2a39d04627ced7646c22d7bc7b464e1fdae000 Mon Sep 17 00:00:00 2001 From: mDuo13 Date: Mon, 17 Aug 2020 15:21:53 -0700 Subject: [PATCH 2/4] Top nav conf + html --- dactyl-config.yml | 34 +++++++++----------- tool/template-base.html | 47 +--------------------------- tool/template-top-nav.html | 64 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 66 deletions(-) create mode 100644 tool/template-top-nav.html diff --git a/dactyl-config.yml b/dactyl-config.yml index 2bd28127e1..5d0c7510f2 100644 --- a/dactyl-config.yml +++ b/dactyl-config.yml @@ -54,7 +54,7 @@ cover_page: languages: - code: en - display_name: English + display_name: Eng prefix: "/" - code: ja display_name: 日本語 @@ -69,6 +69,7 @@ targets: # Override them with --vars to change which fork/branch to edit. github_forkurl: https://github.com/ripple/xrpl-dev-portal github_branch: master + prefix: "/" link_subs: "./src/api-v3/paths/preparations/payments.ts": "https://github.com/xpring-eng/xrp-api/blob/master/src/api-v3/paths/preparations/payments.ts" readability_goals: @@ -79,6 +80,7 @@ targets: display_name: XRP Ledger Dev Portal (日本語) github_forkurl: https://github.com/ripple/xrpl-dev-portal github_branch: master + prefix: "/ja/" locale_file: locale/ja/LC_MESSAGES/messages.mo link_subs: # Adjust XRP-API readme link to point to the right place in the repo @@ -257,14 +259,6 @@ pages: # "Build" funnel --------------------------------------------------------------- - name: Build - funnel: Build - template: template-landing-children.html #TODO: change? - html: build.html - targets: - - en - - ja - - - name: Docs funnel: Build template: template-landing-docs.html html: docs.html @@ -6290,7 +6284,7 @@ pages: - md: dev-tools/dev-tools.md html: dev-tools.html funnel: Build - category: Dev Tools + doc_type: Dev Tools targets: - en @@ -6305,14 +6299,14 @@ pages: template: template-redirect.html redirect_url: dev-tools.html funnel: Build - category: Dev Tools + doc_type: Dev Tools targets: - en - ja - name: RPC Tool funnel: Build - category: Dev Tools + doc_type: Dev Tools html: xrp-ledger-rpc-tool.html targets: - en @@ -6321,7 +6315,7 @@ pages: - name: WebSocket API Tool funnel: Build - category: Dev Tools + doc_type: Dev Tools template: template-websocket-api-tool.html html: websocket-api-tool.html targets: @@ -6330,7 +6324,7 @@ pages: - name: Data API v2 Tool funnel: Build - category: Dev Tools + doc_type: Dev Tools html: data-api-v2-tool.html methods_js: js/apitool-methods-data_v2.js rest_host: https://data.ripple.com @@ -6343,7 +6337,7 @@ pages: - name: ripple.txt Validator # Redirect from ripple.txt validator to toml funnel: Build - category: Dev Tools + doc_type: Dev Tools html: ripple-txt-validator.html template: template-redirect.html redirect_url: xrp-ledger-toml-checker.html @@ -6353,7 +6347,7 @@ pages: - name: xrp-ledger.toml Checker funnel: Build - category: Dev Tools + doc_type: Dev Tools html: xrp-ledger-toml-checker.html targets: - en @@ -6362,7 +6356,7 @@ pages: - name: Domain Verification Checker funnel: Build - category: Dev Tools + doc_type: Dev Tools html: validator-domain-verifier.html targets: - en @@ -6372,7 +6366,7 @@ pages: - name: XRP Faucets html: xrp-testnet-faucet.html funnel: Build - category: Dev Tools + doc_type: Dev Tools template: template-test-net.html targets: - en @@ -6381,7 +6375,7 @@ pages: - name: XRP Test Net Faucet # Redirect from old URL html: xrp-test-net-faucet.html funnel: Build - category: Dev Tools + doc_type: Dev Tools template: template-redirect.html redirect_url: xrp-testnet-faucet.html targets: @@ -6390,7 +6384,7 @@ pages: - name: Transaction Sender funnel: Build - category: Dev Tools + doc_type: Dev Tools html: tx-sender.html targets: - en diff --git a/tool/template-base.html b/tool/template-base.html index 3af1e29b3e..672aa8d79c 100644 --- a/tool/template-base.html +++ b/tool/template-base.html @@ -51,52 +51,7 @@ - + {% include 'template-top-nav.html' %}
diff --git a/tool/template-top-nav.html b/tool/template-top-nav.html new file mode 100644 index 0000000000..96a309de14 --- /dev/null +++ b/tool/template-top-nav.html @@ -0,0 +1,64 @@ + From 4fbd3c652a20715674990a666f6082e2e5582b97 Mon Sep 17 00:00:00 2001 From: mDuo13 Date: Mon, 17 Aug 2020 15:44:15 -0700 Subject: [PATCH 3/4] Make top nav unfixed --- assets/js/jump-to-top.js | 6 +++--- tool/template-github-edit.html | 4 ++-- tool/template-top-nav.html | 13 ++++++++++--- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/assets/js/jump-to-top.js b/assets/js/jump-to-top.js index 69c1aafac9..692afed704 100644 --- a/assets/js/jump-to-top.js +++ b/assets/js/jump-to-top.js @@ -1,6 +1,6 @@ $(document).ready(function() { - // Mobile menu. + // Mobile menu. $('[data-toggle="slide-collapse"]').on('click', function() { $navMenuCont = $($(this).data('target')); $navMenuCont.toggleClass('show'); @@ -9,7 +9,7 @@ $(document).ready(function() { $(".menu-overlay").click(function(event) { $(".navbar-toggler").trigger("click"); }); - + @@ -26,6 +26,6 @@ $(document).ready(function() { } }); $(".jump-to-top").click(function() { - $("body").animate({scrollTop: TO_TOP_POS}, TO_TOP_SPEED) + $("html").animate({scrollTop: TO_TOP_POS}, TO_TOP_SPEED) }); }); diff --git a/tool/template-github-edit.html b/tool/template-github-edit.html index 46faba028e..4150f4e1f4 100644 --- a/tool/template-github-edit.html +++ b/tool/template-github-edit.html @@ -1,4 +1,4 @@ -
+
{% if target.github_forkurl is defined %} {% set have_edit_link = False %} {% if currentpage.md is defined %} @@ -23,6 +23,6 @@ {% if not have_edit_link %} {% set githuburl = target.github_forkurl %} {% endif %} - {% trans %}Edit{% endtrans %} + {% trans %}Edit{% endtrans %} {% endif %}
diff --git a/tool/template-top-nav.html b/tool/template-top-nav.html index 96a309de14..604cfc386a 100644 --- a/tool/template-top-nav.html +++ b/tool/template-top-nav.html @@ -1,9 +1,10 @@ -