j1_template_mde 2018.4.33 → 2018.4.34

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (48) hide show
  1. checksums.yaml +4 -4
  2. data/_includes/themes/j1/layouts/layout_shim_generator.html +1 -1
  3. data/_includes/themes/j1/modules/navigator/generator.html +16 -3
  4. data/lib/j1/commands/generate.rb +4 -4
  5. data/lib/j1/version.rb +1 -1
  6. data/lib/starter_web/Gemfile +1 -1
  7. data/lib/starter_web/_config.yml +1 -1
  8. data/lib/starter_web/_data/j1_config.yml +24 -7
  9. data/lib/starter_web/_data/modules/j1_cookie_consent.yml +12 -7
  10. data/lib/starter_web/_data/modules/j1_navigator.yml +61 -50
  11. data/lib/starter_web/_data/modules/j1_navigator_menu.yml +4 -6
  12. data/lib/starter_web/assets/data/cookie_consent.html +12 -11
  13. data/lib/starter_web/assets/data/menu.html +3 -2
  14. data/lib/starter_web/assets/data/quicklinks.html +149 -0
  15. data/lib/starter_web/assets/data/sidebar.html +271 -0
  16. data/lib/starter_web/assets/images/pages/roundtrip/package.json +1 -1
  17. data/lib/starter_web/assets/themes/j1/core/css/theme_extensions.css +8 -5
  18. data/lib/starter_web/assets/themes/j1/core/css/theme_extensions.min.css +1 -1
  19. data/lib/starter_web/assets/themes/j1/core/css/uno.css +8 -5
  20. data/lib/starter_web/assets/themes/j1/core/css/uno.min.css +1 -1
  21. data/lib/starter_web/assets/themes/j1/core/js/adapter/algolia.js +1 -1
  22. data/lib/starter_web/assets/themes/j1/core/js/adapter/back2top.js +3 -3
  23. data/lib/starter_web/assets/themes/j1/core/js/adapter/bs_gallery.js +2 -2
  24. data/lib/starter_web/assets/themes/j1/core/js/adapter/cookie_consent.js +36 -25
  25. data/lib/starter_web/assets/themes/j1/core/js/adapter/custom.js +1 -1
  26. data/lib/starter_web/assets/themes/j1/core/js/adapter/iframer.js +1 -1
  27. data/lib/starter_web/assets/themes/j1/core/js/adapter/lightbox.js +1 -1
  28. data/lib/starter_web/assets/themes/j1/core/js/adapter/logger.js +1 -1
  29. data/lib/starter_web/assets/themes/j1/core/js/adapter/master_header.js +2 -2
  30. data/lib/starter_web/assets/themes/j1/core/js/adapter/navigator.js +108 -23
  31. data/lib/starter_web/assets/themes/j1/core/js/adapter/scroller.js +1 -1
  32. data/lib/starter_web/assets/themes/j1/core/js/adapter/searcher.js +1 -1
  33. data/lib/starter_web/assets/themes/j1/core/js/adapter/stickybits.js +1 -1
  34. data/lib/starter_web/assets/themes/j1/core/js/adapter/switcher.js +1 -1
  35. data/lib/starter_web/assets/themes/j1/core/js/adapter/template.js +145 -74
  36. data/lib/starter_web/assets/themes/j1/core/js/adapter/toccer.js +5 -5
  37. data/lib/starter_web/assets/themes/j1/core/js/template.js +1 -1
  38. data/lib/starter_web/assets/themes/j1/core/js/template.js.map +1 -1
  39. data/lib/starter_web/assets/themes/j1/core/js/template.min.js +1 -1
  40. data/lib/starter_web/j1_config.yml +223 -0
  41. data/lib/starter_web/package.json +1 -1
  42. data/lib/starter_web/pages/public/about/about_site.adoc +33 -4
  43. data/lib/starter_web/pages/public/legal/en/300_privacy.adoc +130 -14
  44. data/lib/starter_web/pages/public/legal/en/400_license_agreement.adoc +2 -4
  45. data/lib/starter_web/pages/public/start/downloads/quickstarter/000_includes/tables/100_quickstart_installation_packages.asciidoc +1 -1
  46. metadata +5 -4
  47. data/lib/starter_web/assets/data/_authclient.html +0 -365
  48. data/lib/starter_web/pages/public/about/about_you.adoc +0 -139
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: da893f9221e682e33237bee43ab33b89bda07797
4
- data.tar.gz: fadefec42806b1051a4b8393f248cd35706f363e
3
+ metadata.gz: 58dc73b8766183dc99f3aad6b5e35c09431cc350
4
+ data.tar.gz: 796a884fd7028ff6d57eeb8bf10cbb0fcb9b0072
5
5
  SHA512:
6
- metadata.gz: cfb075c946c4d8c3a66c457fe62936f22ccdfba2f77cca61992f2571e4b592943ba22efe33aeb87564eac3c42c0dbb0ade17c73d542f4d2d222ea8be65a820c4
7
- data.tar.gz: e4442c5b327bee06d78fa2e9ded48446ed9f756d5f1ef358f1f96cbc18312e7fab8773070adf5bf146170c3319172467e8afd82edefdd3e609c757988d7be5c2
6
+ metadata.gz: 545ae198f8f71e2d25be1db19a92d695d8d8640d2541026fc2a5b6b0c075e37d5278381628635b4b73f297a5312b6d32ba8e6c7b1c3d7f39a5868be00ac995df
7
+ data.tar.gz: 9a91605ea0702af884999fa532468b5189a9f06283078ce9aa4c7609ce8c3166ec2781a3b91ae6c8d0b3f4a42b11ecb304c549b5b82ef0dadb453f7e3daab9ec
@@ -23,7 +23,7 @@
23
23
  {% assign j1_apps = site.data.apps %}
24
24
  {% assign nedb_config = j1_apps.j1_nedb %}
25
25
  {% assign cookie_consent_config = site.data.modules.j1_cookie_consent %}
26
- {% assign consent_defaults = cookie_consent_config.defaults %} %}
26
+ {% assign consent_defaults = cookie_consent_config.defaults %}
27
27
  {% assign consent_settings = cookie_consent_config.consent %}
28
28
  {% assign consent_config = consent_settings | merge: consent_defaults %}
29
29
 
@@ -36,6 +36,7 @@
36
36
  {% assign nav_id = "navigator_nav" %}
37
37
  {% assign nav_expand = "lg" %}
38
38
  {% assign authclient_modals_id = "authclient_modals" %}
39
+ {% assign navigator_nav_quicklinks = "quicklinks_container" %}
39
40
 
40
41
 
41
42
  {% comment %} Set config files
@@ -113,9 +114,14 @@
113
114
 
114
115
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [check for sidebar] -->
115
116
  {% if sidebar_options.enabled %}
116
- <!-- [INFO ] [j1.modules.navigator.generator.html ] [topsearch sidebar detected] -->
117
- <!-- [INFO ] [j1.modules.navigator.generator.html ] [start processing: sidebar] -->
117
+ <!-- [INFO ] [j1.modules.navigator.generator.html ] [sidebar detected] -->
118
+ <!-- [INFO ] [j1.modules.navigator.generator.html ] [place container for: sidebar] -->
119
+ <div id="mod_sidebar" class="side"></div>
120
+
121
+ {% comment %}
118
122
  {% include {{ sidebar_create }} options=sidebar_options %}
123
+ {% endcomment %}
124
+
119
125
  {% endif %}
120
126
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [end processing: sidebar] -->
121
127
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [start processing: main menue] -->
@@ -157,8 +163,15 @@
157
163
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [check for Quicklinks] -->
158
164
  <!-- [INFO ] [j1.modules.navigator.generator.html ] Quicklinks enabled: {{quicklinks_options.enabled}}] -->
159
165
  {% if quicklinks_options.enabled %}
160
- <!-- [INFO ] [j1.modules.navigator.generator.html ] [start processing: quicklinks] -->
166
+ <!-- [INFO ] [j1.modules.navigator.generator.html ] [place container for: quicklinks] -->
167
+ <!-- [INFO ] [j1.modules.navigator.quicklinks.proc ] [J1 AuthManager detected as: {{ authentication_enabled }}] -->
168
+ <!-- [INFO ] [j1.modules.navigator.quicklinks.proc ] [J1 CookieConsent detected as: {{ consent_enabled }}] -->
169
+ <div id="mod_quicklinks" class="attr-nav collapse navbar-collapse justify-content-end"></div>
170
+
171
+ {% comment %}
161
172
  {% include {{ quicklinks_create }} options=quicklinks_options auth_options=j1_auth_config consent_options=cookie_consent_options %}
173
+ {% endcomment %}
174
+
162
175
  {% endif %}
163
176
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [end processing: quicklinks] -->
164
177
 
@@ -130,16 +130,16 @@ module J1
130
130
  bundle_install path
131
131
  end
132
132
  unless options['force']
133
- J1.logger.info "Generated Jekyll site installed in folder #{path}."
133
+ J1.logger.info "Generated Jekyll site installed in folder #{path}"
134
134
  else
135
- J1.logger.info "Generated Jekyll site force installed in folder #{path}."
135
+ J1.logger.info "Generated Jekyll site force installed in folder #{path}"
136
136
  end
137
- J1.logger.info 'Installation of RubyGems (bundle) skipped.' if options['skip-bundle']
137
+ J1.logger.info 'Installation of RubyGems (bundle) skipped' if options['skip-bundle']
138
138
  end
139
139
 
140
140
  def bundle_install(path)
141
141
  J1::External.require_with_graceful_fail 'bundler'
142
- J1.logger.info "Running bundle install in #{path}..."
142
+ J1.logger.info "Running bundle install in #{path} ..."
143
143
  Dir.chdir(path) do
144
144
  process, output = J1::Utils::Exec.run('bundle', 'install')
145
145
  output.to_s.each_line do |line|
@@ -1,3 +1,3 @@
1
1
  module J1
2
- VERSION = '2018.4.33'
2
+ VERSION = '2018.4.34'
3
3
  end
@@ -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.33'
49
+ gem 'j1_template_mde', '~> 2018.4.34'
50
50
 
51
51
  # --------------------------------------------------------------------
52
52
  # PRODUCTION: Gem needed for the Jekyll and J1 prod environment
@@ -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.33
63
+ version: 2018.4.34
64
64
 
65
65
 
66
66
  # ==============================================================================
@@ -74,7 +74,8 @@ tags_path: /builder/tags
74
74
  # -------------------------------------------------------------------------
75
75
  # Common site URLs
76
76
  #
77
- user_info_url: /pages/public/about/you/
77
+ about-site-url: /pages/public/about/site/
78
+ user_info_url: /pages/public/legal/en/privacy/
78
79
  theme_author_url: https://jekyll.one
79
80
 
80
81
 
@@ -85,7 +86,23 @@ prettify: true
85
86
 
86
87
 
87
88
  # ==============================================================================
88
- # 2. FRAMEWORK configuration
89
+ # 2. USER configuration
90
+ #
91
+ # ------------------------------------------------------------------------------
92
+
93
+ # -------------------------------------------------------------------------
94
+ # Default settings
95
+ #
96
+ user:
97
+ provider: site
98
+ provider_url: https://jekyll.one
99
+ user_name: vistor
100
+ status: active
101
+ provider_membership: guest
102
+ provider_permissions: public
103
+
104
+ # ==============================================================================
105
+ # 3. FRAMEWORK configuration
89
106
  #
90
107
  # ------------------------------------------------------------------------------
91
108
  #
@@ -116,7 +133,7 @@ body:
116
133
 
117
134
 
118
135
  # ==============================================================================
119
- # 3. CONNECTOR configuration
136
+ # 4. CONNECTOR configuration
120
137
  #
121
138
  # ------------------------------------------------------------------------------
122
139
 
@@ -173,7 +190,7 @@ advertising:
173
190
  custom_data:
174
191
 
175
192
  # -------------------------------------------------------------------------
176
- # SHARING connector settings
193
+ # SHARING connector settings (currently NOT supported)
177
194
  #
178
195
  # Settings for sharing helper. Sharing is for things like tweet, plusone,
179
196
  # like, reddit buttons etc. Set 'provider' to the sharing provider you
@@ -183,12 +200,12 @@ advertising:
183
200
  # Set 'provider' to the sharing provider you want to use
184
201
  #
185
202
  # sharing:
186
- # enabled: false
203
+ # enabled: false
187
204
  # provider:
188
205
 
189
206
 
190
207
  # ==============================================================================
191
- # 4. Typography settings
208
+ # 5. Typography settings
192
209
  #
193
210
  # ------------------------------------------------------------------------------
194
211
  typography:
@@ -196,7 +213,7 @@ typography:
196
213
  rtext_size: 300
197
214
 
198
215
  # ==============================================================================
199
- # 5. SASS and CSS configuration
216
+ # 6. SASS and CSS configuration
200
217
  #
201
218
  # ------------------------------------------------------------------------------
202
219
  #
@@ -20,18 +20,18 @@ defaults:
20
20
  modal_position: top
21
21
  stop_scrolling: true
22
22
  consent_modal_id: cookie_consent_modals
23
- consent_modals_title: Cookie Consent
23
+ consent_modals_title: Privacy
24
24
  whitelisted_pages: [
25
- /,
26
- /pages/public/about/you/,
25
+ /,
26
+ /pages/public/about/site/,
27
+ /pages/public/about/become_a_patron/
27
28
  /pages/public/legal/en/impress/,
28
29
  /pages/public/legal/en/privacy/,
29
- /pages/public/legal/en/license_agreement/,
30
- /pages/public/about/become_a_patron/
30
+ /pages/public/legal/en/license_agreement/
31
31
  ]
32
32
 
33
33
  categories:
34
- enabled: true
34
+ enabled: false
35
35
  category_title: Cookie usage by category
36
36
  category_description: Usage Information
37
37
  category_description_text: By category, cookies may used for content pages if marked by <i class="fa md-green fa-check ml-1"></i>
@@ -41,7 +41,7 @@ defaults:
41
41
  category_second_party: Second-party Cookies
42
42
 
43
43
  buttons:
44
- policy_button: true
44
+ policy_button: false
45
45
  policy_button_text: Cookie Policy
46
46
  accept_button: true
47
47
  accept_button_text: Yes, I accept cookies
@@ -54,6 +54,11 @@ defaults:
54
54
  #
55
55
  consent:
56
56
  enabled: true
57
+ strict: false # all pages requires a consent
58
+
59
+ show_consent_icon: false # show the consent icon (in quicklinks)
60
+ delete_on_decline: false # currently NOT supported
61
+ show_consent_on_pending: true # on first visit, whitelisted pages does NOT require a consent (overloaded by strict)
57
62
 
58
63
  policy_about: >
59
64
  This website uses cookies to ensure vistors get the best experience
@@ -35,7 +35,7 @@ defaults:
35
35
  background_color_full: rgba_darken_400 # rgba_darken
36
36
  background_color_collapsed: "#3f51b5" # "#20295B"
37
37
  background_color_scrolled: "#3f51b5" # "#20295B"
38
-
38
+
39
39
  nav_menu:
40
40
  raised_level: 15
41
41
  delay_open_menu: 200
@@ -60,7 +60,7 @@ defaults:
60
60
  dropdown_padding_x: 15
61
61
  dropdown_padding_y: 10
62
62
  dropdown_item_color: md_grey_900
63
- dropdown_border_color: "#3f51b5" #BS bg-primary
63
+ dropdown_border_color: "#3f51b5" #BS bg-primary
64
64
  dropdown_border_top: 3
65
65
  dropdown_border_radius: 0
66
66
  dropdown_background_color_hover: md_bluegrey_50
@@ -72,12 +72,12 @@ defaults:
72
72
  icon_color: rgba_lighten
73
73
  icon_color_hover: rgba_lighten_900
74
74
  icon_size: larger
75
- sidebar: enabled
76
- sidebar_icon: dots-vertical
77
- topsearch: enabled
78
- top_search_icon: magnify
79
- cookies: enabled
75
+
80
76
  cookies_icon: cookie
77
+ top_search_icon: magnify
78
+
79
+ sidebar: true
80
+ sidebar_icon: dots-vertical
81
81
  disqus_icon: disqus
82
82
  disqus_url: none
83
83
  github_icon: github-circle
@@ -87,7 +87,7 @@ defaults:
87
87
  facebook_icon: facebook
88
88
  facebook_url: none
89
89
  twitter_icon: twitter
90
- twitter_url: none
90
+ twitter_url: none
91
91
  signin: false
92
92
  signin_client: enabled
93
93
  signin_icon: login
@@ -140,6 +140,9 @@ nav_menu:
140
140
  #
141
141
  nav_quicklinks:
142
142
  enabled: true
143
+ disqus_url: https://disqus.com/
144
+ github_url: https://github.com/jekyll-one
145
+ patreon_url: https://www.patreon.com/jekyll_one/posts
143
146
 
144
147
  # ------------------------------------------------------------------------------
145
148
  # 4. Navigation topsearch settings
@@ -152,29 +155,29 @@ nav_topsearch:
152
155
  #
153
156
  nav_authclient:
154
157
  hide_on_cookies_declined: false
155
-
156
158
 
157
- auth_signin_modal:
159
+
160
+ auth_signin_modal:
158
161
  title: SignIn
159
162
  body_text: >
160
163
  In order to get *signed in*, check one of the options below
161
164
  and mark a provider for authentication. You'll be *redirected*
162
- to authenticate with the provider *selected*. If signed in
165
+ to authenticate with the provider *selected*. If signed in
163
166
  *successfully*, you get back to this site for the page requested.
164
167
 
165
-
168
+
166
169
  NOTE: To get access to secured pages of this site,
167
170
  authentication with a provider is needed only *once*.
168
171
 
169
172
  auth_disqus:
170
173
  id: 1
171
174
  title: Disqus
172
- text: >
175
+ text: >
173
176
  SignIn to Disqus. Get access to all *PROTECTED* content pages of this site.
174
177
  auth_facebook:
175
178
  id: 2
176
179
  title: Facebook
177
- text: >
180
+ text: >
178
181
  SignIn to Facebook. Get access to all *PROTECTED* content pages of this site.
179
182
  auth_github:
180
183
  id: 3
@@ -189,10 +192,10 @@ nav_authclient:
189
192
  auth_twitter:
190
193
  id: 5
191
194
  title: Twitter
192
- text: >
193
- SignIn to Twitter. Get access to all *PROTECTED* content pages of this site.
194
-
195
- auth_signout_modal:
195
+ text: >
196
+ SignIn to Twitter. Get access to all *PROTECTED* content pages of this site.
197
+
198
+ auth_signout_modal:
196
199
  title: SignOut
197
200
  body_text: >
198
201
  After signing out from this site, you'll be *redirected*
@@ -201,7 +204,7 @@ nav_authclient:
201
204
 
202
205
 
203
206
  NOTE: In order to signing out *completely*, check the switch
204
- below to *on*.
207
+ below to *on*.
205
208
 
206
209
  # ------------------------------------------------------------------------------
207
210
  # 6. Navigation sidebar settings
@@ -214,7 +217,8 @@ nav_sidebar:
214
217
  - box:
215
218
  enabled: true
216
219
  type: user_info
217
- title: User Info
220
+ title: User
221
+
218
222
  links:
219
223
  - title: Provider
220
224
  value: ??provider-name
@@ -222,76 +226,83 @@ nav_sidebar:
222
226
  target: _blank
223
227
  icon: domain
224
228
  - title: User
225
- value: ??user-name
226
- href: ??user-info-url#user-data
227
- target: _blank
228
229
  icon: account
230
+ value: ??user-name
231
+ href: ??user-info-url
232
+ target: none
233
+
229
234
  # User state currently disabled
230
235
  # - title: State
236
+ # icon: account-alert
231
237
  # value: ??user-state
232
238
  # href: ??user-info-url
233
239
  # target: _blank
234
- # icon: account-alert
240
+
235
241
  - title: Permisions
236
- value: ??provider-permissions
237
- href: ??user-info-url
238
- target: _blank
239
242
  icon: account-check
243
+ value: ??provider-permissions
244
+ href: ??user-info-url#content-permissions
245
+ target: none
240
246
  - title: Membership
247
+ icon: account-settings
241
248
  value: ??provider-membership
242
249
  href: ??user-info-url
243
- target: _blank
244
- icon: account-settings
250
+ target: none
245
251
  - title: Cookies
246
- value: ??cookie-state
247
- href: ??user-info-url
248
- target: ""
249
252
  icon: cookie
253
+ value: ??cookie-state
254
+ href: ??user-info-url#revoke-cookie-consent
255
+ target: none
250
256
 
251
257
  - box:
252
258
  enabled: true
253
259
  type: theme_info
254
- title: Theme Info
260
+ title: Theme
255
261
  links:
256
- - title: Theme
262
+ - title: Name
263
+ icon: face
257
264
  value: ??theme-name
258
265
  href: /pages/public/previewer/theme/
259
- target: _blank
260
- icon: face
266
+ target: none
261
267
  - title: Author
268
+ icon: grease-pencil
262
269
  value: ??theme-author
263
270
  href: ??theme-author-url
264
271
  target: _blank
265
- icon: grease-pencil
266
272
  - title: Version
273
+ icon: numeric
267
274
  value: ??theme-version
268
275
  href: /pages/public/previewer/theme/
269
- target: _blank
270
- icon: numeric
276
+ target: none
271
277
 
272
278
  - box:
273
279
  enabled: true
274
280
  type: site_info
275
- title: Site Info
281
+ title: Site
276
282
  links:
277
283
  - title: About
278
- href: /pages/public/about/
279
284
  icon: home-outline
285
+ href: /pages/public/about/site/
286
+ target: false
280
287
  - title: Become a Patron
281
- href: /pages/public/about/become_a_patron/
282
288
  icon: patreon
289
+ href: /pages/public/about/become_a_patron/
290
+ target: _blank
283
291
  - title: Impress
284
- href: /pages/public/legal/en/impress/
285
292
  icon: alert-outline
286
- # - title: Terms of Use
287
- # href: /pages/public/legal/en/terms_of_use/
288
- # icon: compass-outline
293
+ href: /pages/public/legal/en/impress/
294
+ target: none
289
295
  - title: Privacy
290
- href: /pages/public/legal/en/privacy/
291
296
  icon: heart
292
- - title: License Agreement
293
- href: /pages/public/legal/en/license_agreement/
297
+ href: /pages/public/legal/en/privacy/
298
+ target: none
299
+ - title: License
294
300
  icon: checkbox-multiple-marked-circle-outline
301
+ href: /pages/public/legal/en/license_agreement/
302
+ target: none
303
+
295
304
  # - title: Contact
296
- # href: mailto:contact@jekyll.one
297
305
  # icon: contact-mail
306
+ # href: mailto:contact@jekyll.one
307
+ # target: none
308
+