From 9b16504485a14b477aa00ae33a43d91e7e4ce9e6 Mon Sep 17 00:00:00 2001 From: Simone <26844016+simonebortolin@users.noreply.github.com> Date: Fri, 30 Dec 2022 17:54:00 +0100 Subject: Streamlining of customisations: migration of numerous functionalities to the JTD fork and add new functionalities implemented by JTD fork (#75) * use form validation by jdt * migrate theme-switch to new version of jtd * Use new feature of jdt * streamlining of customisations: migrate, aux button, modal and theme switch to fork JTD * fix * fix Co-authored-by: Simone Bortolin --- _config.yml | 13 +- _includes/cig_password.html | 30 ++- _includes/icons/custom.html | 9 +- _layouts/default.html | 394 ++++++++++++++++++------------------ _ont/ont-huawei-ma5671a-root-web.md | 8 +- _sass/custom/custom.scss | 120 ----------- _tools/ascii-hex.md | 53 +++-- _tools/speed-gpon-eth.md | 161 ++++++++------- assets/js/modal.js | 28 --- assets/js/theme-switch.js | 37 ---- 10 files changed, 359 insertions(+), 494 deletions(-) delete mode 100644 assets/js/modal.js delete mode 100644 assets/js/theme-switch.js diff --git a/_config.yml b/_config.yml index 1246691..3633e02 100644 --- a/_config.yml +++ b/_config.yml @@ -33,18 +33,21 @@ plugins: - jekyll-redirect-from - jekyll-default-layout -color_scheme: "light" +color_scheme: "auto" +enable_switch_color_scheme: true +enable_localstorage_color_scheme: true + url: "https://hack-gpon.github.io" nav_sort: case_sensitive -aux_links: +aux_buttons: - title: "GitHub" color: 'purple' - icon: 'svg-github' + icon: 'github' link: '//github.com/hack-gpon/hack-gpon.github.io' - title: "Telegram" color: 'blue' - icon: 'svg-telegram' + icon: 'telegram' link: '//t.me/HackGPON' #aux_links: @@ -90,6 +93,8 @@ mermaid: # barGap: 4 # topPadding: 50 +enable_modal: true + collections: ont: permalink: "/:path/" diff --git a/_includes/cig_password.html b/_includes/cig_password.html index 5118a5c..e3be28b 100644 --- a/_includes/cig_password.html +++ b/_includes/cig_password.html @@ -1,32 +1,40 @@
-
+
- + +
+ Please provide a valid GPON S/N. +
- +
- +
- +
\ No newline at end of file diff --git a/_includes/icons/custom.html b/_includes/icons/custom.html index a83ef5b..7fc2266 100644 --- a/_includes/icons/custom.html +++ b/_includes/icons/custom.html @@ -9,4 +9,11 @@ - \ No newline at end of file + + + Edit + + + + + \ No newline at end of file diff --git a/_layouts/default.html b/_layouts/default.html index 15482bb..43d58d6 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -6,57 +6,45 @@ layout: table_wrappers {% include head.html %} - + Skip to main content Link - - - + + Search - - - + + Menu - - - - + + Expand - + Document - - - + + {% include icons/alert.html %} - {% include icons/code_copy.html %} {% include icons/external_link.html %} + {% include icons/code_copy.html %} + {% if site.enable_switch_color_scheme != false %} + {% include icons/switch_color_scheme.html %} + {% endif %} {% include icons/custom.html %} @@ -64,66 +52,83 @@ layout: table_wrappers
{% include title.html %} - - - +
- {% capture nav_footer_custom %} - {%- include nav_footer_custom.html -%} - {% endcapture %} - {% if nav_footer_custom != "" %} - {{ nav_footer_custom }} - {% else %} - + + {% capture nav_footer_custom %} + {%- include nav_footer_custom.html -%} + {% endcapture %} + {% if nav_footer_custom != "" %} + {{ nav_footer_custom }} + {% else %} + {% endif %}
{% if site.search_enabled != false %} - {% capture search_placeholder %}{% include search_placeholder_custom.html %}{% endcapture %} -
-
- - -
-
-
+ + {% capture search_placeholder %}{% include search_placeholder_custom.html %}{% endcapture %} + +
+
+ + +
+
+
+ {% else %} +
{% endif %} {% include header_custom.html %} - + {% if site.aux_links or site.aux_buttons or site.enable_switch_color_scheme == true %} + + {% endif %}
- {% if page.parent and page.url != "/" %} + {% if page.parent and page.url != "/" %} {% include nav/crumbs.html nodes=nav_page_ancestors %} {% endif %}
@@ -139,9 +144,7 @@ layout: table_wrappers href="{{ site.gh_edit_repository }}/{{ site.gh_edit_view_mode }}/{{ site.gh_edit_branch }}{% if site.gh_edit_source %}/{{ site.gh_edit_source }}{% endif %}/{{ page.path }}" id="edit-this-page" title="{{ site.gh_edit_link_text }}"> - - + {% endif %}

{{ page.title | default: site.title | default: site.github.repository_name }}

@@ -151,10 +154,10 @@ layout: table_wrappers {% if site.last_edit_timestamp_script == true %} -