j1_template_mde 2018.4.29 → 2018.4.30
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_app.html +2 -2
- data/_includes/themes/j1/layouts/content_generator_blog_archive.html +2 -0
- data/_includes/themes/j1/layouts/content_generator_collection.html +2 -0
- data/_includes/themes/j1/layouts/content_generator_page.html +2 -1
- data/_includes/themes/j1/layouts/content_generator_post.html +2 -1
- data/_includes/themes/j1/layouts/content_generator_raw.html +2 -2
- data/_includes/themes/j1/layouts/layout_metadata_generator.html +5 -5
- data/_includes/themes/j1/layouts/layout_module_generator.html +3 -3
- data/_includes/themes/j1/layouts/layout_resource_generator.html +3 -3
- data/_includes/themes/j1/layouts/layout_shim_generator.html +8 -19
- data/_includes/themes/j1/layouts/layout_theme_generator.html +4 -4
- data/_includes/themes/j1/modules/navigator/generator.html +53 -52
- data/_includes/themes/j1/modules/navigator/procedures/quicklinks.proc +16 -9
- data/_includes/themes/j1/modules/navigator/procedures/sidebar.proc +9 -9
- data/_includes/themes/j1/modules/navigator/procedures/topsearch.proc +3 -3
- data/_includes/themes/j1/procedures/layouts/content_writer.proc +4 -4
- data/_includes/themes/j1/procedures/layouts/default_writer.proc +6 -10
- data/_includes/themes/j1/procedures/layouts/module_writer.proc +9 -9
- data/_includes/themes/j1/procedures/layouts/resource_writer.proc +6 -6
- data/_layouts/default.html +18 -19
- data/_layouts/home.html +6 -6
- data/lib/j1/version.rb +1 -1
- data/lib/j1_app/j1_auth_manager/auth_manager.rb +10 -9
- data/lib/starter_web/Gemfile +1 -1
- data/lib/starter_web/_config.yml +1 -1
- data/lib/starter_web/_data/j1_resources.yml +5 -3
- data/lib/starter_web/_data/modules/j1_navigator.yml +0 -1
- data/lib/starter_web/_data/modules/j1_stickybits.yml +19 -0
- data/lib/starter_web/_rack/nginx.conf +85 -0
- data/lib/starter_web/assets/images/pages/roundtrip/package.json +1 -1
- data/lib/starter_web/assets/themes/j1/core/js/adapter/algolia.js +4 -4
- data/lib/starter_web/assets/themes/j1/core/js/adapter/navigator.js +69 -108
- data/lib/starter_web/assets/themes/j1/core/js/adapter/stickybits.js +96 -0
- data/lib/starter_web/assets/themes/j1/core/js/adapter/template.js +9 -10
- data/lib/starter_web/assets/themes/j1/core/js/template.js +22 -7
- 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 -2
- data/lib/starter_web/package.json.new +1 -1
- data/lib/starter_web/pages/public/start/downloads/quickstarter/100_linux_starter.adoc +0 -5
- data/lib/starter_web/pages/public/start/downloads/quickstarter/200_macos_starter.adoc +0 -3
- data/lib/starter_web/pages/public/start/downloads/quickstarter/300_windows_starter.adoc +0 -3
- data/lib/starter_web/pages/public/start/roundtrip/400_icon_fonts.adoc +197 -58
- data/lib/starter_web/pages/public/start/roundtrip/700_extended_modals.adoc +1 -1
- data/lib/starter_web/pages/public/start/roundtrip/710_responsive_tables.adoc +1 -1
- data/lib/starter_web/pages/public/start/roundtrip/800_google_custom_search.adoc +41 -0
- metadata +6 -4
- data/lib/starter_web/_data/modules/j1_polyfills.yml +0 -0
- data/lib/starter_web/assets/images/pages/roundtrip/oleg-magni-1370182-unsplash.jpg +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5ed2b60f8afe427beec56560d691237da17a77f9
|
4
|
+
data.tar.gz: 51e893d2242403dbf5ee8bc3b70bbee468935ba7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e35a4c46752411fd637fe4e86dbe6f820d16474078b7e405de263fb04b12041f9df58aa603dcf7190316156218fcf300202b894698b85a53283ee5aaafd0cfc6
|
7
|
+
data.tar.gz: 21fe94753e594af43cdf7578898e5fddd44b73c3c34548b5bd6bf07cf495a2ea4ab4e4e7a61b97c8a9b061c730311138019eff84f83af8c2e3de5735bf924bb4
|
@@ -27,8 +27,8 @@
|
|
27
27
|
|
28
28
|
{% comment %} Main
|
29
29
|
-------------------------------------------------------------------------------- {% endcomment %}
|
30
|
-
<!-- [INFO ] [j1.layout.
|
30
|
+
<!-- [INFO ] [j1.layout.content_generator_app.html ] [Begin content] -->
|
31
31
|
<main id="app-content" class="col-md-12" style="padding-left:60px;padding-right:60px;">
|
32
32
|
{{content}}
|
33
33
|
</main>
|
34
|
-
<!-- [INFO ] [j1.layout.
|
34
|
+
<!-- [INFO ] [j1.layout.content_generator_app.html ] [End content] -->
|
@@ -53,6 +53,7 @@
|
|
53
53
|
|
54
54
|
{% comment %} Main
|
55
55
|
-------------------------------------------------------------------------------- {% endcomment %}
|
56
|
+
<!-- [INFO ] [j1.layout.content_generator_blog.html ] [Begin content] -->
|
56
57
|
<!-- split page to place a sidebar e.g. the document TOC -->
|
57
58
|
<div class="container mb-5">
|
58
59
|
<div class="row">
|
@@ -208,3 +209,4 @@
|
|
208
209
|
|
209
210
|
</div> <!-- end row -->
|
210
211
|
</div> <!-- end container -->
|
212
|
+
<!-- [INFO ] [j1.layout.content_generator_blog.html ] [End content] -->
|
@@ -48,6 +48,7 @@
|
|
48
48
|
|
49
49
|
{% comment %} Main
|
50
50
|
-------------------------------------------------------------------------------- {% endcomment %}
|
51
|
+
<!-- [INFO ] [j1.layout.content_generator_coll.html ] [Begin content] -->
|
51
52
|
<div class="container mb-5">
|
52
53
|
<div class="row">
|
53
54
|
|
@@ -114,3 +115,4 @@
|
|
114
115
|
|
115
116
|
</div> <!-- end row -->
|
116
117
|
</div> <!-- end container -->
|
118
|
+
<!-- [INFO ] [j1.layout.content_generator_coll.html ] [Begin content] -->
|
@@ -48,7 +48,7 @@
|
|
48
48
|
|
49
49
|
{% comment %} Main
|
50
50
|
-------------------------------------------------------------------------------- {% endcomment %}
|
51
|
-
|
51
|
+
<!-- [INFO ] [j1.layout.content_generator_page.html ] [Begin content] -->
|
52
52
|
<div class="container mb-5">
|
53
53
|
<div class="row">
|
54
54
|
|
@@ -90,6 +90,7 @@
|
|
90
90
|
|
91
91
|
</div> <!-- end row -->
|
92
92
|
</div> <!-- end container -->
|
93
|
+
<!-- [INFO ] [j1.layout.content_generator_page.html ] [End content] -->
|
93
94
|
|
94
95
|
{% comment %} Calc|Write the Back URL
|
95
96
|
-------------------------------------------------------------------------------- {% endcomment %}
|
@@ -53,7 +53,7 @@
|
|
53
53
|
|
54
54
|
{% comment %} Main
|
55
55
|
-------------------------------------------------------------------------------- {% endcomment %}
|
56
|
-
|
56
|
+
<!-- [INFO ] [j1.layout.content_generator_post.html ] [Begin content] -->
|
57
57
|
{% if page.comments %}
|
58
58
|
<div class="container mb-0">
|
59
59
|
{% else %}
|
@@ -216,3 +216,4 @@
|
|
216
216
|
{% comment %} END Blog post CONTENT
|
217
217
|
------------------------------------------------------------------------------ {% endcomment %}
|
218
218
|
</div> <!-- end container -->
|
219
|
+
<!-- [INFO ] [j1.layout.content_generator_post.html ] [End content] -->
|
@@ -27,9 +27,9 @@
|
|
27
27
|
|
28
28
|
{% comment %} Main
|
29
29
|
-------------------------------------------------------------------------------- {% endcomment %}
|
30
|
-
<!-- [INFO ] [j1.layout.
|
30
|
+
<!-- [INFO ] [j1.layout.content_generator_raw.html ] [Begin content] -->
|
31
31
|
<!-- main id="raw-content" class="col-md-12" style="padding-left:60px;padding-right:60px;" -->
|
32
32
|
<main id="raw-content" class="col-md-12">
|
33
33
|
{{content}}
|
34
34
|
</main>
|
35
|
-
<!-- [INFO ] [j1.layout.
|
35
|
+
<!-- [INFO ] [j1.layout.content_generator_raw.html ] [End content] -->
|
@@ -27,15 +27,15 @@
|
|
27
27
|
|
28
28
|
{% comment %} Main
|
29
29
|
-------------------------------------------------------------------------------- {% endcomment %}
|
30
|
-
<!-- [INFO ] [j1.layout.meta_data_generator.html
|
30
|
+
<!-- [INFO ] [j1.layout.meta_data_generator.html ] [start processing: place meta tags (taken from site config|page frontmatter)] -->
|
31
31
|
|
32
|
-
<!-- [INFO ] [j1.layout.meta_data_generator.html
|
32
|
+
<!-- [INFO ] [j1.layout.meta_data_generator.html ] [page|content encoding] -->
|
33
33
|
<meta http-equiv="Content-Type" content="text/html;charset={{site.coding}}">
|
34
34
|
|
35
|
-
<!-- [INFO ] [j1.layout.meta_data_generator.html
|
35
|
+
<!-- [INFO ] [j1.layout.meta_data_generator.html ] [added for MS Edge Browser] -->
|
36
36
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
37
37
|
|
38
|
-
<!-- [INFO ] [j1.layout.meta_data_generator.html
|
38
|
+
<!-- [INFO ] [j1.layout.meta_data_generator.html ] [initial zoom level when the page is first loaded by the browser] -->
|
39
39
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
40
40
|
|
41
41
|
{% if page.layout == 'home' %}
|
@@ -103,4 +103,4 @@
|
|
103
103
|
<meta name="robots" content="nofollow">
|
104
104
|
{% endif %}
|
105
105
|
|
106
|
-
<!-- [INFO ] [j1.layout.meta_data_generator.html
|
106
|
+
<!-- [INFO ] [j1.layout.meta_data_generator.html ] [end processing] -->
|
@@ -31,10 +31,10 @@
|
|
31
31
|
{% comment %} Main
|
32
32
|
-------------------------------------------------------------------------------- {% endcomment %}
|
33
33
|
{% if page.debug %}
|
34
|
-
<!-- [INFO ] [j1.
|
34
|
+
<!-- [INFO ] [j1.layout_module_generator.html ] [resource DATA to be loaded: {{resources_collate}}] -->
|
35
35
|
{% endif %}
|
36
36
|
|
37
|
-
<!-- [INFO ] [j1.
|
37
|
+
<!-- [INFO ] [j1.layout_module_generator.html ] [start processing: collect data for REGION: {{resource_placement}}, LAYOUT: {{page.layout}}] -->
|
38
38
|
{% for item in items_collate %}
|
39
39
|
|
40
40
|
{% assign array_name = item[0] %}
|
@@ -46,4 +46,4 @@
|
|
46
46
|
{% include {{ module_writer }} region=resource_placement resources=array_value %}
|
47
47
|
{% endif %}
|
48
48
|
{% endfor %}
|
49
|
-
<!-- [INFO ] [j1.
|
49
|
+
<!-- [INFO ] [j1.layout_module_generator.html ] [end processing] -->
|
@@ -34,10 +34,10 @@
|
|
34
34
|
-------------------------------------------------------------------------------- {% endcomment %}
|
35
35
|
|
36
36
|
{% if page.debug %}
|
37
|
-
<!-- [INFO ] [j1.
|
37
|
+
<!-- [INFO ] [j1.layout_resource_generator.html ] [resource DATA to be loaded: {{resources_collate}}] -->
|
38
38
|
{% endif %}
|
39
39
|
|
40
|
-
<!-- [INFO ] [j1.
|
40
|
+
<!-- [INFO ] [j1.layout_resource_generator.html ] [start processing: region: {{resource_placement}}, layout: {{page.layout}}] -->
|
41
41
|
{% for item in items_collate %}
|
42
42
|
|
43
43
|
{% assign array_name = item[0] %}
|
@@ -50,4 +50,4 @@
|
|
50
50
|
{% include {{ resource_writer }} region=resource_placement globals=global_array resources=array_value %}
|
51
51
|
|
52
52
|
{% endfor %}
|
53
|
-
<!-- [INFO ] [j1.
|
53
|
+
<!-- [INFO ] [j1.layout_resource_generator.html ] [end processing] -->
|
@@ -22,32 +22,21 @@
|
|
22
22
|
-------------------------------------------------------------------------------- {% endcomment %}
|
23
23
|
{% assign j1_apps = site.data.apps %}
|
24
24
|
{% assign nedb_config = j1_apps.j1_nedb %}
|
25
|
-
{% assign stickyfill = site.data.j1_polyfills.stickyfill.enabled %}
|
26
25
|
|
27
26
|
{% comment %} Main
|
28
27
|
-------------------------------------------------------------------------------- {% endcomment %}
|
29
|
-
<!-- [INFO ] [j1.
|
30
|
-
<!-- [INFO ] [j1.
|
28
|
+
<!-- [INFO ] [j1.layout_shim_generator.html ] [start processing: place all SHIM config for all MODULES, layout: {{page.layout}} ] -->
|
29
|
+
<!-- [INFO ] [j1.layout_shim_generator.html ] [create GLOBAL js script variables for later module access ] -->
|
31
30
|
|
32
31
|
<script>
|
33
|
-
// [INFO ] [j1.
|
32
|
+
// [INFO ] [j1.layout_shim_generator.html ] [create global ENVIRONMENT variable for Javascript access]
|
34
33
|
var j1_environment = "{{ site.environment }}";
|
35
|
-
var sticky_elements = $('.sticky');
|
36
|
-
|
37
|
-
{% comment %} Polyfill initializations
|
38
|
-
------------------------------------------------------------------------------ {% endcomment %}
|
39
|
-
{% if stickyfill %}
|
40
|
-
<!-- [INFO ] [j1.layout.shim_loader.html ] [load and activate the polyfill stickyfill for elements using CSS style "sticky"] -->
|
41
|
-
$(document).ready(function() {
|
42
|
-
Stickyfill.add(sticky_elements);
|
43
|
-
});
|
44
|
-
{% endif %}
|
45
34
|
|
46
|
-
// [INFO ] [j1.
|
35
|
+
// [INFO ] [j1.layout_shim_generator.html ] [create global NeDB database object]
|
47
36
|
// jadams, 2017-06-06: for the time being, NeDB is NOT a module */
|
48
37
|
//var {{site.data.modules.j1_nedb.datastore}};
|
49
38
|
|
50
|
-
// [INFO ] [j1.
|
39
|
+
// [INFO ] [j1.layout_shim_generator.html ] [create global INSTANCE variables for J1 Carousel]
|
51
40
|
{% if j1_apps.j1_carousel.enabled and page.layout != 'app' %}
|
52
41
|
|
53
42
|
{% assign config = site.data.apps.j1_carousel %}
|
@@ -62,7 +51,7 @@
|
|
62
51
|
|
63
52
|
{% endif %}
|
64
53
|
|
65
|
-
// [INFO ] [j1.
|
54
|
+
// [INFO ] [j1.layout_shim_generator.html ] [create global INSTANCE variables for J1 Justified Gallery]
|
66
55
|
{% if j1_apps.j1_justified_gallery.enabled and page.layout != 'app' %}
|
67
56
|
|
68
57
|
{% assign config = site.data.apps.j1_justified_gallery %}
|
@@ -78,7 +67,7 @@
|
|
78
67
|
|
79
68
|
{% endif %}
|
80
69
|
|
81
|
-
// [INFO ] [j1.
|
70
|
+
// [INFO ] [j1.layout_shim_generator.html ] [create global INSTANCE variables for J1 Justified Gallery]
|
82
71
|
{% if j1_apps.j1_light_gallery.enabled and page.layout != 'app' %}
|
83
72
|
|
84
73
|
{% assign config = site.data.apps.j1_light_gallery %}
|
@@ -94,7 +83,7 @@
|
|
94
83
|
|
95
84
|
{% endif %}
|
96
85
|
|
97
|
-
// [INFO ] [j1.
|
86
|
+
// [INFO ] [j1.layout_shim_generator.html ] [create global INSTANCE variables for headers]
|
98
87
|
if ( $('#homehead').length ) {
|
99
88
|
j1["homehead"] = true;
|
100
89
|
}
|
@@ -40,9 +40,9 @@
|
|
40
40
|
{% comment %} Main
|
41
41
|
-------------------------------------------------------------------------------- {% endcomment %}
|
42
42
|
|
43
|
-
<!-- [INFO ] [j1.
|
43
|
+
<!-- [INFO ] [j1.layout_theme_generator.html ] [start processing: load BS theme CSS for all pages] -->
|
44
44
|
{% if switcher_config.enabled %}
|
45
|
-
<!-- [INFO ] [j1.
|
45
|
+
<!-- [INFO ] [j1.layout_theme_generator.html ] [load the previously selected theme from cookie] -->
|
46
46
|
<script>
|
47
47
|
|
48
48
|
var logger = log4javascript.getLogger('ThemeGenerator');
|
@@ -99,7 +99,7 @@
|
|
99
99
|
|
100
100
|
</script>
|
101
101
|
{% else %}
|
102
|
-
<!-- [INFO ] [j1.
|
102
|
+
<!-- [INFO ] [j1.layout_theme_generator.html ] [NO cookie found. Load default theme CSS from asset|theme path] -->
|
103
103
|
<link rel="stylesheet" href="{{asset_path}}/{{theme_base}}/{{default_theme}}.{{theme_ext}}" />
|
104
104
|
{% endif %}
|
105
|
-
<!-- [INFO ] [j1.
|
105
|
+
<!-- [INFO ] [j1.layout_theme_generator.html ] [end processing] -->
|
@@ -18,7 +18,7 @@
|
|
18
18
|
# -----------------------------------------------------------------------------
|
19
19
|
{% endcomment %}
|
20
20
|
|
21
|
-
{% comment %} Liquid procedures
|
21
|
+
{% comment %} Liquid procedures
|
22
22
|
-------------------------------------------------------------------------------- {% endcomment %}
|
23
23
|
{% include themes/{{site.template.name}}/procedures/global/setup.proc %}
|
24
24
|
{% capture select_color %}themes/{{site.template.name}}/procedures/global/select_color.proc{% endcapture %}
|
@@ -33,46 +33,46 @@
|
|
33
33
|
|
34
34
|
{% comment %} Set global settings
|
35
35
|
------------------------------------------------------------------------------ {% endcomment %}
|
36
|
-
{% assign nav_id
|
37
|
-
{% assign nav_expand
|
38
|
-
{% assign authclient_modals_id
|
36
|
+
{% assign nav_id = "navigator_nav" %}
|
37
|
+
{% assign nav_expand = "lg" %}
|
38
|
+
{% assign authclient_modals_id = "authclient_modals" %}
|
39
39
|
|
40
40
|
|
41
41
|
{% comment %} Set config files
|
42
42
|
------------------------------------------------------------------------------ {% endcomment %}
|
43
|
-
{% assign navigator_config
|
44
|
-
{% assign
|
43
|
+
{% assign navigator_config = site.data.modules.j1_navigator %}
|
44
|
+
{% assign j1_auth_config = site.j1_auth %}
|
45
|
+
{% assign nav_defaults = navigator_config.defaults %}
|
45
46
|
|
46
47
|
|
47
48
|
{% comment %} Set config data
|
48
49
|
------------------------------------------------------------------------------ {% endcomment %}
|
49
|
-
{% assign nav_bar_defaults
|
50
|
-
{% assign nav_bar_config
|
51
|
-
{% assign nav_quicklinks_default
|
52
|
-
{% assign nav_quicklinks_config
|
53
|
-
{% assign nav_topsearch_default
|
54
|
-
{% assign nav_topsearch_config
|
55
|
-
{% assign nav_sidebar_default
|
56
|
-
{% assign nav_sidebar_config
|
57
|
-
{% assign nav_authclient_default
|
58
|
-
{% assign nav_authclient_config
|
50
|
+
{% assign nav_bar_defaults = nav_defaults.nav_bar %}
|
51
|
+
{% assign nav_bar_config = navigator_config.nav_bar %}
|
52
|
+
{% assign nav_quicklinks_default = nav_defaults.nav_quicklinks %}
|
53
|
+
{% assign nav_quicklinks_config = navigator_config.nav_quicklinks %}
|
54
|
+
{% assign nav_topsearch_default = nav_defaults.nav_topsearch %}
|
55
|
+
{% assign nav_topsearch_config = navigator_config.nav_topsearch %}
|
56
|
+
{% assign nav_sidebar_default = nav_defaults.nav_sidebar %}
|
57
|
+
{% assign nav_sidebar_config = navigator_config.nav_sidebar %}
|
58
|
+
{% assign nav_authclient_default = nav_defaults.nav_authclient %}
|
59
|
+
{% assign nav_authclient_config = navigator_config.nav_authclient %}
|
59
60
|
|
60
61
|
|
61
62
|
{% comment %} Set config options
|
62
63
|
------------------------------------------------------------------------------ {% endcomment %}
|
63
|
-
{% assign nav_bar_options
|
64
|
-
{% assign quicklinks_options
|
65
|
-
{% assign topsearch_options
|
66
|
-
{% assign sidebar_options
|
67
|
-
{% assign authclient_options
|
68
|
-
|
64
|
+
{% assign nav_bar_options = nav_bar_defaults | merge: nav_bar_config %}
|
65
|
+
{% assign quicklinks_options = nav_quicklinks_default | merge: nav_quicklinks_config %}
|
66
|
+
{% assign topsearch_options = nav_topsearch_default | merge: nav_topsearch_config %}
|
67
|
+
{% assign sidebar_options = nav_sidebar_default | merge: nav_sidebar_config %}
|
68
|
+
{% assign authclient_options = nav_authclient_default | merge: nav_authclient_config %}
|
69
69
|
|
70
70
|
{% comment %} Set navBarOptions
|
71
71
|
------------------------------------------------------------------------------ {% endcomment %}
|
72
|
-
{% assign brand_position
|
73
|
-
{% assign nav_fixed
|
74
|
-
{% assign nav_style
|
75
|
-
{% assign nav_color
|
72
|
+
{% assign brand_position = nav_bar_options.brand_position %}
|
73
|
+
{% assign nav_fixed = nav_bar_options.fixed %}
|
74
|
+
{% assign nav_style = nav_bar_options.style %}
|
75
|
+
{% assign nav_color = nav_bar_options.color %}
|
76
76
|
|
77
77
|
|
78
78
|
{% comment %} Set navBarProperties
|
@@ -93,27 +93,26 @@
|
|
93
93
|
|
94
94
|
{% comment %} Main
|
95
95
|
-------------------------------------------------------------------------------- {% endcomment %}
|
96
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html
|
96
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] [check for topsearch] -->
|
97
97
|
{% if topsearch_options.enabled %}
|
98
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html
|
98
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] [start processing: topsearch] -->
|
99
99
|
{% include {{ topsearch_create }} options=topsearch_options %}
|
100
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html
|
100
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] [end processing: topsearch] -->
|
101
101
|
{% endif %}
|
102
102
|
|
103
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html
|
103
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] [start processing: navigation] -->
|
104
104
|
<nav id="{{nav_id}}" class="{{nav_bar_defaults}} {{nav_bar_color}} {{nav_bar_fixed}} {{nav_bar_style}}">
|
105
105
|
|
106
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html
|
106
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] [check for sidebar] -->
|
107
107
|
{% if sidebar_options.enabled %}
|
108
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html
|
109
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html
|
108
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] [topsearch sidebar detected] -->
|
109
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] [start processing: sidebar] -->
|
110
110
|
{% include {{ sidebar_create }} options=sidebar_options %}
|
111
111
|
{% endif %}
|
112
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html
|
113
|
-
|
114
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html ] [start processing: main menue] -->
|
112
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] [end processing: sidebar] -->
|
113
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] [start processing: main menue] -->
|
115
114
|
{% if brand_position == "left" %}
|
116
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html
|
115
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] place brand to the left] -->
|
117
116
|
{% if site.brand.image %}
|
118
117
|
<a class="navbar-brand" href="{{ home_path }}"> <img src="{{ site.data.j1_config.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
|
119
118
|
{% else %}
|
@@ -123,7 +122,7 @@
|
|
123
122
|
<i class="mdi mdi-menu mdi-48px"></i>
|
124
123
|
</button>
|
125
124
|
{% elsif brand_position == "right" %}
|
126
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html
|
125
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] place brand to the right] -->
|
127
126
|
<button type="button" class="navigator navbar-toggler animated fadeIn" data-toggle="collapse" data-target="#{{menu_id}}" aria-controls="{{menu_id}}" aria-expanded="false" aria-label="Toggle navigation">
|
128
127
|
<i class="mdi mdi-menu mdi-48px"></i>
|
129
128
|
</button>
|
@@ -133,7 +132,7 @@
|
|
133
132
|
<a class="navbar-brand" href="{{home_path}}" "> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
|
134
133
|
{% endif %}
|
135
134
|
{% else %}
|
136
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html
|
135
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] place brand to default (right)] -->
|
137
136
|
<button type="button" class="navigator navbar-toggler animated fadeIn" data-toggle="collapse" data-target="#{{menu_id}}" aria-controls="{{menu_id}}" aria-expanded="false" aria-label="Toggle navigation">
|
138
137
|
<i class="mdi mdi-menu mdi-48px"></i>
|
139
138
|
</button>
|
@@ -144,27 +143,29 @@
|
|
144
143
|
{% endif %}
|
145
144
|
{% endif %}
|
146
145
|
|
147
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html
|
148
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html
|
146
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] [start processing: nav bar] -->
|
147
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] [place nav menu container for AJAX load] -->
|
149
148
|
<div id="{{menu_id}}" class="collapse"></div>
|
150
149
|
|
151
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html
|
150
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] [check for Quicklinks] -->
|
151
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] Quicklinks enabled: {{quicklinks_options.enabled}}] -->
|
152
152
|
{% if quicklinks_options.enabled %}
|
153
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html
|
154
|
-
|
155
|
-
{% include {{ quicklinks_create }} options=quicklinks_options %}
|
153
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] [start processing: quicklinks] -->
|
154
|
+
{% include {{ quicklinks_create }} options=quicklinks_options auth_options=j1_auth_config %}
|
156
155
|
{% endif %}
|
157
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html
|
156
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] [end processing: quicklinks] -->
|
158
157
|
|
159
158
|
</nav>
|
160
159
|
|
160
|
+
|
161
161
|
{% comment %} Place HTMl code for SignIn|SignOut dialogs for J1AuthClient
|
162
162
|
-------------------------------------------------------------------------------- {% endcomment %}
|
163
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html
|
164
|
-
|
165
|
-
|
166
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html
|
163
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] [check for J1 AuthClient] -->
|
164
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] [J1 AuthClient enabled: {{j1_auth_config.enabled}}] -->
|
165
|
+
{% if j1_auth_config.enabled %}
|
166
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] [start processing: AuthClient] -->
|
167
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] [place <div> container for the auth_client] -->
|
167
168
|
<div id="{{authclient_modals_id}}" class="authclient_modals"></div>
|
168
169
|
{% endif %}
|
169
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html
|
170
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html
|
170
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] [end processing: auth_client] -->
|
171
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] [end processing: navigation] -->
|
@@ -9,7 +9,7 @@
|
|
9
9
|
# Copyright (C) 2019 Juergen Adams
|
10
10
|
#
|
11
11
|
# J1 Template is licensed under the MIT License.
|
12
|
-
# See: https://github.com/jekyll-one/j1_template_mde/blob/master/LICENSE
|
12
|
+
# See: https://github.com/jekyll-one/j1_template_mde/blob/master/LICENSE
|
13
13
|
#
|
14
14
|
# -----------------------------------------------------------------------------
|
15
15
|
# Test data:
|
@@ -21,6 +21,7 @@
|
|
21
21
|
{% comment %} Liquid procedure values
|
22
22
|
-------------------------------------------------------------------------------- {% endcomment %}
|
23
23
|
{% assign quicklinks_options = include.options %}
|
24
|
+
{% assign auth_options = include.auth_options %}
|
24
25
|
|
25
26
|
{% comment %} Liquid procedures
|
26
27
|
-------------------------------------------------------------------------------- {% endcomment %}
|
@@ -56,7 +57,11 @@
|
|
56
57
|
{% assign google_plus_url = quicklinks_options.google_plus_url %}
|
57
58
|
{% assign twitter_url = quicklinks_options.twitter_url %}
|
58
59
|
|
59
|
-
{%
|
60
|
+
{% comment %}
|
61
|
+
auth_options.enabled: {{ auth_options.enabled | debug }}
|
62
|
+
{% endcomment %}
|
63
|
+
|
64
|
+
<!-- [INFO ] [j1.modules.navigator.quicklinks.proc ] [J1 AuthManager detected as: {{ auth_options.enabled }}] -->
|
60
65
|
|
61
66
|
{% if quicklinks_options.top_search_icon %} {% assign top_search_enabled = true %} {% endif %}
|
62
67
|
{% if quicklinks_options.sidebar_icon %} {% assign sidebar_enabled = true %} {% endif %}
|
@@ -68,7 +73,12 @@
|
|
68
73
|
{% else %}
|
69
74
|
{% assign icon_family = 'mdi' %}
|
70
75
|
{% endif %}
|
71
|
-
|
76
|
+
|
77
|
+
{% include {{select_icon_size}} family=quicklinks_options.icon_family size=quicklinks_options.icon_size %}
|
78
|
+
{% assign icon_size = {{size}} %}
|
79
|
+
|
80
|
+
|
81
|
+
|
72
82
|
{% comment %} Icon color set dynamically by adapter
|
73
83
|
------------------------------------------------------------------------------
|
74
84
|
{% include {{select_color}} color=quicklinks_options.icon_color fallback="#9E9E9E" %}
|
@@ -76,22 +86,19 @@
|
|
76
86
|
{% capture icon_color %}style="color:{{my_icon_color}}"{% endcapture %}
|
77
87
|
{% endcomment %}
|
78
88
|
|
79
|
-
{% include {{select_icon_size}} family=quicklinks_options.icon_family size=quicklinks_options.icon_size %}
|
80
|
-
{% assign icon_size = {{size}} %}
|
81
|
-
|
82
89
|
|
83
90
|
{% comment %} Main
|
84
91
|
-------------------------------------------------------------------------------- {% endcomment %}
|
85
|
-
<!-- [INFO ] [j1.modules.navigator.quicklinks.proc] [start processing: quick links] -->
|
92
|
+
<!-- [INFO ] [j1.modules.navigator.quicklinks.proc ] [start processing: quick links] -->
|
86
93
|
<div id="mod_quicklinks" class="attr-nav collapse navbar-collapse justify-content-end">
|
87
94
|
<ul class="navbar-nav">
|
88
95
|
{% if facebook_url != "none" %}<li nav-item><a class="nav-icon" href="{{facebook_url}}"><i class="{{icon_family}} {{icon_family}}-{{facebook_icon}} {{icon_size}}"></i></a></li>{% endif %}
|
89
96
|
{% if github_url != "none" %}<li nav-item><a class="nav-icon" href="{{github_url}}"><i class="{{icon_family}} {{icon_family}}-{{github_icon}} {{icon_size}}"></i></a></li>{% endif %}
|
90
97
|
{% if google_plus_url != "none" %}<li nav-item><a class="nav-icon" href="{{google_plus_url}}"><i class="{{icon_family}} {{icon_family}}-{{google_plus_icon}} {{icon_size}}"></i></a></li>{% endif %}
|
91
98
|
{% if twitter_url != "none" %}<li nav-item><a class="nav-icon" href="{{twitter_url}}"><i class="{{icon_family}} {{icon_family}}-{{twitter_icon}} {{icon_size}}"></i></a></li>{% endif %}
|
92
|
-
{% if
|
99
|
+
{% if auth_options.enabled %}<li class="nav-item" id="quickLinksSignInOutButton"><a class="nav-icon" id="navLinkSignInOut" href="#" data-toggle="modal" data-target="#{{signin_modal_id}}"><i id="iconSignInOut" class="{{icon_family}} {{icon_family}}-{{signin_icon}} {{icon_size}}"></i></a></li>{% endif %}
|
93
100
|
{% if top_search_enabled %}<li class="nav-item search"><a class="nav-icon" href="#"><i class="{{icon_family}} {{icon_family}}-{{search_icon}} {{icon_size}}"></i></a></li>{% endif %}
|
94
101
|
{% if sidebar_enabled %}<li class="nav-item side-menu"><a class="nav-icon" href="#"><i class="{{icon_family}} {{icon_family}}-{{sidebar_icon}} {{icon_size}}"></i></a></li>{% endif %}
|
95
102
|
</ul>
|
96
103
|
</div>
|
97
|
-
<!-- [INFO ] [j1.modules.navigator.quicklinks.proc] [end processing: quick links] -->
|
104
|
+
<!-- [INFO ] [j1.modules.navigator.quicklinks.proc ] [end processing: quick links] -->
|