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.
Files changed (50) hide show
  1. checksums.yaml +4 -4
  2. data/_includes/themes/j1/layouts/content_generator_app.html +2 -2
  3. data/_includes/themes/j1/layouts/content_generator_blog_archive.html +2 -0
  4. data/_includes/themes/j1/layouts/content_generator_collection.html +2 -0
  5. data/_includes/themes/j1/layouts/content_generator_page.html +2 -1
  6. data/_includes/themes/j1/layouts/content_generator_post.html +2 -1
  7. data/_includes/themes/j1/layouts/content_generator_raw.html +2 -2
  8. data/_includes/themes/j1/layouts/layout_metadata_generator.html +5 -5
  9. data/_includes/themes/j1/layouts/layout_module_generator.html +3 -3
  10. data/_includes/themes/j1/layouts/layout_resource_generator.html +3 -3
  11. data/_includes/themes/j1/layouts/layout_shim_generator.html +8 -19
  12. data/_includes/themes/j1/layouts/layout_theme_generator.html +4 -4
  13. data/_includes/themes/j1/modules/navigator/generator.html +53 -52
  14. data/_includes/themes/j1/modules/navigator/procedures/quicklinks.proc +16 -9
  15. data/_includes/themes/j1/modules/navigator/procedures/sidebar.proc +9 -9
  16. data/_includes/themes/j1/modules/navigator/procedures/topsearch.proc +3 -3
  17. data/_includes/themes/j1/procedures/layouts/content_writer.proc +4 -4
  18. data/_includes/themes/j1/procedures/layouts/default_writer.proc +6 -10
  19. data/_includes/themes/j1/procedures/layouts/module_writer.proc +9 -9
  20. data/_includes/themes/j1/procedures/layouts/resource_writer.proc +6 -6
  21. data/_layouts/default.html +18 -19
  22. data/_layouts/home.html +6 -6
  23. data/lib/j1/version.rb +1 -1
  24. data/lib/j1_app/j1_auth_manager/auth_manager.rb +10 -9
  25. data/lib/starter_web/Gemfile +1 -1
  26. data/lib/starter_web/_config.yml +1 -1
  27. data/lib/starter_web/_data/j1_resources.yml +5 -3
  28. data/lib/starter_web/_data/modules/j1_navigator.yml +0 -1
  29. data/lib/starter_web/_data/modules/j1_stickybits.yml +19 -0
  30. data/lib/starter_web/_rack/nginx.conf +85 -0
  31. data/lib/starter_web/assets/images/pages/roundtrip/package.json +1 -1
  32. data/lib/starter_web/assets/themes/j1/core/js/adapter/algolia.js +4 -4
  33. data/lib/starter_web/assets/themes/j1/core/js/adapter/navigator.js +69 -108
  34. data/lib/starter_web/assets/themes/j1/core/js/adapter/stickybits.js +96 -0
  35. data/lib/starter_web/assets/themes/j1/core/js/adapter/template.js +9 -10
  36. data/lib/starter_web/assets/themes/j1/core/js/template.js +22 -7
  37. data/lib/starter_web/assets/themes/j1/core/js/template.js.map +1 -1
  38. data/lib/starter_web/assets/themes/j1/core/js/template.min.js +1 -1
  39. data/lib/starter_web/package.json +1 -2
  40. data/lib/starter_web/package.json.new +1 -1
  41. data/lib/starter_web/pages/public/start/downloads/quickstarter/100_linux_starter.adoc +0 -5
  42. data/lib/starter_web/pages/public/start/downloads/quickstarter/200_macos_starter.adoc +0 -3
  43. data/lib/starter_web/pages/public/start/downloads/quickstarter/300_windows_starter.adoc +0 -3
  44. data/lib/starter_web/pages/public/start/roundtrip/400_icon_fonts.adoc +197 -58
  45. data/lib/starter_web/pages/public/start/roundtrip/700_extended_modals.adoc +1 -1
  46. data/lib/starter_web/pages/public/start/roundtrip/710_responsive_tables.adoc +1 -1
  47. data/lib/starter_web/pages/public/start/roundtrip/800_google_custom_search.adoc +41 -0
  48. metadata +6 -4
  49. data/lib/starter_web/_data/modules/j1_polyfills.yml +0 -0
  50. data/lib/starter_web/assets/images/pages/roundtrip/oleg-magni-1370182-unsplash.jpg +0 -0
data/_includes/themes/j1/modules/navigator/procedures/sidebar.proc CHANGED
@@ -63,7 +63,7 @@
63
63
  {% comment %} Main
64
64
  -------------------------------------------------------------------------------- {% endcomment %}
65
65
 
66
- <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [Start processing: sidebar] -->
66
+ <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [Start processing: sidebar] -->
67
67
  <div id="mod_sidebar" class="side">
68
68
  <a href="#" class="close-side"><i class="{{icon_family}} {{icon_family}}-{{close_icon}} mdi-48px" {{icon_color}}></i></a>
69
69
 
@@ -86,8 +86,8 @@
86
86
  {% comment %} Collect USER info
87
87
  ---------------------------------------------------------------------- {% endcomment %}
88
88
  {% when 'user_info' %}
89
- <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [USER info enabled] -->
90
- <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [Write widged placeholder: USER info] -->
89
+ <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [USER info enabled] -->
90
+ <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [Write widged placeholder: USER info] -->
91
91
  <div id="user-info" class="widget">
92
92
  <h4 class="heading">{{title}}</h4>
93
93
  <ul id="display_user_details" class="link">
@@ -137,8 +137,8 @@
137
137
  {% comment %} Collect THEME info
138
138
  ---------------------------------------------------------------------- {% endcomment %}
139
139
  {% when 'theme_info' %}
140
- <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [THEME info detected] -->
141
- <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [Write widged placeholder: USER info] -->
140
+ <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [THEME info detected] -->
141
+ <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [Write widged placeholder: USER info] -->
142
142
  <div id="theme-info" class="widget">
143
143
  <h4 class="heading">{{title}}</h4>
144
144
  <ul class="link">
@@ -173,7 +173,7 @@
173
173
  {% endfor %}
174
174
  </ul>
175
175
  </div>
176
- <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [End processing: THEME info] -->
176
+ <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [End processing: THEME info] -->
177
177
 
178
178
  {% comment %} END Collect THEME info
179
179
  ---------------------------------------------------------------------- {% endcomment %}
@@ -189,7 +189,7 @@
189
189
  {% comment %} Collect SITE info
190
190
  ---------------------------------------------------------------------- {% endcomment %}
191
191
  {% when 'site_info' %}
192
- <!-- [INFO ] [j1.modules.navigator.sidebar.proc] [Start processing SITE info] -->
192
+ <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [Start processing SITE info] -->
193
193
 
194
194
  <div id="site-info" class="widget">
195
195
  <h4 class="heading">{{title}}</h4>
@@ -233,10 +233,10 @@
233
233
 
234
234
  {% endfor %}
235
235
  {% endfor %}
236
- <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [End processing sidebar boxes] -->
236
+ <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [End processing sidebar boxes] -->
237
237
 
238
238
  </div>
239
- <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [End processing: sidebar] -->
239
+ <!-- [INFO ] [j1.modules.navigator.sidebar.proc ] [End processing: sidebar] -->
240
240
 
241
241
 
242
242
 
data/_includes/themes/j1/modules/navigator/procedures/topsearch.proc CHANGED
@@ -80,7 +80,7 @@
80
80
  {% comment %} JekyllSimpleSearch engine
81
81
  ------------------------------------------------------------------------------ {% endcomment %}
82
82
  {% if quick_search %}
83
- <!-- [INFO ] [j1.modules.navigator.topsearch.proc ] [start processing: top search] -->
83
+ <!-- [INFO ] [j1.modules.navigator.topsearch.proc ] [start processing: top search] -->
84
84
  <div id="mod_topsearch" class="top-search">
85
85
  <div class="container-fluid">
86
86
  <div class="input-group">
@@ -89,7 +89,7 @@
89
89
  <span class="input-group-addon close-search"><i class="{{icon_family}} {{icon_family}}-{{close_icon}} {{icon_size}}" {{icon_color}}></i></span>
90
90
  </div>
91
91
  </div>
92
- <!-- [INFO ] [j1.modules.navigator.topsearch.proc ] [add search panel (hidden)] -->
92
+ <!-- [INFO ] [j1.modules.navigator.topsearch.proc ] [add search panel (hidden)] -->
93
93
  <div class="row">
94
94
  <div class="card card-flat panel-search mr-5 mb-3 ml-5" id="jss-panel" style="display: none">
95
95
  {% if search_heading_lead %}<div class="panel-heading lead">{{ search_heading_lead }}</div>{% endif %}
@@ -100,7 +100,7 @@
100
100
  </div>
101
101
  </div>
102
102
  </div>
103
- <!-- [INFO ] [j1.modules.navigator.topsearch.proc ] [end processing: top search] -->
103
+ <!-- [INFO ] [j1.modules.navigator.topsearch.proc ] [end processing: top search] -->
104
104
  {% endif %}
105
105
 
106
106
  {% endif %}
data/_includes/themes/j1/procedures/layouts/content_writer.proc CHANGED
@@ -30,7 +30,7 @@
30
30
  {% comment %} Main
31
31
  -------------------------------------------------------------------------------- {% endcomment %}
32
32
 
33
- <!-- [INFO ] [j1.layout.content_writer.proc ] [start processing: load CONTENT portion for layout: {{page.layout}}] -->
33
+ <!-- [INFO ] [j1.layout.content_writer.proc ] [Start processing: load CONTENT portion for layout: {{page.layout}}] -->
34
34
  {% for lane in items %}
35
35
  {% for items in lane %}
36
36
 
@@ -73,7 +73,7 @@
73
73
  {% when 'body-main' %}
74
74
 
75
75
  {% if placement == 'body-main' %}
76
- <!-- [INFO ] [j1.layout.content_writer.proc ] [load region 'body-main' for layout: {{page.layout}}] -->
76
+ <!-- [INFO ] [j1.layout.content_writer.proc ] [load region 'body-main' for layout: {{page.layout}}] -->
77
77
  {% if type == 'async' %}
78
78
  <div id="{{ id }}" class="{{ class }}"></div>
79
79
  {% elsif type == 'sync' %}
@@ -87,7 +87,7 @@
87
87
  {% when 'body-footer' %}
88
88
 
89
89
  {% if placement == 'body-footer' %}
90
- <!-- [INFO ] [j1.layout.content_writer.proc ] [load region body-footer for layout: {{page.layout}} ] -->
90
+ <!-- [INFO ] [j1.layout.content_writer.proc ] [load region body-footer for layout: {{page.layout}} ] -->
91
91
  {% if type == 'async' %}
92
92
  <div id="{{ id }}" class="{{ class }}"></div>
93
93
  {% elsif type == 'sync' %}
@@ -102,6 +102,6 @@
102
102
 
103
103
  {% endfor %}
104
104
  {% endfor %}
105
- <!-- [INFO ] [j1.layout.content_writer.proc ] [end processing] -->
105
+ <!-- [INFO ] [j1.layout.content_writer.proc ] [End processing] -->
106
106
 
107
107
  {% assign items = nil %}
data/_includes/themes/j1/procedures/layouts/default_writer.proc CHANGED
@@ -72,8 +72,7 @@
72
72
  -------------------------------------------------------------------------- {% endcomment %}
73
73
  {% when 'head' %}
74
74
  {% if placement == 'head' %}
75
- <!-- [INFO ] [j1.layout.default_writer.proc ] [start processing: load region head, layout: {{page.layout}} ] -->
76
-
75
+ <!-- [INFO ] [j1.layout.default_writer.proc ] [Start processing: load region head, layout: {{page.layout}} ] -->
77
76
  {% if type == 'async' %}
78
77
  <div id="{{ id }}" class="{{ class }}"></div>
79
78
  {% elsif type == 'sync' %}
@@ -86,8 +85,7 @@
86
85
  -------------------------------------------------------------------------- {% endcomment %}
87
86
  {% when 'body-navigation' %}
88
87
  {% if placement == 'body-navigation' %}
89
- <!-- [INFO ] [j1.layout.default_writer.proc ] [start processing: load region body-navigation, layout: {{page.layout}} ] -->
90
-
88
+ <!-- [INFO ] [j1.layout.default_writer.proc ] [start processing: load region body-navigation, layout: {{page.layout}} ] -->
91
89
  {% if type == 'async' %}
92
90
  <div id="{{ id }}" class="{{ class }}"></div>
93
91
  {% elsif type == 'sync' %}
@@ -100,9 +98,8 @@
100
98
  -------------------------------------------------------------------------- {% endcomment %}
101
99
  {% when 'body-header' %}
102
100
  {% if placement == 'body-header' %}
103
- <!-- [INFO ] [j1.layout.default_writer.proc ] [start processing: load region body-header, layout: {{page.layout}} ] -->
104
- <!-- [INFO ] [j1.layout.default_writer.proc ] [load page specific header data from yaml data file ] -->
105
-
101
+ <!-- [INFO ] [j1.layout.default_writer.proc ] [start processing: load region body-header, layout: {{page.layout}} ] -->
102
+ <!-- [INFO ] [j1.layout.default_writer.proc ] [load page specific header data from yaml data file ] -->
106
103
  {% if type == 'async' %}
107
104
  <div id="{{ id }}" class="{{ class }}"></div>
108
105
  {% elsif type == 'sync' %}
@@ -115,8 +112,7 @@
115
112
  -------------------------------------------------------------------------- {% endcomment %}
116
113
  {% when 'body-footer' %}
117
114
  {% if placement == 'body-footer' %}
118
- <!-- [INFO ] [j1.layout.default_writer.proc ] [start processing: load region body-footer, layout: {{page.layout}} ] -->
119
-
115
+ <!-- [INFO ] [j1.layout.default_writer.proc ] [start processing: load region body-footer, layout: {{page.layout}} ] -->
120
116
  {% if type == 'async' %}
121
117
  <div id="{{ id }}" class="{{ class }}"></div>
122
118
  {% elsif type == 'sync' %}
@@ -155,6 +151,6 @@
155
151
 
156
152
  {% endcase %}
157
153
  {% endif %} {% comment %} END if (lane) enabled {% endcomment %}
158
-
154
+ <!-- [INFO ] [j1.layout.default_writer.proc ] [End processing: load region head, layout: {{page.layout}} ] -->
159
155
  {% endfor %}
160
156
  {% endfor %}
data/_includes/themes/j1/procedures/layouts/module_writer.proc CHANGED
@@ -107,14 +107,14 @@
107
107
 
108
108
  {% if data_key == 'init_function' %}
109
109
 
110
- <!-- [INFO ] [j1.layout.module_writer.proc ] [place J1 adapter for resource: {{id}}] -->
110
+ <!-- [INFO ] [j1.layout.module_writer.proc ] [place J1 adapter for resource: {{id}}] -->
111
111
  <script>
112
112
  $(document).ready(function() {
113
- // [INFO ] [j1.layout.module_writer.proc ] [create logger for component "loader"]
113
+ // [INFO ] [j1.layout.module_writer.proc ] [create logger for component "loader"]
114
114
  var logger = log4javascript.getLogger("j1.loader");
115
115
 
116
116
  {% if environment == 'development' %}
117
- // [INFO ] [j1.layout.module_writer.proc ] [create module loader START message]
117
+ // [INFO ] [j1.layout.module_writer.proc ] [create module loader START message]
118
118
  {% if id == 'log4javascript' %}
119
119
  var start = moment();
120
120
  var finished = '';
@@ -127,26 +127,26 @@
127
127
  {% endif %}
128
128
  {% endif %}
129
129
 
130
- // [INFO ] [j1.layout.module_writer.proc ] [collect frontmatter options and pass them to the INIT function]
130
+ // [INFO ] [j1.layout.module_writer.proc ] [collect frontmatter options and pass them to the INIT function]
131
131
  {% comment %} Added layout|toc|comments to all adapters
132
132
  ----------------------------------------------------------- {% endcomment %}
133
133
  {% for init_function in data_value %}
134
134
 
135
135
  {% if frontmatter_options %}
136
- // [INFO ] [j1.layout.module_writer.proc ] [extend frontmatter options]
136
+ // [INFO ] [j1.layout.module_writer.proc ] [extend frontmatter options]
137
137
  {% capture frontmatter_options %}{{frontmatter_options}}, {"layout": "{{page.layout}}", "scrollbar": "{{page.scrollbar}}", "toc": "{{page.toc}}", "comments": "{{page.comments}}"}{% endcapture %}
138
138
  var settings = $.extend({}, {{frontmatter_options}});
139
139
  {% endif %}
140
140
 
141
141
  {% if frontmatter_options %}
142
- // [INFO ] [j1.layout.module_writer.proc ] [pass frontmatter options for module: {{id}}]
142
+ // [INFO ] [j1.layout.module_writer.proc ] [pass frontmatter options for module: {{id}}]
143
143
  {{ init_function }}( settings );
144
144
  {% else %}
145
- // [INFO ] [j1.layout.module_writer.proc ] [capture frontmatter options for module: {{id}}]
145
+ // [INFO ] [j1.layout.module_writer.proc ] [capture frontmatter options for module: {{id}}]
146
146
  {% capture settings %}{"layout": "{{page.layout}}", "scrollbar": "{{page.scrollbar}}", "toc": "{{page.toc}}", "comments": "{{page.comments}}"}{% endcapture %}
147
147
  var settings = $.extend({}, {{settings}});
148
148
  {% if pass_init_data %}
149
- // [INFO ] [j1.layout.module_writer.proc ] [frontmatter options captured for module: {{id}}: {{settings}}]
149
+ // [INFO ] [j1.layout.module_writer.proc ] [frontmatter options captured for module: {{id}}: {{settings}}]
150
150
  {{ init_function }}( settings );
151
151
  {% else %}
152
152
  {{ init_function }}();
@@ -155,7 +155,7 @@
155
155
  {% endfor %}
156
156
 
157
157
  {% if environment == 'development' and loader_finished_message %}
158
- // [INFO ] [j1.layout.module_writer.proc ] [create module loader FINISHED message]
158
+ // [INFO ] [j1.layout.module_writer.proc ] [create module loader FINISHED message]
159
159
  {% if id == 'log4javascript' %}
160
160
  finished = moment();
161
161
  log_text = "[" +finished.format("HH:mm:ss.SSS")+ "] [INFO ] [j1.loader ] [{{comment | replace: 'Resources for', '' | strip }} initializing finished]"
data/_includes/themes/j1/procedures/layouts/resource_writer.proc CHANGED
@@ -88,8 +88,8 @@
88
88
 
89
89
  {% if data_key == 'files' %}
90
90
 
91
- <!-- [INFO ] [j1.layout.{{layout}}.resource_writer.proc] [{{comment}}] -->
92
- <!-- [INFO ] [j1.layout.{{layout}}.resource_writer.proc] [place general file resources for ID: {{id}} ] -->
91
+ <!-- [INFO ] [j1.layout.resource_writer.proc ] [{{layout}}: {{comment}}] -->
92
+ <!-- [INFO ] [j1.layout.resource_writer.proc ] [{{layout}}: place general file resources for ID: {{id}} ] -->
93
93
 
94
94
  {% for file in data_value %}
95
95
 
@@ -138,8 +138,8 @@
138
138
  {% if data_key == 'css' %}
139
139
  {% for locator in data_value %}
140
140
 
141
- <!-- [INFO ] [j1.layout.{{layout}}.resource_writer.proc] [{{comment}}] -->
142
- <!-- [INFO ] [j1.layout.{{layout}}.resource_writer.proc] [place {{data_key}} files for resource ID: {{id}} ] -->
141
+ <!-- [INFO ] [j1.layout.resource_writer.proc ] [{{layout}}: {{comment}}] -->
142
+ <!-- [INFO ] [j1.layout.resource_writer.proc ] [{{layout}}: place {{data_key}} files for resource ID: {{id}} ] -->
143
143
 
144
144
  {% include {{select_location}} location=location locator=locator %}
145
145
  {% assign my_location = {{location_source}} %}
@@ -158,8 +158,8 @@
158
158
  {% if data_key == 'js' %}
159
159
  {% for locator in data_value %}
160
160
 
161
- <!-- [INFO ] [j1.layout.{{layout}}.resource_writer.proc] [{{comment}}] -->
162
- <!-- [INFO ] [j1.layout.{{layout}}.resource_writer.proc] [place {{data_key}} files for resource ID: {{id}} ] -->
161
+ <!-- [INFO ] [j1.layout.resource_writer.proc ] [{{layout}}: {{comment}}] -->
162
+ <!-- [INFO ] [j1.layout.resource_writer.proc ] [{{layout}}: place {{data_key}} files for resource ID: {{id}} ] -->
163
163
 
164
164
  {% include {{select_location}} location=location locator=locator %}
165
165
  {% assign my_location = {{location_source}} %}
data/_layouts/default.html CHANGED
@@ -38,7 +38,7 @@ layout: compress
38
38
  {% comment %} Additional debug data
39
39
  -------------------------------------------------------------------------------- {% endcomment %}
40
40
  {% if page.debug %}
41
- <!-- [DEBUG ] [j1.layout.default.html ] [layout data to be loaded: {{lanes_collate}}] -->
41
+ <!-- [DEBUG ] [j1.layout.default.html ] [layout data to be loaded: {{lanes_collate}}] -->
42
42
  {% endif %}
43
43
 
44
44
  {% comment %} Liquid procedures
@@ -53,8 +53,6 @@ layout: compress
53
53
  {% assign compress = site.compress_html.enabled %}
54
54
  {% assign prettify = site.data.j1_config.prettify %}
55
55
  {% assign logon_client = site.data.modules.j1_sign_in_up %}
56
-
57
-
58
56
  {% assign body_scrollbar = site.data.j1_config.body.scrollbar %}
59
57
 
60
58
 
@@ -75,16 +73,15 @@ layout: compress
75
73
  <!DOCTYPE {{ site.doctype }}>
76
74
  <html lang="{{ site.language }}">
77
75
 
78
- <!-- [INFO ] [j1.layout.default.html ] [page generated: {{site.time}}] -->
79
- <!-- [INFO ] [j1.layout.default.html ] [environment detected: {{environment}}] -->
80
-
76
+ <!-- [INFO ] [j1.layout.default.html ] [Page generated: {{site.time}}] -->
77
+ <!-- [INFO ] [j1.layout.default.html ] [Environment detected as: {{environment}}] -->
81
78
  {% comment %} Collect the head section (region head)
82
79
  ------------------------------------------------------------------------------ {% endcomment %}
83
80
  <head>
84
81
  <!-- link rel="stylesheet" href="https://pro.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-LRlmVvLKVApDVGuspQFnRQJjkv0P7/YFrw84YYQtmYG4nK8c+M+NlmYDCv0rKWpG" crossorigin="anonymous" -->
85
- <!-- [INFO ] [j1.layout.default.html ] [start processing: run default_writer for region 'head'] -->
82
+ <!-- [INFO ] [j1.layout.default.html ] [Start|Run default_writer for region: 'head'] -->
86
83
  {% include {{default_writer}} region='head' items=lanes_collate %}
87
- <!-- [INFO ] [j1.layout.default.html ] [end default_writer processing: region 'head'] -->
84
+ <!-- [INFO ] [j1.layout.default.html ] [End|Run default_writer for region: 'head'] -->
88
85
  </head>
89
86
 
90
87
  {% comment %} Collect the body section (region body-*)
@@ -101,38 +98,39 @@ layout: compress
101
98
 
102
99
  {% comment %} Master Wrapper to prevent "DOM flicker"
103
100
  ------------------------------------------------------------------------------ {% endcomment %}
104
- <!-- [INFO ] [j1.layout.default.html ] [prevent "DOM flicker" aka "FOUC" (Flash of unstyled content)] -->
101
+ <!-- [INFO ] [j1.layout.default.html ] [Start page processing|content creation] -->
102
+ <!-- [INFO ] [j1.layout.default.html ] [Place wrapper to prevent "DOM flicker" ] -->
105
103
  <div id="no_flicker" class="nojs" >
106
104
 
107
- <!-- [INFO ] [j1.layout.default.html ] [start processing: FOUC|Prevent DOM flicker, make page hidden] -->
105
+ <!-- [INFO ] [j1.layout.default.html ] [Make page hidden] -->
108
106
  <script>
109
107
  $("#no_flicker").css("display", "none");
110
108
  </script>
111
109
 
112
110
  {% comment %} Collect the BODY-NAVIGATION region
113
111
  -------------------------------------------------------------------------- {% endcomment %}
114
- <!-- [INFO ] [j1.layout.default.html ] [start processing: run default_writer for region 'body-navigation'] -->
112
+ <!-- [INFO ] [j1.layout.default.html ] [Start|Run default_writer for region: 'body-navigation'] -->
115
113
  {% include {{default_writer}} region='body-navigation' items=lanes_collate %}
116
- <!-- [INFO ] [j1.layout.default.html ] [end default_writer processing: region 'body-navigation'] -->
114
+ <!-- [INFO ] [j1.layout.default.html ] [End|Run default_writer for region: 'body-navigation'] -->
117
115
 
118
116
  {% comment %} Inherited CONTENT from other LAYOUTS
119
117
  -------------------------------------------------------------------------- {% endcomment %}
120
- <!-- [INFO ] [j1.layout.default.html ] [start processing: load content inherited by layout: {{ page.layout}}] -->
118
+ <!-- [INFO ] [j1.layout.default.html ] [Start|Load content inherited by layout: {{ page.layout}}] -->
121
119
  {{ content }}
122
- <!-- [INFO ] [j1.layout.default.html ] [end default_writer processing: content inherited by layout: {{ page.layout}}] -->
120
+ <!-- [INFO ] [j1.layout.default.html ] [End|Load: content inherited by layout: {{ page.layout}}] -->
123
121
 
124
122
  {% comment %} Collect the BODY-FOOTER region
125
123
  -------------------------------------------------------------------------- {% endcomment %}
126
- <!-- [INFO ] [j1.layout.default.html ] [start processing: run default_writer for region 'body-footer'] -->
124
+ <!-- [INFO ] [j1.layout.default.html ] [Start|Run default_writer for region: 'body-footer'] -->
127
125
  {% include {{default_writer}} region='body-footer' items=lanes_collate %}
128
- <!-- [INFO ] [j1.layout.default.html ] [end default_writer processing: region 'body-footer'] -->
126
+ <!-- [INFO ] [j1.layout.default.html ] [End|Run default_writer for region: 'body-footer'] -->
129
127
 
130
128
  </div>
131
- <!-- [INFO ] [j1.layout.default.html ] [end processing: content creation finished] -->
129
+ <!-- [INFO ] [j1.layout.default.html ] [End page processing: content creation] -->
132
130
 
133
131
  {% comment %} Initialize Tooltips|Popovers
134
132
  ---------------------------------------------------------------------------- {% endcomment %}
135
- <!-- [INFO ] [j1.layout.default.html ] [end default_writer processing: Initialize Tooltips|Popovers] -->
133
+ <!-- [INFO ] [j1.layout.default.html ] [Initialize Tooltips|Popovers] -->
136
134
  <script>
137
135
  $(function() {
138
136
  $('[data-toggle="tooltip"]').tooltip();
@@ -142,7 +140,7 @@ layout: compress
142
140
 
143
141
  {% comment %} Initialize Enhanced Bootstrap Modals
144
142
  ---------------------------------------------------------------------------- {% endcomment %}
145
- <!-- [INFO ] [j1.layout.default.html ] [end default_writer processing: Initialize Enhanced Bootstrap Modals] -->
143
+ <!-- [INFO ] [j1.layout.default.html ] [Initialize enhanced bootstrap modals] -->
146
144
  <script>
147
145
  $(function() {
148
146
  $('body').on('shown.bs.modal', '.modal', function() {
@@ -168,6 +166,7 @@ layout: compress
168
166
  });
169
167
  });
170
168
  </script>
169
+ <!-- [INFO ] [j1.layout.default.html ] [End|Processing default writer] -->
171
170
 
172
171
  </body>
173
172
  </html>
data/_layouts/home.html CHANGED
@@ -61,20 +61,20 @@ regenerate: false
61
61
  {% comment %} Main
62
62
  -------------------------------------------------------------------------------- {% endcomment %}
63
63
 
64
- <!-- [INFO ] [j1.layout.home.home.html ] [start processing] -->
64
+ <!-- [INFO ] [j1.layout.home.html ] [start processing] -->
65
65
  {% comment %} Collect the BODY-HEADER region
66
66
  ------------------------------------------------------------------------------ {% endcomment %}
67
- <!-- [INFO ] [j1.layout.home.html ] [run default_writer for region 'body-header'] -->
67
+ <!-- [INFO ] [j1.layout.home.html ] [run default_writer for region 'body-header'] -->
68
68
  <header id="header">
69
69
  {% include {{default_writer}} region='body-header' items=lanes_collate %}
70
70
  </header>
71
- <!-- [INFO ] [j1.layout.home.html ] [end default_writer processing: region 'body-header'] -->
71
+ <!-- [INFO ] [j1.layout.home.html ] [end default_writer processing: region 'body-header'] -->
72
72
 
73
73
  {% comment %} Collect the BODY-MAIN region
74
74
  ------------------------------------------------------------------------------ {% endcomment %}
75
- <!-- [INFO ] [j1.layout.home.html ] [run content_writer for region 'body-main'] -->
75
+ <!-- [INFO ] [j1.layout.home.html ] [run content_writer for region 'body-main'] -->
76
76
  <main class="container-fluid no-padding r-text-{{rtext_size}}">
77
77
  {% include {{content_writer}} region='body-main' items=lanes_collate %}
78
78
  </main>
79
- <!-- [INFO ] [j1.layout.home.html ] [end content_writer processing: region 'body-main'] -->
80
- <!-- [INFO ] [j1.layout.home.html ] [end processing] -->
79
+ <!-- [INFO ] [j1.layout.home.html ] [end content_writer processing: region 'body-main'] -->
80
+ <!-- [INFO ] [j1.layout.home.html ] [end processing] -->
data/lib/j1/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module J1
2
- VERSION = '2018.4.29'
2
+ VERSION = '2018.4.30'
3
3
  end
data/lib/j1_app/j1_auth_manager/auth_manager.rb CHANGED
@@ -679,7 +679,7 @@ module J1App
679
679
  # END: get '/authentication'
680
680
  # --------------------------------------------------------------------------
681
681
 
682
- # ENDPOINT post_authentication (called after a user is authenticated)
682
+ # ENDPOINT post_authentication (called after a user is back from OAuth Provider)
683
683
  # --------------------------------------------------------------------------
684
684
  get '/post_authentication' do
685
685
  reward = {
@@ -756,14 +756,14 @@ module J1App
756
756
  if user.nil?
757
757
  # Collection of session data failed (e.g cookie > 4K)
758
758
  #
759
- log_info! 'Post Authentication', 'Identification', 'Internal error', 'Authentication failed'
759
+ log_info! 'Post Authentication', 'Identification', 'Internal error', 'User identification failed'
760
760
  warden.logout
761
761
  session.clear
762
762
  log_info! 'Post Authentication', 'Redirect', 'Pass to error page (access_denied)'
763
763
  description_title = "Access Denied"
764
764
  redirect "/access_denied?provider=unknown&user=unknown&category=unknown&title=#{description_title}"
765
765
  else
766
- log_info! 'Post Authentication', 'Identification', 'Authorization successful'
766
+ log_info! 'Post Authentication', 'Identification', 'User identified successfully'
767
767
  log_info! 'Post Authentication', 'Cookie', 'Update web session data' # "#{j1_web_session}"
768
768
  j1_web_session['user_name'] = user[:info]['nickname']
769
769
  j1_web_session['user_id'] = user[:uid]
@@ -785,12 +785,12 @@ module J1App
785
785
 
786
786
  # Check if user is allowed to access protected content in GENERAL
787
787
  #
788
- log_info! 'Post Authentication', 'Identification', 'Check allowed users'
788
+ log_info! 'Post Authentication', 'Identification', 'Check for allowed users'
789
789
  unless j1_web_session['users_allowed'].include? 'all'
790
790
  unless j1_web_session['users_allowed'].include? "#{current_user}"
791
791
  log_info! 'Post Authentication', 'Identification', 'User not allowed', "#{current_user}"
792
792
  log_info! 'Post Authentication', 'Identification', 'Allowed users', "#{j1_web_session['users_allowed']}"
793
- log_info! 'Post Authentication', 'Association', 'Logout user from current session', "#{current_user}"
793
+ log_info! 'Post Authentication', 'Identification', 'Logout user from current session', "#{current_user}"
794
794
  warden.logout
795
795
  session.clear
796
796
  log_info! 'Post Authentication', 'Redirect', 'Pass to error page (access_denied)'
@@ -798,10 +798,11 @@ module J1App
798
798
  redirect "/access_denied?provider=#{current_provider}&user=#{current_user}&category=#{category}&title=#{description_title}"
799
799
  end
800
800
  end
801
+ log_info! 'Post Authentication', 'Identification', 'Allowed users', "#{j1_web_session['users_allowed']}"
801
802
 
802
803
  # Check conditions to access protected content (if any)
803
804
  #
804
- log_info! 'Post Authentication', 'Identification', 'Check conditions', "#{current_provider}"
805
+ log_info! 'Post Authentication', 'Identification', 'Check for conditions', "#{current_provider}"
805
806
  check_conditions = providers["#{user[:provider]}"]['conditions'][category]['enabled']
806
807
  if check_conditions
807
808
 
@@ -818,7 +819,7 @@ module J1App
818
819
  log_info! 'Post Authentication', 'Identification', 'Check blacklisting'
819
820
  log_info! 'Post Authentication', 'Identification', 'User blacklisted', "#{current_user}"
820
821
  user[:info][:blacklisted] = 'true'
821
- log_info! 'Post Authentication', 'Association', 'Logout user from current session', "#{current_user}"
822
+ log_info! 'Post Authentication', 'Identification', 'Logout user from current session', "#{current_user}"
822
823
  warden.logout
823
824
  session.clear
824
825
  log_info! 'Post Authentication', 'Redirect', 'Pass to error page (access_denied)'
@@ -849,7 +850,7 @@ module J1App
849
850
  log_info! 'Post Authentication', 'Identification', 'Check payment status'
850
851
  if user[:info]['payment_info'].empty?
851
852
  log_info! 'Post Authentication', 'Identification', 'Payment status: NOT AVAILABLE', "#{current_user}"
852
- log_info! 'Post Authentication', 'Association', 'Logout user from current session', "#{current_user}"
853
+ log_info! 'Post Authentication', 'Identification', 'Logout user from current session', "#{current_user}"
853
854
  warden.logout
854
855
  session.clear
855
856
  log_info! 'Post Authentication', 'Redirect', 'Pass to error page (access_denied)'
@@ -862,7 +863,7 @@ module J1App
862
863
  payment_status = user[:info]['payment_info']['attributes']['declined_since']
863
864
  unless payment_valid? payment_status
864
865
  log_info! 'Post Authentication', 'Identification', 'Payment status INVALID', "#{current_user}"
865
- log_info! 'Post Authentication', 'Association', 'Logout user from current session', "#{current_user}"
866
+ log_info! 'Post Authentication', 'Identification', 'Logout user from current session', "#{current_user}"
866
867
  warden.logout
867
868
  session.clear
868
869
  log_info! 'Post Authentication', 'Redirect', 'Pass to error page (access_denied)'