Optimizations, Update Readme YellowLabTools

5 files changed, 17 insertions, 22 deletions

diff --git a/templates/macros/create_stork_toml.html b/templates/macros/create_stork_toml.html
index c9ed35c..642b3f9 100644
--- a/templates/macros/create_stork_toml.html
+++ b/templates/macros/create_stork_toml.html
@@ -1,8 +1,3 @@
-{# cargo install stork-search --locked #}
-{# cd .dev/abridge #}
-{# zola build #}
-{# /home/jieiku/.cargo/bin/stork build --input public/data_stork/index.html --output static/stork.st #}
-
 {%- macro from_section(section) -%}
 {%- set section = get_section(path=section) -%}
 {%- for post in section.pages -%}
diff --git a/templates/macros/head.html b/templates/macros/head.html
index c3b217c..92b2bb5 100644
--- a/templates/macros/head.html
+++ b/templates/macros/head.html
@@ -1,5 +1,5 @@
 {#- Theme Switcher Button to toggle between dark/light #}
-{%- macro theme() %}
+{%- macro theme(config) %}
   {%- if config.extra.js_theme %}
   {%- if config.extra.js_themeButton or config.extra.js_bundle %}
   <script src="{{ get_url(path=config.extra.js_theme, trailing_slash=false) | safe }}"{%- if config.extra.integrity %} integrity="sha384-{{ get_file_hash(path=config.extra.js_theme, sha_type=384, base64=true) | safe }}"{%- endif %}></script>
@@ -7,7 +7,7 @@
   {%- endif %}
 {%- endmacro %}
 
-{%- macro stylesheets() %}
+{%- macro stylesheets(config) %}
 
   {%- if config.extra.stylesheets %}{%- for i in config.extra.stylesheets %}
   <link rel="stylesheet" href="{{ get_url(path=i, trailing_slash=false, cachebust=true) | safe }}" />
@@ -15,7 +15,7 @@
 
 {%- endmacro %}
 
-{%- macro stylesheets_preload() %}
+{%- macro stylesheets_preload(config) %}
 
 {%- if config.extra.fonts %}{%- for i in config.extra.fonts %}
   {%- if i.url is matching("^http[s]?://") %}
@@ -43,7 +43,7 @@
 
 
 
-{%- macro feed() %}
+{%- macro feed(config) %}
   {%- if config.generate_feed %}
   <link rel="alternate" type="{% if config.feed_filename is containing('atom') %}application/atom+xml{% else %}application/rss+xml{% endif %}" title="Atom/RSS Feed" href="{{ get_url(path=config.feed_filename, trailing_slash=false) | safe }}" />
   {%- endif %}
@@ -51,7 +51,7 @@
 
 
 
-{%- macro js() %}
+{%- macro js(config) %}
 
   {%- set preStyle = false %}
 
@@ -228,7 +228,7 @@
 
 
 
-{%- macro favicons() %}
+{%- macro favicons(config) %}
   {%- if config.extra.favicon_theme_color %}
   <meta name="theme-color" content="{{ config.extra.favicon_theme_color }}" />
   {%- endif %}
@@ -260,7 +260,7 @@
 
 
 
-{%- macro security() %}
+{%- macro security(config) %}
   {%- if config.extra.security_header_referrer %}
   <meta name="referrer" content="{{ config.extra.security_header_referrer | safe }}" />
   {%- endif %}
@@ -275,7 +275,7 @@
 {#- page_images:   using for the blog single template page -#}
 {#- page_section:  the blog single template page have to pass the parameter -#}
 {#- is_404:        using for the 404.html template -#}
-{%- macro seo( title="",title_addition="",description="",type="website",is_home=false,is_404=false,is_page=false,page_images="",page_section="",created_time="2021-07-04T07:07:00-07:00",  updated_time="2021-07-04T07:07:00-07:00" ) %}
+{%- macro seo( config, title="", title_addition="", description="", type="website", is_home=false, is_404=false, is_page=false, page_images="", page_section="", created_time="2021-07-04T07:07:00-07:00", updated_time="2021-07-04T07:07:00-07:00" ) %}
 {%- if is_404 -%}
   <meta name="robots" content="noindex, follow" />
 {%- else -%}
diff --git a/templates/macros/macros.html b/templates/macros/macros.html
index 97b481f..dd3b75c 100644
--- a/templates/macros/macros.html
+++ b/templates/macros/macros.html
@@ -1,8 +1,8 @@
-{%- macro title_post(page) %}
+{%- macro title_post(page, config) %}
         <h1><a href="{{ page.permalink | safe }}{%- if config.extra.uglyurls %}index.html{%- endif %}">{{ page.title }}</a></h1>
 {%- endmacro title_post %}
 
-{%- macro meta_post(page) %}
+{%- macro meta_post(page, config) %}
         <span{%- if config.extra.meta_post.size %} class="{{ config.extra.meta_post.size }}"{% endif %}>
 
         {#- Author #}
@@ -42,12 +42,12 @@
           {%- if page.taxonomies.tags %} {%- for tag in page.taxonomies.tags %} #<a href="{{ get_taxonomy_url(kind='tags', name=tag) | safe }}{%- if config.extra.uglyurls %}index.html{%- endif %}">{{ tag }}</a> {% endfor -%}{%- endif %}</span>
 {%- endmacro meta_post %}
 
-{%- macro title_index(page) %}
+{%- macro title_index(page, config) %}
         <h1>{% if config.extra.title_size_index %}<span class="{{ config.extra.title_size_index }}">{% endif %}<a href="{{ page.permalink | safe }}{%- if config.extra.uglyurls %}index.html{%- endif %}">{{ page.title }}</a>{% if config.extra.title_size_index %}</span>{% endif %}</h1>
 {%- endmacro title_index %}
 
 
-{%- macro meta_index(page) %}
+{%- macro meta_index(page, config) %}
         <span{%- if config.extra.meta_index.size %} class="{{ config.extra.meta_index.size }}"{% endif %}>
 
         {#- Author #}
@@ -99,7 +99,7 @@
 {%- endmacro footer %}
 
 
-{%- macro pagination(paginator)%}
+{%- macro pagination(paginator, config)%}
   {%- if paginator.number_pagers > 1 %}
             {%- if paginator.number_pagers <= 5 %}  {# 5 or less pager is simple, just display all 5 #}
                 {%- set start = 1 %}
diff --git a/templates/macros/page.html b/templates/macros/page.html
index df06117..7fd0f77 100644
--- a/templates/macros/page.html
+++ b/templates/macros/page.html
@@ -1,4 +1,4 @@
-{%- macro page_listing(page) %}
+{%- macro page_listing(page, config) %}
         <div class="toc-item">
           <a href="{{ page.permalink | safe}}{%- if config.extra.uglyurls %}index.html{%- endif %}">{{ page.title }}</a>
         </div>
diff --git a/templates/macros/social.html b/templates/macros/social.html
index 0c704bf..52fb6ff 100644
--- a/templates/macros/social.html
+++ b/templates/macros/social.html
@@ -1,4 +1,4 @@
-{%- macro social_links(social_config) %}
+{%- macro social_links(social_config, config) %}
       <nav>
         <ul>
 {%- set base_url = get_url(path="", lang=lang) -%}
@@ -6,8 +6,8 @@
           <li><a href="{{ get_url(path=config.feed_filename, trailing_slash=false) | safe }}" target="_blank" title="Atom/RSS Feed"><i type="Button" class="svg rss" title="Atom/RSS Feed"></i></a></li>{% endif -%}{% endif -%}
           {%- if social_config.mail -%}
           {%- if social_config.mail_encode -%}
-          {%- set base64_email = "abridge" ~ social_config.mail -%}
-          <li class="js"><a class="m-protected" href="#" target="_blank" title="{{ base64_email | base64_encode }}"><i type="Button" class="svg mail" title="Mail"></i></a></li>
+          {%- set base64_email = social_config.mail -%}
+          <li class="js"><a class="m-protected" href="#{{ base64_email | base64_encode }}" target="_blank" title="Mail"><i type="Button" class="svg mail" title="Mail"></i></a></li>
           {%- else -%}
           <li><a href="mailto:{{ social_config.mail }}" target="_blank" title="Mail"><i type="Button" class="svg mail" title="Mail"></i></a></li>
           {%- endif -%}