j1_template 2019.4.7 → 2019.4.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (75) hide show
  1. checksums.yaml +4 -4
  2. data/_includes/themes/j1/layouts/content_generator_collection.html +24 -9
  3. data/_includes/themes/j1/layouts/content_generator_page.html +24 -9
  4. data/_includes/themes/j1/layouts/content_generator_post.html +27 -15
  5. data/_includes/themes/j1/layouts/layout_theme_generator.html +39 -19
  6. data/_includes/themes/j1/layouts/layout_theme_generator.new.html +118 -0
  7. data/_includes/themes/j1/layouts/layout_theme_generator.org.html +119 -0
  8. data/_includes/themes/j1/procedures/global/pager.proc +49 -51
  9. data/lib/j1/version.rb +1 -1
  10. data/lib/j1_app/j1_auth_manager/auth_manager.rb +27 -29
  11. data/lib/j1_app/j1_auth_manager/views/auth_manager_ui.erb +12 -8
  12. data/lib/starter_web/Gemfile +1 -1
  13. data/lib/starter_web/_cc_test_data/_config.yml +1 -1
  14. data/lib/starter_web/_cc_test_data/_data/blocks/banner.yml +57 -0
  15. data/lib/starter_web/_cc_test_data/_data/blocks/defaults/banner.yml +55 -0
  16. data/lib/starter_web/_cc_test_data/_data/blocks/defaults/footer.yml +3 -3
  17. data/lib/starter_web/_cc_test_data/_data/blocks/defaults/panel.yml +30 -38
  18. data/lib/starter_web/_cc_test_data/_data/blocks/footer.yml +181 -110
  19. data/lib/starter_web/_cc_test_data/_data/modules/back2top.yml +1 -1
  20. data/lib/starter_web/_cc_test_data/_data/modules/defaults/smooth_scroll.yml +169 -0
  21. data/lib/starter_web/_cc_test_data/_data/modules/defaults/theme_switcher.yml +168 -0
  22. data/lib/starter_web/_cc_test_data/_data/modules/smooth_scroll.yml +169 -0
  23. data/lib/starter_web/_cc_test_data/_data/modules/theme_switcher.yml +168 -0
  24. data/lib/starter_web/_config.yml +74 -71
  25. data/lib/starter_web/_data/blocks/banner.yml +57 -0
  26. data/lib/starter_web/_data/blocks/defaults/banner.yml +55 -0
  27. data/lib/starter_web/_data/modules/{j1_navigator_menu.yml → _old_configs/j1_navigator_menu.yml} +0 -0
  28. data/lib/starter_web/_data/modules/{j1_parallax.yml → _old_configs/j1_parallax.yml} +0 -0
  29. data/lib/starter_web/_data/modules/{j1_smooth_scroll.yml → _old_configs/j1_smooth_scroll.yml} +0 -0
  30. data/lib/starter_web/_data/modules/{j1_stickybits.yml → _old_configs/j1_stickybits.yml} +0 -0
  31. data/lib/starter_web/_data/modules/{j1_theme_switcher.yml → _old_configs/j1_theme_switcher.yml} +0 -0
  32. data/lib/starter_web/_data/modules/{j1_toccer.yml → _old_configs/j1_toccer.yml} +0 -0
  33. data/lib/starter_web/_data/modules/defaults/smooth_scroll.yml +169 -0
  34. data/lib/starter_web/_data/modules/defaults/stickybits.yml +37 -0
  35. data/lib/starter_web/_data/modules/defaults/theme_switcher.yml +168 -0
  36. data/lib/starter_web/_data/modules/defaults/toccer.yml +172 -0
  37. data/lib/starter_web/_data/modules/navigator_menu.yml +306 -0
  38. data/lib/starter_web/_data/modules/smooth_scroll.yml +169 -0
  39. data/lib/starter_web/_data/modules/stickybits.yml +38 -0
  40. data/lib/starter_web/_data/modules/theme_switcher.yml +168 -0
  41. data/lib/starter_web/_data/modules/toccer.yml +172 -0
  42. data/lib/starter_web/_data/resources.yml +23 -24
  43. data/lib/starter_web/_data/template_settings.yml +2 -2
  44. data/lib/starter_web/assets/data/authclient.html +9 -9
  45. data/lib/starter_web/assets/data/banner.html +24 -19
  46. data/lib/starter_web/assets/data/cookie_consent.html +9 -9
  47. data/lib/starter_web/assets/data/footer.html +9 -10
  48. data/lib/starter_web/assets/data/menu.html +23 -16
  49. data/lib/starter_web/assets/data/panel.html +9 -10
  50. data/lib/starter_web/assets/data/sidebar.html +9 -10
  51. data/lib/starter_web/assets/data/webhook.html +8 -8
  52. data/lib/starter_web/assets/images/pages/roundtrip/package.json +1 -1
  53. data/lib/starter_web/assets/themes/j1/adapter/js/back2top.js +11 -9
  54. data/lib/starter_web/assets/themes/j1/adapter/js/cookie_consent.js +5 -5
  55. data/lib/starter_web/assets/themes/j1/adapter/js/logger.js +8 -18
  56. data/lib/starter_web/assets/themes/j1/adapter/js/master_header.js +48 -70
  57. data/lib/starter_web/assets/themes/j1/adapter/js/navigator.js +45 -27
  58. data/lib/starter_web/assets/themes/j1/adapter/js/octokit.app_only.js +433 -0
  59. data/lib/starter_web/assets/themes/j1/adapter/js/octokit.js +179 -192
  60. data/lib/starter_web/assets/themes/j1/adapter/js/scroller.js +29 -28
  61. data/lib/starter_web/assets/themes/j1/adapter/js/searcher.js +5 -5
  62. data/lib/starter_web/assets/themes/j1/adapter/js/stickybits.js +14 -13
  63. data/lib/starter_web/assets/themes/j1/adapter/js/switcher.js +56 -52
  64. data/lib/starter_web/assets/themes/j1/adapter/js/template.js +256 -213
  65. data/lib/starter_web/assets/themes/j1/adapter/js/toccer.js +24 -21
  66. data/lib/starter_web/assets/themes/j1/core/js/template.js +9 -9
  67. data/lib/starter_web/assets/themes/j1/core/js/template.js.map +1 -1
  68. data/lib/starter_web/assets/themes/j1/core/js/template.min.js +1 -1
  69. data/lib/starter_web/package.json +1 -1
  70. data/lib/starter_web/pages/public/start/downloads/quickstarter/100_linux_starter.adoc +1 -1
  71. data/lib/starter_web/pages/public/start/roundtrip/420_responsive_tables_extensions.adoc +5 -0
  72. data/lib/starter_web/utilsrv/_defaults/package.json +1 -1
  73. data/lib/starter_web/utilsrv/package.json +1 -1
  74. metadata +38 -9
  75. data/lib/starter_web/_data/resources.new.yml +0 -876
@@ -417,25 +417,17 @@ module J1App
417
417
  # warden.logout
418
418
  # session.clear
419
419
 
420
- session_json = user_state_data.to_json
421
- log_info! 'PreFlight', 'Cookie', 'Write web session data', "#{session_json}"
420
+ # session_json = user_state_data.to_json
422
421
 
423
- # session_encoded = Base64.encode64(session_json)
424
- # response.set_cookie(
425
- # 'j1.user.state',
426
- # domain: false,
427
- # value: session_encoded.to_s,
428
- # path: '/'
429
- # )
430
-
431
- writeCookie(user_state_cookie, session_json)
432
-
433
- # log_info! 'PreFlight', 'Redirect', 'Call API request', 'PageValidate'
434
- # redirect "/page_validation?page=#{requested_page}"
422
+ # jadams, 2019-08-08: writeCookie disabled because the content gets
423
+ # (potentially) corrupted (???) for unknown reason
424
+ #
425
+ # log_info! 'PreFlight', 'Cookie', 'Write web session data', "#{session_json}"
426
+ # writeCookie(user_state_cookie, session_json)
435
427
 
436
428
  log_info! 'PreFlight', 'Redirect', 'Pass to error page (access_denied)'
437
429
  description_title = "Access Denied"
438
- redirect "/access_denied?provider=#{current_provider}&user=#{user_name}&category=#{category}&title=#{description_title}"
430
+ redirect "/access_denied?provider=#{current_provider}&user=#{user_name}&category=#{category}&title=#{description_title}"
439
431
  end
440
432
 
441
433
  time = Time.now.ctime.to_s
@@ -487,24 +479,27 @@ module J1App
487
479
  end
488
480
 
489
481
  # Update cookie data
490
- # ----------------------------------------------------------------------
482
+ --------------------------------------------------------------------
491
483
  user_state_data['provider_url'] = providers["#{default_provider}"]['provider_url']
492
484
  user_state_data['users_allowed'] = providers["#{default_provider}"]['users']
493
485
  user_state_data['provider_permissions'] = providers["#{default_provider}"]['permissions']
494
486
  user_state_data['requested_page'] = env['REQUEST_URI']
495
487
  user_state_data['writer'] = 'middleware'
488
+ session_json = user_state_data.to_json
489
+
490
+ # allowed_users = providers["#{default_provider}"]['users'].join(',')
496
491
 
497
- # write updated J1 session cookie
492
+ # write web session cookie 'j1.user.state'
493
+ #
494
+ # jadams, 2019-08-08: writeCookie of 'j1.user.state' is needed to
495
+ # track the requested_page. This cause the potential risk to
496
+ # corrupt the cookie (now, for unknown reason)
498
497
  #
499
- session_json = user_state_data.to_json
500
498
  log_info! 'PreFlight', 'Cookie', 'Write user state session data', "#{session_json}"
501
499
  writeCookie(user_state_cookie, session_json)
502
500
 
503
501
  log_info! 'PreFlight', 'Redirect', 'Call API request', 'PageValidate'
504
-
505
- allowed_users = providers["#{default_provider}"]['users'].join(',')
506
- requested_page = env['REQUEST_URI']
507
- redirect "/page_validation?page=#{requested_page}"
502
+ redirect "/page_validation?page=#{user_state_data['requested_page']}"
508
503
  else
509
504
  raise J1App::ConfigError
510
505
  end
@@ -844,13 +839,16 @@ module J1App
844
839
  # warden.logout
845
840
  # session.clear
846
841
 
847
- user_state_data = readCookie(user_state_cookie)
848
- user_state_data['category_enabled'] = category_condition_state
849
- user_state_data['writer'] = 'middleware'
850
- session_json = user_state_data.to_json
842
+ # user_state_data = readCookie(user_state_cookie)
843
+ # user_state_data['category_enabled'] = category_condition_state
844
+ # user_state_data['writer'] = 'middleware'
845
+ # session_json = user_state_data.to_json
851
846
 
852
- log_info! 'Post Authentication', 'Cookie', 'Write user state session data', "#{session_json}"
853
- writeCookie(user_state_cookie, session_json)
847
+ # jadams, 2019-08-08: writeCookie disabled because the content gets
848
+ # (potentially) corrupted (???) for unknown reason
849
+ #
850
+ # log_info! 'Post Authentication', 'Cookie', 'Write user state session data', "#{session_json}"
851
+ # writeCookie(user_state_cookie, session_json)
854
852
 
855
853
  log_info! 'Post Authentication', 'Redirect', 'Pass to error page (access_denied)'
856
854
  description_title = "Access Denied"
@@ -1125,4 +1123,4 @@ module J1App
1125
1123
  # --------------------------------------------------------------------------
1126
1124
 
1127
1125
  end
1128
- end
1126
+ end
@@ -162,7 +162,7 @@
162
162
  // -------------------------------------------------------------------------
163
163
  $(document).on('shown.bs.modal','#<%= @modal %>', function () {
164
164
  console.log('J1AuthManager: entered modal SHOWN from <%= @modal %>');
165
-
165
+
166
166
  allModalButtons.forEach(function(button, index) {
167
167
  button.addEventListener('click', function() {
168
168
 
@@ -192,20 +192,24 @@
192
192
  });
193
193
 
194
194
  // -------------------------------------------------------------------------
195
- // actionHandler ALL modals (HIDE events)
195
+ // actionHandler ALL modals (HIDDEN event)
196
+ // process action objects
196
197
  // -------------------------------------------------------------------------
197
- $(document).on('hide.bs.modal','#<%= @modal %>', function () {
198
- console.log('J1AuthManager: entered modal HIDE from <%= @modal %>');
198
+ // $(document).on('hide.bs.modal','#<%= @modal %>', function () {
199
+ $(document).on('hidden.bs.modal','#<%= @modal %>', function () {
200
+ console.log('J1AuthManager: entered modal HIDDEN from <%= @modal %>');
199
201
  user_state = j1.readCookie(user_state_cookie_name);
200
202
 
201
203
  // Manage SignIn actions
202
204
  // -----------------------------------------------------------------------
203
205
  if (signIn.do == true) {
204
206
  // pass to authentication
205
- route = "<%= @route %>"
207
+ route = "<%= @route %>"
206
208
  } else if (signIn.do == false) {
207
209
  // pass to (unchanged) current page
208
- route = user_state.current_page;;
210
+ route = user_state.current_page;
211
+ } else {
212
+ route = user_state.current_page;
209
213
  }
210
214
 
211
215
  // Redirect detected route
@@ -213,7 +217,7 @@
213
217
  providerPermissions = user_state.provider_permissions;
214
218
  providerPermissions.push('public');
215
219
  categoryAllowed = providerPermissions.includes(user_state.page_permission);
216
-
220
+
217
221
  // Make sure that protected pages are ALWAYS checked for permissions
218
222
  // except on signIn
219
223
  // -------------------------------------------------------------------
@@ -227,4 +231,4 @@
227
231
  });
228
232
  </script>
229
233
 
230
- </html>
234
+ </html>
@@ -48,7 +48,7 @@ gem 'jekyll', '~> 3.8.5'
48
48
 
49
49
  # Theme Rubies, default: J1 Template
50
50
  #
51
- gem 'j1_template', '~> 2019.4.7'
51
+ gem 'j1_template', '~> 2019.4.8'
52
52
 
53
53
  # ------------------------------------------------------------------------------
54
54
  # PRODUCTION: Gem needed for the Jekyll and J1 prod environment
@@ -68,7 +68,7 @@ environment: development
68
68
  # anything here because version information is bumped-in by
69
69
  # the build process
70
70
  #
71
- version: 2019.4.7
71
+ version: 2019.4.8
72
72
 
73
73
 
74
74
  # ==============================================================================
@@ -25,10 +25,66 @@ about_config:
25
25
  #
26
26
  settings:
27
27
 
28
+ # ------------------------------------------------------------------------------
29
+ # General parallax settings
30
+ #
31
+ # Global configuration for parallax|banner quotes. These settings are
32
+ # side-wide and should match your theme not individual images. Be careful
33
+ # for the selection of banner images.
34
+ #
35
+ # Individual settings (e.g. page placement, cite, source) are configured
36
+ # with the panels configuration (j1_panels.yml).
37
+ #
38
+ # gridify
39
+ # ----------------------------------------------------------------------------
40
+ # If enabled, a grit pattern is placed over the background image. This
41
+ # puts some "noise" on the image to focus more on the quote|text rather
42
+ # than the image.
43
+ #
44
+ # values: boolean (true|false)
45
+ # default: true
46
+ #
47
+ # gridifier
48
+ # ----------------------------------------------------------------------------
49
+ # Pixel image used to gridify the background image of the banner.
50
+ #
51
+ # values: image path|name (string)
52
+ # default: /assets/images/patterns/gridtile.png
53
+ #
54
+ # darken
55
+ # ----------------------------------------------------------------------------
56
+ # Sets the lightning for the banner|background image. As higher the value
57
+ # for darken as less is the (background) light. Values are out of the
58
+ # range from 1 (light) to 9 (dark). Useful to focus on the quote|text
59
+ # rather than the background image.
60
+ #
61
+ # values: number [1 .. 9]
62
+ # default: 3
63
+ #
64
+ # background
65
+ # ----------------------------------------------------------------------------
66
+ # Default background image of the banner if no other image is specified with
67
+ # the panels configuration (j1_panels.yml).
68
+ #
69
+ # values: image path|name (string)
70
+ # default: /assets/images/quotes/default.png
71
+ # ------------------------------------------------------------------------------
72
+ parallax_settings:
73
+
74
+ gridify: true
75
+ gridifier: /assets/images/patterns/gridtile.png
76
+ text_color: rgba_lighten
77
+ cite_color: rgba_lighten
78
+ darken: 3
79
+ background: /assets/images/quotes/default.png
80
+ background_pos_x: 50%
81
+ background_pos_y: 0
82
+
28
83
  # ----------------------------------------------------------------------------
29
84
  # DIVIDER Banner
30
85
  #
31
86
  divider:
87
+
32
88
  # --------------------------------------------------------------------------
33
89
  # DIVIDER banner properties
34
90
  #
@@ -58,6 +114,7 @@ settings:
58
114
  # TEASER Banner
59
115
  #
60
116
  teaser:
117
+
61
118
  # --------------------------------------------------------------------------
62
119
  # home_teaser_banner
63
120
  #
@@ -22,6 +22,61 @@ defaults:
22
22
  #
23
23
  data_path: /assets/data/banner/index.html
24
24
 
25
+ # ------------------------------------------------------------------------------
26
+ # General parallax settings
27
+ #
28
+ # Global configuration for parallax|banner quotes. These settings are
29
+ # side-wide and should match your theme not individual images. Be careful
30
+ # for the selection of banner images.
31
+ #
32
+ # Individual settings (e.g. page placement, cite, source) are configured
33
+ # with the panels configuration (j1_panels.yml).
34
+ #
35
+ # gridify
36
+ # ----------------------------------------------------------------------------
37
+ # If enabled, a grit pattern is placed over the background image. This
38
+ # puts some "noise" on the image to focus more on the quote|text rather
39
+ # than the image.
40
+ #
41
+ # values: boolean (true|false)
42
+ # default: true
43
+ #
44
+ # gridifier
45
+ # ----------------------------------------------------------------------------
46
+ # Pixel image used to gridify the background image of the banner.
47
+ #
48
+ # values: image path|name (string)
49
+ # default: /assets/images/patterns/gridtile.png
50
+ #
51
+ # darken
52
+ # ----------------------------------------------------------------------------
53
+ # Sets the lightning for the banner|background image. As higher the value
54
+ # for darken as less is the (background) light. Values are out of the
55
+ # range from 1 (light) to 9 (dark). Useful to focus on the quote|text
56
+ # rather than the background image.
57
+ #
58
+ # values: number [1 .. 9]
59
+ # default: 3
60
+ #
61
+ # background
62
+ # ----------------------------------------------------------------------------
63
+ # Default background image of the banner if no other image is specified with
64
+ # the panels configuration (j1_panels.yml).
65
+ #
66
+ # values: image path|name (string)
67
+ # default: /assets/images/quotes/default.png
68
+ # ------------------------------------------------------------------------------
69
+ parallax_settings:
70
+
71
+ gridify: true
72
+ gridifier: /assets/images/patterns/gridtile.png
73
+ text_color: rgba_lighten
74
+ cite_color: rgba_lighten
75
+ darken: 3
76
+ background: /assets/images/quotes/default.png
77
+ background_pos_x: 50%
78
+ background_pos_y: 0
79
+
25
80
  # ----------------------------------------------------------------------------
26
81
  # DIVIDER banner
27
82
  #
@@ -32,7 +32,7 @@ defaults:
32
32
  comment: Default Footer
33
33
  theme: footer-light-theme
34
34
 
35
- # ----------------------------------------------------------------------
35
+ # --------------------------------------------------------------------------
36
36
  # ISSUE settings
37
37
  #
38
38
  issue:
@@ -41,7 +41,7 @@ defaults:
41
41
  date_format: "%A, %-d %B %Y"
42
42
  text: Last modified
43
43
 
44
- # ----------------------------------------------------------------------
44
+ # --------------------------------------------------------------------------
45
45
  # ICON settings
46
46
  #
47
47
  icons:
@@ -52,7 +52,7 @@ defaults:
52
52
  enabled: false
53
53
  href: "#"
54
54
 
55
- # ----------------------------------------------------------------------
55
+ # --------------------------------------------------------------------------
56
56
  # LEGAL settings
57
57
  #
58
58
  legals:
@@ -42,13 +42,12 @@ defaults:
42
42
  - card:
43
43
  enabled: false
44
44
  type: text
45
- # title: J1 Template
45
+ title: J1 Template
46
46
  tagline: tagline-text-1
47
47
  icon: responsive
48
48
  icon_size: 8x
49
49
  icon_color: md-grey-800
50
- text: >
51
- card-text-1
50
+ text: card-text-1
52
51
 
53
52
  buttons:
54
53
 
@@ -63,13 +62,12 @@ defaults:
63
62
  - card:
64
63
  enabled: false
65
64
  type: text
66
- # title: J1 Template
65
+ title: J1 Template
67
66
  tagline: tagline-text-2
68
67
  icon: responsive
69
68
  icon_size: 8x
70
69
  icon_color: md-grey-800
71
- text: >
72
- card-text-2
70
+ text: card-text-2
73
71
 
74
72
  buttons:
75
73
 
@@ -84,13 +82,12 @@ defaults:
84
82
  - card:
85
83
  enabled: false
86
84
  type: text
87
- # title: J1 Template
85
+ title: J1 Template
88
86
  tagline: tagline-text-3
89
87
  icon: responsive
90
88
  icon_size: 8x
91
89
  icon_color: md-grey-800
92
- text: >
93
- card-text-3
90
+ text: card-text-3
94
91
 
95
92
  buttons:
96
93
 
@@ -118,12 +115,13 @@ defaults:
118
115
  lane_span: fixed
119
116
 
120
117
  cards:
118
+
121
119
  - card:
122
120
  enabled: false
123
121
  type: header
124
122
  title: title
125
- tagline: >
126
- service-panel header text
123
+ tagline: service-panel header text
124
+
127
125
  - card:
128
126
  enabled: false
129
127
  type: service
@@ -133,8 +131,7 @@ defaults:
133
131
  href: javascript:void(0)
134
132
  title: service-panel title-1
135
133
  tagline: service-panel tagline-1
136
- text: >
137
- card text 1
134
+ text: card text 1
138
135
 
139
136
  services:
140
137
  - service:
@@ -156,8 +153,7 @@ defaults:
156
153
  href: javascript:void(0)
157
154
  title: service-panel title-2
158
155
  tagline: service-panel tagline-2
159
- text: >
160
- service-panel card text 2
156
+ text: service-panel card text 2
161
157
 
162
158
  services:
163
159
  - service:
@@ -179,8 +175,7 @@ defaults:
179
175
  href: javascript:void(0)
180
176
  title: service-panel title-3
181
177
  tagline: service-panel tagline-3
182
- text: >
183
- service-panel card text 3
178
+ text: service-panel card text 3
184
179
 
185
180
  services:
186
181
  - service:
@@ -193,27 +188,6 @@ defaults:
193
188
  title: service 3-3
194
189
  href: javascript:void(0)
195
190
 
196
-
197
- # ----------------------------------------------------------------------------
198
- # STEP panel
199
- #
200
- step:
201
- # --------------------------------------------------------------------------
202
- # STEP panel properties
203
- #
204
- enabled: false
205
- id: step_panel_id
206
- type: step_panel
207
- style: dark
208
- lane_span: fixed
209
-
210
- cards:
211
- - card:
212
- title: step-panel-title
213
- tagline: >
214
- step-panel-tagline
215
-
216
-
217
191
  # ----------------------------------------------------------------------------
218
192
  # NEWS panel
219
193
  #
@@ -240,6 +214,24 @@ defaults:
240
214
  category: featured
241
215
  max_posts: 3
242
216
 
217
+ # # ----------------------------------------------------------------------------
218
+ # # STEP panel
219
+ # #
220
+ # step:
221
+ # # --------------------------------------------------------------------------
222
+ # # STEP panel properties
223
+ # #
224
+ # enabled: false
225
+ # id: step_panel_id
226
+ # type: step_panel
227
+ # style: dark
228
+ # lane_span: fixed
229
+ #
230
+ # cards:
231
+ # - card:
232
+ # title: step-panel-title
233
+ # tagline: step-panel-tagline
234
+
243
235
  # ----------------------------------------------------------------------------
244
236
  # EXCEPTION panel
245
237
  #