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.
- checksums.yaml +4 -4
- data/_includes/themes/j1/layouts/content_generator_collection.html +24 -9
- data/_includes/themes/j1/layouts/content_generator_page.html +24 -9
- data/_includes/themes/j1/layouts/content_generator_post.html +27 -15
- data/_includes/themes/j1/layouts/layout_theme_generator.html +39 -19
- data/_includes/themes/j1/layouts/layout_theme_generator.new.html +118 -0
- data/_includes/themes/j1/layouts/layout_theme_generator.org.html +119 -0
- data/_includes/themes/j1/procedures/global/pager.proc +49 -51
- data/lib/j1/version.rb +1 -1
- data/lib/j1_app/j1_auth_manager/auth_manager.rb +27 -29
- data/lib/j1_app/j1_auth_manager/views/auth_manager_ui.erb +12 -8
- data/lib/starter_web/Gemfile +1 -1
- data/lib/starter_web/_cc_test_data/_config.yml +1 -1
- data/lib/starter_web/_cc_test_data/_data/blocks/banner.yml +57 -0
- data/lib/starter_web/_cc_test_data/_data/blocks/defaults/banner.yml +55 -0
- data/lib/starter_web/_cc_test_data/_data/blocks/defaults/footer.yml +3 -3
- data/lib/starter_web/_cc_test_data/_data/blocks/defaults/panel.yml +30 -38
- data/lib/starter_web/_cc_test_data/_data/blocks/footer.yml +181 -110
- data/lib/starter_web/_cc_test_data/_data/modules/back2top.yml +1 -1
- data/lib/starter_web/_cc_test_data/_data/modules/defaults/smooth_scroll.yml +169 -0
- data/lib/starter_web/_cc_test_data/_data/modules/defaults/theme_switcher.yml +168 -0
- data/lib/starter_web/_cc_test_data/_data/modules/smooth_scroll.yml +169 -0
- data/lib/starter_web/_cc_test_data/_data/modules/theme_switcher.yml +168 -0
- data/lib/starter_web/_config.yml +74 -71
- data/lib/starter_web/_data/blocks/banner.yml +57 -0
- data/lib/starter_web/_data/blocks/defaults/banner.yml +55 -0
- data/lib/starter_web/_data/modules/{j1_navigator_menu.yml → _old_configs/j1_navigator_menu.yml} +0 -0
- data/lib/starter_web/_data/modules/{j1_parallax.yml → _old_configs/j1_parallax.yml} +0 -0
- data/lib/starter_web/_data/modules/{j1_smooth_scroll.yml → _old_configs/j1_smooth_scroll.yml} +0 -0
- data/lib/starter_web/_data/modules/{j1_stickybits.yml → _old_configs/j1_stickybits.yml} +0 -0
- data/lib/starter_web/_data/modules/{j1_theme_switcher.yml → _old_configs/j1_theme_switcher.yml} +0 -0
- data/lib/starter_web/_data/modules/{j1_toccer.yml → _old_configs/j1_toccer.yml} +0 -0
- data/lib/starter_web/_data/modules/defaults/smooth_scroll.yml +169 -0
- data/lib/starter_web/_data/modules/defaults/stickybits.yml +37 -0
- data/lib/starter_web/_data/modules/defaults/theme_switcher.yml +168 -0
- data/lib/starter_web/_data/modules/defaults/toccer.yml +172 -0
- data/lib/starter_web/_data/modules/navigator_menu.yml +306 -0
- data/lib/starter_web/_data/modules/smooth_scroll.yml +169 -0
- data/lib/starter_web/_data/modules/stickybits.yml +38 -0
- data/lib/starter_web/_data/modules/theme_switcher.yml +168 -0
- data/lib/starter_web/_data/modules/toccer.yml +172 -0
- data/lib/starter_web/_data/resources.yml +23 -24
- data/lib/starter_web/_data/template_settings.yml +2 -2
- data/lib/starter_web/assets/data/authclient.html +9 -9
- data/lib/starter_web/assets/data/banner.html +24 -19
- data/lib/starter_web/assets/data/cookie_consent.html +9 -9
- data/lib/starter_web/assets/data/footer.html +9 -10
- data/lib/starter_web/assets/data/menu.html +23 -16
- data/lib/starter_web/assets/data/panel.html +9 -10
- data/lib/starter_web/assets/data/sidebar.html +9 -10
- data/lib/starter_web/assets/data/webhook.html +8 -8
- data/lib/starter_web/assets/images/pages/roundtrip/package.json +1 -1
- data/lib/starter_web/assets/themes/j1/adapter/js/back2top.js +11 -9
- data/lib/starter_web/assets/themes/j1/adapter/js/cookie_consent.js +5 -5
- data/lib/starter_web/assets/themes/j1/adapter/js/logger.js +8 -18
- data/lib/starter_web/assets/themes/j1/adapter/js/master_header.js +48 -70
- data/lib/starter_web/assets/themes/j1/adapter/js/navigator.js +45 -27
- data/lib/starter_web/assets/themes/j1/adapter/js/octokit.app_only.js +433 -0
- data/lib/starter_web/assets/themes/j1/adapter/js/octokit.js +179 -192
- data/lib/starter_web/assets/themes/j1/adapter/js/scroller.js +29 -28
- data/lib/starter_web/assets/themes/j1/adapter/js/searcher.js +5 -5
- data/lib/starter_web/assets/themes/j1/adapter/js/stickybits.js +14 -13
- data/lib/starter_web/assets/themes/j1/adapter/js/switcher.js +56 -52
- data/lib/starter_web/assets/themes/j1/adapter/js/template.js +256 -213
- data/lib/starter_web/assets/themes/j1/adapter/js/toccer.js +24 -21
- data/lib/starter_web/assets/themes/j1/core/js/template.js +9 -9
- data/lib/starter_web/assets/themes/j1/core/js/template.js.map +1 -1
- data/lib/starter_web/assets/themes/j1/core/js/template.min.js +1 -1
- data/lib/starter_web/package.json +1 -1
- data/lib/starter_web/pages/public/start/downloads/quickstarter/100_linux_starter.adoc +1 -1
- data/lib/starter_web/pages/public/start/roundtrip/420_responsive_tables_extensions.adoc +5 -0
- data/lib/starter_web/utilsrv/_defaults/package.json +1 -1
- data/lib/starter_web/utilsrv/package.json +1 -1
- metadata +38 -9
- data/lib/starter_web/_data/resources.new.yml +0 -876
@@ -45,20 +45,23 @@ regenerate: false
|
|
45
45
|
|
46
46
|
{% comment %} Set config data
|
47
47
|
-------------------------------------------------------------------------------- {% endcomment %}
|
48
|
-
{% assign
|
49
|
-
{% assign
|
50
|
-
{% assign
|
48
|
+
{% assign toccer_defaults = modules.defaults.toccer.defaults %}
|
49
|
+
{% assign toccer_settings = modules.toccer.settings %}
|
50
|
+
{% assign footer_config = modules.j1_footer %}
|
51
|
+
{% assign footer_id = modules.j1_footer.global.id %}
|
51
52
|
|
52
53
|
{% comment %} Set config options
|
53
54
|
-------------------------------------------------------------------------------- {% endcomment %}
|
55
|
+
{% assign toccer_options = toccer_defaults | merge: toccer_settings %}
|
54
56
|
|
55
57
|
{% assign active_link_color_fallback = '#204A87' %}
|
56
|
-
{% if
|
57
|
-
{% assign active_link_color =
|
58
|
+
{% if toccer_options.activeLinkColor %}
|
59
|
+
{% assign active_link_color = toccer_options.activeLinkColor %}
|
58
60
|
{% else %}
|
59
61
|
{% assign active_link_color = active_link_color_fallback %}
|
60
62
|
{% endif %}
|
61
63
|
|
64
|
+
|
62
65
|
/*
|
63
66
|
# -----------------------------------------------------------------------------
|
64
67
|
# ~/assets/themes/j1/adapter/js/toccer.js
|
@@ -75,7 +78,7 @@ regenerate: false
|
|
75
78
|
# Tocbot is licensed under under the MIT License.
|
76
79
|
# For details, see https://tscanlin.github.io/tocbot
|
77
80
|
# -----------------------------------------------------------------------------
|
78
|
-
#
|
81
|
+
# Adapter generated: {{site.time}}
|
79
82
|
# -----------------------------------------------------------------------------
|
80
83
|
*/
|
81
84
|
'use strict';
|
@@ -127,11 +130,11 @@ j1.adapter['toccer'] = (function () {
|
|
127
130
|
var isComments = (options.comments === 'true');
|
128
131
|
|
129
132
|
if ( settings.collapseDepth === undefined ) {
|
130
|
-
settings.collapseDepth = {{
|
133
|
+
settings.collapseDepth = {{toccer_options.collapseDepth}};
|
131
134
|
}
|
132
135
|
|
133
136
|
if ( settings.headingsOffset === undefined ) {
|
134
|
-
settings.scrollOffset = {{
|
137
|
+
settings.scrollOffset = {{toccer_options.smoothScrollOffset}};
|
135
138
|
} else {
|
136
139
|
settings.scrollOffset = settings.headingsOffset
|
137
140
|
}
|
@@ -193,13 +196,13 @@ j1.adapter['toccer'] = (function () {
|
|
193
196
|
logger.info('state: ' + state); // Set|Log status
|
194
197
|
|
195
198
|
tocbot.init({
|
196
|
-
log: {{
|
197
|
-
tocSelector: {{
|
198
|
-
headingSelector: {{
|
199
|
-
ignoreSelector: {{
|
200
|
-
contentSelector: {{
|
199
|
+
log: {{ toccer_options.log | json }},
|
200
|
+
tocSelector: {{ toccer_options.tocSelector | json }},
|
201
|
+
headingSelector: {{ toccer_options.headingSelector | json }},
|
202
|
+
ignoreSelector: {{ toccer_options.ignoreSelector | json }},
|
203
|
+
contentSelector: {{ toccer_options.contentSelector | json }},
|
201
204
|
collapseDepth: settings.collapseDepth,
|
202
|
-
throttleTimeout: {{
|
205
|
+
throttleTimeout: {{ toccer_options.throttleTimeout | json }},
|
203
206
|
includeHtml: false,
|
204
207
|
linkClass: 'toc-link',
|
205
208
|
extraLinkClasses: '',
|
@@ -212,11 +215,11 @@ j1.adapter['toccer'] = (function () {
|
|
212
215
|
positionFixedSelector: '',
|
213
216
|
positionFixedClass: 'is-position-fixed',
|
214
217
|
fixedSidebarOffset: 'auto',
|
215
|
-
smoothScroll: {{
|
216
|
-
smoothScrollOffset: {{
|
217
|
-
smoothScrollDuration: {{
|
218
|
-
headingsOffset: {{
|
219
|
-
throttleTimeout: {{
|
218
|
+
smoothScroll: {{ toccer_options.smoothScrollEnabled | json }},
|
219
|
+
smoothScrollOffset: {{ toccer_options.smoothScrollOffset | json }},
|
220
|
+
smoothScrollDuration: {{ toccer_options.smoothScrollDuration | json }},
|
221
|
+
headingsOffset: {{ toccer_options.headingsOffset | json }},
|
222
|
+
throttleTimeout: {{ toccer_options.throttleTimeout | json }}
|
220
223
|
});
|
221
224
|
|
222
225
|
if (tocbot.options.log == true) {
|
@@ -332,14 +335,14 @@ j1.adapter['toccer'] = (function () {
|
|
332
335
|
// -------------------------------------------------------------------------
|
333
336
|
setState: function ( stat ) {
|
334
337
|
state = stat;
|
335
|
-
}, //
|
338
|
+
}, // END setState
|
336
339
|
|
337
340
|
// -------------------------------------------------------------------------
|
338
341
|
// Returns the current (processing) state of the module
|
339
342
|
// -------------------------------------------------------------------------
|
340
343
|
getState: function () {
|
341
344
|
return state;
|
342
|
-
} //
|
345
|
+
} // END state
|
343
346
|
|
344
347
|
}; // END return
|
345
348
|
})(j1, window);
|