j1-template 2020.0.0 → 2020.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/j1/version.rb +1 -1
- data/lib/starter_web/Gemfile +2 -2
- data/lib/starter_web/_config.yml +1 -1
- data/lib/starter_web/_data/layouts/default.yml +5 -5
- data/lib/starter_web/_data/modules/authentication.yml +5 -5
- data/lib/starter_web/_data/modules/cookie_consent.yml +10 -10
- data/lib/starter_web/_data/private.yml +66 -98
- data/lib/starter_web/assets/themes/j1/adapter/js/back2top.js +2 -2
- data/lib/starter_web/assets/themes/j1/adapter/js/cookie_consent.js +38 -28
- data/lib/starter_web/assets/themes/j1/adapter/js/gallery_customizer.js +7 -7
- data/lib/starter_web/assets/themes/j1/adapter/js/j1.js +73 -30
- data/lib/starter_web/assets/themes/j1/adapter/js/logger.js +2 -2
- data/lib/starter_web/assets/themes/j1/adapter/js/themer.js +2 -1
- data/lib/starter_web/package.json +1 -1
- data/lib/starter_web/utilsrv/_defaults/package.json +1 -1
- data/lib/starter_web/utilsrv/package.json +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d18f32e5ab9ccde33c8aca296cbe35757142303fd7d6c3d16ebddf51ff3dd2d0
|
|
4
|
+
data.tar.gz: 7bbad0a22167049f7d9b16a4b8cb9f0d62a2418f3daa49731543ff47d1d08d29
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8020d52ec42867f7a79b2404875fcc0463408a6a8add3c4430f0f46ce45c0a6cff1da40b3a7373490436454b74283dc7afa8a8564342ab7b6eb23c4fd2657635
|
|
7
|
+
data.tar.gz: ccbed08f143dd02d0d2cc7cfbb7f1ea9c7f1a55d1ec26f9dbe35f6c20225eb0fbaacc0dde338a8d09fac7c6f16578f94b80e0d33b1012971791d6cef4260bc11
|
data/lib/j1/version.rb
CHANGED
data/lib/starter_web/Gemfile
CHANGED
|
@@ -51,7 +51,7 @@ gem 'jekyll', '~> 4.0'
|
|
|
51
51
|
|
|
52
52
|
# Theme Rubies, default: J1 Template
|
|
53
53
|
#
|
|
54
|
-
gem 'j1-template', '~> 2020.0.
|
|
54
|
+
gem 'j1-template', '~> 2020.0.1'
|
|
55
55
|
|
|
56
56
|
# ------------------------------------------------------------------------------
|
|
57
57
|
# PRODUCTION: Gem needed for the Jekyll and J1 prod environment
|
|
@@ -110,7 +110,7 @@ group :jekyll_plugins do
|
|
|
110
110
|
# gem 'jekyll-gist', '>= 1.5.0'
|
|
111
111
|
# gem 'jekyll-sitemap', '>= 1.2.0'
|
|
112
112
|
# gem 'jekyll-redirect-from', '>= 0.13.0'
|
|
113
|
-
gem 'j1-paginator', '>= 2020.0.
|
|
113
|
+
gem 'j1-paginator', '>= 2020.0.1'
|
|
114
114
|
gem 'jekyll-sass-converter', '>= 1.5.1'
|
|
115
115
|
end
|
|
116
116
|
|
data/lib/starter_web/_config.yml
CHANGED
|
@@ -53,7 +53,7 @@ environment: development
|
|
|
53
53
|
# ------------------------------------------------------------------------------
|
|
54
54
|
# Sets the build version of J1 Template Gem
|
|
55
55
|
#
|
|
56
|
-
version: 2020.0.
|
|
56
|
+
version: 2020.0.1
|
|
57
57
|
|
|
58
58
|
# version
|
|
59
59
|
# ------------------------------------------------------------------------------
|
|
@@ -191,9 +191,8 @@ lanes:
|
|
|
191
191
|
class:
|
|
192
192
|
|
|
193
193
|
# ------------------------------------------------------------------
|
|
194
|
-
#
|
|
195
|
-
#
|
|
196
|
-
# NOTE:
|
|
194
|
+
# SHIM loader (body-footer)
|
|
195
|
+
# NOTE: UNUSED as it is moved to ???
|
|
197
196
|
#
|
|
198
197
|
# - lane:
|
|
199
198
|
# enabled: false
|
|
@@ -205,6 +204,8 @@ lanes:
|
|
|
205
204
|
|
|
206
205
|
# ------------------------------------------------------------------
|
|
207
206
|
# THEME loader (body-footer)
|
|
207
|
+
# NOTE: UNUSED as it is moved to themer.js
|
|
208
|
+
#
|
|
208
209
|
# - lane:
|
|
209
210
|
# enabled: false
|
|
210
211
|
# region: body-footer
|
|
@@ -227,6 +228,5 @@ lanes:
|
|
|
227
228
|
path: layouts
|
|
228
229
|
file: layout_module_generator.html
|
|
229
230
|
|
|
230
|
-
|
|
231
231
|
# ------------------------------------------------------------------------------
|
|
232
|
-
# END config
|
|
232
|
+
# END config
|
|
@@ -69,7 +69,7 @@ settings:
|
|
|
69
69
|
#
|
|
70
70
|
# ----------------------------------------------------------------------------
|
|
71
71
|
j1_auth:
|
|
72
|
-
enabled:
|
|
72
|
+
enabled: true
|
|
73
73
|
ssl: false
|
|
74
74
|
|
|
75
75
|
content:
|
|
@@ -133,7 +133,7 @@ settings:
|
|
|
133
133
|
# users:
|
|
134
134
|
# whitelist: [ all ]
|
|
135
135
|
# blacklist: []
|
|
136
|
-
#
|
|
136
|
+
#
|
|
137
137
|
# github:
|
|
138
138
|
# provider_url: https://github.com
|
|
139
139
|
# strategy: member
|
|
@@ -147,7 +147,7 @@ settings:
|
|
|
147
147
|
# users:
|
|
148
148
|
# whitelist: [ all ]
|
|
149
149
|
# blacklist: []
|
|
150
|
-
#
|
|
150
|
+
#
|
|
151
151
|
# patreon:
|
|
152
152
|
# provider_url: https://patreon.com
|
|
153
153
|
# strategy: member
|
|
@@ -179,7 +179,7 @@ settings:
|
|
|
179
179
|
# name: "Value Content"
|
|
180
180
|
# amount: 100,
|
|
181
181
|
# state: paid
|
|
182
|
-
#
|
|
182
|
+
#
|
|
183
183
|
# twitter:
|
|
184
184
|
# provider_url: https://twitter.com
|
|
185
185
|
# strategy: member
|
|
@@ -251,4 +251,4 @@ settings:
|
|
|
251
251
|
|
|
252
252
|
|
|
253
253
|
# ------------------------------------------------------------------------------
|
|
254
|
-
# END config
|
|
254
|
+
# END config
|
|
@@ -28,16 +28,16 @@ settings:
|
|
|
28
28
|
|
|
29
29
|
modal_type: full
|
|
30
30
|
modal_position: top
|
|
31
|
-
stop_scrolling: true
|
|
31
|
+
stop_scrolling: true
|
|
32
32
|
consent_modals_title: Privacy
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
33
|
+
# whitelisted_pages: [
|
|
34
|
+
# /,
|
|
35
|
+
# /pages/public/about/site/,
|
|
36
|
+
# /pages/public/about/become_a_patron/
|
|
37
|
+
# /pages/public/legal/en/impress/,
|
|
38
|
+
# /pages/public/legal/en/privacy/,
|
|
39
|
+
# /pages/public/legal/en/license_agreement/
|
|
40
|
+
# ]
|
|
41
41
|
|
|
42
42
|
strict: false # all pages requires a consent (currently NOT supported)
|
|
43
43
|
show_consent_icon: true # show the consent icon (in quicklinks)
|
|
@@ -125,4 +125,4 @@ settings:
|
|
|
125
125
|
relevant to you.
|
|
126
126
|
|
|
127
127
|
# END config
|
|
128
|
-
# ------------------------------------------------------------------------------
|
|
128
|
+
# ------------------------------------------------------------------------------
|
|
@@ -80,25 +80,12 @@ middleware:
|
|
|
80
80
|
# ----------------------------------------------------------------------------
|
|
81
81
|
oauth:
|
|
82
82
|
|
|
83
|
-
# DISQUS credentials
|
|
84
83
|
# --------------------------------------------------------------------------
|
|
84
|
+
# DISQUS credentials
|
|
85
|
+
# ==========================================================================
|
|
85
86
|
disqus:
|
|
86
87
|
|
|
87
|
-
# J1 Auth client (mode
|
|
88
|
-
# ------------------------------------------------------------------------
|
|
89
|
-
# comment:
|
|
90
|
-
# name: j1-starter-local-4k
|
|
91
|
-
# user: juergen.adams@jekyll-one.com
|
|
92
|
-
# strategy: members
|
|
93
|
-
#
|
|
94
|
-
# client_url: http://localhost:4000
|
|
95
|
-
# client_redirect_url: http://localhost:4000/auth/disqus/callback
|
|
96
|
-
# client_id: zOBZQHnxz0DtPmLTgSgSJ036vGB4Csvj5KOTleylVcDaLjQdYRDaPFdm62QR1DAx
|
|
97
|
-
# client_secret: sMh7JdbjE0DiPhrhirlnQUYfOls5E1HDxoJ7ksrxIavbmYdS1AjzX94lmUgku45F
|
|
98
|
-
|
|
99
|
-
# 1. J1 Auth client (mode APP, development system)
|
|
100
|
-
# 2. GH OAuth settings used for J1 Control Center (NetlifyCMS)
|
|
101
|
-
# for the external OAuth client (base_url)
|
|
88
|
+
# J1 Auth client (mode APP, development system)
|
|
102
89
|
# ------------------------------------------------------------------------
|
|
103
90
|
comment:
|
|
104
91
|
name: j1-starter-local-5k
|
|
@@ -112,18 +99,20 @@ middleware:
|
|
|
112
99
|
|
|
113
100
|
# J1 Auth client (mode APP, production)
|
|
114
101
|
# ------------------------------------------------------------------------
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
102
|
+
# comment:
|
|
103
|
+
# name: j1-starter-app
|
|
104
|
+
# user: juergen.adams@jekyll-one.com
|
|
105
|
+
# strategy: members
|
|
106
|
+
#
|
|
107
|
+
# client_url: https://app.jekyll.one
|
|
108
|
+
# client_redirect_url: http://app.jekyll.one/auth/disqus/callback
|
|
109
|
+
# client_id: nxfGmVWvtPHhv2XqXMDZShOwwlEyCyxCvx36xMG1DEv0WfcsKb5Y83yV0CE045X4
|
|
110
|
+
# client_secret: 72vMIfD7RXfPQ9T1hxbwvUOkycWofa14apUOLoYkfJ8ZVDFqjBTrOIjDHzkBQFuw
|
|
111
|
+
|
|
124
112
|
|
|
125
|
-
# GITHUB credentials
|
|
126
113
|
# --------------------------------------------------------------------------
|
|
114
|
+
# GITHUB credentials
|
|
115
|
+
# ==========================================================================
|
|
127
116
|
github:
|
|
128
117
|
|
|
129
118
|
# J1 Auth client (mode APP, development system)
|
|
@@ -140,92 +129,71 @@ middleware:
|
|
|
140
129
|
client_id: 4759b4d27a5f526c632a
|
|
141
130
|
client_secret: 8472988317760fd097d1e80e996f4ec410c1857a
|
|
142
131
|
|
|
143
|
-
# J1 Auth client (mode
|
|
144
|
-
# ------------------------------------------------------------------------
|
|
145
|
-
# comment:
|
|
146
|
-
# name: j1-starter@local-4k
|
|
147
|
-
# user: jekyll-one
|
|
148
|
-
# org: jekyll-one-org
|
|
149
|
-
# strategy: members
|
|
150
|
-
# members: all
|
|
151
|
-
#
|
|
152
|
-
# client_url: http://localhost:4000
|
|
153
|
-
# client_redirect_url: http://localhost:4000/auth/github/callback
|
|
154
|
-
# client_id: 4097db3af722dd1760c0
|
|
155
|
-
# client_secret: 8ed83f3de2727abd5b7ece69a9dfbeed5b73a658
|
|
156
|
-
|
|
157
|
-
# J1 Auth client (mode WEB, runtime system)
|
|
132
|
+
# J1 Auth client (mode APP, prod system)
|
|
158
133
|
# ------------------------------------------------------------------------
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
# J1 Auth client (mode APP, runtime system)
|
|
173
|
-
# ------------------------------------------------------------------------
|
|
174
|
-
# comment:
|
|
175
|
-
# name: j1-starter-local@41k
|
|
176
|
-
# user: jekyll-one
|
|
177
|
-
# org: jekyll-one-org
|
|
178
|
-
# strategy: members
|
|
179
|
-
# members: all
|
|
180
|
-
#
|
|
181
|
-
# client_url: http://localhost:41000
|
|
182
|
-
# client_redirect_url: http://localhost:41000/auth/github/callback
|
|
183
|
-
# client_id: c051940d67119abd3f3b
|
|
184
|
-
# client_secret: 93fcb5fffca69292b08d81ac550b41e1523eb07b
|
|
134
|
+
# comment:
|
|
135
|
+
# name: https://docs.jekyll.one
|
|
136
|
+
# user: jekyll-one
|
|
137
|
+
# org: jekyll-one-org
|
|
138
|
+
# strategy: members
|
|
139
|
+
# members: all
|
|
140
|
+
#
|
|
141
|
+
# client_url: https://docs.jekyll.one/
|
|
142
|
+
# client_redirect_url: https://docs.jekyll.one/auth/github/callback
|
|
143
|
+
# client_id: 9bf5e62056aabee42898
|
|
144
|
+
# client_secret: e9c70921603e56dc38cf05b53868417172b35c2e
|
|
145
|
+
|
|
185
146
|
|
|
186
|
-
# PATREON credentials
|
|
187
147
|
# --------------------------------------------------------------------------
|
|
148
|
+
# PATREON credentials
|
|
149
|
+
# ==========================================================================
|
|
188
150
|
patreon:
|
|
189
151
|
|
|
190
152
|
# J1 Auth client (mode APP, development system)
|
|
191
153
|
# ------------------------------------------------------------------------
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
154
|
+
# comment:
|
|
155
|
+
# name: j1-starter-local-5k
|
|
156
|
+
# user: juergen@jekyll.one
|
|
157
|
+
# strategy: members
|
|
158
|
+
# api: v1
|
|
159
|
+
#
|
|
160
|
+
# client_url: http://localhost:5000
|
|
161
|
+
# client_redirect_url: http://localhost:5000/auth/github/callback
|
|
162
|
+
# client_id: bDuEYHyKjtypxb5wQKMILCCUw-x5XtYD-_9MsDAO22agQGoaB2CRKtP5UReRVflS
|
|
163
|
+
# client_secret: uDRsD1dwWSLPUCeBrjz4umjsNMD04drCtTqy7xSEjkqIVACGa-h-n1w8t9o2mW42
|
|
202
164
|
|
|
203
165
|
# J1 Auth client (mode APP, production)
|
|
204
166
|
# ------------------------------------------------------------------------
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
167
|
+
# comment:
|
|
168
|
+
# name: j1-starter-app-heroku
|
|
169
|
+
# user: juergen@jekyll.one
|
|
170
|
+
# strategy: members
|
|
171
|
+
# api: v1
|
|
172
|
+
#
|
|
173
|
+
# client_url: https://j1-starter-app.herokuapp.com
|
|
174
|
+
# client_redirect_url: https://j1-starter-app.herokuapp.com/auth/patreon/callback
|
|
175
|
+
# client_id: HOgyFtiKA_wwgL-PkwwrQszs3LXJdnw28JYrX28-MvCkhx5dyp8kRW8RC4WnzdVE
|
|
176
|
+
# client_secret: ofh0yfPNtJzzFoCMDW0miHbf7CWJ-JSaOkvXkqyOdczkmNBk-16Gf2GFP3ihD8Gd
|
|
177
|
+
|
|
215
178
|
|
|
216
179
|
|
|
217
|
-
# TWITTER credentials (currently NOT supported)
|
|
218
180
|
# --------------------------------------------------------------------------
|
|
219
|
-
#
|
|
220
|
-
#
|
|
221
|
-
|
|
222
|
-
# user: <your-userid>
|
|
223
|
-
# strategy: <your-strategy>
|
|
224
|
-
# client_url: <your-client-url>
|
|
225
|
-
# client_redirect_url: <your-client-redirect-url>
|
|
226
|
-
# client_id: <your-client-id>
|
|
227
|
-
# client_secret: <your-client-secret>
|
|
181
|
+
# TWITTER credentials (currently NOT supported)
|
|
182
|
+
# ==========================================================================
|
|
183
|
+
twitter:
|
|
228
184
|
|
|
185
|
+
# J1 Auth client
|
|
186
|
+
# ------------------------------------------------------------------------
|
|
187
|
+
# comment:
|
|
188
|
+
# name: <your-oauth-app-name>
|
|
189
|
+
# user: <your-userid>
|
|
190
|
+
# strategy: <your-strategy>
|
|
191
|
+
# api: v1
|
|
192
|
+
#
|
|
193
|
+
# client_url: <your-client-url>
|
|
194
|
+
# client_redirect_url: <your-client-redirect-url>
|
|
195
|
+
# client_id: <your-client-id>
|
|
196
|
+
# client_secret: <your-client-secret>
|
|
229
197
|
|
|
230
198
|
# ------------------------------------------------------------------------------
|
|
231
199
|
# END
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
---
|
|
2
|
-
regenerate:
|
|
2
|
+
regenerate: false
|
|
3
3
|
---
|
|
4
4
|
|
|
5
5
|
{% capture cache %}
|
|
@@ -224,4 +224,4 @@ j1.adapter['back2top'] = (function (j1, window) {
|
|
|
224
224
|
|
|
225
225
|
{% endcapture %}
|
|
226
226
|
{{ cache | strip_empty_lines }}
|
|
227
|
-
{% assign cache = nil %}
|
|
227
|
+
{% assign cache = nil %}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
---
|
|
2
|
-
regenerate:
|
|
2
|
+
regenerate: false
|
|
3
3
|
---
|
|
4
4
|
|
|
5
5
|
{% capture cache %}
|
|
@@ -108,13 +108,20 @@ j1.adapter['cookie_consent'] = (function (j1, window) {
|
|
|
108
108
|
|
|
109
109
|
_this = j1.adapter.cookie_consent;
|
|
110
110
|
logger = log4javascript.getLogger('j1.adapter.cookie_consent');
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
111
|
+
|
|
112
|
+
// TODO:
|
|
113
|
+
// CHECK how|what module should initialize the user_state
|
|
114
|
+
// cookie. For now disabled here, because cookie is too early
|
|
115
|
+
// written. Cause corrupted|imcomplete cookie content if cookie
|
|
116
|
+
// does NOT exists already.
|
|
117
|
+
|
|
118
|
+
// cookie_consent = j1.existsCookie(user_state_name) ?
|
|
119
|
+
// j1.readCookie(user_state_name) :
|
|
120
|
+
// j1.writeCookie({
|
|
121
|
+
// name: user_state_name,
|
|
122
|
+
// data: cookie_consent,
|
|
123
|
+
// expires: 365
|
|
124
|
+
// });
|
|
118
125
|
|
|
119
126
|
// -----------------------------------------------------------------------
|
|
120
127
|
// options loader
|
|
@@ -130,25 +137,28 @@ j1.adapter['cookie_consent'] = (function (j1, window) {
|
|
|
130
137
|
logger.info('state: ' + _this.getState());
|
|
131
138
|
logger.info('module is being initialized');
|
|
132
139
|
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
140
|
+
if (j1.existsCookie(user_state_name)) {
|
|
141
|
+
cookie_consent = j1.readCookie(user_state_name);
|
|
142
|
+
cookie_consent.deleteOnDecline = moduleOptions.delete_cookies_on_decline;
|
|
143
|
+
cookie_consent.showConsentOnPending = moduleOptions.show_consent_on_pending;
|
|
144
|
+
cookie_consent.whitelistedPages = moduleOptions.whitelisted_pages;
|
|
145
|
+
cookie_consent.stopScrolling = moduleOptions.stop_scrolling;
|
|
146
|
+
|
|
147
|
+
// Update cookie consent
|
|
148
|
+
// TODO: MAKE expiery date configurable
|
|
149
|
+
|
|
150
|
+
// j1.writeCookie({
|
|
151
|
+
// name: user_state_name,
|
|
152
|
+
// data: cookie_consent,
|
|
153
|
+
// expires: cookie_consent.live_span
|
|
154
|
+
// });
|
|
155
|
+
|
|
156
|
+
j1.writeCookie({
|
|
157
|
+
name: user_state_name,
|
|
158
|
+
data: cookie_consent,
|
|
159
|
+
expires: 365
|
|
160
|
+
});
|
|
161
|
+
}
|
|
152
162
|
|
|
153
163
|
// ---------------------------------------------------------------------
|
|
154
164
|
// data loader
|
|
@@ -256,4 +266,4 @@ j1.adapter['cookie_consent'] = (function (j1, window) {
|
|
|
256
266
|
|
|
257
267
|
{% endcapture %}
|
|
258
268
|
{{ cache | strip_empty_lines }}
|
|
259
|
-
{% assign cache = nil %}
|
|
269
|
+
{% assign cache = nil %}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
---
|
|
2
|
-
regenerate:
|
|
2
|
+
regenerate: false
|
|
3
3
|
---
|
|
4
4
|
|
|
5
5
|
{% capture cache %}
|
|
@@ -156,7 +156,7 @@ j1.adapter['gallery_customizer'] = (function (j1, window) {
|
|
|
156
156
|
$.when (
|
|
157
157
|
j1.xhrData (
|
|
158
158
|
'j1.adapter.gallery_customizer', {
|
|
159
|
-
xhr_container_id: customizerOptions.xhr_container_id,
|
|
159
|
+
xhr_container_id: customizerOptions.xhr_container_id,
|
|
160
160
|
xhr_data_path: customizerOptions.xhr_data_path },
|
|
161
161
|
'data_loaded'))
|
|
162
162
|
.then (function (success) {
|
|
@@ -260,7 +260,7 @@ j1.adapter['gallery_customizer'] = (function (j1, window) {
|
|
|
260
260
|
e.stopPropagation();
|
|
261
261
|
});
|
|
262
262
|
|
|
263
|
-
$('input:checkbox[name="captions"]').on('click', function (e) {
|
|
263
|
+
$('input:checkbox[name="captions"]').on('click', function (e) {
|
|
264
264
|
var value = $(this).is(':checked');
|
|
265
265
|
|
|
266
266
|
$instance.justifiedGallery({captions: value});
|
|
@@ -299,7 +299,7 @@ j1.adapter['gallery_customizer'] = (function (j1, window) {
|
|
|
299
299
|
e.stopPropagation();
|
|
300
300
|
});
|
|
301
301
|
|
|
302
|
-
$('input:checkbox[name="hide_last_row"]').on('click', function (e) {
|
|
302
|
+
$('input:checkbox[name="hide_last_row"]').on('click', function (e) {
|
|
303
303
|
var value = $(this).is(":checked");
|
|
304
304
|
|
|
305
305
|
if (value == true) {
|
|
@@ -316,14 +316,14 @@ j1.adapter['gallery_customizer'] = (function (j1, window) {
|
|
|
316
316
|
e.stopPropagation();
|
|
317
317
|
});
|
|
318
318
|
|
|
319
|
-
$('#jg-customizer-form button[name="reset-defaults"]').on('click', function (e) {
|
|
319
|
+
$('#jg-customizer-form button[name="reset-defaults"]').on('click', function (e) {
|
|
320
320
|
|
|
321
321
|
$('#rowHeight').val(customizerOptions.gallery_settings.rowHeight);
|
|
322
322
|
$('#rowHeightMax').val(customizerOptions.gallery_settings.maxRowHeight);
|
|
323
323
|
$('#margins').val(customizerOptions.gallery_settings.margins);
|
|
324
324
|
$('#border').val(customizerOptions.gallery_settings.border);
|
|
325
325
|
$('input:checkbox[name="captions"]').val("on").filter('[value="on"]').prop('checked', customizerOptions.gallery_settings.captions);
|
|
326
|
-
$('input:checkbox[name="random"]').val("off").filter('[value="off"]').prop('checked', customizerOptions.gallery_settings.randomize);
|
|
326
|
+
$('input:checkbox[name="random"]').val("off").filter('[value="off"]').prop('checked', customizerOptions.gallery_settings.randomize);
|
|
327
327
|
$('input:checkbox[name="justify_last_row"]').val("on").filter('[value="on"]').prop('checked', customizerOptions.gallery_settings.justifyLastRow);
|
|
328
328
|
$('input:checkbox[name="hide_last_row"]').val("off").filter('[value="off"]').prop('checked', customizerOptions.gallery_settings.hideLastRow);
|
|
329
329
|
|
|
@@ -424,4 +424,4 @@ j1.adapter['gallery_customizer'] = (function (j1, window) {
|
|
|
424
424
|
|
|
425
425
|
{% endcapture %}
|
|
426
426
|
{{ cache | strip_empty_lines }}
|
|
427
|
-
{% assign cache = nil %}
|
|
427
|
+
{% assign cache = nil %}
|
|
@@ -89,6 +89,10 @@ regenerate: true
|
|
|
89
89
|
# J1 Template is licensed under the MIT License.
|
|
90
90
|
# For details, see https://jekyll.one
|
|
91
91
|
# -----------------------------------------------------------------------------
|
|
92
|
+
# TODO:
|
|
93
|
+
# MANAGE themeExtensionCss is to be checked
|
|
94
|
+
#
|
|
95
|
+
# -----------------------------------------------------------------------------
|
|
92
96
|
# Adapter generated: {{site.time}}
|
|
93
97
|
# -----------------------------------------------------------------------------
|
|
94
98
|
*/
|
|
@@ -122,7 +126,7 @@ var j1 = (function () {
|
|
|
122
126
|
// Theme information
|
|
123
127
|
var themeName;
|
|
124
128
|
var themeCss;
|
|
125
|
-
var themeExtensionCss;
|
|
129
|
+
var themeExtensionCss = environment === 'production' ? '/assets/themes/j1/core/css/theme_extensions.min.css' : '/assets/themes/j1/core/css/theme_extensions.css';
|
|
126
130
|
|
|
127
131
|
// Pathes of J1 data files
|
|
128
132
|
var colors_data_path = '{{template_config.colors_data_path}}';
|
|
@@ -168,20 +172,38 @@ var j1 = (function () {
|
|
|
168
172
|
'provider_privacy_url': '{{template_config.user.provider_privacy_url}}',
|
|
169
173
|
'requested_page': 'na',
|
|
170
174
|
'previous_page': 'na',
|
|
171
|
-
'last_pager': '/pages/public/blog/navigator/'
|
|
175
|
+
'last_pager': '/pages/public/blog/navigator/'
|
|
172
176
|
};
|
|
173
177
|
|
|
174
178
|
// user STATE cookie (initial values)
|
|
179
|
+
// var user_state = {
|
|
180
|
+
// 'theme_css': default_theme_css,
|
|
181
|
+
// 'theme_extension_css': '{{themer_options.includeBootswatch}}',
|
|
182
|
+
// 'theme_name': default_theme_name,
|
|
183
|
+
// 'theme_author': default_theme_author,
|
|
184
|
+
// 'theme_author_url': '{{template_config.theme_author_url}}',
|
|
185
|
+
// 'theme_link': default_theme_link,
|
|
186
|
+
// 'theme_version': '{{site.version}}',
|
|
187
|
+
// 'cookies_accepted': 'pending',
|
|
188
|
+
// 'whitelistedPages': default_white_listed_pages,
|
|
189
|
+
// 'deleteOnDecline': false,
|
|
190
|
+
// 'showConsentOnPending': false,
|
|
191
|
+
// 'stopScrolling': true,
|
|
192
|
+
// 'session_active': false,
|
|
193
|
+
// 'last_session_ts': '',
|
|
194
|
+
// 'cc_authenticated': false
|
|
195
|
+
// };
|
|
196
|
+
|
|
175
197
|
var user_state = {
|
|
176
198
|
'theme_css': default_theme_css,
|
|
177
|
-
'theme_extension_css':
|
|
199
|
+
'theme_extension_css': themeExtensionCss,
|
|
178
200
|
'theme_name': default_theme_name,
|
|
179
201
|
'theme_author': default_theme_author,
|
|
180
202
|
'theme_author_url': '{{template_config.theme_author_url}}',
|
|
181
203
|
'theme_link': default_theme_link,
|
|
182
204
|
'theme_version': '{{site.version}}',
|
|
183
205
|
'cookies_accepted': 'pending',
|
|
184
|
-
'whitelistedPages': default_white_listed_pages,
|
|
206
|
+
'whitelistedPages': default_white_listed_pages,
|
|
185
207
|
'deleteOnDecline': false,
|
|
186
208
|
'showConsentOnPending': false,
|
|
187
209
|
'stopScrolling': true,
|
|
@@ -233,15 +255,15 @@ var j1 = (function () {
|
|
|
233
255
|
{
|
|
234
256
|
foo: 'foo_option',
|
|
235
257
|
bar: 'bar_option'
|
|
236
|
-
},
|
|
237
|
-
options
|
|
258
|
+
},
|
|
259
|
+
options
|
|
238
260
|
);
|
|
239
261
|
|
|
240
262
|
// catch senseless detect url 404 errors (middleware /status)
|
|
241
263
|
// See: https://stackoverflow.com/questions/4687235/jquery-get-or-post-to-catch-page-load-error-eg-404
|
|
242
264
|
$.ajaxSetup({
|
|
243
265
|
// called on `$.get()`, `$.post()`, `$.ajax()`
|
|
244
|
-
statusCode : {
|
|
266
|
+
statusCode : {
|
|
245
267
|
// raised on response status code 404
|
|
246
268
|
404 : function (jqxhr, textStatus, errorThrown) {
|
|
247
269
|
var interval_count = 0;
|
|
@@ -251,7 +273,7 @@ var j1 = (function () {
|
|
|
251
273
|
if ( j1.adapter.logger.getState() == 'finished' ) {
|
|
252
274
|
var logger = log4javascript.getLogger('j1.init');
|
|
253
275
|
clearInterval(dependencies_met_logger);
|
|
254
|
-
if(jqxhr.responseText.indexOf('GET /status') > -1) {
|
|
276
|
+
if(jqxhr.responseText.indexOf('GET /status') > -1) {
|
|
255
277
|
logger.info('no middleware found on url /status: ignored');
|
|
256
278
|
logger.info('continue on mode: web');
|
|
257
279
|
}
|
|
@@ -285,12 +307,19 @@ var j1 = (function () {
|
|
|
285
307
|
user_state.session_active = false;
|
|
286
308
|
user_state.last_session_ts = timestamp_now;
|
|
287
309
|
|
|
310
|
+
// DANGEROUS (??): delete user session in browser using MULTI_TAB!
|
|
311
|
+
if (j1.existsCookie(cookie_names.user_session)) {
|
|
312
|
+
var bla = cookie_names.user_session;
|
|
313
|
+
j1.deleteCookie(cookie_names.user_session)
|
|
314
|
+
}
|
|
315
|
+
|
|
288
316
|
j1.writeCookie({
|
|
289
317
|
name: cookie_user_state_name,
|
|
290
318
|
data: user_state,
|
|
291
319
|
expires: 365
|
|
292
320
|
});
|
|
293
321
|
|
|
322
|
+
|
|
294
323
|
});
|
|
295
324
|
|
|
296
325
|
// -----------------------------------------------------------------------
|
|
@@ -335,7 +364,7 @@ var j1 = (function () {
|
|
|
335
364
|
.then(function(data) {
|
|
336
365
|
var logger = log4javascript.getLogger('j1.init');
|
|
337
366
|
user_session = j1.readCookie(cookie_names.user_session);
|
|
338
|
-
user_session.mode = 'app';
|
|
367
|
+
user_session.mode = 'app';
|
|
339
368
|
user_session.requested_page = window.location.pathname;
|
|
340
369
|
user_session.timestamp = timestamp_now;
|
|
341
370
|
user_session = j1.mergeData(user_session, data);
|
|
@@ -855,9 +884,9 @@ var j1 = (function () {
|
|
|
855
884
|
var providerPermissions = {};
|
|
856
885
|
var provider;
|
|
857
886
|
var previous_page;
|
|
858
|
-
var appDetected;
|
|
887
|
+
var appDetected;
|
|
859
888
|
var categoryAllowed;
|
|
860
|
-
|
|
889
|
+
|
|
861
890
|
|
|
862
891
|
logger.info('finalize page');
|
|
863
892
|
j1.setCss();
|
|
@@ -885,8 +914,8 @@ var j1 = (function () {
|
|
|
885
914
|
// -------------------------------------------------------------------
|
|
886
915
|
if (
|
|
887
916
|
j1.authEnabled() &&
|
|
888
|
-
user_session.page_permission !== 'public' &&
|
|
889
|
-
categoryAllowed === false)
|
|
917
|
+
user_session.page_permission !== 'public' &&
|
|
918
|
+
categoryAllowed === false)
|
|
890
919
|
{
|
|
891
920
|
// redirect to middleware|page_authentication
|
|
892
921
|
if (data.authenticated === 'true') {
|
|
@@ -927,7 +956,7 @@ var j1 = (function () {
|
|
|
927
956
|
$('#quickLinksControlCenterButton').css('display', 'block');
|
|
928
957
|
|
|
929
958
|
// show|hide signin|out icon
|
|
930
|
-
if (j1.authEnabled()) {
|
|
959
|
+
if (j1.authEnabled()) {
|
|
931
960
|
if (user_session.authenticated === 'true') {
|
|
932
961
|
// set signout
|
|
933
962
|
logger.info('show signout icon');
|
|
@@ -959,7 +988,7 @@ var j1 = (function () {
|
|
|
959
988
|
// update sidebar for changed consent|theme data
|
|
960
989
|
logger.info('update sidebar');
|
|
961
990
|
user_state = j1.readCookie(cookie_names.user_state);
|
|
962
|
-
current_user_data = j1.mergeData(user_session, user_state);
|
|
991
|
+
current_user_data = j1.mergeData(user_session, user_state);
|
|
963
992
|
j1.core.navigator.updateSidebar(current_user_data);
|
|
964
993
|
|
|
965
994
|
// Set|Log status
|
|
@@ -1023,7 +1052,7 @@ var j1 = (function () {
|
|
|
1023
1052
|
// update sidebar for changed consent|theme data
|
|
1024
1053
|
logger.info('update sidebar');
|
|
1025
1054
|
user_state = j1.readCookie(cookie_names.user_state);
|
|
1026
|
-
current_user_data = j1.mergeData(user_session, user_state);
|
|
1055
|
+
current_user_data = j1.mergeData(user_session, user_state);
|
|
1027
1056
|
j1.core.navigator.updateSidebar(current_user_data);
|
|
1028
1057
|
|
|
1029
1058
|
// Set|Log status
|
|
@@ -1165,9 +1194,17 @@ var j1 = (function () {
|
|
|
1165
1194
|
// Returns true if a web session cookie exists
|
|
1166
1195
|
// -------------------------------------------------------------------------
|
|
1167
1196
|
appDetected: function () {
|
|
1168
|
-
var user_session
|
|
1169
|
-
var
|
|
1197
|
+
var user_session;
|
|
1198
|
+
var cookieExists = j1.existsCookie(cookie_names.user_session);
|
|
1199
|
+
var detected = false;
|
|
1170
1200
|
|
|
1201
|
+
if (cookieExists) {
|
|
1202
|
+
user_session = j1.readCookie(cookie_names.user_session);
|
|
1203
|
+
detected = user_session.mode === 'app' ? true : false;
|
|
1204
|
+
} else {
|
|
1205
|
+
// detected = 'unknown';
|
|
1206
|
+
detected = false;
|
|
1207
|
+
}
|
|
1171
1208
|
return detected;
|
|
1172
1209
|
}, // END appDetected
|
|
1173
1210
|
|
|
@@ -1280,7 +1317,7 @@ var j1 = (function () {
|
|
|
1280
1317
|
|
|
1281
1318
|
// -------------------------------------------------------------------------
|
|
1282
1319
|
// getRuntimeData: Returns the j1_runtime data object
|
|
1283
|
-
//
|
|
1320
|
+
//
|
|
1284
1321
|
// -------------------------------------------------------------------------
|
|
1285
1322
|
getRuntimeData: function (data_path) {
|
|
1286
1323
|
var logger = log4javascript.getLogger('j1.getRuntimeData');
|
|
@@ -1344,8 +1381,8 @@ var j1 = (function () {
|
|
|
1344
1381
|
}, // END getColorData
|
|
1345
1382
|
|
|
1346
1383
|
// -------------------------------------------------------------------------
|
|
1347
|
-
// setColorData:
|
|
1348
|
-
//
|
|
1384
|
+
// setColorData:
|
|
1385
|
+
//
|
|
1349
1386
|
// -------------------------------------------------------------------------
|
|
1350
1387
|
setColorData: function (color) {
|
|
1351
1388
|
|
|
@@ -1482,11 +1519,17 @@ var j1 = (function () {
|
|
|
1482
1519
|
readCookie: function (name) {
|
|
1483
1520
|
var data;
|
|
1484
1521
|
var data_json;
|
|
1485
|
-
|
|
1486
|
-
|
|
1522
|
+
var cookieExists = j1.existsCookie(name);
|
|
1523
|
+
|
|
1524
|
+
if (cookieExists) {
|
|
1525
|
+
data_json = window.atob(Cookies.get(name));
|
|
1526
|
+
data = JSON.parse(data_json);
|
|
1487
1527
|
|
|
1488
|
-
|
|
1489
|
-
|
|
1528
|
+
if (data) {
|
|
1529
|
+
return data;
|
|
1530
|
+
} else {
|
|
1531
|
+
return false;
|
|
1532
|
+
}
|
|
1490
1533
|
} else {
|
|
1491
1534
|
return false;
|
|
1492
1535
|
}
|
|
@@ -1613,7 +1656,7 @@ var j1 = (function () {
|
|
|
1613
1656
|
//see if cookie is in first position
|
|
1614
1657
|
begin = dc.indexOf(prefix);
|
|
1615
1658
|
// not found at all or found as a portion of another cookie name
|
|
1616
|
-
if (begin === -1 || begin !== 0 ) return
|
|
1659
|
+
if (begin === -1 || begin !== 0 ) return false;
|
|
1617
1660
|
}
|
|
1618
1661
|
|
|
1619
1662
|
// if ";" is found somewhere after the prefix position then "end" is
|
|
@@ -1947,7 +1990,7 @@ var j1 = (function () {
|
|
|
1947
1990
|
var tabs_pills_link_color_hover = j1.setColorData('md_gray_300'); // j1.getStyleValue('btn-secondary', 'background-color');
|
|
1948
1991
|
|
|
1949
1992
|
// nav module
|
|
1950
|
-
// -----------------------------------------------------------------------
|
|
1993
|
+
// -----------------------------------------------------------------------
|
|
1951
1994
|
$('head').append('<style>.nav-link:hover { background-color: ' +tabs_pills_link_color_hover+ ' !important; }</style>');
|
|
1952
1995
|
$('head').append('<style>.nav-link.active { background-color: ' +tabs_pills_link_color_active+ ' !important; }</style>');
|
|
1953
1996
|
|
|
@@ -2015,10 +2058,10 @@ var j1 = (function () {
|
|
|
2015
2058
|
// -------------------------------------------------------------------------
|
|
2016
2059
|
goHome: function () {
|
|
2017
2060
|
// most browsers
|
|
2018
|
-
if (typeof window.home == 'function') {
|
|
2061
|
+
if (typeof window.home == 'function') {
|
|
2019
2062
|
window.home();
|
|
2020
2063
|
} else if (document.all) {
|
|
2021
|
-
// for IE
|
|
2064
|
+
// for IE
|
|
2022
2065
|
window.location.href = "about:home";
|
|
2023
2066
|
} else {
|
|
2024
2067
|
window.location.href = "about:blank";
|
|
@@ -2031,4 +2074,4 @@ var j1 = (function () {
|
|
|
2031
2074
|
{% endcapture %}
|
|
2032
2075
|
|
|
2033
2076
|
{{ cache | strip_empty_lines }}
|
|
2034
|
-
{% assign cache = nil %}
|
|
2077
|
+
{% assign cache = nil %}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
---
|
|
2
|
-
regenerate:
|
|
2
|
+
regenerate: false
|
|
3
3
|
---
|
|
4
4
|
|
|
5
5
|
{% capture cache %}
|
|
@@ -313,4 +313,4 @@ j1.adapter['logger'] = (function (j1, window) {
|
|
|
313
313
|
|
|
314
314
|
{% endcapture %}
|
|
315
315
|
{{ cache | strip_empty_lines }}
|
|
316
|
-
{% assign cache = nil %}
|
|
316
|
+
{% assign cache = nil %}
|
|
@@ -30,6 +30,7 @@ regenerate: false
|
|
|
30
30
|
-------------------------------------------------------------------------------- {% endcomment %}
|
|
31
31
|
{% assign environment = site.environment %}
|
|
32
32
|
{% assign template_version = site.version %}
|
|
33
|
+
{% assign asset_path = "/assets/themes/j1" %}
|
|
33
34
|
|
|
34
35
|
{% comment %} Process YML config data
|
|
35
36
|
================================================================================ {% endcomment %}
|
|
@@ -354,4 +355,4 @@ j1.adapter['themer'] = (function (j1, window) {
|
|
|
354
355
|
|
|
355
356
|
{% endcapture %}
|
|
356
357
|
{{ cache | strip_empty_lines }}
|
|
357
|
-
{% assign cache = nil %}
|
|
358
|
+
{% assign cache = nil %}
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: j1-template
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2020.0.
|
|
4
|
+
version: 2020.0.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- juergen_jekyll_one
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-06-
|
|
11
|
+
date: 2020-06-15 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: jekyll
|