j1-template 2020.0.0 → 2020.0.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (80) hide show
  1. checksums.yaml +4 -4
  2. data/_includes/themes/j1/layouts/content_generator_blog_archive.html +22 -18
  3. data/_includes/themes/j1/layouts/content_generator_collection.html +15 -12
  4. data/_includes/themes/j1/layouts/content_generator_page.html +16 -17
  5. data/_includes/themes/j1/layouts/content_generator_post.html +19 -24
  6. data/_includes/themes/j1/modules/navigator/generator.html +62 -40
  7. data/assets/data/menu.html +6 -5
  8. data/assets/data/mmenu.html +455 -0
  9. data/assets/data/{sidebar.html → mmenu_sidebar.html} +24 -18
  10. data/assets/data/mmenu_toc.html +45 -0
  11. data/assets/data/quicklinks.html +9 -4
  12. data/assets/data/ssm.html +227 -0
  13. data/assets/error_pages/HTTP204.html +3 -3
  14. data/assets/themes/j1/core/css/bootstrap.css +116 -93
  15. data/assets/themes/j1/core/css/bootstrap.min.css +4 -4
  16. data/assets/themes/j1/core/css/globals.css +1 -1
  17. data/assets/themes/j1/core/css/theme_extensions.css +150 -23
  18. data/assets/themes/j1/core/css/theme_extensions.min.css +1 -1
  19. data/assets/themes/j1/core/css/uno.css +150 -23
  20. data/assets/themes/j1/core/css/uno.min.css +1 -1
  21. data/assets/themes/j1/core/css/vendor.css +130 -104
  22. data/assets/themes/j1/core/css/vendor.min.css +4 -4
  23. data/assets/themes/j1/core/js/template.js +296 -24
  24. data/assets/themes/j1/core/js/template.js.map +1 -1
  25. data/assets/themes/j1/core/js/template.min.js +1 -1
  26. data/lib/j1/version.rb +1 -1
  27. data/lib/j1_app/j1_auth_manager/auth_manager.rb +21 -17
  28. data/lib/j1_app/j1_auth_manager/config.rb +13 -9
  29. data/lib/j1_app/j1_site_manager/static_site.rb +1 -1
  30. data/lib/starter_web/Gemfile +2 -2
  31. data/lib/starter_web/_config.yml +12 -139
  32. data/lib/starter_web/_data/layouts/default.yml +5 -5
  33. data/lib/starter_web/_data/modules/authentication.yml +4 -4
  34. data/lib/starter_web/_data/modules/cookie_consent.yml +10 -10
  35. data/lib/starter_web/_data/modules/defaults/navigator.yml +25 -24
  36. data/lib/starter_web/_data/modules/defaults/ssm.yml +50 -0
  37. data/lib/starter_web/_data/modules/defaults/toccer.yml +1 -1
  38. data/lib/starter_web/_data/modules/navigator.yml +161 -97
  39. data/lib/starter_web/_data/modules/navigator.yml.new +232 -0
  40. data/lib/starter_web/_data/modules/ssm.yml +133 -0
  41. data/lib/starter_web/_data/modules/toccer.yml +2 -1
  42. data/lib/starter_web/_data/private.yml +66 -98
  43. data/lib/starter_web/_data/resources.yml +76 -10
  44. data/lib/starter_web/apps/public/{cc → cc/cc.yml} +0 -0
  45. data/lib/starter_web/apps/public/cc/index.adoc +107 -0
  46. data/lib/starter_web/assets/images/modules/icons/j1/{j1..ico → j1.ico} +0 -0
  47. data/lib/starter_web/assets/themes/j1/adapter/js/algolia.js +321 -0
  48. data/lib/starter_web/assets/themes/j1/adapter/js/back2top.js +2 -2
  49. data/lib/starter_web/assets/themes/j1/adapter/js/cookie_consent.js +38 -28
  50. data/lib/starter_web/assets/themes/j1/adapter/js/gallery_customizer.js +7 -7
  51. data/lib/starter_web/assets/themes/j1/adapter/js/j1.js +55 -30
  52. data/lib/starter_web/assets/themes/j1/adapter/js/logger.js +2 -2
  53. data/lib/starter_web/assets/themes/j1/adapter/js/mmenu.js +439 -0
  54. data/lib/starter_web/assets/themes/j1/adapter/js/mmenu.js.new +432 -0
  55. data/lib/starter_web/assets/themes/j1/adapter/js/navigator.js +29 -47
  56. data/lib/starter_web/assets/themes/j1/adapter/js/ssm.js +496 -0
  57. data/lib/starter_web/assets/themes/j1/adapter/js/themer.js +2 -1
  58. data/lib/starter_web/assets/themes/j1/adapter/js/toccer.js +40 -36
  59. data/lib/starter_web/assets/themes/j1/extensions/mmenu-light/css/mmenu-light.css +384 -0
  60. data/lib/starter_web/assets/themes/j1/extensions/mmenu-light/css/mmenu-light.min.css +384 -0
  61. data/lib/starter_web/assets/themes/j1/extensions/mmenu-light/css/themes/uno.css +95 -0
  62. data/lib/starter_web/assets/themes/j1/extensions/mmenu-light/css/themes/uno.min.css +95 -0
  63. data/lib/starter_web/assets/themes/j1/extensions/mmenu-light/js/mmenu-light.js +11 -0
  64. data/lib/starter_web/assets/themes/j1/extensions/mmenu-light/js/mmenu-light.min.js +11 -0
  65. data/lib/starter_web/assets/themes/j1/extensions/mmenu-light/js/mmenu-light.polyfills.js +118 -0
  66. data/lib/starter_web/assets/themes/j1/extensions/mmenu-light/js/mmenu-light.polyfills.min.js +118 -0
  67. data/lib/starter_web/collections/posts/public/{jekyll → featured}/_posts/2018-05-01-confusion-about-base-url.adoc +0 -0
  68. data/lib/starter_web/package.json +1 -1
  69. data/lib/starter_web/pages/public/learn/floating_sidebar.adoc +199 -0
  70. data/lib/starter_web/pages/public/learn/roundtrip/100_present_images.adoc +2 -2
  71. data/lib/starter_web/pages/public/learn/roundtrip/200_typography.adoc +2 -2
  72. data/lib/starter_web/pages/public/learn/whats_up.adoc +12 -11
  73. data/lib/starter_web/pages/public/legal/en/500_support.adoc +1 -1
  74. data/lib/starter_web/pages/public/previewer/000_includes/tables/mdi_icons/200_rotate.asciidoc +1 -1
  75. data/lib/starter_web/pages/public/previewer/mdi_icons_preview.adoc +2 -3
  76. data/lib/starter_web/pages/public/previewer/twitter_emoji_preview.adoc +3 -3
  77. data/lib/starter_web/pages/public/site_search.adoc +196 -0
  78. data/lib/starter_web/utilsrv/_defaults/package.json +1 -1
  79. data/lib/starter_web/utilsrv/package.json +1 -1
  80. metadata +27 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 510a99aba326dd41652994163fd6af488045458274281e97a5a433771c6ef19d
4
- data.tar.gz: e4ca95c61fceaa41797a418497a76e5cdb6d6132d59fd75c0159adbfbf57dc00
3
+ metadata.gz: c125517dc4e0ca43a01d25e1d2dbb7f2bf31f23f8882c67198755c86e969dc58
4
+ data.tar.gz: 7f712b5ee752524b4dcb3a82105f4f077c35548959471d9e84d8051055dea281
5
5
  SHA512:
6
- metadata.gz: 7f40d5edc7844ff44496c55dae7bba1ce80653d85a96704b2d7d27a5a8f5e062d841a539aa90be948ac582e2dca839b1563275a78269c0d2631f7979c3d5cd4f
7
- data.tar.gz: 0aac40a1bc33067ebd59eab88945de2febdad4770d11334c82b0fd66e56229ccd6ca8d748de4068f565962b9d11bc0cfd37c4101172f9ec84fae61bdd3a6a8d9
6
+ metadata.gz: 283075f0d84f1220e9d81b760780e832d074f5cbd0889aa7afbc26794b5bf07db81e23fec5cb1eba1a84315e87e9a0cfd7e967521a04123e7ed281c45daf7bf7
7
+ data.tar.gz: dbc293ceac25461a79ad4db4ea4fe2b82a69fd5df878f4b4521872ef6d33849a90230a48024e4ca2e9b86935e735edc6bdf4e4749bacd6d312b1d1ebfd797d90
@@ -67,10 +67,11 @@
67
67
  -------------------------------------------------------------------------------- {% endcomment %}
68
68
  <!-- [INFO ] [j1.layout.content_generator_blog.html ] [Begin content] -->
69
69
  <!-- split page to place a sidebar e.g. the document TOC -->
70
- <div class="container mb-5">
70
+ <div class="container mr-5 mb-5">
71
71
  <div class="row">
72
72
 
73
- <main class="col-md-9 col-xs-12 r-text-{{rtext_size}} js-toc-content">
73
+ <!-- main class="col-md-9 col-xs-12 r-text-{{rtext_size}} js-toc-content" -->
74
+ <main class="col-md-12 col-xs-12 r-text-{{rtext_size}} js-toc-content">
74
75
 
75
76
  {% comment %} Blog Navigator
76
77
  ------------------------------------------------------------------------ {% endcomment %}
@@ -78,9 +79,9 @@
78
79
  <div id="blog_navigator" class="row">
79
80
  <div class="col-md-12" role="main">
80
81
 
81
- <div id="article_navigator">
82
+ <div id="article_navigator">
82
83
 
83
- {% include {{get_page_path}} mode='absolute' %}
84
+ {% include {{get_page_path}} mode='absolute' %}
84
85
  {% capture navigator_path%}{{page_path}}{% endcapture %}
85
86
  {% capture archive_path %}{{navigator_path}}/archive{% endcapture %}
86
87
 
@@ -127,7 +128,7 @@
127
128
 
128
129
  <div class="post-headline">
129
130
  <h2 id="previewer" class="mt-4">Preview</h2>
130
- </div>
131
+ </div>
131
132
 
132
133
  {% comment %} Display pagination links if any
133
134
  ---------------------------------------------------------------- {% endcomment %}
@@ -174,12 +175,12 @@
174
175
  {% when 'calendar' %}
175
176
  {% include {{collate_calendar}} header_title=page.header_title header_tagline=page.header_tagline items=posts_collate %}
176
177
  {% when 'timeline' %}
177
- {% include {{collate_timeline}} items=posts_collate limit_excerpt=50 %}
178
+ {% include {{collate_timeline}} items=posts_collate limit_excerpt=50 %}
178
179
  {% else %}
179
180
  {% include {{collate_list}} header_title=page.header_title header_tagline=page.header_tagline items=posts_collate %}
180
181
  {% endcase %}
181
182
  </div>
182
- </div>
183
+ </div>
183
184
 
184
185
  </div>
185
186
  <!-- end article previewer -->
@@ -193,14 +194,17 @@
193
194
  <!-- End Content placed by blog_archive_content.html -->
194
195
  </main> <!-- end main for split page -->
195
196
 
196
- {% comment %} Place Sidebar|Tocbot
197
- ------------------------------------------------------------------------ {% endcomment %}
198
- <!-- NOTE: BS or Tocbot Affix is not used anymore. Replaced by CSS style "sticky" -->
199
- <aside class="col-md-3 d-none d-md-block sticky">
200
- <div id="j1-sidebar" class="j1-sidebar hidden-print affix-top">
201
- <div id="j1-toc-mgr" class="toc js-toc"></div>
202
- </div>
203
- </aside> <!-- end ASIDE for split page -->
197
+ {% comment %} Place Sidebar|Tocbot
198
+ -------------------------------------------------------------------------- {% endcomment %}
199
+ <!-- NOTE: BS or Tocbot Affix is not used anymore. Replaced by CSS style "sticky" -->
200
+ {% comment %} tocbot and page_navigation (not used anymore)
201
+ --------------------------------------------------------------------------
202
+ <aside class="col-md-3 d-none d-md-block sticky">
203
+ <div id="sidebar">
204
+ <div id="j1-toc-mgr" class="toc js-toc"></div>
205
+ </div>
206
+ </aside>
207
+ -------------------------------------------------------------------------- {% endcomment %}
204
208
 
205
209
  {% comment %} Calc|Write the Back URL
206
210
  -------------------------------------------------------------------------- {% endcomment %}
@@ -210,7 +214,7 @@
210
214
  {% capture browser_page_url %}{{page.url}}{% endcapture %}
211
215
  {% endif %}
212
216
 
213
- <!-- [INFO ] [j1.content_generator_blog_archive ] [ {{page.title}} - save the current page to cookieUserState cookie: {{ browser_page_url }} ] -->
217
+ <!-- [INFO ] [j1.content_generator_blog_archive ] [ {{page.title}} - save the current page to cookieUserState cookie: {{ browser_page_url }} ] -->
214
218
  <script>
215
219
  /* Manage the current page settings */
216
220
  $(document).ready(function() {
@@ -223,7 +227,7 @@
223
227
  var user_state_last_page = "{{browser_page_url}}";
224
228
  user_state.last_page = user_state_last_page;
225
229
  j1.writeCookie({
226
- name: user_state_cookie_name,
230
+ name: user_state_cookie_name,
227
231
  data: user_state
228
232
  });
229
233
  /* Set default colors */
@@ -239,4 +243,4 @@
239
243
 
240
244
  </div> <!-- end row -->
241
245
  </div> <!-- end container -->
242
- <!-- [INFO ] [j1.layout.content_generator_blog.html ] [ end content ] -->
246
+ <!-- [INFO ] [j1.layout.content_generator_blog.html ] [ end content ] -->
@@ -62,14 +62,14 @@
62
62
  {% comment %} Main
63
63
  -------------------------------------------------------------------------------- {% endcomment %}
64
64
  <!-- [INFO ] [j1.layout.content_generator_coll.html ] [ begin content ] -->
65
- <div class="container mb-5">
65
+ <div class="container mr-5 mb-5">
66
66
  <div class="row">
67
67
 
68
68
  {% comment %} COLLECTION content
69
69
  ---------------------------------------------------------------------------- {% endcomment %}
70
70
  {% if sidebar == false %}
71
71
  <!-- FULL page - no sidebar for page toc -->
72
- <main class="col-md-12 col-xs-12 r-text-{{rtext_size}}">
72
+ <main class="col-md-12 col-xs-12 r-text-{{rtext_size}} js-toc-content">
73
73
 
74
74
  <!-- Include a pager at top position -->
75
75
  {% include {{pager}} %}
@@ -91,7 +91,8 @@
91
91
  </main> <!-- end col-md-12 -->
92
92
  {% else %}
93
93
  <!-- SPLIT page. Place a sidebar e.g. for the document toc -->
94
- <main class="col-md-9 col-xs-12 r-text-{{rtext_size}} js-toc-content">
94
+ <!-- main class="col-md-9 col-xs-12 r-text-{{rtext_size}} js-toc-content" -->
95
+ <main class="col-md-12 col-xs-12 r-text-{{rtext_size}} js-toc-content">
95
96
 
96
97
  <!-- Include a pager at top position -->
97
98
  {% include {{pager}} %}
@@ -112,15 +113,17 @@
112
113
 
113
114
  </main> <!-- end col-md-9 -->
114
115
 
115
- <aside class="col-md-3 d-none d-md-block">
116
- {% comment %} if tocbot and page_navigation {% endcomment %}
117
- <!-- NOTE: BS Affix is used on class j1-sidebar instead of Tocbot Affix -->
118
- <div id="j1-sidebar" class="j1-sidebar hidden-print affix-top">
116
+ {% comment %} Place Sidebar|Tocbot
117
+ -------------------------------------------------------------------------- {% endcomment %}
118
+ <!-- NOTE: BS or Tocbot Affix is not used anymore. Replaced by CSS style "sticky" -->
119
+ {% comment %} tocbot and page_navigation (not used anymore)
120
+ --------------------------------------------------------------------------
121
+ <aside class="col-md-3 d-none d-md-block sticky">
122
+ <div id="sidebar">
119
123
  <div id="j1-toc-mgr" class="toc js-toc"></div>
120
- </div> <!-- end ASIDE for split page -->
121
- {% comment %} endif {% endcomment %}
122
- </aside> <!-- end ASIDE for split page -->
123
-
124
+ </div>
125
+ </aside>
126
+ -------------------------------------------------------------------------- {% endcomment %}
124
127
  {% endif %} <!-- endif page_navigation -->
125
128
 
126
129
  {% comment %} END COLLECTION content
@@ -128,4 +131,4 @@
128
131
 
129
132
  </div> <!-- end row -->
130
133
  </div> <!-- end container -->
131
- <!-- [INFO ] [j1.layout.content_generator_coll.html ] [Begin content] -->
134
+ <!-- [INFO ] [j1.layout.content_generator_coll.html ] [Begin content] -->
@@ -61,21 +61,21 @@
61
61
  {% comment %} Main
62
62
  -------------------------------------------------------------------------------- {% endcomment %}
63
63
  <!-- [INFO ] [j1.layout.content_generator_page.html ] [ begin content ] -->
64
- <div class="container mb-5">
64
+ <div class="container mr-5 mb-5">
65
65
  <div class="row">
66
66
 
67
67
  {% if sidebar == false %}
68
68
  <!-- [INFO ] [j1.layout.content_generator_page.html ] [ start main for full page ] -->
69
- <main class="col-md-12 col-xs-12 r-text-{{rtext_size}}">
69
+ <main class="col-md-12 col-xs-12 r-text-{{rtext_size}} js-toc-content">
70
70
  <!-- [INFO ] [j1.layout.content_generator_page.html ] [ begin place content ] -->
71
- {{content}}
71
+ {{content}}
72
72
  </main>
73
- <!-- [INFO ] [j1.layout.content_generator_page.html ] [ end main for full page ] -->
73
+ <!-- [INFO ] [j1.layout.content_generator_page.html ] [ end main for full page ] -->
74
74
  {% else %}
75
75
  <!-- [INFO ] [j1.layout.content_generator_page.html ] [ start main for split page (TOC) ] -->
76
-
77
- <main class="col-md-9 col-xs-12 r-text-{{rtext_size}} js-toc-content">
78
- <!-- [INFO ] [j1.layout.content_generator_page.html ] [ begin place content ] -->
76
+ <main class="col-md-12 col-xs-12 r-text-{{rtext_size}} js-toc-content">
77
+ <!-- main class="col-md-9 col-xs-12 r-text-{{rtext_size}} js-toc-content" -->
78
+ <!-- [INFO ] [j1.layout.content_generator_page.html ] [ begin place content ] -->
79
79
  {{ content }}
80
80
 
81
81
  {% comment %} Place additional headline for comments
@@ -83,20 +83,19 @@
83
83
  {% if page.comments %}
84
84
  <h2 id="comments_leave_comment"> Leave a Comment </h2>
85
85
  {% endif %}
86
- </main>
86
+ </main>
87
87
  <!-- [INFO ] [j1.layout.content_generator_page.html ] [ end main for split page (TOC) ] -->
88
88
  {% comment %} Place Sidebar|Tocbot
89
89
  -------------------------------------------------------------------------- {% endcomment %}
90
90
  <!-- NOTE: BS or Tocbot Affix is not used anymore. Replaced by CSS style "sticky" -->
91
+ {% comment %} tocbot and page_navigation (not used anymore)
92
+ --------------------------------------------------------------------------
91
93
  <aside class="col-md-3 d-none d-md-block sticky">
92
- {% comment %} if tocbot and page_navigation
93
- ------------------------------------------------------------------------ {% endcomment %}
94
94
  <div id="sidebar">
95
95
  <div id="j1-toc-mgr" class="toc js-toc"></div>
96
96
  </div>
97
- {% comment %} endif
98
- ------------------------------------------------------------------------ {% endcomment %}
99
- </aside> <!-- end ASIDE for split page -->
97
+ </aside>
98
+ -------------------------------------------------------------------------- {% endcomment %}
100
99
  {% endif %} <!-- endif sidebar -->
101
100
 
102
101
  </div> <!-- end row -->
@@ -113,9 +112,9 @@
113
112
 
114
113
  <!-- [INFO ] [j1.page.{{page.title}} ] [Save the current ArticleBrowser page to UserState cookie] -->
115
114
  <!-- script>
116
- var logger = log4javascript.getLogger("j1.page.{{page.title|downcase}}.init");
115
+ var logger = log4javascript.getLogger("j1.page.{{page.title|downcase}}.init");
117
116
  var cookieUserState = 'j1.user.state'
118
- var log_text = 'Save the current browser page ({{page.title|downcase}}) to cookie: ' +cookieUserState;
117
+ var log_text = 'Save the current browser page ({{page.title|downcase}}) to cookie: ' +cookieUserState;
119
118
 
120
119
  var j1_user_state = {
121
120
  'authenticated' : 'false',
@@ -128,11 +127,11 @@
128
127
  'last_signin' : 'unknown',
129
128
  'provider' : 'unknown',
130
129
  'user_name' : 'unknown',
131
- 'user_id' : 'unknown'
130
+ 'user_id' : 'unknown'
132
131
  };
133
132
 
134
133
  // Set|Detect J1 App status
135
134
  j1_user_state.last_page = "{{browser_page_url}}"
136
- j1.setUserState( j1_user_state );
135
+ j1.setUserState( j1_user_state );
137
136
  logger.info(log_text);
138
137
  </script -->
@@ -65,9 +65,9 @@
65
65
  -------------------------------------------------------------------------------- {% endcomment %}
66
66
  <!-- [INFO ] [j1.layout.content_generator_post.html ] [ begin content ] -->
67
67
  {% if page.comments %}
68
- <div class="container mb-0">
69
- {% else %}
70
- <div class="container mb-5"> <!-- Add additional space between end of article and the footer -->
68
+ <div class="container mr-5 mb-0">
69
+ {% else %}
70
+ <div class="container mr-5 mb-5"> <!-- Add additional space between end of article and the footer -->
71
71
  {% endif %}
72
72
 
73
73
 
@@ -77,8 +77,7 @@
77
77
  {% if sidebar == false %}
78
78
  <!-- FULL page - no sidebar for page toc -->
79
79
  <div class="row">
80
-
81
- <main class="col-md-12 col-xs-12 r-text-{{rtext_size}}">
80
+ <main class="col-md-12 col-xs-12 r-text-{{rtext_size}} js-toc-content">
82
81
  <!-- Include a pager at top position -->
83
82
  {% include {{pager}} %}
84
83
  <!-- div class="featured-headline" -->
@@ -137,7 +136,8 @@
137
136
  {% else %}
138
137
  <!-- SPLIT page. Place a sidebar e.g. for the document toc -->
139
138
  <div class="row">
140
- <main class="col-md-9 col-xs-12 r-text-{{rtext_size}} js-toc-content">
139
+ <!-- main class="col-md-9 col-xs-12 r-text-{{rtext_size}} js-toc-content" -->
140
+ <main class="col-md-12 col-xs-12 r-text-{{rtext_size}} js-toc-content">
141
141
 
142
142
  <!-- Include a pager at top position -->
143
143
  {% include {{pager}} %}
@@ -174,7 +174,7 @@
174
174
  });
175
175
  </script>
176
176
 
177
- <!-- Drawer content -->
177
+ <!-- Drawer content -->
178
178
  <div id="post_navigator" class="bmd-layout-drawer bg-faded">
179
179
  <span class="navbar-brand mt-2 ml-3" style="font-weight: 500;">{{page.series|upcase}}</span>
180
180
  <!-- Series Navigator -->
@@ -203,26 +203,21 @@
203
203
 
204
204
  </main> <!-- end col-md-9 -->
205
205
 
206
- {% comment %} Place Sidebar|Tocbot
207
- ------------------------------------------------------------------------ {% endcomment %}
208
- <!-- NOTE: BS or Tocbot Affix is not used anymore. Replaced by CSS style "sticky" -->
209
- <aside class="col-md-3 d-none d-md-block sticky">
210
- {% if page.adsense %}
211
- {% include {{create_ad_block}} page=page post=post %}
212
- {% endif %}
213
- {% comment %} if tocbot and page_navigation {% endcomment %}
214
- <!-- NOTE: BS Affix is used on class j1-sidebar instead of Tocbot Affix -->
215
- <!-- div id="j1-sidebar" class="j1-sidebar hidden-print affix-top" -->
216
- <div id="sidebar">
217
- <div id="j1-toc-mgr" class="toc js-toc"></div>
218
- </div>
219
- {% comment %} endif {% endcomment %}
220
- </aside> <!-- end col-md-3 -->
221
-
206
+ {% comment %} Place Sidebar|Tocbot
207
+ -------------------------------------------------------------------------- {% endcomment %}
208
+ <!-- NOTE: BS or Tocbot Affix is not used anymore. Replaced by CSS style "sticky" -->
209
+ {% comment %} tocbot and page_navigation (not used anymore)
210
+ --------------------------------------------------------------------------
211
+ <aside class="col-md-3 d-none d-md-block sticky">
212
+ <div id="sidebar">
213
+ <div id="j1-toc-mgr" class="toc js-toc"></div>
214
+ </div>
215
+ </aside>
216
+ -------------------------------------------------------------------------- {% endcomment %}
222
217
  </div> <!-- end row -->
223
218
  {% endif %} <!-- endif sidebar -->
224
219
 
225
220
  {% comment %} END Blog post CONTENT
226
221
  ------------------------------------------------------------------------------ {% endcomment %}
227
222
  </div> <!-- end container -->
228
- <!-- [INFO ] [j1.layout.content_generator_post.html ] [End content] -->
223
+ <!-- [INFO ] [j1.layout.content_generator_post.html ] [End content] -->
@@ -1,7 +1,8 @@
1
- {% comment %}
1
+ {% comment %}
2
2
  # -----------------------------------------------------------------------------
3
3
  # ~/_includes/themes/j1/modules/navigator/generator.html
4
- # Liquid HTML template to create the Navigation System for J1 Template
4
+ # Liquid HTML template to create the Navigation System for J1 Template
5
+ # (includes all containers needed for MMenu)
5
6
  #
6
7
  # Product/Info:
7
8
  # https://jekyll.one
@@ -41,7 +42,7 @@
41
42
  {% assign template_config = site.data.template_settings %}
42
43
  {% assign blocks = site.data.blocks %}
43
44
  {% assign modules = site.data.modules %}
44
-
45
+
45
46
  {% comment %} Set config files
46
47
  -------------------------------------------------------------------------------- {% endcomment %}
47
48
  {% assign authentication_defaults = modules.defaults.authentication.defaults %}
@@ -55,6 +56,9 @@
55
56
  {% assign cookiebar_defaults = site.data.modules.defaults.cookiebar.defaults %}
56
57
  {% assign cookiebar_settings = site.data.modules.cookiebar.settings %}
57
58
 
59
+ {% assign ssm_settings = modules.ssm.settings %}
60
+ {% assign ssm_defaults = modules.defaults.ssm.defaults %}
61
+
58
62
  {% comment %} Set config data
59
63
  -------------------------------------------------------------------------------- {% endcomment %}
60
64
  {% assign nav_bar_defaults = navigator_defaults.nav_bar %}
@@ -63,23 +67,24 @@
63
67
  {% assign nav_quicklinks_settings = navigator_settings.nav_quicklinks %}
64
68
  {% assign nav_topsearch_defaults = navigator_defaults.nav_topsearch %}
65
69
  {% assign nav_topsearch_settings = navigator_settings.nav_topsearch %}
66
- {% assign nav_sidebar_defaults = navigator_defaults.nav_sidebar %}
67
- {% assign nav_sidebar_settings = navigator_settings.nav_sidebar %}
68
70
 
69
71
  {% assign nav_authclient_defaults = authentication_defaults.auth_client %}
70
72
  {% assign nav_authclient_settings = authentication_settings.auth_client %}
71
73
 
74
+ {% assign nav_mmenu_defaults = navigator_defaults.nav_mmenu %}
75
+ {% assign nav_mmenu_settings = navigator_settings.nav_mmenu %}
76
+
72
77
  {% comment %} Set config options
73
78
  -------------------------------------------------------------------------------- {% endcomment %}
74
79
  {% assign nav_bar_options = nav_bar_defaults | merge: nav_bar_settings %}
75
80
  {% assign quicklinks_options = nav_quicklinks_defaults | merge: nav_quicklinks_settings %}
76
81
  {% assign topsearch_options = nav_topsearch_defaults | merge: nav_topsearch_settings %}
77
- {% assign sidebar_options = nav_sidebar_defaults | merge: nav_sidebar_settings %}
78
82
  {% assign authclient_options = nav_authclient_defaults | merge: nav_authclient_settings %}
79
83
  {% assign cookie_consent_options = consent_defaults | merge: consent_settings %}
80
84
  {% assign authentication_options = authentication_defaults | merge: authentication_settings %}
81
-
82
- {% assign auth_manager_config = authentication_options.j1_auth %}
85
+ {% assign auth_manager_options = authentication_options.j1_auth %}
86
+ {% assign nav_mmenu_options = nav_mmenu_defaults | merge: nav_mmenu_settings %}
87
+ {% assign ssm_options = ssm_defaults | merge: ssm_settings %}
83
88
 
84
89
  {% comment %} Set navBarOptions
85
90
  -------------------------------------------------------------------------------- {% endcomment %}
@@ -92,17 +97,18 @@
92
97
  -------------------------------------------------------------------------------- {% endcomment %}
93
98
  {% assign nav_bar_id = navigator_defaults.nav_bar.xhr_container_id %}
94
99
  {% assign nav_menu_id = navigator_defaults.nav_menu.xhr_container_id %}
100
+ {% assign nav_mmenu_id = navigator_defaults.nav_mmenu.xhr_container_id %}
95
101
  {% assign nav_sidebar_id = navigator_defaults.nav_sidebar.xhr_container_id %}
96
102
  {% assign nav_quicklinks_id = navigator_defaults.nav_quicklinks.xhr_container_id %}
97
103
  {% assign authclient_modals_id = authclient_options.xhr_container_id %}
98
104
  {% assign nav_navbar_media_breakpoint = navigator_defaults.nav_bar.media_breakpoint %}
99
105
 
100
- {% comment %} Set navBarProperties
106
+ {% comment %} Set navBarProperties
101
107
  -------------------------------------------------------------------------------- {% endcomment %}
102
108
  {% if nav_fixed %}
103
109
  {% assign nav_bar_fixed = 'navbar-fixed' %}
104
110
  {% if nav_style == 'overlay' %} {% assign nav_bar_style = 'navbar-transparent' %} {% endif %}
105
- {% endif %}
111
+ {% endif %}
106
112
 
107
113
  {% if nav_color == 'light' %}
108
114
  {% assign nav_bar_color = 'light' %}
@@ -110,32 +116,48 @@
110
116
 
111
117
  {% capture nav_bar_default_css_classes %}navbar navigator navbar-expand-{{nav_navbar_media_breakpoint}} navbar-default{% endcapture %}
112
118
 
113
-
114
-
115
119
  {% comment %} Main
116
120
  -------------------------------------------------------------------------------- {% endcomment %}
117
121
 
122
+ {% comment %} Generate SSM container
123
+ -------------------------------------------------------------------------------- {% endcomment %}
124
+ <!-- [INFO ] [j1.modules.navigator.generator.html ] [ check for ssm ] -->
125
+ {% if ssm_options.enabled %}
126
+ <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place ssm container for AJAX load ] -->
127
+ <nav id="ssm-container" class="ssm-btns-right ssm-anim-slide no-r-text"></nav>
128
+ {% endif %}
129
+
118
130
  {% comment %} Generate TopSearch container
119
131
  -------------------------------------------------------------------------------- {% endcomment %}
120
132
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ check for topsearch ] -->
121
133
  {% if topsearch_options.enabled %}
122
- <!-- [INFO ] [j1.modules.navigator.generator.html ] [ start processing: topsearch ] -->
134
+ <!-- [INFO ] [j1.modules.navigator.generator.html ] [ start processing: topsearch ] -->
123
135
  {% include {{ topsearch_create }} options=topsearch_options %}
124
136
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ end processing: topsearch ] -->
125
137
  {% endif %}
126
138
 
139
+ {% comment %} Place MMobile NAV menu containers (HTML data loaded via AJAX)
140
+ -------------------------------------------------------------------------------- {% endcomment %}
141
+ <!-- [INFO ] [j1.modules.navigator.generator.html ] [ start processing: mmenu ] -->
142
+ {% for item in nav_mmenu_options.menus %}
143
+ <!-- [INFO ] [j1.modules.navigator.generator.html ] [ processing: {{item.menu.xhr_container_id}} ] -->
144
+
145
+ {% comment %} Conditiuon DISABLED for testing
146
+ --------------------------------------------------------------------------------
147
+ {% if item.menu.enabled %}
148
+ <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place mmenu container for AJAX load ] -->
149
+ <nav id="{{item.menu.xhr_container_id}}"></nav>
150
+ {% endif %}
151
+ -------------------------------------------------------------------------------- {% endcomment %}
152
+
153
+ <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place mmenu container for AJAX load ] -->
154
+ <nav id="{{item.menu.xhr_container_id}}"></nav>
155
+
156
+ {% endfor %}
157
+
127
158
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ start processing: navigation ] -->
128
159
  <nav id="{{nav_bar_id}}" class="{{nav_bar_default_css_classes}} {{nav_bar_color}} {{nav_bar_fixed}} {{nav_bar_style}}">
129
160
 
130
- {% comment %} Place|Hide Sidebar container (HTML data loaded via AJAX)
131
- ------------------------------------------------------------------------------ {% endcomment %}
132
- <!-- [INFO ] [j1.modules.navigator.generator.html ] [ check for sidebar ] -->
133
- {% if sidebar_options.enabled %}
134
- <!-- [INFO ] [j1.modules.navigator.generator.html ] [ sidebar detected ] -->
135
- <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place container for: sidebar ] -->
136
- <div id="{{nav_sidebar_id}}" class="side"></div>
137
- {% endif %}
138
-
139
161
  {% comment %} Place brand image
140
162
  ------------------------------------------------------------------------------ {% endcomment %}
141
163
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ end processing: sidebar ] -->
@@ -143,39 +165,41 @@
143
165
  {% if brand_position == "left" %}
144
166
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place brand image to the: left ] -->
145
167
  {% if site.brand.image %}
146
- <a class="navbar-brand" href="{{ home_path }}"> <img src="{{ site.data.template_settings.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
168
+ <a id="navbar-brand" class="navbar-brand animated" href="#"> <img src="{{ site.data.template_settings.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
147
169
  {% else %}
148
- <a class="navbar-brand" href="{{home_path}}" "> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
170
+ <a id="navbar-brand" class="navbar-brand animated" href="#" "> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
149
171
  {% endif %}
150
- <button type="button" class="navigator navbar-toggler animated fadeIn" data-toggle="collapse" data-target="#{{nav_menu_id}}" aria-controls="{{nav_menu_id}}" aria-expanded="false" aria-label="Toggle navigation">
172
+ <button id="navbar-toggler" type="button" class="navigator navbar-toggler animated fadeIn" data-toggle="collapse" data-target="#{{nav_menu_id}}" aria-controls="{{nav_menu_id}}" aria-expanded="false" aria-label="Toggle navigation">
151
173
  <i class="mdi mdi-menu mdi-48px"></i>
152
174
  </button>
153
175
  {% elsif brand_position == "right" %}
154
176
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place brand to the: right ] -->
155
- <button type="button" class="navigator navbar-toggler animated fadeIn" data-toggle="collapse" data-target="#{{nav_menu_id}}" aria-controls="{{nav_menu_id}}" aria-expanded="false" aria-label="Toggle navigation">
156
- <i class="mdi mdi-menu mdi-48px"></i>
157
- </button>
158
177
  {% if site.brand.image %}
159
- <a class="navbar-brand" href="{{ home_path }}"> <img src="{{ site.data.template_settings.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
178
+ <a id="navbar-brand" class="navbar-brand animated" href="#"> <img src="{{ site.data.template_settings.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
160
179
  {% else %}
161
- <a class="navbar-brand" href="{{home_path}}" "> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
180
+ <a id="navbar-brand" class="navbar-brand animated" href="#" "> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
162
181
  {% endif %}
163
- {% else %}
164
- <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place brand to default position: left ] -->
165
- <button type="button" class="navigator navbar-toggler animated fadeIn" data-toggle="collapse" data-target="#{{nav_menu_id}}" aria-controls="{{nav_menu_id}}" aria-expanded="false" aria-label="Toggle navigation">
182
+ <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place mobile menu button to the: left ] -->
183
+ <button id="mmenu-button" type="button" class="navigator navbar-toggler animated fadeIn" data-toggle="collapse" data-target="#{{nav_menu_id}}" aria-controls="{{nav_menu_id}}" aria-expanded="false" aria-label="Toggle navigation">
166
184
  <i class="mdi mdi-menu mdi-48px"></i>
167
185
  </button>
186
+ {% else %}
187
+ <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place brand to default position: left ] -->
168
188
  {% if site.brand.image %}
169
- <a class="navbar-brand" href="{{ home_path }}"> <img src="{{ site.data.template_settings.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
189
+ <a id="navbar-brand" class="navbar-brand animated" href="#"> <img src="{{ site.data.template_settings.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
170
190
  {% else %}
171
- <a class="navbar-brand" href="{{home_path}}" "> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
191
+ <a id="navbar-brand" class="navbar-brand animated" href="#" "> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
172
192
  {% endif %}
193
+ <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place menu toggler to the: right ] -->
194
+ <button id="navbar-toggler" type="button" class="navigator navbar-toggler animated fadeIn" data-toggle="collapse" data-target="#{{nav_menu_id}}" aria-controls="{{nav_menu_id}}" aria-expanded="false" aria-label="Toggle navigation">
195
+ <i class="mdi mdi-menu mdi-48px"></i>
196
+ </button>
173
197
  {% endif %}
174
198
 
175
- {% comment %} Place NAV menu container (HTML data loaded via AJAX)
199
+ {% comment %} Place Desktop NAV menu container (HTML data loaded via AJAX)
176
200
  ------------------------------------------------------------------------------ {% endcomment %}
177
201
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ start processing: nav bar ] -->
178
- <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place nav menu container for AJAX load ] -->
202
+ <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place nav menu container for AJAX load (desktop) ] -->
179
203
  <div id="{{nav_menu_id}}" class="collapse"></div>
180
204
 
181
205
  {% comment %} Place|Hide Quicklinks container (HTML data loaded via AJAX)
@@ -193,10 +217,8 @@
193
217
  {% comment %} Place container for sign in|out dialog used by J1 AuthClient
194
218
  -------------------------------------------------------------------------------- {% endcomment %}
195
219
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ check for: authclient ] -->
196
- <!-- [INFO ] [j1.modules.navigator.generator.html ] [ authclient enabled: {{auth_manager_config.enabled}} ] -->
220
+ <!-- [INFO ] [j1.modules.navigator.generator.html ] [ authclient enabled: {{auth_manager_options.enabled}} ] -->
197
221
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place container for: authclient ] -->
198
222
  <div id="{{authclient_modals_id}}" class="authclient_modals"></div>
199
223
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ end processing: auth_client ] -->
200
224
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ end processing: navigation ] -->
201
-
202
-