j1_template 2019.4.4 → 2019.4.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (225) hide show
  1. checksums.yaml +4 -4
  2. data/_includes/themes/j1/layouts/content_generator_app.html +8 -10
  3. data/_includes/themes/j1/layouts/content_generator_blog_archive.html +24 -18
  4. data/_includes/themes/j1/layouts/content_generator_collection.html +10 -12
  5. data/_includes/themes/j1/layouts/content_generator_page.html +11 -14
  6. data/_includes/themes/j1/layouts/content_generator_post.html +10 -12
  7. data/_includes/themes/j1/layouts/content_generator_raw.html +8 -10
  8. data/_includes/themes/j1/layouts/layout_metadata_generator.html +9 -10
  9. data/_includes/themes/j1/layouts/layout_module_generator.html +10 -11
  10. data/_includes/themes/j1/layouts/layout_resource_generator.html +10 -11
  11. data/_includes/themes/j1/layouts/layout_shim_generator.html +14 -20
  12. data/_includes/themes/j1/layouts/layout_theme_generator.html +45 -52
  13. data/_includes/themes/j1/modules/connectors/ad/google-adsense.html +1 -1
  14. data/_includes/themes/j1/modules/connectors/ads +2 -2
  15. data/_includes/themes/j1/modules/connectors/analytic/google-analytics.html +1 -1
  16. data/_includes/themes/j1/modules/connectors/analytics +2 -2
  17. data/_includes/themes/j1/modules/connectors/comment/disqus.html +1 -1
  18. data/_includes/themes/j1/modules/connectors/comments +2 -2
  19. data/_includes/themes/j1/modules/footers/footer_light_generator.html +33 -18
  20. data/_includes/themes/j1/modules/headers/master_header_generator.html +23 -11
  21. data/_includes/themes/j1/modules/navigator/generator.html +3 -3
  22. data/_includes/themes/j1/modules/navigator/generator.olde.html +3 -3
  23. data/_includes/themes/j1/procedures/global/get_category_item.proc +4 -4
  24. data/_includes/themes/j1/procedures/global/pager.proc +12 -5
  25. data/_includes/themes/j1/procedures/global/setup.proc +9 -9
  26. data/_includes/themes/j1/procedures/layouts/content_writer.proc +9 -10
  27. data/_includes/themes/j1/procedures/layouts/default_writer.proc +9 -11
  28. data/_includes/themes/j1/procedures/layouts/module_writer.proc +11 -13
  29. data/_includes/themes/j1/procedures/layouts/resource_writer.proc +8 -10
  30. data/_includes/themes/j1/procedures/posts/collate_calendar.proc +1 -1
  31. data/_includes/themes/j1/procedures/posts/collate_list.proc +1 -1
  32. data/_includes/themes/j1/procedures/posts/collate_timeline.proc +1 -1
  33. data/_layouts/default.html +3 -3
  34. data/_layouts/home.html +2 -2
  35. data/lib/j1/version.rb +1 -1
  36. data/lib/j1_app/j1_auth_manager/_unused/auth_manager.org.2.rb +1086 -0
  37. data/lib/j1_app/j1_auth_manager/_unused/auth_manager.org.rb +1548 -0
  38. data/lib/j1_app/j1_auth_manager/auth_manager.rb +302 -453
  39. data/lib/j1_app/j1_auth_manager/config.rb +13 -0
  40. data/lib/j1_app/j1_auth_manager/helpers.rb +14 -0
  41. data/lib/j1_app/j1_auth_manager/views/auth_manager_ui.erb +99 -87
  42. data/lib/starter_web/Gemfile +1 -1
  43. data/lib/starter_web/_cc_test_data/_config.yml +1 -1
  44. data/lib/starter_web/_cc_test_data/_data/j1_categories.yml +1 -1
  45. data/lib/starter_web/_cc_test_data/_data/j1_polyfills.yml +1 -1
  46. data/lib/starter_web/_cc_test_data/_data/modules/back2top.yml +0 -6
  47. data/lib/starter_web/_cc_test_data/_data/modules/cookiebar.yml +1 -1
  48. data/lib/starter_web/_cc_test_data/_data/modules/defaults/back2top.yml +19 -6
  49. data/lib/starter_web/_cc_test_data/_data/modules/defaults/cookie_consent.yml +8 -0
  50. data/lib/starter_web/_cc_test_data/_data/modules/defaults/cookiebar.yml +8 -0
  51. data/lib/starter_web/_cc_test_data/_data/modules/defaults/jekyll_search.yml +8 -0
  52. data/lib/starter_web/_cc_test_data/_data/modules/defaults/navigator.yml +8 -0
  53. data/lib/starter_web/_cc_test_data/_data/modules/defaults/webhook.yml +23 -15
  54. data/lib/starter_web/_cc_test_data/_data/modules/jekyll_search.yml +8 -8
  55. data/lib/starter_web/_cc_test_data/_data/modules/webhook.yml +26 -19
  56. data/lib/starter_web/_cc_test_data/_data/resources.yml +1 -1
  57. data/lib/starter_web/_config.yml +1 -1
  58. data/lib/starter_web/_data/_defaults/categories.yml +32 -0
  59. data/lib/starter_web/_data/{j1_colors.yml → _defaults/colors.yml} +0 -0
  60. data/lib/starter_web/_data/{j1_font_sizes.yml → _defaults/font_sizes.yml} +0 -0
  61. data/lib/starter_web/_data/{j1_i18n.yml → _defaults/i18n.yml} +0 -0
  62. data/lib/starter_web/_data/{apps → _defaults}/j1_light_gallery.yml +0 -0
  63. data/lib/starter_web/_data/{j1_polyfills.yml → _defaults/polyfills.yml} +1 -1
  64. data/lib/starter_web/_data/{j1_resources.yml → _defaults/resources.yml} +203 -65
  65. data/lib/starter_web/_data/_defaults/template_settings.yml +256 -0
  66. data/lib/starter_web/_data/{j1_categories.yml → _old_configs/j1_categories.yml} +1 -1
  67. data/lib/starter_web/_data/_old_configs/j1_colors.yml +608 -0
  68. data/lib/starter_web/_data/_old_configs/j1_config.yml +256 -0
  69. data/lib/starter_web/_data/_old_configs/j1_font_sizes.yml +26 -0
  70. data/lib/starter_web/_data/_old_configs/j1_i18n.yml +19 -0
  71. data/lib/starter_web/_data/_old_configs/j1_resources.yml +877 -0
  72. data/lib/starter_web/_data/apps/{j1_bootstrap_gallery.yml → _unused/j1_bootstrap_gallery.yml} +0 -0
  73. data/lib/starter_web/_data/apps/{j1_carousel.yml → _unused/j1_carousel.yml} +0 -0
  74. data/lib/starter_web/_data/apps/{j1_justified_gallery.yml → _unused/j1_justified_gallery.yml} +0 -0
  75. data/lib/starter_web/_data/apps/{j1_lightbox.yml → _unused/j1_lightbox.yml} +0 -0
  76. data/lib/starter_web/_data/apps/{j1_link_checker.yml → _unused/j1_link_checker.yml} +0 -0
  77. data/lib/starter_web/_data/apps/_unused/light_gallery.yml +108 -0
  78. data/lib/starter_web/_data/apps/bootstrap_gallery.yml +187 -0
  79. data/lib/starter_web/_data/apps/carousel.yml +511 -0
  80. data/lib/starter_web/_data/apps/defaults/bootstrap_gallery.yml +187 -0
  81. data/lib/starter_web/_data/apps/defaults/carousel.yml +223 -0
  82. data/lib/starter_web/_data/apps/defaults/justified_gallery.yml +245 -0
  83. data/lib/starter_web/_data/apps/defaults/light_gallery.yml +115 -0
  84. data/lib/starter_web/_data/apps/defaults/lightbox.yml +181 -0
  85. data/lib/starter_web/_data/apps/defaults/link_checker.yml +32 -0
  86. data/lib/starter_web/_data/apps/justified_gallery.yml +245 -0
  87. data/lib/starter_web/_data/apps/light_gallery.yml +114 -0
  88. data/lib/starter_web/_data/apps/lightbox.yml +181 -0
  89. data/lib/starter_web/_data/apps/link_checker.yml +32 -0
  90. data/lib/starter_web/_data/blocks/footer.yml +2 -2
  91. data/lib/starter_web/_data/categories.yml +32 -0
  92. data/lib/starter_web/_data/colors.yml +608 -0
  93. data/lib/starter_web/_data/font_sizes.yml +26 -0
  94. data/lib/starter_web/_data/i18n.yml +19 -0
  95. data/lib/starter_web/_data/j1_config.yml +9 -20
  96. data/lib/starter_web/_data/layouts/default.yml +10 -10
  97. data/lib/starter_web/_data/modules/_old_configs/_j1_navigator.yml +2 -2
  98. data/lib/starter_web/_data/modules/{j1_header.yml → _old_configs/j1_header.yml} +0 -0
  99. data/lib/starter_web/_data/modules/{j1_iframe_resizer.yml → _old_configs/j1_iframe_resizer.yml} +0 -0
  100. data/lib/starter_web/_data/modules/{j1_log4javascript.yml → _old_configs/j1_log4javascript.yml} +1 -1
  101. data/lib/starter_web/_data/modules/back2top.yml +7 -14
  102. data/lib/starter_web/_data/modules/cookiebar.yml +1 -1
  103. data/lib/starter_web/_data/modules/defaults/back2top.yml +27 -14
  104. data/lib/starter_web/_data/modules/defaults/cookie_consent.yml +8 -0
  105. data/lib/starter_web/_data/modules/defaults/cookiebar.yml +8 -0
  106. data/lib/starter_web/_data/modules/defaults/framer.yml +272 -0
  107. data/lib/starter_web/_data/modules/defaults/header.yml +221 -0
  108. data/lib/starter_web/_data/modules/defaults/jekyll_search.yml +17 -0
  109. data/lib/starter_web/_data/modules/defaults/log4javascript.yml +120 -0
  110. data/lib/starter_web/_data/modules/defaults/navigator.yml +8 -3
  111. data/lib/starter_web/_data/modules/defaults/webhook.yml +40 -24
  112. data/lib/starter_web/_data/modules/framer.yml +272 -0
  113. data/lib/starter_web/_data/modules/header.yml +221 -0
  114. data/lib/starter_web/_data/modules/j1_navigator_menu.yml +26 -9
  115. data/lib/starter_web/_data/modules/j1_parallax.yml +4 -0
  116. data/lib/starter_web/_data/modules/j1_smooth_scroll.yml +4 -0
  117. data/lib/starter_web/_data/modules/j1_stickybits.yml +4 -0
  118. data/lib/starter_web/_data/modules/j1_theme_switcher.yml +7 -0
  119. data/lib/starter_web/_data/modules/j1_toccer.yml +3 -0
  120. data/lib/starter_web/_data/modules/jekyll_search.yml +27 -3
  121. data/lib/starter_web/_data/modules/log4javascript.yml +120 -0
  122. data/lib/starter_web/_data/modules/navigator.yml +13 -15
  123. data/lib/starter_web/_data/modules/webhook.yml +32 -22
  124. data/lib/starter_web/_data/polyfills.yml +50 -0
  125. data/lib/starter_web/_data/resources.yml +876 -0
  126. data/lib/starter_web/_data/template_settings.yml +279 -0
  127. data/lib/starter_web/apps/protected/netlify-admin/config/_old_configs/config.backup.yml +1 -1
  128. data/lib/starter_web/apps/protected/netlify-admin/config/_old_configs/config.org.yml +1 -1
  129. data/lib/starter_web/apps/protected/netlify-admin/config/_snippets/01_site_configuration/110_resource_settings.yml +1 -1
  130. data/lib/starter_web/apps/protected/netlify-admin/config/_snippets/03_module_configuration/130_module_settings.j1_back2top.yml +24 -15
  131. data/lib/starter_web/apps/protected/netlify-admin/config/_snippets/_examples/config.arrays.yml +1 -1
  132. data/lib/starter_web/apps/protected/netlify-admin/config/config.yml +9 -4
  133. data/lib/starter_web/assets/data/{menu.old.html → _temp/menu.old.html} +0 -0
  134. data/lib/starter_web/assets/data/carousel.json +19 -4
  135. data/lib/starter_web/assets/data/colors.json +12 -11
  136. data/lib/starter_web/assets/data/font_sizes.json +12 -11
  137. data/lib/starter_web/assets/data/galleries.json +19 -2
  138. data/lib/starter_web/assets/data/messages.yml +130 -0
  139. data/lib/starter_web/assets/data/panel.html +32 -9
  140. data/lib/starter_web/assets/data/quicklinks.html +30 -28
  141. data/lib/starter_web/assets/data/themes.json +11 -11
  142. data/lib/starter_web/assets/data/{web_hook.html → webhook.html} +4 -4
  143. data/lib/starter_web/assets/images/master_header/whats-up-1920x1200.png +0 -0
  144. data/lib/starter_web/assets/images/pages/pen/jquery/jQuery-logo.png +0 -0
  145. data/lib/starter_web/assets/images/pages/pen/jquery/jquery-banner-1280x600.jpg +0 -0
  146. data/lib/starter_web/assets/images/pages/pen/jquery/jquery-banner-1920x800.jpg +0 -0
  147. data/lib/starter_web/assets/images/pages/pen/jquery/src/JQuery-Logo.svg +122 -0
  148. data/lib/starter_web/assets/images/pages/pen/jquery/src/banner.psd +0 -0
  149. data/lib/starter_web/assets/images/pages/roundtrip/package.json +1 -1
  150. data/lib/starter_web/assets/themes/j1/{core/js/adapter/back2top.js → adapter/js/_unused/back2top.org.js} +0 -0
  151. data/lib/starter_web/assets/themes/j1/{core/js/adapter → adapter/js}/_unused/cookie_consent.button_events.not_moved.js +2 -2
  152. data/lib/starter_web/assets/themes/j1/{core/js/adapter/cookie_consent.js → adapter/js/_unused/cookie_consent.org.js} +2 -2
  153. data/lib/starter_web/assets/themes/j1/{core/js/adapter/master_header.js → adapter/js/_unused/masterheader.org.js} +96 -105
  154. data/lib/starter_web/assets/themes/j1/{core/js/adapter → adapter/js/_unused}/navigator.new.kapott.1.js +13 -13
  155. data/lib/starter_web/assets/themes/j1/{core/js/adapter → adapter/js/_unused}/navigator.new.kapott.2.js +16 -16
  156. data/lib/starter_web/assets/themes/j1/adapter/js/_unused/octokit.new.js +83 -0
  157. data/lib/starter_web/assets/themes/j1/{core/js/adapter/webhook.js → adapter/js/_unused/octokit.old.js} +72 -64
  158. data/lib/starter_web/assets/themes/j1/{core/js/adapter → adapter/js/_unused}/promise_test.js +0 -0
  159. data/lib/starter_web/assets/themes/j1/{core/js/adapter → adapter/js}/_unused/template.new-1.js +30 -30
  160. data/lib/starter_web/assets/themes/j1/{core/js/adapter/template.js → adapter/js/_unused/template.new.js} +479 -305
  161. data/lib/starter_web/assets/themes/j1/{core/js/adapter → adapter/js/_unused}/template.old.js +31 -31
  162. data/lib/starter_web/assets/themes/j1/{core/js/adapter → adapter/js}/_unused/template.org.js +30 -30
  163. data/lib/starter_web/assets/themes/j1/{core/js/adapter → adapter/js}/_unused/webhook.eventhandler.not_deferred.js +1 -1
  164. data/lib/starter_web/assets/themes/j1/{core/js/adapter → adapter/js}/_unused/webhook.new.js +1 -1
  165. data/lib/starter_web/assets/themes/j1/{core/js/adapter → adapter/js}/algolia.js +116 -44
  166. data/lib/starter_web/assets/themes/j1/adapter/js/back2top.js +223 -0
  167. data/lib/starter_web/assets/themes/j1/{core/js/adapter/bs_gallery.js → adapter/js/bootstrap_gallery.js} +138 -67
  168. data/lib/starter_web/assets/themes/j1/{extensions/carousel/js/j1_adapter_carousel.js → adapter/js/carousel.js} +126 -48
  169. data/lib/starter_web/assets/themes/j1/adapter/js/cookie_bar.js +166 -0
  170. data/lib/starter_web/assets/themes/j1/adapter/js/cookie_consent.js +235 -0
  171. data/lib/starter_web/assets/themes/j1/{core/js/adapter → adapter/js}/custom.js +90 -39
  172. data/lib/starter_web/assets/themes/j1/{core/js/adapter → adapter/js}/example.js +94 -36
  173. data/lib/starter_web/assets/themes/j1/adapter/js/framer.js +199 -0
  174. data/lib/starter_web/assets/themes/j1/adapter/js/justified_gallery.js +339 -0
  175. data/lib/starter_web/assets/themes/j1/adapter/js/lightbox.js +177 -0
  176. data/lib/starter_web/assets/themes/j1/adapter/js/logger.js +237 -0
  177. data/lib/starter_web/assets/themes/j1/adapter/js/master_header.js +548 -0
  178. data/lib/starter_web/assets/themes/j1/{core/js/adapter → adapter/js}/navigator.js +152 -123
  179. data/lib/starter_web/assets/themes/j1/adapter/js/octokit.js +440 -0
  180. data/lib/starter_web/assets/themes/j1/adapter/js/scroller.js +173 -0
  181. data/lib/starter_web/assets/themes/j1/adapter/js/searcher.js +197 -0
  182. data/lib/starter_web/assets/themes/j1/adapter/js/stickybits.js +162 -0
  183. data/lib/starter_web/assets/themes/j1/adapter/js/switcher.js +186 -0
  184. data/lib/starter_web/assets/themes/j1/adapter/js/template.js +1368 -0
  185. data/lib/starter_web/assets/themes/j1/{core/js/adapter → adapter/js}/toccer.js +128 -61
  186. data/lib/starter_web/assets/themes/j1/core/js/template.js +13 -13
  187. data/lib/starter_web/assets/themes/j1/core/js/template.js.map +1 -1
  188. data/lib/starter_web/assets/themes/j1/core/js/template.min.js +1 -1
  189. data/lib/starter_web/assets/themes/j1/extensions/cookiebar/js/cookiebar.js +25 -10
  190. data/lib/starter_web/assets/themes/j1/extensions/cookiebar/js/cookiebar.min.js +20 -0
  191. data/lib/starter_web/assets/themes/j1/extensions/light_gallery/js/lg-fullscreen.js +62 -72
  192. data/lib/starter_web/assets/themes/j1/extensions/light_gallery/js/lg-fullscreen.min.js +2 -2
  193. data/lib/starter_web/collections/posts/private/series/_posts/2018-11-01-docker-using-shared-folders.adoc +1 -1
  194. data/lib/starter_web/collections/posts/public/featured/_posts/2018-06-01-top-open-source-static-site-generators.adoc +1 -0
  195. data/lib/starter_web/collections/posts/public/featured/_posts/2018-07-01-what-is-a-static-site.adoc +1 -1
  196. data/lib/starter_web/collections/posts/public/featured/_posts/2019-04-22-about-cookies.adoc +1 -0
  197. data/lib/starter_web/collections/posts/public/jekyll/_posts/2018-05-01-confusion-about-base-url.adoc +1 -0
  198. data/lib/starter_web/package.json +15 -9
  199. data/lib/starter_web/pages/private/bookshelf/{100_about_jekyll_collections.adoc → 100_whats_up.adoc} +4 -4
  200. data/lib/starter_web/pages/private/bookshelf/200_book_shelf_biography.adoc +1 -1
  201. data/lib/starter_web/pages/private/bookshelf/300_book_shelf_fantasy.adoc +1 -1
  202. data/lib/starter_web/pages/private/bookshelf/400_book_shelf_romance.adoc +1 -1
  203. data/lib/starter_web/pages/private/pen/jquery/deferred_try_catch.adoc +118 -0
  204. data/lib/starter_web/pages/public/blog/navigator/archive.html +12 -4
  205. data/lib/starter_web/pages/public/blog/navigator/archive/categoryview.html +11 -3
  206. data/lib/starter_web/pages/public/blog/navigator/archive/dateview.html +11 -3
  207. data/lib/starter_web/pages/public/blog/navigator/archive/tagview.html +11 -3
  208. data/lib/starter_web/pages/public/legal/de/300_privacy.adoc +28 -30
  209. data/lib/starter_web/pages/public/legal/en/300_privacy.adoc +28 -30
  210. data/lib/starter_web/pages/public/previewer/bootstrap_theme.adoc +3 -3
  211. data/lib/starter_web/pages/public/start/downloads/quickstarter/100_linux_starter.adoc +1 -1
  212. data/lib/starter_web/pages/public/start/{read_me_first.adoc → whats_up.adoc} +4 -4
  213. data/lib/starter_web/utilsrv/_defaults/dot.env +1 -1
  214. data/lib/starter_web/utilsrv/package.json +21 -6
  215. data/lib/starter_web/utilsrv/server.js +106 -80
  216. metadata +101 -51
  217. data/lib/starter_web/assets/themes/j1/core/js/adapter/iframer.js +0 -101
  218. data/lib/starter_web/assets/themes/j1/core/js/adapter/lightbox.js +0 -96
  219. data/lib/starter_web/assets/themes/j1/core/js/adapter/logger.js +0 -155
  220. data/lib/starter_web/assets/themes/j1/core/js/adapter/scroller.js +0 -113
  221. data/lib/starter_web/assets/themes/j1/core/js/adapter/searcher.js +0 -127
  222. data/lib/starter_web/assets/themes/j1/core/js/adapter/stickybits.js +0 -99
  223. data/lib/starter_web/assets/themes/j1/core/js/adapter/switcher.js +0 -117
  224. data/lib/starter_web/assets/themes/j1/extensions/cookiebar/js/j1cookiebar.js +0 -112
  225. data/lib/starter_web/assets/themes/j1/extensions/justified_gallery/js/j1_adapter_justified_gallery.js +0 -262
@@ -0,0 +1,122 @@
1
+ <?xml version="1.0" encoding="utf-8"?>
2
+ <!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
3
+ <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
4
+ <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
5
+ viewBox="0 0 278.4 70.7" enable-background="new 0 0 278.4 70.7" xml:space="preserve">
6
+ <g>
7
+ <g>
8
+ <path fill="#0769AD" d="M107.2,63c0,0.6-0.1,1.2-0.1,1.9l2.5-4.5l-0.3-1.5l2.5-0.4l0.9,6.3l1.1-3.9c0.1-0.4,0.1-0.7,0.1-1
9
+ c0-0.3,0-0.6-0.1-1l2.6-0.5c0.1,0.5,0.2,1,0.1,1.5c0,0.6-0.2,1.3-0.6,2.4l-2.1,5.7h-3.1l-0.7-4.2l-2.4,4.2h-3c0.1-3.9,0-6.4-0.3-9
10
+ l2.6-0.4C107.2,59.9,107.3,61.4,107.2,63z"/>
11
+ <path fill="#0769AD" d="M123.4,60.8c-1.2,0.6-1.7,0.9-2.8,1.6l-1.2,5.5h-2.7l1.9-9.1l2.4-0.4l-0.1,1.3c0.9-0.5,1.7-0.9,2.5-1.3
12
+ L123.4,60.8z"/>
13
+ <path fill="#0769AD" d="M125,58.8l2.8-0.4l-2,9.5h-2.7L125,58.8z M125.9,54.7l2.8-0.4l-0.6,2.9l-2.8,0.4L125.9,54.7z"/>
14
+ <path fill="#0769AD" d="M132.8,60.7l-1,4.6c0,0.1,0,0.2,0,0.2c0,0.1,0.1,0.2,0.3,0.2c0.5,0,1-0.2,1.5-0.4l0.5,1.9
15
+ c-0.8,0.4-1.9,0.8-3,0.8c-1.4,0-2.1-0.7-2-1.8c0-0.1,0-0.3,0.1-0.4l1.1-5.2h-1.4l0.5-2.2h1.4l0.5-2.2l2.8-0.4l-0.5,2.6h2.2
16
+ l-0.6,2.2H132.8z"/>
17
+ <path fill="#0769AD" d="M136,61.9c0.5-2.1,1.5-3.5,4.4-3.5c1.8,0,3.1,0.8,3,2.3c-0.1,1.8-1,2.7-3.3,3.3c-1.1,0.3-1.2,0.3-2,0.6
18
+ l-0.1,0.6c-0.1,0.3,0,0.7,0.5,0.7c1,0,2.4-0.5,3.7-1l0.4,1.9c-1.2,0.7-3,1.3-4.6,1.3c-1.9,0-2.7-0.8-2.7-2.4
19
+ c0-0.3,0.1-0.7,0.2-1.1L136,61.9z M140.9,61c0-0.3-0.3-0.5-0.8-0.5c-1,0-1.3,0.6-1.4,1.3l-0.1,0.7c0.5-0.1,0.7-0.2,1.2-0.3
20
+ C140.5,61.9,140.9,61.6,140.9,61z"/>
21
+ <path fill="#0769AD" d="M150.4,54.8l2.8-0.4l-2.8,13.5h-2.7L150.4,54.8z"/>
22
+ <path fill="#0769AD" d="M153.5,61.9c0.5-2.1,1.5-3.5,4.4-3.5c1.8,0,3.1,0.8,3,2.3c-0.1,1.8-1,2.7-3.3,3.3c-1.1,0.3-1.2,0.3-2,0.6
23
+ l-0.1,0.6c-0.1,0.3,0,0.7,0.5,0.7c1,0,2.4-0.5,3.7-1l0.4,1.9c-1.2,0.7-3,1.3-4.6,1.3c-1.9,0-2.7-0.8-2.7-2.4
24
+ c0-0.3,0.1-0.7,0.2-1.1L153.5,61.9z M158.4,61c0-0.3-0.3-0.5-0.8-0.5c-1,0-1.3,0.6-1.4,1.3l-0.1,0.7c0.5-0.1,0.7-0.2,1.2-0.3
25
+ C158,61.9,158.4,61.6,158.4,61z"/>
26
+ <path fill="#0769AD" d="M161.2,67.5l0.6-2c0.7,0.2,1.5,0.5,2.5,0.5c0.9,0,1-0.3,1.1-0.7c0.1-0.4-0.2-0.6-1.2-1.2
27
+ c-1.9-1-2-1.7-1.7-3.1c0.4-2,1-2.5,3.6-2.5c0.9,0,2,0.2,2.8,0.4l-0.5,2c-0.7-0.2-1.7-0.3-2.3-0.3c-0.8,0-0.9,0.1-1,0.6
28
+ c-0.1,0.4,0,0.5,0.9,1c2.1,1.1,2.4,1.5,2.1,3c-0.5,2.1-1.1,2.9-3.9,2.9C163.2,68.1,162,67.8,161.2,67.5z"/>
29
+ <path fill="#0769AD" d="M168.9,67.5l0.6-2c0.7,0.2,1.5,0.5,2.5,0.5c0.9,0,1-0.3,1.1-0.7c0.1-0.4-0.2-0.6-1.2-1.2
30
+ c-1.9-1-2-1.7-1.7-3.1c0.4-2,1-2.5,3.6-2.5c0.9,0,2,0.2,2.8,0.4l-0.5,2c-0.7-0.2-1.7-0.3-2.3-0.3c-0.8,0-0.9,0.1-1,0.6
31
+ c-0.1,0.4,0,0.5,0.9,1c2.1,1.1,2.4,1.5,2.1,3c-0.5,2.1-1.1,2.9-3.9,2.9C170.9,68.1,169.7,67.8,168.9,67.5z"/>
32
+ <path fill="#0769AD" d="M176.3,70l1.5-2.1h-1l0.7-3.2h2.7l-0.7,3.4l-2.2,2.6L176.3,70z"/>
33
+ <path fill="#0769AD" d="M191,67.9l0-0.8c-0.7,0.6-1.7,1-3,1c-2,0-2.5-1.2-2-3.3l0.5-2.5c0.5-2.2,1.1-3.9,5-3.9
34
+ c0.3,0,0.9,0,1.1,0.1l0.8-3.7l2.8-0.4l-2.8,13.5H191z M188.5,65.1c-0.1,0.5,0,0.7,0.5,0.7c1,0,1.7-0.5,2.2-1l0.9-4.1
35
+ c-0.3-0.1-0.7-0.1-1-0.1c-1.4,0-1.7,0.7-1.9,1.6L188.5,65.1z"/>
36
+ <path fill="#0769AD" d="M195.8,65c0-0.2,0-0.4,0.1-0.7l0.5-2.2c0.5-2.4,1.7-3.8,5-3.8c2.5,0,3.6,1.4,3.5,3.1c0,0.2,0,0.4-0.1,0.7
37
+ l-0.5,2.2c-0.5,2.2-1.6,3.8-5,3.8C196.9,68.1,195.7,66.7,195.8,65z M202.1,61.7c0-0.7-0.4-1.1-1.3-1.1c-1,0-1.6,0.5-1.8,1.4
38
+ l-0.5,2.3c0,0.1,0,0.3-0.1,0.4c0,0.7,0.4,1.1,1.3,1.1c1,0,1.6-0.5,1.8-1.4l0.5-2.3C202.1,61.9,202.1,61.8,202.1,61.7z"/>
39
+ <path fill="#0769AD" d="M221.3,61.6c0-0.1,0-0.2,0-0.3c0-0.2-0.1-0.3-0.4-0.3c-0.5,0-1.7,0.5-2.5,0.9l-1.3,6h-2.7l1.3-6.3
40
+ c0-0.1,0-0.2,0-0.3c0-0.2-0.1-0.3-0.4-0.3c-0.5,0-1.7,0.5-2.4,0.9l-1.3,6h-2.7l1.9-9.1l2.4-0.4l-0.1,1c1.5-0.7,2.6-1.1,3.7-1.1
41
+ c0.9,0,1.4,0.4,1.6,1.1c1.4-0.8,2.7-1.1,3.8-1.1c1.2,0,1.7,0.7,1.6,1.9c0,0.3,0,0.7-0.1,1.1l-1.4,6.5H220L221.3,61.6z"/>
42
+ <path fill="#0769AD" d="M225.1,65c0-0.2,0-0.4,0.1-0.7l0.5-2.2c0.5-2.4,1.7-3.8,5-3.8c2.5,0,3.6,1.4,3.5,3.1c0,0.2,0,0.4-0.1,0.7
43
+ l-0.5,2.2c-0.5,2.2-1.6,3.8-5,3.8C226.2,68.1,225,66.7,225.1,65z M231.4,61.7c0-0.7-0.4-1.1-1.3-1.1c-1,0-1.6,0.5-1.8,1.4
44
+ l-0.5,2.3c0,0.1,0,0.3-0.1,0.4c0,0.7,0.4,1.1,1.3,1.1c1,0,1.6-0.5,1.8-1.4l0.5-2.3C231.4,61.9,231.4,61.8,231.4,61.7z"/>
45
+ <path fill="#0769AD" d="M241.2,60.8c-1.2,0.6-1.7,0.9-2.8,1.6l-1.2,5.5h-2.7l1.9-9.1l2.4-0.4l-0.1,1.3c0.9-0.5,1.7-0.9,2.5-1.3
46
+ L241.2,60.8z"/>
47
+ <path fill="#0769AD" d="M241.9,61.9c0.5-2.1,1.5-3.5,4.4-3.5c1.8,0,3.1,0.8,3,2.3c-0.1,1.8-1,2.7-3.3,3.3c-1.1,0.3-1.2,0.3-2,0.6
48
+ l-0.1,0.6c-0.1,0.3,0,0.7,0.5,0.7c1,0,2.4-0.5,3.7-1l0.4,1.9c-1.2,0.7-3,1.3-4.6,1.3c-1.9,0-2.7-0.8-2.7-2.4
49
+ c0-0.3,0.1-0.7,0.2-1.1L241.9,61.9z M246.8,61c0-0.3-0.3-0.5-0.8-0.5c-1,0-1.3,0.6-1.4,1.3l-0.1,0.7c0.5-0.1,0.7-0.2,1.2-0.3
50
+ C246.4,61.9,246.7,61.6,246.8,61z"/>
51
+ <path fill="#0769AD" d="M250.4,64.7h2.7l-0.7,3.2h-2.7L250.4,64.7z"/>
52
+ </g>
53
+ </g>
54
+ <path fill="#0769AD" d="M3.3,13.4c-4.6,6.5-4,15.1-0.5,22C2.8,35.6,2.9,35.8,3,36c0,0.1,0.1,0.2,0.2,0.3c0,0.1,0.1,0.1,0.1,0.2
55
+ c0.1,0.1,0.1,0.2,0.2,0.3c0.1,0.2,0.2,0.4,0.3,0.6c0.1,0.1,0.1,0.2,0.2,0.3c0.1,0.2,0.3,0.4,0.4,0.6c0.1,0.1,0.1,0.2,0.2,0.3
56
+ c0.2,0.3,0.4,0.5,0.6,0.8c0,0,0,0,0,0c0,0,0.1,0.1,0.1,0.1c0.2,0.2,0.3,0.5,0.5,0.7c0.1,0.1,0.1,0.2,0.2,0.2
57
+ c0.2,0.2,0.3,0.4,0.5,0.6c0.1,0.1,0.1,0.1,0.2,0.2c0.2,0.3,0.4,0.5,0.7,0.7c0,0,0,0,0,0c0,0,0,0,0,0c0.2,0.2,0.4,0.5,0.7,0.7
58
+ c0.1,0.1,0.1,0.1,0.2,0.2c0.2,0.2,0.3,0.3,0.5,0.5c0.1,0.1,0.1,0.1,0.2,0.2c0.2,0.2,0.5,0.4,0.7,0.7c0,0,0,0,0,0
59
+ c0,0,0.1,0.1,0.1,0.1c0.2,0.2,0.4,0.4,0.7,0.6c0.1,0.1,0.2,0.1,0.3,0.2c0.2,0.1,0.4,0.3,0.6,0.4c0.1,0.1,0.2,0.1,0.3,0.2
60
+ c0.2,0.2,0.4,0.3,0.6,0.4c0.1,0.1,0.1,0.1,0.2,0.2c0,0,0,0,0.1,0c0.2,0.1,0.4,0.3,0.6,0.4c0.1,0.1,0.2,0.1,0.3,0.2
61
+ c0.3,0.2,0.6,0.4,0.9,0.6c0.1,0,0.2,0.1,0.3,0.1c0.2,0.1,0.5,0.3,0.7,0.4c0.1,0.1,0.3,0.1,0.4,0.2c0.2,0.1,0.3,0.2,0.5,0.3
62
+ c0,0,0.1,0,0.1,0.1c0.1,0,0.1,0.1,0.2,0.1c0.3,0.1,0.5,0.3,0.8,0.4c0.1,0,0.1,0,0.2,0.1c0.3,0.1,0.6,0.3,0.9,0.4
63
+ c0.1,0,0.1,0.1,0.2,0.1c0.3,0.1,0.6,0.2,0.9,0.3c0,0,0.1,0,0.1,0c0.3,0.1,0.7,0.2,1,0.3c0.1,0,0.2,0.1,0.2,0.1
64
+ c0.3,0.1,0.7,0.2,1,0.3c22,4,28.4-13.2,28.4-13.2c-5.4,7-14.9,8.8-24,6.8c-0.3-0.1-0.7-0.2-1-0.3c-0.1,0-0.2,0-0.2-0.1
65
+ c-0.3-0.1-0.7-0.2-1-0.3c0,0-0.1,0-0.1-0.1c-0.3-0.1-0.6-0.2-0.9-0.3c-0.1,0-0.2-0.1-0.2-0.1c-0.3-0.1-0.6-0.3-0.9-0.4
66
+ c-0.1,0-0.1-0.1-0.2-0.1c-0.3-0.1-0.5-0.2-0.8-0.4c-0.1,0-0.1-0.1-0.2-0.1c-0.2-0.1-0.4-0.2-0.6-0.3c-0.1-0.1-0.3-0.1-0.4-0.2
67
+ c-0.2-0.1-0.5-0.3-0.7-0.4c-0.1-0.1-0.2-0.1-0.2-0.1c-0.3-0.2-0.6-0.4-0.9-0.6c-0.1-0.1-0.2-0.1-0.3-0.2c-0.2-0.1-0.5-0.3-0.7-0.4
68
+ c-0.1-0.1-0.1-0.1-0.2-0.2c-0.2-0.1-0.4-0.3-0.6-0.5c-0.1-0.1-0.2-0.1-0.3-0.2c-0.2-0.1-0.4-0.3-0.6-0.4c-0.1-0.1-0.2-0.1-0.3-0.2
69
+ c-0.2-0.2-0.5-0.4-0.7-0.6c0,0-0.1,0-0.1-0.1c-0.2-0.2-0.5-0.5-0.7-0.7c-0.1-0.1-0.1-0.1-0.2-0.2c-0.2-0.2-0.4-0.3-0.5-0.5
70
+ c-0.1-0.1-0.1-0.1-0.2-0.2c-0.2-0.2-0.4-0.5-0.7-0.7c0,0,0,0,0,0c-0.2-0.2-0.4-0.5-0.7-0.8c-0.1-0.1-0.1-0.1-0.2-0.2
71
+ c-0.2-0.2-0.3-0.4-0.5-0.6c-0.1-0.1-0.1-0.1-0.2-0.2C10,33.5,9.8,33.2,9.6,33c-5-6.8-6.8-16.3-2.8-24"/>
72
+ <path fill="#0769AD" d="M17.4,7.9C14.1,12.7,14.3,19,16.9,24c0.4,0.8,0.9,1.7,1.5,2.4c0.5,0.7,1,1.5,1.7,2.1
73
+ c0.2,0.3,0.5,0.5,0.7,0.8c0.1,0.1,0.1,0.1,0.2,0.2c0.2,0.2,0.5,0.5,0.8,0.7c0,0,0,0,0,0c0,0,0,0,0,0c0.3,0.3,0.6,0.5,0.9,0.7
74
+ c0.1,0.1,0.1,0.1,0.2,0.2c0.3,0.2,0.6,0.5,0.9,0.7c0,0,0,0,0,0c0.1,0.1,0.3,0.2,0.4,0.3c0.1,0,0.1,0.1,0.2,0.1
75
+ c0.2,0.1,0.5,0.3,0.7,0.4c0,0,0.1,0,0.1,0.1c0.2,0.1,0.4,0.2,0.6,0.3c0.1,0,0.1,0.1,0.2,0.1c0.1,0.1,0.3,0.1,0.4,0.2c0,0,0,0,0.1,0
76
+ c0.3,0.1,0.6,0.3,0.9,0.4c0.1,0,0.1,0.1,0.2,0.1c0.2,0.1,0.5,0.2,0.7,0.3c0.1,0,0.2,0.1,0.3,0.1c0.2,0.1,0.4,0.2,0.7,0.2
77
+ c0.1,0,0.2,0.1,0.3,0.1c0.3,0.1,0.6,0.2,1,0.3c17,2.8,20.9-10.3,20.9-10.3c-3.5,5.1-10.4,7.5-17.7,5.6c-0.3-0.1-0.6-0.2-1-0.3
78
+ c-0.1,0-0.2-0.1-0.3-0.1c-0.2-0.1-0.5-0.1-0.7-0.2c-0.1,0-0.2-0.1-0.3-0.1c-0.2-0.1-0.5-0.2-0.7-0.3c-0.1,0-0.1-0.1-0.2-0.1
79
+ c-0.3-0.1-0.6-0.3-0.9-0.4c-0.1-0.1-0.3-0.2-0.4-0.2c-0.1,0-0.2-0.1-0.3-0.1c-0.2-0.1-0.4-0.2-0.6-0.3c0,0-0.1,0-0.1-0.1
80
+ c-0.2-0.1-0.5-0.3-0.7-0.4c-0.1,0-0.1-0.1-0.2-0.1c-0.1-0.1-0.3-0.2-0.4-0.3c-0.3-0.2-0.6-0.4-0.9-0.7c-0.1-0.1-0.1-0.1-0.2-0.2
81
+ c-3.2-2.5-5.7-6-6.9-9.9c-1.3-4.1-1-8.6,1.2-12.3"/>
82
+ <path fill="#0769AD" d="M29.3,3.8c-1.9,2.9-2.1,6.4-0.8,9.6c1.4,3.4,4.3,6,7.7,7.2c0.1,0.1,0.3,0.1,0.4,0.1c0.1,0,0.1,0,0.2,0.1
83
+ c0.2,0.1,0.4,0.1,0.6,0.2c9.4,1.8,11.9-4.8,12.6-5.8c-2.2,3.2-6,4-10.6,2.9c-0.4-0.1-0.8-0.2-1.1-0.3c-0.4-0.2-0.9-0.3-1.3-0.5
84
+ c-0.8-0.4-1.6-0.9-2.3-1.4c-4.1-3.1-6.7-9.1-4-13.9"/>
85
+ <path fill="#333333" d="M247,17.2l0.4,1.6c0.1,0.4-0.2,0.8-0.6,0.8"/>
86
+ <path fill="#333333" d="M217.4,14.5c-0.1,0.4-0.2,1-0.3,1.3l-3.3,15.2l3.4-16L217.4,14.5z"/>
87
+ <polygon fill="#333333" points="120,24.7 118.2,31.1 120,24.7 "/>
88
+ <path fill="#333333" d="M247.4,18.8l-0.9-4c-0.7-2.9-2.8-4.2-7.5-4.2h-19.8c-0.5,0-0.9,0.2-1,0.7l-7.5,35.6c-0.1,0.5-0.1,0.8-0.1,1
89
+ c0.1,0.2,0.9,0.2,1.4,0.2h6.9c0.5,0,1.3,0,1.5-0.1c0.3-0.1,0.4-0.8,0.5-1.2l2.4-12.5l3-13.9c0.1-0.4,0.5-0.8,1-0.8l19.6,0
90
+ C247.2,19.6,247.5,19.2,247.4,18.8"/>
91
+ <path fill="#333333" d="M275.3,4.3c-0.5,0-8.7,0-8.7,0c-0.5,0-1,0.5-1.3,0.9L250,27.6c-0.3,0.4-0.6,0.4-0.7-0.1l-1.1-4.9
92
+ c-0.1-0.4-0.6-0.8-1-0.8h-9.8c-0.5,0-0.7,0.4-0.6,0.8l4.4,15.4c0.1,0.4,0.1,1.2,0,1.6l-2.1,7.8c-0.1,0.4,0.2,0.6,0.6,0.6h9.7
93
+ c0.5,0,0.9-0.1,1-0.6l2.1-7.9c0.1-0.4,0.4-1,0.7-1.4l24.9-33c0.3-0.4,0.2-0.8-0.2-0.8L275.3,4.3z"/>
94
+ <path fill="#333333" d="M173.1,10.6h-8.9c-0.5,0-0.9,0.2-1,0.6l-2.9,13.7L157.4,38c-0.1,0.4-0.5,0.4-1,0.4h-5.8
95
+ c-5.8,0-5.1-3.6-3.9-9.1c0-0.1,3.7-18.1,3.7-18.1c0.1-0.4-0.2-0.6-0.7-0.6h-8.4c-0.5,0-0.9,0.2-1,0.6l-3.4,18.1
96
+ c-1.7,9.8-1.7,18.4,9.6,18.7c0.2,0,17.9,0,17.9,0c0.5,0,0.9-0.2,1-0.6l3.9-18.2l3.8-18.2C173.1,11,173.3,10.6,173.1,10.6z"/>
97
+ <path fill="#333333" d="M84.9,10.6h-9.5c-0.5,0-0.9,0.1-1,0.6l-1.7,7.4c-0.1,0.4,0.2,0.8,0.7,0.8h9.1c0.5,0,0.9-0.4,1-0.9l1.6-7.5
98
+ C85.1,11,85.3,10.6,84.9,10.6z"/>
99
+ <path fill="#333333" d="M72.8,21.8c-0.5,0-0.9,0.4-1,0.8l-1.3,5.7l-2.9,13.1c0,0-1.5,6.9-1.7,7.4c0,0-1.3,5-4.3,4.8
100
+ c-1.4-0.1-3-0.4-3-0.4h0c-0.9-0.3-0.9,0.6-1,1.1l-1.9,8.1c-0.1,0.4,0.2,0.8,0.6,0.9c0,0,4.1,0.6,7,0.6h0.5c7.1,0,10.9-4.2,13.3-15.6
101
+ L79.9,35l2.6-12.3c0.1-0.4-0.2-0.9-0.6-0.9"/>
102
+ <path fill="#333333" d="M195.5,10.5c-16,0-19.8,9.9-21.9,19.6c-2.1,10-1.9,17.9,14.6,17.9h0.6c6.6,0,14.5,0,14.5,0
103
+ c0.4,0,0.9-0.4,1-0.9l1.6-6.3c0.1-0.4-0.2-0.6-0.7-0.6h-14.9c-5.4,0-7.3-1.7-7.1-5.4c0-0.4,0.5-1.5,0.9-1.5h22.9c1,0,1-0.6,1-0.6
104
+ C210.5,22.3,210.6,10.5,195.5,10.5 M199.7,26.2c0,0.5-1.6,0.4-1.6,0.4l-12.4-0.1c-0.4,0-0.6-0.6-0.6-1c0,0,0-0.5,0.1-0.6
105
+ c1-3.3,3.8-5.2,8.4-5.2c5.1,0,6.2,2.5,6.2,5.4"/>
106
+ <path fill="#333333" d="M126.5,37.7c0,0,4.5-10.9,5.5-17.1c1.4-8.4-2.8-20.6-19.1-20.6C96.8,0,89.8,11.6,87.1,24.3
107
+ C84.4,37,87.9,48.1,104,48l24.5,0c0.5,0,0.9-0.4,1-0.8l2.1-7.9c0.1-0.4-0.2-0.8-0.6-0.8l-2,0l-2,0c-0.4,0-0.6-0.3-0.6-0.6
108
+ C126.5,37.9,126.5,37.8,126.5,37.7 M118.1,31.1l-1.8,6.3c-0.1,0.4-0.6,0.7-1.1,0.7h-9.5c-7.2,0-9-5.6-7.2-13.9
109
+ c1.8-8.5,5.2-13.7,12.3-14.3c9.7-0.7,11.7,6.1,9.3,14L118.1,31.1z"/>
110
+ <g>
111
+ </g>
112
+ <g>
113
+ </g>
114
+ <g>
115
+ </g>
116
+ <g>
117
+ </g>
118
+ <g>
119
+ </g>
120
+ <g>
121
+ </g>
122
+ </svg>
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "private": true,
3
3
  "name": "web",
4
- "version": "2019.4.2",
4
+ "version": "2019.4.5",
5
5
  "description": "Web/Content sources for J1 Starter",
6
6
  "main": "_config.yml",
7
7
  "config": {
@@ -101,7 +101,7 @@ j1.cookieConsent = (function (j1, window) {
101
101
  consentSettings = $.extend({}, {{consent_settings | replace: '=>', ':' }});
102
102
 
103
103
  // Merge|Overload module CONFIG by DEFAULTS
104
- consentOptions = j1.mergeData( consentDefaults, consentSettings );
104
+ consentOptions = j1.core.mergeData( consentDefaults, consentSettings );
105
105
 
106
106
  // Load (individual) frontmatter options (currently NOT used)
107
107
  if ( options != null ) { var frontmatterOptions = $.extend({}, options) }
@@ -215,7 +215,7 @@ j1.cookieConsent = (function (j1, window) {
215
215
 
216
216
  if ( stopScrolling ) { $('body').addClass('stop-scrolling'); }
217
217
 
218
- user_state = j1.getUserStateCookie();
218
+ user_state = j1.getUserStateFromCookie();
219
219
  if ( appDetected ) {
220
220
  web_session_state = j1.getWebSessionCookie();
221
221
  }
@@ -92,7 +92,7 @@ j1.cookieConsent = ( function ( j1, window ) {
92
92
  consentSettings = $.extend({}, {{consent_settings | replace: '=>', ':' }});
93
93
 
94
94
  // Merge|Overload module CONFIG by DEFAULTS
95
- consentOptions = j1.mergeData( consentDefaults, consentSettings );
95
+ consentOptions = j1.core.mergeData( consentDefaults, consentSettings );
96
96
 
97
97
  // Load (individual) frontmatter options (currently NOT used)
98
98
  if ( options != null ) { var frontmatterOptions = $.extend({}, options) }
@@ -284,7 +284,7 @@ j1.cookieConsent = ( function ( j1, window ) {
284
284
  // -------------------------------------------------------------------
285
285
  $(document).on('shown.bs.modal','#topFullCookieConsent', function () {
286
286
  if ( stopScrolling ) { $('body').addClass('stop-scrolling'); }
287
- user_state = j1.getUserStateCookie();
287
+ user_state = j1.getUserStateFromCookie();
288
288
  if ( appDetected ) {
289
289
  web_session_state = j1.getWebSessionCookie();
290
290
  }
@@ -6,134 +6,117 @@ regenerate: true
6
6
 
7
7
  {% comment %}
8
8
  # -----------------------------------------------------------------------------
9
- # ~/assets/themes/j1/core/js/adapter/master_header.js
10
- # Liquid template to create the Template Adapter for J1 Master Header
11
- # using the jQuery Plugin Backstretch for image and video placement
12
- # and animation
9
+ # ~/assets/themes/j1/adapter/js/master_header.js
10
+ # Liquid template to adapt Backstretch Core functions
13
11
  #
14
- # Product/Info:
15
- # https://jekyll.one
12
+ # Product/Info:
13
+ # https://jekyll.one
16
14
  #
17
- # Copyright (C) 2019 Juergen Adams
18
- #
19
- # J1 Template is licensed under the MIT License.
20
- # For details, see https://jekyll.one
15
+ # Copyright (C) 2019 Juergen Adams
21
16
  #
17
+ # J1 Template is licensed under the MIT License.
18
+ # For details, see https://jekyll.one
22
19
  # -----------------------------------------------------------------------------
23
20
  # Test data:
24
21
  # {{ liquid_var | debug }}
25
- #
26
22
  # -----------------------------------------------------------------------------
27
23
  {% endcomment %}
28
24
 
25
+ {% comment %} Liquid procedures
26
+ -------------------------------------------------------------------------------- {% endcomment %}
27
+
28
+ {% comment %} Set global settings
29
+ -------------------------------------------------------------------------------- {% endcomment %}
30
+ {% assign environment = site.environment %}
31
+ {% assign template_version = site.version %}
32
+
33
+ {% comment %} Process YML config data
34
+ ================================================================================ {% endcomment %}
35
+
36
+ {% comment %} Set config files
37
+ -------------------------------------------------------------------------------- {% endcomment %}
38
+ {% assign site_config = site %}
39
+ {% assign template_config = site.data.template_settings %}
40
+ {% assign blocks = site.data.blocks %}
41
+ {% assign modules = site.data.modules %}
42
+
43
+ {% comment %} Set config data
44
+ -------------------------------------------------------------------------------- {% endcomment %}
45
+ {% assign header_config = modules.j1_header %}
46
+ {% assign header_globals = header_config.defaults.header %}
47
+ {% assign header_defaults = header_config.defaults.header %}
48
+ {% assign image_header_defaults = header_config.defaults.image_header %}
49
+
50
+ {% comment %} Set config options
51
+ -------------------------------------------------------------------------------- {% endcomment %}
52
+
53
+
29
54
  /*
30
55
  # -----------------------------------------------------------------------------
31
- # ~/assets/themes/j1/core/js/adapter/master_header.js
32
- # JS Adapter for J1 Master Header
56
+ # ~/assets/themes/j1/adapter/js/master_header.js
57
+ # JS Adapter for J1 Master Header
33
58
  #
34
- # Product/Info:
35
- # https://jekyll.one
36
- # http://www.jquery-backstretch.com/
59
+ # Product/Info:
60
+ # https://jekyll.one
61
+ # http://www.jquery-backstretch.com/
37
62
  #
38
- # Copyright (C) 2019 Juergen Adams
39
- # Copyright (C) 2012 Scott Robbin
40
- #
41
- # J1 Template is licensed under the MIT License.
42
- # For details, see https://jekyll.one
43
- # Backstretch is licensed under the MIT License.
44
- # For details, see https://github.com/jquery-backstretch/jquery-backstretch
63
+ # Copyright (C) 2019 Juergen Adams
64
+ # Copyright (C) 2012 Scott Robbin
45
65
  #
66
+ # J1 Template is licensed under the MIT License.
67
+ # For details, see https://jekyll.one
68
+ # Backstretch is licensed under the MIT License.
69
+ # For details, see https://github.com/jquery-backstretch/jquery-backstretch
46
70
  # -----------------------------------------------------------------------------
47
71
  # Adapter generated: {{site.time}}
48
72
  # -----------------------------------------------------------------------------
49
73
  */
50
74
  'use strict';
51
75
 
52
- {% comment %} Variables
53
- -------------------------------------------------------------------------------- {% endcomment %}
54
- {% assign environment = site.environment %}
55
-
56
- {% assign header_config = site.data.modules.j1_header %}
57
- {% assign header_globals = header_config.defaults.header %}
58
- {% assign header_defaults = header_config.defaults.header %}
59
- {% assign image_header_defaults = header_config.defaults.image_header %}
60
-
61
-
62
76
  {% comment %} Main
63
77
  -------------------------------------------------------------------------------- {% endcomment %}
64
- j1.MastHead = (function (j1, window) {
78
+ j1.adapter['masterheader'] = (function (j1, window) {
65
79
 
66
- var environment = '{{environment}}'; // Set environment
67
- var state = 'not_started';
80
+ {% comment %} Set global variables
81
+ ------------------------------------------------------------------------------ {% endcomment %}
82
+ var environment = '{{environment}}';
83
+ var state = 'not_started';
68
84
  var logger;
69
85
  var logText;
70
86
 
87
+ // ---------------------------------------------------------------------------
88
+ // Main object
89
+ // ---------------------------------------------------------------------------
71
90
  return {
72
- // Initialize
73
- init: function ( options ) {
74
-
75
- {% comment %}
76
- ---------------------------------------------------------------------------- {% endcomment %}
77
- // Set environment
78
- var environment = "{{environment}}";
79
- // Setup logger
80
- logger = log4javascript.getLogger("j1.MasterHeader.adapter");
81
91
 
82
- // J1 data files
83
- var j1_colors = {};
84
- var j1_font_sizes = {};
85
- var colors_data_path = "/assets/data/colors.json";
86
- var font_size_data_path = "/assets/data/font_sizes.json";
92
+ // -------------------------------------------------------------------------
93
+ // Initializer
94
+ // -------------------------------------------------------------------------
95
+ init: function ( options ) {
96
+ var frontmatterOptions = options != null ? $.extend({}, options) : {};
87
97
 
88
- // Initialize module defaults
89
- if ( options != null ) {
90
- var frontmatterOptions = $.extend({}, options);
91
- }
98
+ {% comment %} Set global variables
99
+ -------------------------------------------------------------------------- {% endcomment %}
100
+ logger = log4javascript.getLogger("j1.adapter.masterheader");
92
101
 
93
102
  state = 'started';
94
103
  logger.info('state: ' + state); // Set|Log status
95
104
 
96
- {% comment %} helper functions for (AJAX) data load
105
+ {% comment %} Run loading headers if J1 Template data is loaded
97
106
  -------------------------------------------------------------------------- {% endcomment %}
98
- function load_color_data() {
99
- // Returns the j1_colors object
100
- return $.ajax({
101
- url: colors_data_path,
102
- success: function (data) {
103
- if (typeof data == 'string') {
104
- j1_colors = JSON.parse(data);
105
- }
106
- if (typeof data == 'object') {
107
- j1_colors = data;
108
- }
109
- }
110
- });
111
- };
112
- function load_font_sizes() {
113
- // Returns the j1_font_sizes object
114
- return $.ajax({
115
- url: font_size_data_path,
116
- success: function (data) {
117
- if (typeof data == 'string') {
118
- j1_font_sizes = JSON.parse(data);
119
- }
120
- if (typeof data == 'object') {
121
- j1_font_sizes = data;
122
- }
123
- }
124
- });
125
- };
107
+ var j1DataLoaded = setInterval(function() {
108
+
109
+ {% comment %} Deferred (AJAX) data load
110
+ ------------------------------------------------------------------------ {% endcomment %}
111
+ if ( j1.getState() === 'running' ) {
112
+ clearInterval(j1DataLoaded); // clear interval checking
126
113
 
127
- {% comment %} Deferred data load
128
- -------------------------------------------------------------------------- {% endcomment %}
129
- // Load color and font (json) data asychronously
130
- // See: https://stackoverflow.com/questions/3709597/wait-until-all-jquery-ajax-requests-are-done
131
- $.when( load_color_data(), load_font_sizes() ).done (
132
- function( load_color_data_response, load_font_sizes_response ) {
133
114
  state = 'running';
134
115
  logger.info('state: ' + state); // Set|Log status
135
- j1.MastHead.loadHeader( frontmatterOptions, j1_colors, j1_font_sizes );
136
- });
116
+ j1.adapter.masterheader.loadHeader( frontmatterOptions );
117
+
118
+ } // END j1.getState() === 'running'
119
+ }, 50); // END setInterval j1DataLoaded
137
120
 
138
121
  return true;
139
122
  }, // END init
@@ -141,7 +124,7 @@ j1.MastHead = (function (j1, window) {
141
124
  // -------------------------------------------------------------------------
142
125
  // Initialize all header supported
143
126
  // -------------------------------------------------------------------------
144
- loadHeader: function ( frontmatterOptions, j1_colors, j1_font_sizes ) {
127
+ loadHeader: function ( frontmatterOptions ) {
145
128
 
146
129
  {% comment %} Load data from header config (yaml data file)
147
130
  -------------------------------------------------------------------------- {% endcomment %}
@@ -207,9 +190,8 @@ j1.MastHead = (function (j1, window) {
207
190
  $(".j1-masthead-caption").text(theCaption).show(); //.addClass('animated fadeInUp');
208
191
  }
209
192
 
210
- $("a.j1-masthead-caption-anchor").each(function(i, e){
211
- if ( typeof j1_colors[imageHeaderOptions.slides[index].caption_color] != 'undefined' ) {
212
- imageHeaderOptions.slides[index].caption_color = j1_colors[imageHeaderOptions.slides[index].caption_color] }
193
+ $("a.j1-masthead-caption-anchor").each(function(i,e) {
194
+ imageHeaderOptions.slides[index].caption_color = j1.setColorData(imageHeaderOptions.slides[index].caption_color)
213
195
  $(e).css( "color", imageHeaderOptions.slides[index].caption_color );
214
196
  });
215
197
  }
@@ -349,11 +331,11 @@ j1.MastHead = (function (j1, window) {
349
331
  // Load Header DEFAULTS
350
332
  var header_defaults = $.extend({}, {{header_defaults | replace:'=>',':' }});
351
333
  // Merge|Overload Header DEFAULTS by (header) OPTIONS
352
- var headerOptions = j1.mergeData( header_defaults, headerOptions );
334
+ var headerOptions = j1.core.mergeData( header_defaults, headerOptions );
353
335
  // Load Backstretch DEFAULTS
354
336
  var image_header_defaults = $.extend({}, {{image_header_defaults | replace:'=>',':' }});
355
337
  // Merge|Overload Backstretch DEFAULTS by (header) OPTIONS
356
- var imageHeaderOptions = j1.mergeData( image_header_defaults, imageHeaderOptions );
338
+ var imageHeaderOptions = j1.core.mergeData( image_header_defaults, imageHeaderOptions );
357
339
  {% else %}
358
340
  {% continue %}
359
341
  {% endif %} // ENDif header_id
@@ -407,10 +389,15 @@ j1.MastHead = (function (j1, window) {
407
389
 
408
390
  {% comment %} Resolve symbolic color names
409
391
  -------------------------------------------------------------------- {% endcomment %}
410
- if ( typeof j1_colors[headerOptions.title_color] != 'undefined' ) { headerOptions.title_color = j1_colors[headerOptions.title_color] }
411
- if ( typeof j1_colors[headerOptions.tagline_color] != 'undefined' ) { headerOptions.tagline_color = j1_colors[headerOptions.tagline_color] }
412
- if ( typeof j1_colors[headerOptions.background_color_1] != 'undefined' ) { headerOptions.background_color_1 = j1_colors[headerOptions.background_color_1] }
413
- if ( typeof j1_colors[headerOptions.background_color_2] != 'undefined' ) { headerOptions.background_color_2 = j1_colors[headerOptions.background_color_2] }
392
+ headerOptions.title_color = j1.setColorData(headerOptions.title_color);
393
+ headerOptions.tagline_color = j1.setColorData(headerOptions.tagline_color);
394
+ headerOptions.background_color_1 = j1.setColorData(headerOptions.background_color_1);
395
+ headerOptions.background_color_2 = j1.setColorData(headerOptions.background_color_2);
396
+
397
+ {% comment %} Resolve symbolic font sizes names
398
+ -------------------------------------------------------------------- {% endcomment %}
399
+ headerOptions.title_size = j1.setFontSize(headerOptions.title_size);
400
+ headerOptions.tagline_size = j1.setFontSize(headerOptions.tagline_size);
414
401
 
415
402
  {% comment %} Add header CSS classes
416
403
  -------------------------------------------------------------------- {% endcomment %}
@@ -428,7 +415,8 @@ j1.MastHead = (function (j1, window) {
428
415
  {% comment %} Add header CSS styles to <HEAD>
429
416
  -------------------------------------------------------------------- {% endcomment %}
430
417
  var masthead_style = '';
431
- // Initialze header background gradient/colors
418
+
419
+ // Initialze header background gradient
432
420
  masthead_style += "<style> .j1-masthead { ";
433
421
  masthead_style += "background-image: -webkit-gradient(linear, left top, left bottom, from( " +headerOptions.background_color_1+ " ), to( " +headerOptions.background_color_2+ " ));";
434
422
  masthead_style += "background-image: -webkit-linear-gradient(top, " +headerOptions.background_color_1+ " 0%, " +headerOptions.background_color_2+ " 100%);";
@@ -440,18 +428,21 @@ j1.MastHead = (function (j1, window) {
440
428
 
441
429
  // Initialze header sizes
442
430
  masthead_style = '';
431
+
443
432
  masthead_style = "<style> .j1-masthead { padding-top:" +headerOptions.padding_top+ "px; padding-bottom: " +headerOptions.padding_bottom+ "px; margin-bottom: " +headerOptions.margin_bottom+ "px; text-shadow: 0 1px 0 rgba(0,0,0,.1); </style>"
444
433
  $('head').append( masthead_style );
445
- $('head').append("<style> .j1-masthead .head-title h2 { color: " +headerOptions.title_color+ ";font-size: " +j1_font_sizes[headerOptions.title_size]+ " !important; text-align: " +headerOptions.title_align+ ";} </style>");
446
- $('head').append("<style> .j1-masthead .head-tagline h3 { color: " +headerOptions.tagline_color+ ";font-size: " +j1_font_sizes[headerOptions.tagline_size]+ " !important; text-align: " +headerOptions.tagline_align+ "; } </style>");
434
+ $('head').append("<style> .j1-masthead .head-title h2 { color: " +headerOptions.title_color+ ";font-size: " +headerOptions.title_size+ " !important; text-align: " +headerOptions.title_align+ ";} </style>");
435
+ $('head').append("<style> .j1-masthead .head-tagline h3 { color: " +headerOptions.tagline_color+ ";font-size: " +headerOptions.tagline_size+ " !important; text-align: " +headerOptions.tagline_align+ "; } </style>");
447
436
 
448
437
  // Add opacity to all header images
449
438
  // See: https://tympanus.net/codrops/2013/11/07/css-overlay-techniques/
450
439
  var masthead_opacity;
440
+
451
441
  masthead_opacity = '<style> .backstretch-item { opacity: ' +imageHeaderOptions.opacity+ '; </style>';
452
442
  $('head').append( masthead_opacity );
443
+
453
444
  state = 'initialized';
454
- logger.info('state: ' + state); // Set|Log status
445
+ logger.info('state: ' + state);
455
446
 
456
447
  {% comment %} Run the image header if any
457
448
  -------------------------------------------------------------------- {% endcomment %}