j1-template 2020.0.3 → 2020.0.4

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 (42) hide show
  1. checksums.yaml +4 -4
  2. data/_includes/themes/j1/layouts/content_generator_blog_archive.html +21 -17
  3. data/_includes/themes/j1/layouts/content_generator_collection.html +14 -11
  4. data/_includes/themes/j1/layouts/content_generator_page.html +15 -16
  5. data/_includes/themes/j1/layouts/content_generator_post.html +17 -22
  6. data/_includes/themes/j1/modules/navigator/generator.html +31 -25
  7. data/assets/data/{sidebar.html → mmenu_sidebar.html} +24 -18
  8. data/assets/data/mmenu_toc.html +45 -0
  9. data/assets/data/quicklinks.html +12 -4
  10. data/assets/error_pages/HTTP204.html +3 -3
  11. data/assets/themes/j1/core/css/theme_extensions.css +2 -2
  12. data/assets/themes/j1/core/css/theme_extensions.min.css +1 -1
  13. data/assets/themes/j1/core/css/uno.css +2 -2
  14. data/assets/themes/j1/core/css/uno.min.css +1 -1
  15. data/assets/themes/j1/core/js/template.js +2 -2
  16. data/assets/themes/j1/core/js/template.js.map +1 -1
  17. data/assets/themes/j1/core/js/template.min.js +1 -1
  18. data/lib/j1/version.rb +1 -1
  19. data/lib/starter_web/Gemfile +1 -1
  20. data/lib/starter_web/_config.yml +12 -139
  21. data/lib/starter_web/_data/modules/defaults/navigator.yml +2 -24
  22. data/lib/starter_web/_data/modules/defaults/toccer.yml +1 -1
  23. data/lib/starter_web/_data/modules/navigator.yml +158 -97
  24. data/lib/starter_web/_data/modules/toccer.yml +2 -1
  25. data/lib/starter_web/_data/resources.yml +8 -2
  26. data/lib/starter_web/assets/themes/j1/adapter/js/mmenu.js +207 -44
  27. data/lib/starter_web/assets/themes/j1/adapter/js/navigator.js +8 -32
  28. data/lib/starter_web/assets/themes/j1/adapter/js/toccer.js +40 -36
  29. data/lib/starter_web/assets/themes/j1/extensions/mmenu-light/css/mmenu-light.min.css +375 -1
  30. data/lib/starter_web/assets/themes/j1/extensions/mmenu-light/css/themes/uno.css +95 -0
  31. data/lib/starter_web/assets/themes/j1/extensions/mmenu-light/css/themes/uno.min.css +95 -0
  32. data/lib/starter_web/assets/themes/j1/extensions/mmenu-light/js/mmenu-light.js +3 -1
  33. data/lib/starter_web/assets/themes/j1/extensions/mmenu-light/js/mmenu-light.min.js +11 -3
  34. data/lib/starter_web/assets/themes/j1/extensions/mmenu-light/js/mmenu-light.polyfills.min.js +118 -0
  35. data/lib/starter_web/collections/posts/public/{jekyll → featured}/_posts/2018-05-01-confusion-about-base-url.adoc +0 -0
  36. data/lib/starter_web/package.json +1 -1
  37. data/lib/starter_web/pages/public/learn/roundtrip/100_present_images.adoc +2 -2
  38. data/lib/starter_web/pages/public/learn/roundtrip/200_typography.adoc +2 -2
  39. data/lib/starter_web/pages/public/legal/en/500_support.adoc +1 -1
  40. data/lib/starter_web/utilsrv/_defaults/package.json +1 -1
  41. data/lib/starter_web/utilsrv/package.json +1 -1
  42. metadata +8 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5d3711d432bcb8345139685cd06df4952544d74b98bcce348dc3a23435d023ac
4
- data.tar.gz: b5a7e08cdff2b51c815d86cada41ac601c57a083465d1bee31883dae2596a520
3
+ metadata.gz: 9ed33fae1215efb36d11eb406cdf2b4f724505c2a91e56a8154df048cf9f808c
4
+ data.tar.gz: fc8619dd7bdf3d5fd758636680651ef196e1a3b4c110bc9499e7922e48ef1a53
5
5
  SHA512:
6
- metadata.gz: 17d0793bbc2f65a280e4447b5b8d5b2cfa47e9541c24be3d118fa51165fd50d576bc3ca428d32892201340562213b714dffe73b9d05715f611a44ad11dc2e78b
7
- data.tar.gz: 908afd620d27216ce001e2861a8e110df0bf8fef04957df898ae37cc050f3767ed5cf55b7a82342bc2e3c908aa0e83368ca5de18a8ac74bf16cb80c413fd14af
6
+ metadata.gz: cd83535639e49facaa4f1edcb0754a403d32794737540c58121f82cb0496d79d56b76ff40a3d148c59f3d68281b95383e97ba023f860f8d78018df46f8329c2c
7
+ data.tar.gz: 2e4a397041b0610b5e1df1f82676e477682e992f9df10439040a6be890a0924ff937cf9cc4ead97897aa7f3212586d37f122d887b9081be6e6071c037d796d8f
@@ -70,7 +70,8 @@
70
70
  <div class="container 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 ] -->
@@ -69,7 +69,7 @@
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] -->
@@ -66,16 +66,16 @@
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 -->
@@ -66,7 +66,7 @@
66
66
  <!-- [INFO ] [j1.layout.content_generator_post.html ] [ begin content ] -->
67
67
  {% if page.comments %}
68
68
  <div class="container mb-0">
69
- {% else %}
69
+ {% else %}
70
70
  <div class="container mb-5"> <!-- Add additional space between end of article and the footer -->
71
71
  {% endif %}
72
72
 
@@ -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] -->
@@ -2,6 +2,7 @@
2
2
  # -----------------------------------------------------------------------------
3
3
  # ~/_includes/themes/j1/modules/navigator/generator.html
4
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
@@ -63,23 +64,23 @@
63
64
  {% assign nav_quicklinks_settings = navigator_settings.nav_quicklinks %}
64
65
  {% assign nav_topsearch_defaults = navigator_defaults.nav_topsearch %}
65
66
  {% 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
67
 
69
68
  {% assign nav_authclient_defaults = authentication_defaults.auth_client %}
70
69
  {% assign nav_authclient_settings = authentication_settings.auth_client %}
71
70
 
71
+ {% assign nav_mmenu_defaults = navigator_defaults.nav_mmenu %}
72
+ {% assign nav_mmenu_settings = navigator_settings.nav_mmenu %}
73
+
72
74
  {% comment %} Set config options
73
75
  -------------------------------------------------------------------------------- {% endcomment %}
74
76
  {% assign nav_bar_options = nav_bar_defaults | merge: nav_bar_settings %}
75
77
  {% assign quicklinks_options = nav_quicklinks_defaults | merge: nav_quicklinks_settings %}
76
78
  {% assign topsearch_options = nav_topsearch_defaults | merge: nav_topsearch_settings %}
77
- {% assign sidebar_options = nav_sidebar_defaults | merge: nav_sidebar_settings %}
78
79
  {% assign authclient_options = nav_authclient_defaults | merge: nav_authclient_settings %}
79
80
  {% assign cookie_consent_options = consent_defaults | merge: consent_settings %}
80
81
  {% assign authentication_options = authentication_defaults | merge: authentication_settings %}
81
-
82
- {% assign auth_manager_config = authentication_options.j1_auth %}
82
+ {% assign auth_manager_options = authentication_options.j1_auth %}
83
+ {% assign nav_mmenu_options = nav_mmenu_defaults | merge: nav_mmenu_settings %}
83
84
 
84
85
  {% comment %} Set navBarOptions
85
86
  -------------------------------------------------------------------------------- {% endcomment %}
@@ -112,6 +113,7 @@
112
113
  {% capture nav_bar_default_css_classes %}navbar navigator navbar-expand-{{nav_navbar_media_breakpoint}} navbar-default{% endcapture %}
113
114
 
114
115
 
116
+
115
117
  {% comment %} Main
116
118
  -------------------------------------------------------------------------------- {% endcomment %}
117
119
 
@@ -124,24 +126,28 @@
124
126
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ end processing: topsearch ] -->
125
127
  {% endif %}
126
128
 
127
- {% comment %} Place Mobile NAV menu container (HTML data loaded via AJAX)
128
- ------------------------------------------------------------------------------ {% endcomment %}
129
+ {% comment %} Place MMobile NAV menu containers (HTML data loaded via AJAX)
130
+ -------------------------------------------------------------------------------- {% endcomment %}
129
131
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ start processing: mmenu ] -->
130
- <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place nav menu container for AJAX load (mobile) ] -->
131
- <nav id="{{nav_mmenu_id}}"></nav>
132
+ {% for item in nav_mmenu_options.menus %}
133
+ <!-- [INFO ] [j1.modules.navigator.generator.html ] [ processing: {{item.menu.xhr_container_id}} ] -->
134
+
135
+ {% comment %} Conditiuon DISABLED for testing
136
+ --------------------------------------------------------------------------------
137
+ {% if item.menu.enabled %}
138
+ <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place mmenu container for AJAX load ] -->
139
+ <nav id="{{item.menu.xhr_container_id}}"></nav>
140
+ {% endif %}
141
+ -------------------------------------------------------------------------------- {% endcomment %}
142
+
143
+ <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place mmenu container for AJAX load ] -->
144
+ <nav id="{{item.menu.xhr_container_id}}"></nav>
145
+
146
+ {% endfor %}
132
147
 
133
148
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ start processing: navigation ] -->
134
149
  <nav id="{{nav_bar_id}}" class="{{nav_bar_default_css_classes}} {{nav_bar_color}} {{nav_bar_fixed}} {{nav_bar_style}}">
135
150
 
136
- {% comment %} Place|Hide Sidebar container (HTML data loaded via AJAX)
137
- ------------------------------------------------------------------------------ {% endcomment %}
138
- <!-- [INFO ] [j1.modules.navigator.generator.html ] [ check for sidebar ] -->
139
- {% if sidebar_options.enabled %}
140
- <!-- [INFO ] [j1.modules.navigator.generator.html ] [ sidebar detected ] -->
141
- <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place container for: sidebar ] -->
142
- <div id="{{nav_sidebar_id}}" class="side"></div>
143
- {% endif %}
144
-
145
151
  {% comment %} Place brand image
146
152
  ------------------------------------------------------------------------------ {% endcomment %}
147
153
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ end processing: sidebar ] -->
@@ -149,9 +155,9 @@
149
155
  {% if brand_position == "left" %}
150
156
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place brand image to the: left ] -->
151
157
  {% if site.brand.image %}
152
- <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>
158
+ <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>
153
159
  {% else %}
154
- <a class="navbar-brand" href="{{home_path}}" "> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
160
+ <a id="navbar-brand" class="navbar-brand animated" href="#" "> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
155
161
  {% endif %}
156
162
  <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">
157
163
  <i class="mdi mdi-menu mdi-48px"></i>
@@ -159,9 +165,9 @@
159
165
  {% elsif brand_position == "right" %}
160
166
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place brand to the: right ] -->
161
167
  {% if site.brand.image %}
162
- <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>
163
169
  {% else %}
164
- <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>
165
171
  {% endif %}
166
172
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place menu toggler to the: left ] -->
167
173
  <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">
@@ -170,9 +176,9 @@
170
176
  {% else %}
171
177
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place brand to default position: left ] -->
172
178
  {% if site.brand.image %}
173
- <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>
179
+ <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>
174
180
  {% else %}
175
- <a class="navbar-brand" href="{{home_path}}" "> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
181
+ <a id="navbar-brand" class="navbar-brand animated" href="#" "> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
176
182
  {% endif %}
177
183
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place menu toggler to the: right ] -->
178
184
  <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">
@@ -201,7 +207,7 @@
201
207
  {% comment %} Place container for sign in|out dialog used by J1 AuthClient
202
208
  -------------------------------------------------------------------------------- {% endcomment %}
203
209
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ check for: authclient ] -->
204
- <!-- [INFO ] [j1.modules.navigator.generator.html ] [ authclient enabled: {{auth_manager_config.enabled}} ] -->
210
+ <!-- [INFO ] [j1.modules.navigator.generator.html ] [ authclient enabled: {{auth_manager_options.enabled}} ] -->
205
211
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ place container for: authclient ] -->
206
212
  <div id="{{authclient_modals_id}}" class="authclient_modals"></div>
207
213
  <!-- [INFO ] [j1.modules.navigator.generator.html ] [ end processing: auth_client ] -->
@@ -6,8 +6,8 @@ regenerate: true
6
6
 
7
7
  {% comment %}
8
8
  # -----------------------------------------------------------------------------
9
- # ~/assets/data/sidebar.html
10
- # Liquid PROCEDURE template to create the HTML portion of the sidebar
9
+ # ~/assets/data/mmenu_sidebar.html
10
+ # Liquid PROCEDURE template to create the HTML portion of the MMenu Sidebar
11
11
  # NOTE: Loaded dynamically by J1 NAV Manager module (AJAX)
12
12
  #
13
13
  # Product/Info:
@@ -40,12 +40,12 @@ regenerate: true
40
40
 
41
41
  {% comment %} Set config data
42
42
  -------------------------------------------------------------------------------- {% endcomment %}
43
- {% assign nav_sidebar_defaults = navigator_defaults.nav_sidebar %}
44
- {% assign nav_sidebar_settings = navigator_settings.nav_sidebar %}
43
+ {% assign nav_mmenu_defaults = navigator_defaults.nav_mmenu %}
44
+ {% assign nav_mmenu_settings = navigator_settings.nav_mmenu %}
45
45
 
46
46
  {% comment %} Set config options
47
47
  ------------------------------------------------------------------------------ {% endcomment %}
48
- {% assign sidebar_options = nav_sidebar_defaults | merge: nav_sidebar_settings %}
48
+ {% assign nav_mmenu_options = nav_mmenu_defaults | merge: nav_mmenu_settings %}
49
49
 
50
50
  {% comment %} Set sidebar properties
51
51
  ------------------------------------------------------------------------------ {% endcomment %}
@@ -62,6 +62,13 @@ regenerate: true
62
62
  {% comment %} Main
63
63
  ------------------------------------------------------------------------------ {% endcomment %}
64
64
 
65
+ {% for item in nav_mmenu_options.menus %}
66
+ {% if item.menu.xhr_container_id == "navigator_sidebar_mmenu" %}
67
+ <!-- [INFO ] [ j1.modules.navigator.mmenu_sidebar.html ] [ collect data for mmenu sitebar ] -->
68
+ {% assign sidebar_options = item.menu.content %}
69
+ {% endif %}
70
+ {% endfor %}
71
+
65
72
  {% if sidebar_options.icon_family == 'FontAwesome' or sidebar_options.icon_family == 'FontAwesome4' or sidebar_options.icon_family == 'FontAwesome5' %}
66
73
  {% assign icon_family = 'fa' %}
67
74
  {% elsif sidebar_options.icon_family == 'MDI' or sidebar_options.icon_family == 'Material Design Icons'%}
@@ -80,9 +87,9 @@ regenerate: true
80
87
  {% comment %} Main
81
88
  -------------------------------------------------------------------------------- {% endcomment %}
82
89
 
83
- <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [Start processing: sidebar] -->
84
- <a href="#" class="close-side"><i class="{{icon_family}} {{icon_family}}-{{close_icon}} mdi-48px" {{icon_color}}></i></a>
85
-
90
+ <!-- [INFO ] [ j1.modules.navigator.mmenu_sidebar.html ] [Start processing: sidebar] -->
91
+ <!-- use BS4 class d-block to make sure, the sidebar is VISIBLE on ALL @media -->
92
+ <div class="mm-side d-block">
86
93
  {% for boxes in sidebar_options.boxes %}
87
94
  {% for box in boxes %}
88
95
 
@@ -102,8 +109,8 @@ regenerate: true
102
109
  {% comment %} Collect USER info
103
110
  ---------------------------------------------------------------------- {% endcomment %}
104
111
  {% when 'user_info' %}
105
- <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [USER info enabled] -->
106
- <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [Write widged placeholder: USER info] -->
112
+ <!-- [INFO ] [ j1.modules.navigator.mmenu_sidebar.html ] [USER info enabled] -->
113
+ <!-- [INFO ] [ j1.modules.navigator.mmenu_sidebar.html ] [Write widged placeholder: USER info] -->
107
114
  <div id="user-info" class="widget">
108
115
  <h4 class="heading">{{title}}</h4>
109
116
  <ul id="display_user_details" class="link">
@@ -153,8 +160,8 @@ regenerate: true
153
160
  {% comment %} Collect THEME info
154
161
  ---------------------------------------------------------------------- {% endcomment %}
155
162
  {% when 'theme_info' %}
156
- <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [THEME info detected] -->
157
- <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [Write widged placeholder: USER info] -->
163
+ <!-- [INFO ] [ j1.modules.navigator.mmenu_sidebar.html ] [THEME info detected] -->
164
+ <!-- [INFO ] [ j1.modules.navigator.mmenu_sidebar.html ] [Write widged placeholder: USER info] -->
158
165
  <div id="theme-info" class="widget">
159
166
  <h4 class="heading">{{title}}</h4>
160
167
  <ul class="link">
@@ -189,7 +196,7 @@ regenerate: true
189
196
  {% endfor %}
190
197
  </ul>
191
198
  </div>
192
- <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [End processing: THEME info] -->
199
+ <!-- [INFO ] [ j1.modules.navigator.mmenu_sidebar.html ] [End processing: THEME info] -->
193
200
 
194
201
  {% comment %} END Collect THEME info
195
202
  ---------------------------------------------------------------------- {% endcomment %}
@@ -205,7 +212,7 @@ regenerate: true
205
212
  {% comment %} Collect SITE info
206
213
  ---------------------------------------------------------------------- {% endcomment %}
207
214
  {% when 'site_info' %}
208
- <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [Start processing SITE info] -->
215
+ <!-- [INFO ] [ j1.modules.navigator.mmenu_sidebar.html ] [Start processing SITE info] -->
209
216
 
210
217
  <div id="site-info" class="widget">
211
218
  <h4 class="heading">{{title}}</h4>
@@ -251,11 +258,10 @@ regenerate: true
251
258
 
252
259
  {% endfor %}
253
260
  {% endfor %}
254
- <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [End processing sidebar boxes] -->
255
- <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [End processing: sidebar] -->
256
-
261
+ <!-- [INFO ] [ j1.modules.navigator.mmenu_sidebar.html ] [End processing sidebar boxes] -->
262
+ <!-- [INFO ] [ j1.modules.navigator.mmenu_sidebar.html ] [End processing: sidebar] -->
263
+ </div>
257
264
  {% endcapture %}
258
265
 
259
266
  {{ cache | pretty_print | remove:'<html><body>' | remove:'</body></html>' | strip_empty_lines }}
260
267
  {% assign cache = nil %}
261
-