From 81ef2c0bcfa474d3a97f116bb7ee5d0ea33b7b86 Mon Sep 17 00:00:00 2001 From: Adam Schmideg Date: Tue, 22 Jan 2019 11:46:45 +0100 Subject: [PATCH] links use baseurl --- _config.yml | 1 + _data/navbar.yml | 3 +++ _includes/head.html | 27 ++++++++++++++------------- _layouts/default.html | 25 ++++++++++++++++++++----- _layouts/sidebar.html | 2 +- docs/index.md | 16 ++++++++-------- downloads.html | 4 ++-- 7 files changed, 49 insertions(+), 29 deletions(-) create mode 100644 _data/navbar.yml diff --git a/_config.yml b/_config.yml index 1077dda58e..9e9c83c8c1 100644 --- a/_config.yml +++ b/_config.yml @@ -6,6 +6,7 @@ exclude: - .gitignore google_analytics: UA-131485733-1 +favicon: /static/images/favicon.png defaults: - diff --git a/_data/navbar.yml b/_data/navbar.yml new file mode 100644 index 0000000000..9dcc1eea33 --- /dev/null +++ b/_data/navbar.yml @@ -0,0 +1,3 @@ +Install: /docs/Installing-Geth +Downloads: /downloads +Documentation: /docs \ No newline at end of file diff --git a/_includes/head.html b/_includes/head.html index fb6cabcd0e..3d32667258 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -19,28 +19,29 @@ {% endif %} - + + {% if layout.common-css %} + {% for css in layout.common-css %} + + {% endfor %} + {% endif %} - - - - {% if page.css %} {% for css in page.css %} - + {% endfor %} {% endif %} - - - - - + {% if layout.common-js %} + {% for js in layout.common-js %} + + {% endfor %} + {% endif %} + {% if page.js %} {% for js in page.js %} - + {% endfor %} {% endif %} - \ No newline at end of file diff --git a/_layouts/default.html b/_layouts/default.html index 23000fd533..2ad0a92154 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,3 +1,17 @@ +--- +common-css: +- /static/styles/bootstrap.min.css +- /static/styles/flatly.min.css +- /static/styles/font-awesome.min.css +- /static/styles/custom/common.css +common-js: +- /static/scripts/jquery.min.js +- /static/scripts/bootstrap.min.js +- /static/scripts/moment.min.js +- /static/scripts/marked.min.js +- /static/scripts/emojify.min.js +- /static/scripts/custom/polyfills.js +--- {% include head.html %} @@ -12,14 +26,15 @@ - Go Ethereum + Go Ethereum diff --git a/_layouts/sidebar.html b/_layouts/sidebar.html index 17d206a954..3105c9759a 100644 --- a/_layouts/sidebar.html +++ b/_layouts/sidebar.html @@ -9,7 +9,7 @@ layout: default {{ group[0] }} {% for link in group[1] %} {{ link.first[0] }} + href="{{ link.first[1] | prepend: site.baseurl | replace: '//', '/'}}">{{ link.first[0] }} {% endfor %} {% endfor %} diff --git a/docs/index.md b/docs/index.md index 65580c1f45..63562db30e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -5,13 +5,13 @@ This is the documentation for the official Ethereum golang implementation. For g Main entry points: -* [Installation Instructions](/docs/Building-Ethereum) -* [Developer/Management API](/docs/Management-APIs) -* [Managing Accounts](/docs/Managing-your-accounts) -* [Command Line Options](/docs/Command-Line-Options) -* [JavaScript Console](/docs/JavaScript-Console) -* [Private Network](/docs/Private-network) -* [Developers' Guide](/docs/Developers-Guide) -* [Whisper v6](/docs/Whisper) +* [Installation Instructions](Building-Ethereum) +* [Developer/Management API](Management-APIs) +* [Managing Accounts](Managing-your-accounts) +* [Command Line Options](Command-Line-Options) +* [JavaScript Console](JavaScript-Console) +* [Private Network](Private-network) +* [Developers' Guide](Developers-Guide) +* [Whisper v6](Whisper) Sidebar lists all pages. diff --git a/downloads.html b/downloads.html index 3acd7d6838..e843ddec11 100644 --- a/downloads.html +++ b/downloads.html @@ -1,9 +1,9 @@ --- layout: default css: -- ../static/styles/custom/downloads.css +- /static/styles/custom/downloads.css js: -- ../static/scripts/filesize.min.js +- /static/scripts/filesize.min.js ---