j1_template_mde 2018.4.30 → 2018.4.31
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/_includes/themes/j1/layouts/layout_metadata_generator.html +5 -2
- data/_includes/themes/j1/modules/connectors/ad/{google-adsense → google-adsense.html} +10 -11
- data/_includes/themes/j1/modules/connectors/ads +7 -6
- data/_includes/themes/j1/procedures/layouts/default_writer.proc +0 -1
- data/lib/j1/version.rb +1 -1
- data/lib/starter_web/Gemfile +13 -1
- data/lib/starter_web/_config.yml +116 -82
- data/lib/starter_web/_data/j1_config.yml +10 -0
- data/lib/starter_web/_data/layouts/default.yml +10 -0
- data/lib/starter_web/_data/modules/j1_cookiebar.yml +2 -2
- data/lib/starter_web/_rack/nginx.conf +92 -35
- data/lib/starter_web/{package.json.new → _unused/package.json.new} +1 -1
- data/lib/starter_web/assets/images/pages/roundtrip/package.json +1 -1
- data/lib/starter_web/assets/themes/j1/core/css/theme_extensions.css +1 -1
- data/lib/starter_web/assets/themes/j1/core/css/theme_extensions.min.css +1 -1
- data/lib/starter_web/assets/themes/j1/core/css/uno.css +1 -1
- data/lib/starter_web/assets/themes/j1/core/css/uno.min.css +1 -1
- data/lib/starter_web/assets/themes/j1/core/css/vendor.css +41 -42
- data/lib/starter_web/assets/themes/j1/core/css/vendor.min.css +2 -2
- data/lib/starter_web/assets/themes/j1/core/js/adapter/algolia.js +1 -1
- data/lib/starter_web/assets/themes/j1/core/js/adapter/cookiebar.js +1 -1
- data/lib/starter_web/assets/themes/j1/core/js/adapter/template.js +2 -2
- data/lib/starter_web/assets/themes/j1/extensions/carousel/css/theme/uno.css +5 -4
- data/lib/starter_web/assets/themes/j1/extensions/carousel/css/theme/uno.min.css +1 -2
- data/lib/starter_web/index.html +2 -2
- data/lib/starter_web/package.json +1 -1
- data/lib/starter_web/pages/private/previewer/000_includes/tables/mdi_icons/100_absolute_sizes.asciidoc +5 -5
- data/lib/starter_web/pages/private/previewer/000_includes/tables/mdi_icons/110_bs_grid_sizes.asciidoc +6 -6
- data/lib/starter_web/pages/private/previewer/000_includes/tables/mdi_icons/120_relative_sizes.asciidoc +11 -11
- data/lib/starter_web/pages/private/previewer/000_includes/tables/mdi_icons/200_rotate.asciidoc +1 -1
- data/lib/starter_web/pages/private/previewer/000_includes/tables/mdi_icons/300_flip.asciidoc +1 -0
- data/lib/starter_web/pages/private/previewer/000_includes/tables/mdi_icons/400_spin_pulsed.asciidoc +1 -1
- data/lib/starter_web/pages/private/previewer/000_includes/tables/mdi_icons/500_bw_color_palette.asciidoc +1 -0
- data/lib/starter_web/pages/private/previewer/000_includes/tables/mdi_icons/510_bs_color_palette.asciidoc +1 -0
- data/lib/starter_web/pages/private/previewer/000_includes/tables/mdi_icons/600_md_color_palette.asciidoc +1 -0
- data/lib/starter_web/pages/private/previewer/000_includes/tables/mdi_icons/601_md_color_palette_indigo.asciidoc +1 -0
- data/lib/starter_web/pages/private/previewer/000_includes/tables/mdi_icons/602_md_color_palette_pink.asciidoc +1 -0
- data/lib/starter_web/pages/private/previewer/000_includes/tables/twitter_emoji/100_bs_sizes.asciidoc +6 -5
- data/lib/starter_web/pages/private/previewer/000_includes/tables/twitter_emoji/100_relative_sizes.asciidoc +6 -5
- data/lib/starter_web/pages/private/previewer/000_includes/tables/twitter_emoji/200_rotate.asciidoc +1 -0
- data/lib/starter_web/pages/private/previewer/000_includes/tables/twitter_emoji/300_flip.asciidoc +1 -0
- data/lib/starter_web/pages/private/previewer/000_includes/tables/twitter_emoji/400_spin_pulsed.asciidoc +1 -0
- data/lib/starter_web/pages/private/previewer/mdi_icons_preview.adoc +1 -1
- data/lib/starter_web/pages/private/previewer/twitter_emoji_preview.adoc +1 -1
- data/lib/starter_web/pages/public/start/roundtrip/000_includes/documents/710_responsive_tables.asciidoc +1 -0
- data/lib/starter_web/pages/public/start/roundtrip/400_icon_fonts.adoc +3 -1
- data/lib/starter_web/pages/public/start/roundtrip/800_search_engine.adoc +3 -1
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 86688175c8a20b73ee8747fb197c195f45c9ffbb
|
4
|
+
data.tar.gz: 639a02e41e1c5ce60ccf20c5caec2f2cbd1d57fc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: fa189e0a6f73182c9dc5486065ccdeb5dbf7e232bdcb417de144c3fb3be124b97390fcc0ad9a67505e51c7dc63a7abc4b52ff44425f1ac8584f551e6bf8b62bf
|
7
|
+
data.tar.gz: 80e2f8f9f37fe3d17dbbc2ccf3559f8209b7e4f21b34c444e91478fc819b15cb96cf53209ddd6269a4d42028d0a91d6d2f703ba1196d5f3088b55e5b712ac564
|
@@ -41,7 +41,7 @@
|
|
41
41
|
{% if page.layout == 'home' %}
|
42
42
|
<title>{{site.slogan}}</title>
|
43
43
|
{% else %}
|
44
|
-
<title>{{page.
|
44
|
+
<title>{{page.tagline}}</title>
|
45
45
|
{% endif %}
|
46
46
|
|
47
47
|
{% if page.layout == 'home' %}
|
@@ -98,8 +98,11 @@
|
|
98
98
|
<meta name="robots" content="nofollow">
|
99
99
|
{% endif %}
|
100
100
|
|
101
|
-
{% if page.robots != 'true'
|
101
|
+
{% if page.robots.index != 'true' %}
|
102
102
|
<meta name="robots" content="noindex">
|
103
|
+
{% endif %}
|
104
|
+
|
105
|
+
{% if page.robots.follow != 'true' %}
|
103
106
|
<meta name="robots" content="nofollow">
|
104
107
|
{% endif %}
|
105
108
|
|
@@ -26,14 +26,13 @@
|
|
26
26
|
{% comment %} Main
|
27
27
|
--------------------------------------------------------------- {% endcomment %}
|
28
28
|
|
29
|
-
<
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
</div><!-- /.google-ads -->
|
29
|
+
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
|
30
|
+
<script>
|
31
|
+
(adsbygoogle = window.adsbygoogle || []).push({
|
32
|
+
google_ad_client: "{{ site.data.j1_config.advertising.adsense.data_ad_client }}",
|
33
|
+
enable_page_level_ads: true
|
34
|
+
});
|
35
|
+
</script>
|
36
|
+
|
37
|
+
|
38
|
+
|
@@ -25,10 +25,11 @@
|
|
25
25
|
|
26
26
|
{% comment %} Main
|
27
27
|
--------------------------------------------------------------- {% endcomment %}
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
{% endcase %}
|
28
|
+
|
29
|
+
<!-- [INFO ] [j1.layout.connectors ] [Start processing load region head, layout: {{page.layout}}] -->
|
30
|
+
{% if site.data.j1_config.advertising.adsense.enabled and page.adsense %}
|
31
|
+
<!-- [INFO ] [j1.layout.connectors ] [Place Google Adsense ] -->
|
32
|
+
{% include themes/{{site.template.name}}/modules/connectors/ad/google-adsense.html %}
|
34
33
|
{% endif %}
|
34
|
+
<!-- [INFO ] [j1.layout.connectors ] [End processing] -->
|
35
|
+
|
data/lib/j1/version.rb
CHANGED
data/lib/starter_web/Gemfile
CHANGED
@@ -46,7 +46,7 @@ gem 'jekyll', '~> 3.8.5'
|
|
46
46
|
# Theme Rubies
|
47
47
|
# Default: J1 Template
|
48
48
|
#
|
49
|
-
gem 'j1_template_mde', '~> 2018.4.
|
49
|
+
gem 'j1_template_mde', '~> 2018.4.31'
|
50
50
|
|
51
51
|
# --------------------------------------------------------------------
|
52
52
|
# PRODUCTION: Gem needed for the Jekyll and J1 prod environment
|
@@ -145,6 +145,18 @@ end
|
|
145
145
|
#
|
146
146
|
# gem 'rake', '~> 12.0'
|
147
147
|
|
148
|
+
# html-proofer. Automate the process of checking links on your site
|
149
|
+
#
|
150
|
+
# bundle exec htmlproofer \
|
151
|
+
# --allow_missing_href \
|
152
|
+
# --allow_hash_href \
|
153
|
+
# --assume_extension \
|
154
|
+
# --directory_index_file \
|
155
|
+
# --directory_index_file \
|
156
|
+
# --empty_alt_ignore ./_site/index.html &> out.txt
|
157
|
+
#
|
158
|
+
#gem 'html-proofer', '~> 3.10'
|
159
|
+
|
148
160
|
# --------------------------------------------------------------------
|
149
161
|
# Define the build environment and the web server for J1 sites that
|
150
162
|
# runs as an web application. To improve the production (run-time)
|
data/lib/starter_web/_config.yml
CHANGED
@@ -60,7 +60,7 @@ environment: development
|
|
60
60
|
# anything here because version information is bumped-in by
|
61
61
|
# the build process
|
62
62
|
#
|
63
|
-
version: 2018.4.
|
63
|
+
version: 2018.4.31
|
64
64
|
|
65
65
|
|
66
66
|
# ==============================================================================
|
@@ -377,13 +377,15 @@ collections_dir: collections
|
|
377
377
|
include: [.htaccess]
|
378
378
|
exclude: [
|
379
379
|
vendor, node_modules, "package*",
|
380
|
-
".sass-cache",".vscode","
|
380
|
+
".sass-cache", ".vscode", ".idea",
|
381
|
+
"*.ignore",
|
381
382
|
"*.bat*", "*.sh", "*.tmp",
|
382
|
-
"*.
|
383
|
+
"*.txt", "*.log", "*.ppt*",
|
384
|
+
"*.zip", "*.7z", "*.a2p",
|
383
385
|
"*.asciidoc", "History.markdown",
|
384
386
|
"README.md", "changelog.md",
|
385
387
|
"Rakefile", "Gemfile", "Guardfile",
|
386
|
-
"Gemfile.lock", "yarn.lock"
|
388
|
+
"Gemfile.lock", "yarn.lock"
|
387
389
|
]
|
388
390
|
keep_files: [ ".git", ".gitignore", node_modules, "package*" ]
|
389
391
|
|
@@ -556,11 +558,11 @@ j1_auth:
|
|
556
558
|
- \W*((?i)premium(?-i))\W*
|
557
559
|
|
558
560
|
providers:
|
559
|
-
activated: [ disqus
|
561
|
+
activated: [ disqus ]
|
560
562
|
|
561
563
|
disqus:
|
562
564
|
home_url: https://disqus.com
|
563
|
-
product_url:
|
565
|
+
product_url: http://localhost:5000
|
564
566
|
strategy: member
|
565
567
|
scope: []
|
566
568
|
users: [ all ]
|
@@ -572,82 +574,82 @@ j1_auth:
|
|
572
574
|
users:
|
573
575
|
blacklist: []
|
574
576
|
|
575
|
-
|
576
|
-
|
577
|
-
|
578
|
-
|
579
|
-
|
580
|
-
|
581
|
-
|
582
|
-
|
583
|
-
|
584
|
-
|
585
|
-
|
586
|
-
|
587
|
-
|
588
|
-
|
589
|
-
|
590
|
-
|
591
|
-
|
592
|
-
|
593
|
-
|
594
|
-
|
595
|
-
|
596
|
-
|
597
|
-
|
598
|
-
|
599
|
-
|
600
|
-
|
601
|
-
|
602
|
-
|
603
|
-
|
604
|
-
|
605
|
-
|
606
|
-
|
607
|
-
|
608
|
-
|
609
|
-
|
610
|
-
|
611
|
-
|
612
|
-
|
613
|
-
|
614
|
-
|
615
|
-
|
616
|
-
|
617
|
-
|
618
|
-
|
619
|
-
|
620
|
-
|
621
|
-
|
622
|
-
|
623
|
-
|
624
|
-
|
625
|
-
|
626
|
-
|
627
|
-
|
628
|
-
|
629
|
-
|
630
|
-
|
631
|
-
|
632
|
-
|
633
|
-
|
634
|
-
|
635
|
-
|
636
|
-
|
637
|
-
|
638
|
-
|
639
|
-
|
640
|
-
|
641
|
-
|
642
|
-
|
643
|
-
|
644
|
-
|
645
|
-
|
646
|
-
|
647
|
-
|
648
|
-
|
649
|
-
|
650
|
-
|
577
|
+
# facebook:
|
578
|
+
# home_url: https://facebook.com
|
579
|
+
# product_url: http://localhost:5000
|
580
|
+
# strategy: member
|
581
|
+
# scope: []
|
582
|
+
# users: [ all ]
|
583
|
+
# permissions: [ private ]
|
584
|
+
# data_fields: []
|
585
|
+
# conditions:
|
586
|
+
# private:
|
587
|
+
# enabled: true
|
588
|
+
# users:
|
589
|
+
# whitelist: [ all ]
|
590
|
+
# blacklist: []
|
591
|
+
#
|
592
|
+
# github:
|
593
|
+
# home_url: https://github.com
|
594
|
+
# product_url: http://localhost:5000
|
595
|
+
# strategy: member
|
596
|
+
# scope: []
|
597
|
+
# users: [ all ]
|
598
|
+
# permissions: [ private ]
|
599
|
+
# data_fields: []
|
600
|
+
# conditions:
|
601
|
+
# private:
|
602
|
+
# enabled: true
|
603
|
+
# users:
|
604
|
+
# whitelist: [ all ]
|
605
|
+
# blacklist: []
|
606
|
+
#
|
607
|
+
# patreon:
|
608
|
+
# home_url: https://patreon.com
|
609
|
+
# product_url: http://localhost:5000
|
610
|
+
# strategy: member
|
611
|
+
# scope: [ users, pledges-to-me ]
|
612
|
+
# users: [ all ]
|
613
|
+
# permissions: [ private, premium ]
|
614
|
+
# data_fields: [
|
615
|
+
# email, name, first_name, nickname,
|
616
|
+
# amount_cents, created_at, declined_since
|
617
|
+
# ]
|
618
|
+
# conditions:
|
619
|
+
# private:
|
620
|
+
# enabled: true
|
621
|
+
# users:
|
622
|
+
# blacklist: []
|
623
|
+
# premium:
|
624
|
+
# enabled: true
|
625
|
+
# users:
|
626
|
+
# whitelist: [ juergen_adams ]
|
627
|
+
# blacklist: []
|
628
|
+
# payment:
|
629
|
+
# activated: [ "Premium Content", "Value Content" ]
|
630
|
+
# tiers:
|
631
|
+
# - tier:
|
632
|
+
# name: "Premium Content"
|
633
|
+
# amount: 500,
|
634
|
+
# state: paid
|
635
|
+
# - tier:
|
636
|
+
# name: "Value Content"
|
637
|
+
# amount: 100,
|
638
|
+
# state: paid
|
639
|
+
#
|
640
|
+
# twitter:
|
641
|
+
# home_url: https://twitter.com
|
642
|
+
# product_url: http://localhost:5000
|
643
|
+
# strategy: member
|
644
|
+
# scope: []
|
645
|
+
# users: [ all ]
|
646
|
+
# permissions: [ private, premium ]
|
647
|
+
# data_fields: []
|
648
|
+
# conditions:
|
649
|
+
# private:
|
650
|
+
# enabled: true
|
651
|
+
# users:
|
652
|
+
# blacklist: []
|
651
653
|
|
652
654
|
# ---------------------------------------------------------------
|
653
655
|
# SAFEMODE
|
@@ -759,6 +761,10 @@ defaults:
|
|
759
761
|
scrollbar: false
|
760
762
|
indexed: true
|
761
763
|
|
764
|
+
robots:
|
765
|
+
index: true
|
766
|
+
follow: true
|
767
|
+
|
762
768
|
icons:
|
763
769
|
family: MDI
|
764
770
|
color: md-indigo
|
@@ -791,6 +797,10 @@ defaults:
|
|
791
797
|
adsense: true
|
792
798
|
comments: true
|
793
799
|
|
800
|
+
robots:
|
801
|
+
index: true
|
802
|
+
follow: true
|
803
|
+
|
794
804
|
icons:
|
795
805
|
# category-icon: comment-text-outline
|
796
806
|
family: MDI
|
@@ -821,6 +831,10 @@ defaults:
|
|
821
831
|
adsense: true
|
822
832
|
comments: true
|
823
833
|
|
834
|
+
robots:
|
835
|
+
index: true
|
836
|
+
follow: true
|
837
|
+
|
824
838
|
icons:
|
825
839
|
# category-icon: comment-text-outline
|
826
840
|
family: MDI
|
@@ -848,6 +862,10 @@ defaults:
|
|
848
862
|
adsense: true
|
849
863
|
comments: true
|
850
864
|
|
865
|
+
robots:
|
866
|
+
index: true
|
867
|
+
follow: true
|
868
|
+
|
851
869
|
icons:
|
852
870
|
# category-icon: dots-horizontal-circle
|
853
871
|
family: MDI
|
@@ -876,6 +894,10 @@ defaults:
|
|
876
894
|
adsense: true
|
877
895
|
comments: false
|
878
896
|
|
897
|
+
robots:
|
898
|
+
index: false
|
899
|
+
follow: false
|
900
|
+
|
879
901
|
icons:
|
880
902
|
# category-icon: wikipedia
|
881
903
|
family: MDI
|
@@ -902,6 +924,10 @@ defaults:
|
|
902
924
|
adsense: true
|
903
925
|
scrollbar: false
|
904
926
|
|
927
|
+
robots:
|
928
|
+
index: true
|
929
|
+
follow: true
|
930
|
+
|
905
931
|
# --------------------------------------------------------
|
906
932
|
# BIOGRAPHY (Book Shelf)
|
907
933
|
#
|
@@ -914,6 +940,10 @@ defaults:
|
|
914
940
|
adsense: true
|
915
941
|
scrollbar: false
|
916
942
|
|
943
|
+
robots:
|
944
|
+
index: true
|
945
|
+
follow: true
|
946
|
+
|
917
947
|
# --------------------------------------------------------
|
918
948
|
# FANTASY (Book Shelf)
|
919
949
|
#
|
@@ -938,6 +968,10 @@ defaults:
|
|
938
968
|
adsense: true
|
939
969
|
scrollbar: false
|
940
970
|
|
971
|
+
robots:
|
972
|
+
index: true
|
973
|
+
follow: true
|
974
|
+
|
941
975
|
|
942
976
|
# ==============================================================================
|
943
977
|
# 6. LAYOUT configuration
|
@@ -159,6 +159,16 @@ analytics:
|
|
159
159
|
baseURL: 'myserver.tld/piwik' # Piwik installation address (without protocol)
|
160
160
|
idsite: '1'
|
161
161
|
|
162
|
+
# -------------------------------------------------------------------------
|
163
|
+
# ADVERTISING connector settings
|
164
|
+
#
|
165
|
+
# Set 'provider' to the analytics provider you want to use.
|
166
|
+
# Set 'provider' to false to turn analytics off globally.
|
167
|
+
#
|
168
|
+
advertising:
|
169
|
+
adsense:
|
170
|
+
enabled: true
|
171
|
+
data_ad_client: ca-pub-6537273267695855
|
162
172
|
|
163
173
|
# -------------------------------------------------------------------------
|
164
174
|
# SHARING connector settings
|
@@ -113,6 +113,16 @@ lanes:
|
|
113
113
|
path: layouts
|
114
114
|
file: layout_metadata_generator.html
|
115
115
|
|
116
|
+
# ------------------------------------------------------------------
|
117
|
+
# CONNECTORS (Google Ads)
|
118
|
+
- lane:
|
119
|
+
enabled: true
|
120
|
+
region: head
|
121
|
+
type: sync
|
122
|
+
base: _includes/themes/j1
|
123
|
+
path: modules/connectors
|
124
|
+
file: ads
|
125
|
+
|
116
126
|
# ------------------------------------------------------------------
|
117
127
|
# Module RESOURCE loader (head)
|
118
128
|
- lane:
|
@@ -17,7 +17,7 @@
|
|
17
17
|
enabled: true
|
18
18
|
load: sync
|
19
19
|
autoEnable: true
|
20
|
-
background_color: '#
|
20
|
+
background_color: '#212121'
|
21
21
|
text_color: '#EEEEEE'
|
22
22
|
|
23
23
|
message: >
|
@@ -41,7 +41,7 @@ stopScrolling: true
|
|
41
41
|
acceptText: I understand and agree
|
42
42
|
acceptText_de: Ich habe den Hinweis verstanden und stimme zu
|
43
43
|
acceptFunction: null
|
44
|
-
declineButton:
|
44
|
+
declineButton: true
|
45
45
|
declineText: Disable Cookies
|
46
46
|
declineFunction: null
|
47
47
|
policyButton: true
|