appscms-tools-theme 4.7.4 → 4.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abaa0710c1c53e583dfa86ad44f6f4ffc1d30bad1e64f39b16ab6068cb3f72b5
-  data.tar.gz: a8cb147c2173e705c879cb8f3fe1205d1e8621dc471e29dfbfeb66639b01e888
+  metadata.gz: 90072729d7373ad157133c3cb3acbade1b443ff967e470c745a3c87fd739086f
+  data.tar.gz: 7255d68d72e2bd0375f31e26d9c0638b4b8ec97ccfdb3fceb7ee7404f9ed296c
 SHA512:
-  metadata.gz: cc5aa8d4d7092673047bfdaf2b233a3ed2c08d93e6835be6b3bde86e6498d377df3defdd4b638e58d8684a5943fc97fd8f1b013828363d6ba9af7a13dfe1ded9
-  data.tar.gz: a9857d3d789072abfaede4f74ab1ab81fc3746014dc52c0a207804d17c33c1db28ebb2b3f58bfa7fb3902845708f20c3da739aba44b83d0aa453e958b716da57
+  metadata.gz: ad5f65cf16e33ce3d989132240ae1ba83b9472f504f772f877e25844396d056def41e33c5575b2430516d2760ce5b507b9fdadfe9f80a2da4750e770ac55e3e1
+  data.tar.gz: c927bfea8e2c08acce50af6f34c2ff959cca7de7e5afa27905af4c5b7b547157044be521f73154ce71045839e5acd55c16a90806c8dd0f94daf5fb16f909c5c9

data/_includes/alternates/alternates.html

@@ -5,27 +5,7 @@
 {%- for checklang in site.pages -%}
 {%- if checklang.permalink == i -%}
 {%- assign languagetext = [i] -%}
-
-
-{% assign whitelist_urls = site.whitelist_urls %}
-{% if site.noindex_languages contains languagetext[0] %}
-{%- if whitelist_urls -%}
-{% for url in whitelist_urls %}
-{% assign current_url = url | remove_first: '/' | strip %}
-{% assign language_url = languagetext[0] | strip %}
-{% if current_url == language_url %}
-{%- assign exclude_url = true -%}
-{% endif %}
-{% endfor %}
-{%- if exclude_url -%}
 <link data-rh="true" rel="alternate" href="{{site.url}}/{{languagetext[0]}}" hreflang="{{languagetext[0]}}" />
-{%- endif -%}
-{%- endif -%}
-{%- else -%}
-<link data-rh="true" rel="alternate" href="{{site.url}}/{{languagetext[0]}}" hreflang="{{languagetext[0]}}" />
-{%- endif -%}
-
-
 {%- endif -%}
 {%- endfor -%}
 {%- endfor -%}
@@ -36,74 +16,46 @@
 {%- for i in matchurls -%}
 {%- assign languagetext = [i] -%}
 {%- if i== page.permalink -%}
-
-{% assign whitelist_urls = site.whitelist_urls %}
-{% if site.noindex_languages contains languagetext[0] %}
-{%- if whitelist_urls -%}
-{% for url in whitelist_urls %}
-{% assign current_url = url | remove_first: '/' | strip %}
-{% assign language_url = languagetext[0] | strip %}
-{% if current_url == language_url %}
-{%- assign exclude_url = true -%}
-{% endif %}
-{% endfor %}
-{%- if exclude_url -%}
-<link data-rh="true" rel="alternate" href="{{site.url}}/{{languagetext[0]}}" hreflang="{{languagetext[0]}}" />
-{%- endif -%}
-{%- endif -%}
-{%- else -%}
 <link data-rh="true" rel="alternate" href="{{site.url}}/{{page.permalink}}" hreflang="{{languagetext[0]}}" />
-{%- endif -%}
-
 {%- else -%}
 {%- for checklang in site.pages -%}
 {%- if checklang.permalink == i -%}
 {%- assign languagetext = [i] -%}
-
-{% if site.noindex_languages contains languagetext[0] %}
-{%- if whitelist_urls -%}
-{% for url in whitelist_urls %}
-{% assign current_url = url | remove_first: '/' | strip %}
-{% assign language_url = languagetext[0] | strip %}
-{% if current_url == language_url %}
-<link data-rh="true" rel="alternate" href="{{site.url}}/{{languagetext[0]}}" hreflang="{{languagetext[0]}}" />
-{% endif %}
-{% endfor %}
-{%- endif -%}
-{%- else -%}
 <link data-rh="true" rel="alternate" href="{{site.url}}/{{languagetext[0]}}" hreflang="{{languagetext[0]}}" />
-{%- endif -%}
-
 {%- endif -%}
 {%- endfor -%}
 {%- endif -%}
 {%- endfor -%}
+
 {%- else -%}
+
 {%- for item in site.pages -%}
 {%- assign languagetext = [item.lang] -%}
 {%- assign pagelink = page.permalink | split: "/" | last-%}
 {%- assign itemlink = item.permalink | split: "/" | last-%}
-{%- if pagelink == itemlink and page.lang != item.lang and page.permalink != item.permalink -%}
 
-{% if site.noindex_languages contains languagetext[0] %}
-{%- if whitelist_urls -%}
+{% if pagelink == itemlink and page.lang != item.lang and page.permalink != item.permalink %}
+{% assign whitelist_urls = site.data.noindexURLs.internatlionalization_whitelist_urls %}
+{% if whitelist_urls %}
+{% assign exclude_url = false %}
 {% for url in whitelist_urls %}
 {% assign current_url = url | strip %}
 {% if current_url == item.permalink %}
-<link data-rh="true" rel="alternate" href="{{site.url}}{{item.permalink}}" hreflang="{{languagetext[0]}}" />
+{% assign exclude_url = true %}
 {% endif %}
 {% endfor %}
-{%- endif -%}
-{%- else -%}
-<link data-rh="true" rel="alternate" href="{{site.url}}{{item.permalink}}" hreflang="{{languagetext[0]}}" />
-{%- endif -%}
+{% if exclude_url %}
+<link data-rh="true" rel="alternate" href="{{ site.url }}{{ item.permalink }}" hreflang="{{ languagetext[0] }}" />
+{% endif %}
+{% endif %}
+{% endif %}
 
-{%- endif -%}
 {%- if pagelink == itemlink and page.lang == item.lang -%}
-
-{% assign whitelist_urls = site.whitelist_urls %}
-{% if site.noindex_languages contains languagetext[0] %}
+{% assign whitelist_urls = site.data.noindexURLs.internatlionalization_whitelist_urls %}
+{% assign noindex_languages = site.data.noindexURLs.noindex_languages %}
+{% if noindex_languages contains languagetext[0] %}
 {%- if whitelist_urls -%}
+{% assign exclude_url = false %}
 {% for url in whitelist_urls %}
 {% assign current_url = url | strip %}
 {% if current_url == item.permalink %}
@@ -115,22 +67,20 @@
 {%- endif -%}
 {%- endif -%}
 {%- else -%}
-
-
 {% assign final_permalink = item.permalink %}
 {% if item.permalink contains '/' %}
 {% else %}
-  {% assign final_permalink = '/' | append: item.permalink %}
+{% assign final_permalink = '/' | append: item.permalink %}
 {% endif %}
-
-{%- if site.blacklist_urls contains final_permalink -%}
+{% assign blacklist_urls = site.data.noindexURLs.blacklist_urls %}
+{%- if blacklist_urls contains final_permalink -%}
 {%- else -%}
 <link data-rh="true" rel="alternate" href="{{ site.url }}{{final_permalink}}" hreflang="{{ languagetext[0] }}" />
 {%- endif -%}
 
-{%- endif -%}
 
-{%- endif -%} 
+{%- endif -%}
+{%- endif -%}
 {%- endfor -%} 
 {%- endif -%} 
 {%- endif -%}

data/_includes/appscms/head/head.html

@@ -283,17 +283,17 @@
   <meta name="robots" content="noindex" />
   {%- endif -%} 
 
-  {% assign whitelist_urls = site.whitelist_urls %}
-  {% if site.noindex_languages contains page.lang %}
+  {% assign whitelist_urls = site.data.noindexURLs.internatlionalization_whitelist_urls %}
+  {% assign noindex_languages = site.data.noindexURLs.noindex_languages %}
+  {% if noindex_languages contains page.lang %}
   {% unless whitelist_urls contains page.url %}
   <meta name="robots" content="noindex" />
   {% endunless %}
   {% endif %}
-  
-  {% if site.blacklist_urls %}
-  {% if site.blacklist_urls contains page.url %}
-  <meta name="robots" content="noindex">
-  {% endif %}
+
+  {% assign blacklist_urls = site.data.noindexURLs.blacklist_urls %}
+  {% if blacklist_urls contains page.url %}
+  <meta name="robots" content="noindex" />
   {% endif %}
   
   {%- if site.pwa -%}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appscms-tools-theme
 version: !ruby/object:Gem::Version
-  version: 4.7.4
+  version: 4.7.5
 platform: ruby
 authors:
 - vivek-appscms
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-17 00:00:00.000000000 Z
+date: 2024-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -613,7 +613,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Appscms theme for all tools