appscms-tools-theme 4.6.8 → 4.6.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/_includes/alternates/alternates.html +134 -47
  3. data/_includes/appscms/head/head.html +18 -2
  4. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2fd658d17e16a1f149ad19d97a2cc14a2a38eda84e173cb8ab4b22c6479bb1ae
4
- data.tar.gz: 7a6571468117db5c09d9e6a778da9f35518d3c06243f7eda469a9c72de3d3561
3
+ metadata.gz: d69832d5a6242fd16f32bbd5ebd52d202f63d5292bbdd252488d7f6337fda44d
4
+ data.tar.gz: 552a1c8f94b223238affe49221052a1faa889295940eec5cb3638ba460fb7173
5
5
  SHA512:
6
- metadata.gz: ebea815ddd483081bd1a7a0180003afcc8d6d97edee50cc125fa930998e2b5d567bd2d6c264017ab3c9904d7543183441dc1313c87e2f9b437537748ea94c751
7
- data.tar.gz: a0a3a13829a2b7ed60c04384015fc10d3379117f967cb9bac9f5720fcabd4d59b36cb47760fe0cd3ca9ee4433387e2d92b77edc630251a4b1377417e7d2fc865
6
+ metadata.gz: 69322f9088a6282ddc2b9f8ffc765717fe7d1039e125505e492848ce72dbaeabc7cb77c79fb24f961af86e0183556a9c768454128d73db74d1bc2ed9182d7bcb
7
+ data.tar.gz: 367e38f2f0cc32c6cc432dddd74a4e7f6c892a0fe2101b0bb31577d488688d8583eaaf94eed2444e764f5670ff7c7001f5d27756a89c35423e81a92d124400fb
data/_includes/alternates/alternates.html CHANGED
@@ -1,49 +1,136 @@
1
- {%- include languages/languages.html -%} {%- if page.permalink == nil -%}
1
+ {%- include languages/languages.html -%}
2
+ {%- if page.permalink == nil -%}
2
3
  <link data-rh="true" rel="alternate" href="{{site.url}}" hreflang="en" />
3
- {%- for i in matchurls -%} {%- for checklang in site.pages -%} {%- if
4
- checklang.permalink == i -%} {%- assign languagetext = [i] -%}
5
- <link
6
- data-rh="true"
7
- rel="alternate"
8
- href="{{site.url}}/{{languagetext[0]}}"
9
- hreflang="{{languagetext[0]}}"
10
- />
11
- {%- endif -%} {%- endfor -%} {%- endfor -%} {%- else -%} {%- if matchurls
12
- contains page.permalink -%} {%- assign languagetext = [i] -%}
4
+ {%- for i in matchurls -%}
5
+ {%- for checklang in site.pages -%}
6
+ {%- if checklang.permalink == i -%}
7
+ {%- assign languagetext = [i] -%}
8
+
9
+
10
+ {% assign whitelist_urls = site.whitelist_urls %}
11
+ {% if site.noindex_languages contains languagetext[0] %}
12
+ {%- if whitelist_urls -%}
13
+ {% for url in whitelist_urls %}
14
+ {% assign current_url = url | remove_first: '/' | strip %}
15
+ {% assign language_url = languagetext[0] | strip %}
16
+ {% if current_url == language_url %}
17
+ {%- assign exclude_url = true -%}
18
+ {% endif %}
19
+ {% endfor %}
20
+ {%- if exclude_url -%}
21
+ <link data-rh="true" rel="alternate" href="{{site.url}}/{{languagetext[0]}}" hreflang="{{languagetext[0]}}" />
22
+ {%- endif -%}
23
+ {%- endif -%}
24
+ {%- else -%}
25
+ <link data-rh="true" rel="alternate" href="{{site.url}}/{{languagetext[0]}}" hreflang="{{languagetext[0]}}" />
26
+ {%- endif -%}
27
+
28
+
29
+ {%- endif -%}
30
+ {%- endfor -%}
31
+ {%- endfor -%}
32
+ {%- else -%}
33
+ {%- if matchurls contains page.permalink -%}
34
+ {%- assign languagetext = [i] -%}
13
35
  <link data-rh="true" rel="alternate" href="{{site.url}}" hreflang="en" />
14
- {%- for i in matchurls -%} {%- assign languagetext = [i] -%} {%- if i==
15
- page.permalink -%}
16
- <link
17
- data-rh="true"
18
- rel="alternate"
19
- href="{{site.url}}/{{page.permalink}}"
20
- hreflang="{{languagetext[0]}}"
21
- />
22
- {%- else -%} {%- for checklang in site.pages -%} {%- if checklang.permalink == i
23
- -%} {%- assign languagetext = [i] -%}
24
- <link
25
- data-rh="true"
26
- rel="alternate"
27
- href="{{site.url}}/{{languagetext[0]}}"
28
- hreflang="{{languagetext[0]}}"
29
- />
30
- {%- endif -%} {%- endfor -%} {%- endif -%} {%- endfor -%} {%- else -%} {%- for
31
- item in site.pages -%} {%- assign languagetext = [item.lang] -%} {%- assign
32
- pagelink = page.permalink | split: "/" | last-%} {%- assign itemlink =
33
- item.permalink | split: "/" | last-%} {%- if pagelink == itemlink and page.lang
34
- != item.lang and page.permalink != item.permalink -%}
35
- <link
36
- data-rh="true"
37
- rel="alternate"
38
- href="{{site.url}}{{item.permalink}}"
39
- hreflang="{{languagetext[0]}}"
40
- />
41
- {%- endif -%} {%- if pagelink == itemlink and page.lang == item.lang -%}
42
-
43
- <link
44
- data-rh="true"
45
- rel="alternate"
46
- href="{{site.url}}{{item.permalink}}"
47
- hreflang="{{languagetext[0]}}"
48
- />
49
- {%- endif -%} {%- endfor -%} {%- endif -%} {%- endif -%}
36
+ {%- for i in matchurls -%}
37
+ {%- assign languagetext = [i] -%}
38
+ {%- if i== page.permalink -%}
39
+
40
+ {% assign whitelist_urls = site.whitelist_urls %}
41
+ {% if site.noindex_languages contains languagetext[0] %}
42
+ {%- if whitelist_urls -%}
43
+ {% for url in whitelist_urls %}
44
+ {% assign current_url = url | remove_first: '/' | strip %}
45
+ {% assign language_url = languagetext[0] | strip %}
46
+ {% if current_url == language_url %}
47
+ {%- assign exclude_url = true -%}
48
+ {% endif %}
49
+ {% endfor %}
50
+ {%- if exclude_url -%}
51
+ <link data-rh="true" rel="alternate" href="{{site.url}}/{{languagetext[0]}}" hreflang="{{languagetext[0]}}" />
52
+ {%- endif -%}
53
+ {%- endif -%}
54
+ {%- else -%}
55
+ <link data-rh="true" rel="alternate" href="{{site.url}}/{{page.permalink}}" hreflang="{{languagetext[0]}}" />
56
+ {%- endif -%}
57
+
58
+ {%- else -%}
59
+ {%- for checklang in site.pages -%}
60
+ {%- if checklang.permalink == i -%}
61
+ {%- assign languagetext = [i] -%}
62
+
63
+ {% if site.noindex_languages contains languagetext[0] %}
64
+ {%- if whitelist_urls -%}
65
+ {% for url in whitelist_urls %}
66
+ {% assign current_url = url | remove_first: '/' | strip %}
67
+ {% assign language_url = languagetext[0] | strip %}
68
+ {% if current_url == language_url %}
69
+ <link data-rh="true" rel="alternate" href="{{site.url}}/{{languagetext[0]}}" hreflang="{{languagetext[0]}}" />
70
+ {% endif %}
71
+ {% endfor %}
72
+ {%- endif -%}
73
+ {%- else -%}
74
+ <link data-rh="true" rel="alternate" href="{{site.url}}/{{languagetext[0]}}" hreflang="{{languagetext[0]}}" />
75
+ {%- endif -%}
76
+
77
+ {%- endif -%}
78
+ {%- endfor -%}
79
+ {%- endif -%}
80
+ {%- endfor -%}
81
+ {%- else -%}
82
+ {%- for item in site.pages -%}
83
+ {%- assign languagetext = [item.lang] -%}
84
+ {%- assign pagelink = page.permalink | split: "/" | last-%}
85
+ {%- assign itemlink = item.permalink | split: "/" | last-%}
86
+ {%- if pagelink == itemlink and page.lang != item.lang and page.permalink != item.permalink -%}
87
+
88
+ {% if site.noindex_languages contains languagetext[0] %}
89
+ {%- if whitelist_urls -%}
90
+ {% for url in whitelist_urls %}
91
+ {% assign current_url = url | strip %}
92
+ {% if current_url == item.permalink %}
93
+ <link data-rh="true" rel="alternate" href="{{site.url}}{{item.permalink}}" hreflang="{{languagetext[0]}}" />
94
+ {% endif %}
95
+ {% endfor %}
96
+ {%- endif -%}
97
+ {%- else -%}
98
+ <link data-rh="true" rel="alternate" href="{{site.url}}{{item.permalink}}" hreflang="{{languagetext[0]}}" />
99
+ {%- endif -%}
100
+
101
+ {%- endif -%}
102
+ {%- if pagelink == itemlink and page.lang == item.lang -%}
103
+
104
+ {% assign whitelist_urls = site.whitelist_urls %}
105
+ {% if site.noindex_languages contains languagetext[0] %}
106
+ {%- if whitelist_urls -%}
107
+ {% for url in whitelist_urls %}
108
+ {% assign current_url = url | strip %}
109
+ {% if current_url == item.permalink %}
110
+ {%- assign exclude_url = true -%}
111
+ {% endif %}
112
+ {% endfor %}
113
+ {%- if exclude_url -%}
114
+ <link data-rh="true" rel="alternate" href="{{site.url}}{{item.permalink}}" hreflang="{{languagetext[0]}}" />
115
+ {%- endif -%}
116
+ {%- endif -%}
117
+ {%- else -%}
118
+
119
+
120
+ {% assign final_permalink = item.permalink %}
121
+ {% if item.permalink contains '/' %}
122
+ {% else %}
123
+ {% assign final_permalink = '/' | append: item.permalink %}
124
+ {% endif %}
125
+
126
+ {%- if site.blacklist_urls contains final_permalink -%}
127
+ {%- else -%}
128
+ <link data-rh="true" rel="alternate" href="{{ site.url }}{{final_permalink}}" hreflang="{{ languagetext[0] }}" />
129
+ {%- endif -%}
130
+
131
+ {%- endif -%}
132
+
133
+ {%- endif -%}
134
+ {%- endfor -%}
135
+ {%- endif -%}
136
+ {%- endif -%}
data/_includes/appscms/head/head.html CHANGED
@@ -277,10 +277,26 @@
277
277
  name="twitter:image:src"
278
278
  content="{{site.url}}{{favicon}}"
279
279
  />
280
- {% include adsense/adsense.html %} {%- if page.noindex -%}
280
+ {% include adsense/adsense.html %}
281
+
282
+ {%- if page.noindex -%}
281
283
  <meta name="robots" content="noindex" />
284
+ {%- endif -%}
282
285
 
283
- {%- endif -%} {%- if site.pwa -%}
286
+ {% assign whitelist_urls = site.whitelist_urls %}
287
+ {% if site.noindex_languages contains page.lang %}
288
+ {% unless whitelist_urls contains page.url %}
289
+ <meta name="robots" content="noindex" />
290
+ {% endunless %}
291
+ {% endif %}
292
+
293
+ {% if site.blacklist_urls %}
294
+ {% if site.blacklist_urls contains page.url %}
295
+ <meta name="robots" content="noindex">
296
+ {% endif %}
297
+ {% endif %}
298
+
299
+ {%- if site.pwa -%}
284
300
 
285
301
  <link rel="manifest" href="/assets/js/manifest.json" />
286
302
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: appscms-tools-theme
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.6.8
4
+ version: 4.6.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - vivek-appscms
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-07-01 00:00:00.000000000 Z
11
+ date: 2024-07-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: jekyll
@@ -613,7 +613,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
613
613
  - !ruby/object:Gem::Version
614
614
  version: '0'
615
615
  requirements: []
616
- rubygems_version: 3.3.26
616
+ rubygems_version: 3.3.7
617
617
  signing_key:
618
618
  specification_version: 4
619
619
  summary: Appscms theme for all tools