j1_template_mde 2018.4.31 → 2018.4.32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (130) hide show
  1. checksums.yaml +4 -4
  2. data/_includes/themes/j1/layouts/layout_metadata_generator.html +5 -6
  3. data/_includes/themes/j1/layouts/layout_shim_generator.html +20 -2
  4. data/_includes/themes/j1/layouts/layout_theme_generator.html +2 -2
  5. data/_includes/themes/j1/modules/connectors/{analytic/google → ad/custom-provider.html} +7 -16
  6. data/_includes/themes/j1/modules/connectors/ad/google-adsense.html +6 -6
  7. data/_includes/themes/j1/modules/connectors/ads +23 -8
  8. data/_includes/themes/j1/modules/connectors/analytic/custom-provider.html +32 -0
  9. data/_includes/themes/j1/modules/connectors/analytic/google-analytics.html +38 -0
  10. data/_includes/themes/j1/modules/connectors/analytics +16 -17
  11. data/_includes/themes/j1/modules/connectors/comment/custom-provider.html +31 -0
  12. data/_includes/themes/j1/modules/connectors/comment/disqus.html +3 -3
  13. data/_includes/themes/j1/modules/connectors/comment/facebook.html +31 -0
  14. data/_includes/themes/j1/modules/connectors/comments +14 -12
  15. data/_includes/themes/j1/modules/connectors/sharing +3 -10
  16. data/_includes/themes/j1/modules/navigator/generator.html +17 -12
  17. data/_includes/themes/j1/modules/navigator/procedures/quicklinks.proc +37 -27
  18. data/_includes/themes/j1/modules/navigator/procedures/sidebar.proc +3 -3
  19. data/_includes/themes/j1/procedures/layouts/module_writer.proc +4 -4
  20. data/_includes/themes/j1/procedures/layouts/resource_writer.proc +6 -6
  21. data/lib/j1/version.rb +1 -1
  22. data/lib/j1_app/j1_auth_manager/_unused/auth_manager.before_merge_added.rb +1267 -0
  23. data/lib/j1_app/j1_auth_manager/_unused/auth_manager.update.web_cookie.rb +1333 -0
  24. data/lib/j1_app/j1_auth_manager/_unused/auth_manager_ui.2.erb +198 -0
  25. data/lib/j1_app/j1_auth_manager/_unused/auth_manager_ui.additional_inits.erb +254 -0
  26. data/lib/j1_app/j1_auth_manager/auth_manager.rb +361 -275
  27. data/lib/j1_app/j1_auth_manager/config.rb +9 -9
  28. data/lib/j1_app/j1_auth_manager/helpers.rb +60 -2
  29. data/lib/j1_app/j1_auth_manager/views/auth_manager_ui.erb +123 -37
  30. data/lib/starter_web/Gemfile +1 -1
  31. data/lib/starter_web/_config.yml +42 -32
  32. data/lib/starter_web/_data/j1_config.yml +46 -56
  33. data/lib/starter_web/_data/j1_resources.yml +25 -5
  34. data/lib/starter_web/_data/layouts/default.yml +10 -0
  35. data/lib/starter_web/_data/modules/j1_cookie_consent.yml +120 -0
  36. data/lib/starter_web/_data/modules/j1_log4javascript.yml +24 -22
  37. data/lib/starter_web/_data/modules/j1_navigator.yml +61 -50
  38. data/lib/starter_web/_data/modules/j1_navigator_menu.yml +32 -11
  39. data/lib/starter_web/_data/tables/country.asciidoc +252 -0
  40. data/lib/starter_web/assets/data/_authclient.html +365 -0
  41. data/lib/starter_web/assets/data/authclient.html +213 -222
  42. data/lib/starter_web/assets/data/cookie_consent.html +261 -0
  43. data/lib/starter_web/assets/data/countries.json +974 -0
  44. data/lib/starter_web/assets/data/footer.html +17 -26
  45. data/lib/starter_web/assets/data/menu.html +20 -21
  46. data/lib/starter_web/assets/images/icons/j1/scalable/j1v2.svg +1 -1
  47. data/lib/starter_web/assets/images/master_header/admin-bootstrap.jpg +0 -0
  48. data/lib/starter_web/assets/images/pages/roundtrip/package.json +16 -16
  49. data/lib/starter_web/assets/themes/j1/core/css/theme_extensions.css +1313 -1219
  50. data/lib/starter_web/assets/themes/j1/core/css/theme_extensions.min.css +1 -1
  51. data/lib/starter_web/assets/themes/j1/core/css/uno.css +1251 -1219
  52. data/lib/starter_web/assets/themes/j1/core/css/uno.min.css +1 -1
  53. data/lib/starter_web/assets/themes/j1/core/css/vendor.css +72 -72
  54. data/lib/starter_web/assets/themes/j1/core/css/vendor.min.css +2 -2
  55. data/lib/starter_web/assets/themes/j1/core/js/adapter/algolia.js +1 -1
  56. data/lib/starter_web/assets/themes/j1/core/js/adapter/back2top.js +1 -1
  57. data/lib/starter_web/assets/themes/j1/core/js/adapter/bs_gallery.js +1 -1
  58. data/lib/starter_web/assets/themes/j1/core/js/adapter/cookie_consent.js +345 -0
  59. data/lib/starter_web/assets/themes/j1/core/js/adapter/custom.js +1 -1
  60. data/lib/starter_web/assets/themes/j1/core/js/adapter/lightbox.js +1 -1
  61. data/lib/starter_web/assets/themes/j1/core/js/adapter/logger.js +1 -1
  62. data/lib/starter_web/assets/themes/j1/core/js/adapter/master_header.js +1 -1
  63. data/lib/starter_web/assets/themes/j1/core/js/adapter/navigator.js +254 -190
  64. data/lib/starter_web/assets/themes/j1/core/js/adapter/scroller.js +1 -1
  65. data/lib/starter_web/assets/themes/j1/core/js/adapter/searcher.js +1 -1
  66. data/lib/starter_web/assets/themes/j1/core/js/adapter/stickybits.js +1 -1
  67. data/lib/starter_web/assets/themes/j1/core/js/adapter/switcher.js +1 -1
  68. data/lib/starter_web/assets/themes/j1/core/js/adapter/template.js +432 -97
  69. data/lib/starter_web/assets/themes/j1/core/js/adapter/toccer.js +1 -1
  70. data/lib/starter_web/assets/themes/j1/core/js/template.js +15 -15
  71. data/lib/starter_web/assets/themes/j1/core/js/template.js.map +1 -1
  72. data/lib/starter_web/assets/themes/j1/core/js/template.min.js +1 -1
  73. data/lib/starter_web/assets/themes/j1/extensions/cookiebar/js/cookiebar.js +277 -0
  74. data/lib/starter_web/assets/themes/j1/{core/js/adapter/cookiebar.js → extensions/cookiebar/js/j1cookiebar.js} +1 -1
  75. data/lib/starter_web/collections/_biography/becoming.adoc +1 -1
  76. data/lib/starter_web/collections/_biography/born-to-run.adoc +1 -1
  77. data/lib/starter_web/collections/posts/{premium → private}/series/_posts/000_includes/attributes.asciidoc +0 -0
  78. data/lib/starter_web/collections/posts/{premium → private}/series/_posts/000_includes/documents/100-docker-using-shared-folders.asciidoc +0 -0
  79. data/lib/starter_web/collections/posts/{premium → private}/series/_posts/000_includes/documents/loop.sh +0 -0
  80. data/lib/starter_web/collections/posts/{premium → private}/series/_posts/000_includes/tables/debug_variables.asciidoc +0 -0
  81. data/lib/starter_web/collections/posts/{premium → private}/series/_posts/2018-11-01-docker-using-shared-folders.adoc +0 -0
  82. data/lib/starter_web/collections/posts/{private → protected}/wikipedia/_posts/000_includes/attributes.asciidoc +0 -0
  83. data/lib/starter_web/collections/posts/{private → protected}/wikipedia/_posts/000_includes/tables/debug_variables.asciidoc +0 -0
  84. data/lib/starter_web/collections/posts/{private → protected}/wikipedia/_posts/2016-11-20-minneapolis.adoc +0 -0
  85. data/lib/starter_web/collections/posts/{private → protected}/wikipedia/_posts/2016-11-24-narcisse-snake-dens.adoc +0 -0
  86. data/lib/starter_web/collections/posts/{private → protected}/wikipedia/_posts/2016-11-26-columbia-river.adoc +1 -1
  87. data/lib/starter_web/collections/posts/public/featured/_posts/2019-04-12-about-cookies.adoc +175 -0
  88. data/lib/starter_web/collections/posts/public/{featured → jekyll}/_posts/2018-05-01-confusion-about-base-url.adoc +0 -0
  89. data/lib/starter_web/index.html +4 -1
  90. data/lib/starter_web/package.json +1 -1
  91. data/lib/starter_web/pages/{premium → private}/bookshelf/100_about_jekyll_collections.adoc +1 -1
  92. data/lib/starter_web/pages/{premium → private}/bookshelf/200_book_shelf_biography.adoc +1 -1
  93. data/lib/starter_web/pages/{premium → private}/bookshelf/300_book_shelf_fantasy.adoc +1 -1
  94. data/lib/starter_web/pages/{premium → private}/bookshelf/400_book_shelf_romance.adoc +1 -1
  95. data/lib/starter_web/pages/{private → protected}/TeamUp/000_includes/attributes.asciidoc +0 -0
  96. data/lib/starter_web/pages/{private → protected}/TeamUp/index.adoc +3 -3
  97. data/lib/starter_web/pages/{private → protected}/previewer/000_includes/attributes.asciidoc +0 -0
  98. data/lib/starter_web/pages/{private → protected}/previewer/000_includes/tables/mdi_icons/100_absolute_sizes.asciidoc +0 -0
  99. data/lib/starter_web/pages/{private → protected}/previewer/000_includes/tables/mdi_icons/110_bs_grid_sizes.asciidoc +0 -0
  100. data/lib/starter_web/pages/{private → protected}/previewer/000_includes/tables/mdi_icons/120_relative_sizes.asciidoc +0 -0
  101. data/lib/starter_web/pages/{private → protected}/previewer/000_includes/tables/mdi_icons/200_rotate.asciidoc +0 -0
  102. data/lib/starter_web/pages/{private → protected}/previewer/000_includes/tables/mdi_icons/300_flip.asciidoc +0 -0
  103. data/lib/starter_web/pages/{private → protected}/previewer/000_includes/tables/mdi_icons/400_spin_pulsed.asciidoc +0 -0
  104. data/lib/starter_web/pages/{private → protected}/previewer/000_includes/tables/mdi_icons/500_bw_color_palette.asciidoc +0 -0
  105. data/lib/starter_web/pages/{private → protected}/previewer/000_includes/tables/mdi_icons/510_bs_color_palette.asciidoc +0 -0
  106. data/lib/starter_web/pages/{private → protected}/previewer/000_includes/tables/mdi_icons/600_md_color_palette.asciidoc +0 -0
  107. data/lib/starter_web/pages/{private → protected}/previewer/000_includes/tables/mdi_icons/601_md_color_palette_indigo.asciidoc +0 -0
  108. data/lib/starter_web/pages/{private → protected}/previewer/000_includes/tables/mdi_icons/602_md_color_palette_pink.asciidoc +0 -0
  109. data/lib/starter_web/pages/{private → protected}/previewer/000_includes/tables/twitter_emoji/100_bs_sizes.asciidoc +0 -0
  110. data/lib/starter_web/pages/{private → protected}/previewer/000_includes/tables/twitter_emoji/100_relative_sizes.asciidoc +0 -0
  111. data/lib/starter_web/pages/{private → protected}/previewer/000_includes/tables/twitter_emoji/200_rotate.asciidoc +0 -0
  112. data/lib/starter_web/pages/{private → protected}/previewer/000_includes/tables/twitter_emoji/300_flip.asciidoc +0 -0
  113. data/lib/starter_web/pages/{private → protected}/previewer/000_includes/tables/twitter_emoji/400_spin_pulsed.asciidoc +0 -0
  114. data/lib/starter_web/pages/{private → protected}/previewer/justified_gallery.html +1 -1
  115. data/lib/starter_web/pages/{private → protected}/previewer/mdi_icons_preview.adoc +1 -1
  116. data/lib/starter_web/pages/{private → protected}/previewer/twitter_emoji_preview.adoc +1 -1
  117. data/lib/starter_web/pages/public/about/about_you.adoc +139 -0
  118. data/lib/starter_web/pages/public/legal/de/100_impress.adoc +26 -15
  119. data/lib/starter_web/pages/public/legal/de/200_terms_of_use.adoc +2 -2
  120. data/lib/starter_web/pages/public/legal/en/100_impress.adoc +65 -53
  121. data/lib/starter_web/pages/public/legal/en/200_terms_of_use.adoc +11 -8
  122. data/lib/starter_web/pages/public/legal/en/300_privacy.adoc +46 -68
  123. data/lib/starter_web/pages/public/legal/en/400_license_agreement.adoc +72 -74
  124. data/lib/starter_web/pages/public/legal/en/eu/cookie.policy.asciidoc +55 -0
  125. data/lib/starter_web/pages/public/previewer/bootstrap_theme.adoc +1 -1
  126. data/lib/starter_web/pages/public/start/roundtrip/700_extended_modals.adoc +71 -53
  127. metadata +60 -44
  128. data/_includes/themes/j1/modules/connectors/analytic/googleUA +0 -44
  129. data/lib/starter_web/_data/modules/j1_cookiebar.yml +0 -65
  130. data/lib/starter_web/_unused/package.json.new +0 -125
@@ -1,65 +0,0 @@
1
- # ------------------------------------------------------------------------------
2
- # ~/_data/modules/j1_cookiebar.yml
3
- # Default configuration for J1 Cookiebar module
4
- #
5
- # Product/Info:
6
- # https://jekyll-one.com
7
- #
8
- # Copyright (C) 2019 Juergen Adams
9
- #
10
- # J1 Template is licensed under the MIT License.
11
- # See: https://github.com/jekyll-one/j1_template_mde/blob/master/LICENSE
12
- # ------------------------------------------------------------------------------
13
-
14
- # ------------------------------------------------------------------------------
15
- # Cookiebar configuration
16
- # ------------------------------------------------------------------------------
17
- enabled: true
18
- load: sync
19
- autoEnable: true
20
- background_color: '#212121'
21
- text_color: '#EEEEEE'
22
-
23
- message: >
24
- </br>
25
- <p>
26
- Some of these pages use so-called Cookies,
27
- which serve the content of this site to be
28
- user-friendly, more effective and safer.
29
- </p>
30
- </br>
31
-
32
- message_de: >
33
- </br>
34
- <p>Diese Internetseiten verwenden zum Teil so genannte
35
- Cookies, die dazu dienen das Angebot nutzerfreundlicher,
36
- effektiver und sicherer zu machen.</p>
37
- </br>
38
-
39
- acceptButton: true
40
- stopScrolling: true
41
- acceptText: I understand and agree
42
- acceptText_de: Ich habe den Hinweis verstanden und stimme zu
43
- acceptFunction: null
44
- declineButton: true
45
- declineText: Disable Cookies
46
- declineFunction: null
47
- policyButton: true
48
- policyText: Privacy
49
- policyText_de: Datenschutzbestimmungen
50
- policyURL: /pages/public/legal/en/privacy/
51
- policyURL_de: /pages/public/legal/de/privacy/
52
- acceptOnContinue: false
53
- acceptOnScroll: false
54
- acceptAnyClick: false
55
- expireDays: 3650
56
- renewOnVisit: false
57
- forceShow: false
58
- effect: slide
59
- element: "#no_flicker" #body #nav
60
- append: false
61
- fixed: false
62
- bottom: false
63
- zindex:
64
- domain: www.example.com
65
- referrer: www.example.com
@@ -1,125 +0,0 @@
1
- {
2
- "private": true,
3
- "name": "web",
4
- "version": "2018.4.31",
5
- "description": "Web/Content sources for J1 Starter",
6
- "main": "_config.yml",
7
- "config": {
8
- "bundler": "jekyll"
9
- },
10
- "homepage": "https://jekyll-one.com",
11
- "author": {
12
- "name": "Juergen Adams",
13
- "email": "jadams@jekyll-one.com",
14
- "url": "https://jekyll-one.com"
15
- },
16
- "license": "MIT",
17
- "bugs": {
18
- "url": "https://github.com/jekyll-one/j1_template_mde/issues"
19
- },
20
- "repository": "https://github.com/jekyll-one/j1_template_mde/packages/400_template_web/",
21
- "engines": {
22
- "node": ">=8.9",
23
- "npm": ">=5.5",
24
- "yarn": ">=1.3",
25
- "webpack": "^4.8.3"
26
- },
27
- "keywords": [
28
- "J1",
29
- "Template",
30
- "Starter"
31
- ],
32
- "jekyll": {
33
- "configfile": "_config.yml",
34
- "gemfile": "Gemfile",
35
- "metadata": ".jekyll-metadata",
36
- "opt_incremental": "--incremental",
37
- "opt_interface": "0.0.0.0",
38
- "opt_web_port": "4000",
39
- "opt_web_url": "http://127.0.0.1:4000/",
40
- "opt_app_port": "5000",
41
- "opt_app_url": "http://127.0.0.1:5000/",
42
- "opt_profile": "",
43
- "opt_watch": "--watch",
44
- "opt_livereload": "--livereload",
45
- "vendor_path": "vendor/bundle",
46
- "vendorize": "false"
47
- },
48
- "algolia": {
49
- "admin_key": "f2f002c197220fabf4ed13e3b0431d00"
50
- },
51
- "wds": {
52
- "common": "../200_template_js/wp4_configs/webpack.common.js",
53
- "develop": "../200_template_js/wp4_configs/webpack.develop.js"
54
- },
55
- "scripts": {
56
- "app": "cross-var cross-env if-env J1DOCKER=true && run-s app-docker || run-s app-local",
57
- "app-local": "run-p -s app-local:*",
58
- "app-local:rackup": "cross-env SINATRA_ACTIVESUPPORT_WARNING=false bundle exec rackup -o $npm_package_jekyll_opt_interface -p $npm_package_jekyll_opt_app_port",
59
- "app-local:jekyll": "cross-var cross-env JEKYLL_ENV=$npm_package_config_mode BUNDLE_GEMFILE=$npm_package_jekyll_gemfile bundle exec jekyll b -c $npm_package_jekyll_configfile $npm_package_jekyll_opt_watch $npm_package_jekyll_opt_incremental",
60
- "app-local:open": "npm run delay-3s && cross-var opn $npm_package_jekyll_opt_app_url",
61
- "app-docker": "run-p -s app-docker:*",
62
- "app-docker:rackup": "cross-var bundle exec rackup -o $npm_package_jekyll_opt_interface -p $npm_package_jekyll_opt_app_port",
63
- "app-docker:open": "npm run delay-3s && cross-var opn $npm_package_jekyll_opt_app_url",
64
- "algolia": "cross-env ALGOLIA_API_KEY=$npm_package_algolia_admin_key bundle exec jekyll algolia",
65
- "algolia-check": "cross-env ALGOLIA_API_KEY=$npm_package_algolia_admin_key bundle exec jekyll algolia --dry-run --verbose",
66
- "clean": "run-p -s clean:*",
67
- "clean-starter": "run-p -s clean:*",
68
- "clean:jekyll-conf": "shx rm -f _config* Gemfile* .jekyll-metadata",
69
- "clean:jekyll-site": "shx rm -f jekyll_built.log *.lock *.old && shx rm -rf .bundle .sass-cache _site",
70
- "clean:jekyll-links": "shx rm -f _includes _layouts _plugins _install apps assets && shx rm -rf _sass/*",
71
- "bundle": "cross-env if-env BUNDLE_VENDORIZE=true && run-s bundle_vendor || run-s bundle_global",
72
- "bundle_global": "cross-env BUNDLE_GEMFILE=$npm_package_jekyll_gemfile bundle install",
73
- "bundle_vendor": "cross-env BUNDLE_GEMFILE=$npm_package_jekyll_gemfile bundle install --path $npm_package_jekyll_vendor_path",
74
- "built": "run-s -s clean:jekyll-conf && run-s -s jekyll_built:*",
75
- "jekyll_built:conf": "shx cat ../../packages/300_template_src/_install/site/_config.yml | shx sed \"s/^port:.*/#port:/\" | shx sed \"s/^theme:.*/#theme:/\" | shx sed \"s/^source:.*/source: ./\" > _config.yml",
76
- "jekyll_built:gemfile": "shx cat ../../packages/300_template_src/_install/site/Gemfile | shx sed \"s/gem 'j1_template_mde'/#gem 'j1_template_mde'/\" > Gemfile",
77
- "jekyll_built:bundle": "cross-env BUNDLE_VENDORIZE=$npm_package_jekyll_vendorize npm run bundle",
78
- "jekyll_built:built": "cross-var cross-env JEKYLL_ENV=$npm_package_config_mode BUNDLE_GEMFILE=$npm_package_jekyll_gemfile bundle exec jekyll b -c $npm_package_jekyll_configfile $npm_package_jekyll_opt_incremental",
79
- "develop": "run-p -s develop:*",
80
- "develop:wds": "cross-var webpack-dev-server --config $npm_package_wds_develop --env.MODE",
81
- "develop:jekyll": "cross-var cross-env JEKYLL_ENV=$npm_package_config_mode BUNDLE_GEMFILE=$npm_package_jekyll_gemfile bundle exec jekyll b -c $npm_package_jekyll_configfile $npm_package_jekyll_opt_watch $npm_package_jekyll_opt_incremental",
82
- "delay-1s": "node ./node_modules/npm-delay 1000",
83
- "delay-2s": "node ./node_modules/npm-delay 2000",
84
- "delay-3s": "node ./node_modules/npm-delay 3000",
85
- "delay-5s": "node ./node_modules/npm-delay 5000",
86
- "setup-links": "cross-var if-env OS=Windows_NT && run-s -s link-default || cross-env OS=$(echo $(getos)) run-s -s switch-links",
87
- "switch-links": "if-env OS=darwin && run-s -s link-osx || run-s -s link-default",
88
- "link-default": "cross-var echo OS detected as: $OS && run-p -s link-default:*",
89
- "link-osx": "echo OS detected as: OSX && run-p -s link-osx:*",
90
- "link-default:link-type": "cross-var echo use default links for OS: $OS",
91
- "link-default:apps": "lnk ../300_template_src/apps ../400_template_web",
92
- "link-default:assets": "lnk ../300_template_src/assets ../400_template_web",
93
- "link-default:includes": "lnk ../300_template_src/_includes ../400_template_web",
94
- "link-default:layouts": "lnk ../300_template_src/_layouts ../400_template_web",
95
- "link-default:plugins": "lnk ../300_template_src/_plugins ../400_template_web",
96
- "link-default:sass": "lnk ../100_template_css/scss ../400_template_web/_sass",
97
- "link-default:install_files": "lnk ../300_template_src/_install ../400_template_web",
98
- "link-osx:link-type": "echo use explicit symlinks for OS: MacOS",
99
- "link-osx:apps": "lnk -s ../300_template_src/apps ../400_template_web",
100
- "link-osx:assets": "lnk -s ../300_template_src/assets ../400_template_web",
101
- "link-osx:includes": "lnk -s ../300_template_src/_includes ../400_template_web",
102
- "link-osx:layouts": "lnk -s ../300_template_src/_layouts ../400_template_web",
103
- "link-osx:plugins": "lnk -s ../300_template_src/_plugins ../400_template_web",
104
- "link-osx:sass": "lnk -s ../100_template_css/scss ../400_template_web/_sass",
105
- "link-osx:templates": "lnk -s ../300_template_src/_install ../400_template_web"
106
- },
107
- "dependencies": {
108
- "cross-env": "^5.1.4",
109
- "cross-var": "^1.1.0",
110
- "getos": "^3.1.0",
111
- "getos-cli": "^1.0.0",
112
- "if-env": "^1.0.4",
113
- "lnk-cli": "^1.0.1",
114
- "npm-delay": "^1.0.4",
115
- "npm-run-all": "^4.0.2",
116
- "opn-cli": "^3.1.0",
117
- "shx": "^0.2.2"
118
- },
119
- "devDependencies": {
120
- "webpack": "4.19.1",
121
- "webpack-cli": "^3.2.3",
122
- "webpack-dev-server": ">=3.1.11",
123
- "webpack-merge": "4.1.4"
124
- }
125
- }