j1_template_mde 2018.4.11 → 2018.4.12

data/lib/j1_app/omniauth/strategies/facebook.rb

@@ -31,7 +31,7 @@ module OmniAuth
 
       info do
         prune!({
-                   'nickname' => raw_info['username'],
+                   'nickname' => raw_info['username'].gsub('ä','ae').gsub('ö','oe').gsub('ü','ue').gsub(' ','_').downcase,
                    'email' => raw_info['email'],
                    'name' => raw_info['name'],
                    'first_name' => raw_info['first_name'],

data/lib/j1_app/omniauth/strategies/github.rb

@@ -26,13 +26,13 @@ module OmniAuth
 
       info do
         {
-          'nickname' => raw_info['login'],
-          'email' => email,
-          'name' => raw_info['name'],
-          'image' => raw_info['avatar_url'],
-          'urls' => {
-              'GitHub' => raw_info['html_url'],
-              'Blog' => raw_info['blog'],
+          :nickname     => raw_info['login'],
+          :email        => email,
+          :name         => raw_info['name'],
+          :image        => raw_info['avatar_url'],
+          :urls         => {
+            'GitHub'    => raw_info['html_url'],
+            'Blog'      => raw_info['blog'],
           }
         }
       end

data/lib/j1_app/omniauth/strategies/patreon.rb

@@ -16,10 +16,11 @@ module OmniAuth
 
       info do
         {
-          email: raw_info['data']['attributes']['email'],
-          name: raw_info['data']['attributes']['full_name'],
-          access_token: access_token.token,
-          refresh_token: access_token.refresh_token
+          :email          => raw_info['data']['attributes']['email'],
+          :name           => raw_info['data']['attributes']['full_name'],
+          :nickname       => raw_info['data']['attributes']['full_name'].gsub('ä','ae').gsub('ö','oe').gsub('ü','ue').gsub(' ','_').downcase,
+          :access_token   => access_token.token,
+          :refresh_token  => access_token.refresh_token
         }
       end
 

data/lib/j1_app/omniauth/strategies/twitter.rb

@@ -16,7 +16,7 @@ module OmniAuth
 
       info do
         {
-            :nickname => raw_info['screen_name'],
+            :nickname => raw_info['screen_name'].gsub('ä','ae').gsub('ö','oe').gsub('ü','ue').gsub(' ','_').downcase,
             :name => raw_info['name'],
             :email => raw_info["email"],
             :location => raw_info['location'],

data/lib/starter_web/Gemfile

@@ -45,7 +45,7 @@ gem 'jekyll', '~> 3.8.5'
 # Default theme (J1 Template Material Design Elements) based on
 # Bootstrap v4.1.1 and MD for Bootstrap v0.5.10.
 #
-gem 'j1_template_mde', '~> 2018.4.10'
+gem 'j1_template_mde', '~> 2018.4.12'
 
 # --------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment
@@ -95,9 +95,9 @@ gem 'wdm', '>= 0.1.1' if Gem.win_platform?
 # Additional Gem needed for Docker images
 #
 gem 'i18n', '0.9.5'
-
 
 # ---------------------------------------------------------
+# Jekyll Plugins
 # If any (additional) plugins are used, they go here:
 #
 group :jekyll_plugins do

data/lib/starter_web/_config.yml

@@ -60,7 +60,7 @@ environment:                            development
 #   anything here because version information is bumped-in by
 #   the build process
 #
-version:                                2018.4.3
+version:                                2018.4.12
 
 
 # ==============================================================================
@@ -537,13 +537,12 @@ j1_auth:
 
   content:
     public:
-        - ^(\/assets)
-        - ^(\/pages\/about)
-        - ^(\/pages\/start)
+      - ^(\/assets)
+      - ^(\/\w+\/public)
     private:
-      - ^(\/private)
+      - ^(\/\w+\/private)
     premium:
-      - ^(\/premium)
+      - ^(\/\w+\/premium)
 
   provider:
     activated:                          [ disqus, github, patreon ]
@@ -565,6 +564,12 @@ j1_auth:
       github:                           [ all ]
       patreon:                          [ all ]
       twitter:                          [ all ]
+    strategy:
+      disqus:                           member
+      facebook:                         member
+      github:                           member
+      patreon:                          member
+      twitter:                          member
     permission:
       disqus:                           [ private ]
       facebook:                         [ private ]
@@ -572,14 +577,17 @@ j1_auth:
       patreon:                          [ private, premium ]
       twitter:                          [ private ]
     condition:
-      disqus:                           false
-      facebook:                         false
-      github:                           false
-      twitter:                          false
+      disqus:
+        private:                        none
+      facebook:
+        private:                        none
+      github:
+        private:                        none
+      twitter:
+        private:                        none
       patreon:
-        private:                        false
-        premium:
-          pledges:                      true
+        private:                        none
+        premium:                        pledges
 
 # ---------------------------------------------------------------
 # SAFEMODE
@@ -649,13 +657,13 @@ collections:
   #
   biography:
     output:                             true
-    permalink:                          /collections/:collection/:name/
+    permalink:                          /collections/premium/:collection/:name/
   fantasy:
     output:                             true
-    permalink:                          /collections/:collection/:name/
+    permalink:                          /collections/premium/:collection/:name/
   romance:
     output:                             true
-    permalink:                          /collections/:collection/:name/
+    permalink:                          /collections/premium/:collection/:name/
 
 
 # --------------------------------------------------------------------
@@ -707,7 +715,7 @@ defaults:
   # Featured
   #
   - scope:
-      path:                             posts/featured/_posts
+      path:                             posts/public/featured/_posts
       type:                             posts
 
     values:
@@ -736,7 +744,7 @@ defaults:
   #
   - scope:
       type:                             posts
-      path:                             posts/series/_posts
+      path:                             posts/premium/series/_posts
 
     values:
       layout:                           post
@@ -760,7 +768,7 @@ defaults:
   #
   - scope:
       type:                             posts
-      path:                             posts/wikipedia/_posts
+      path:                             posts/private/wikipedia/_posts
 
     values:
       layout:                           post

data/lib/starter_web/_data/modules/_unused/j1_navigator.yml

@@ -188,8 +188,8 @@ nav_sidebar:
         type:                           linkbox
         links:
           About:                        /pages/about/
-          Impress:                      /pages/legal/en/impress/
-          Terms of Use:                 /pages/legal/en/terms_of_use/
-          Privacy:                      /pages/legal/en/privacy/
-          License Agreements:           /pages/legal/en/license_agreement/
+          Impress:                      /pages/public/legal/en/impress/
+          Terms of Use:                 /pages/public/legal/en/terms_of_use/
+          Privacy:                      /pages/public/legal/en/privacy/
+          License Agreements:           /pages/public/legal/en/license_agreement/
           Contact:                      mailto:contact@jekyll.one

data/lib/starter_web/_data/modules/_unused/j1_navigator_menu.yml

@@ -16,11 +16,11 @@
   sublevel:
 
     - title:                            Read Me First
-      href:                             /pages/start/read_me_first/
+      href:                             /public/start/read_me_first/
       icon:                             alert-circle
 
     - title:                            DM 920 HD
-      href:                             /pages/start/dm920hd/
+      href:                             /public/start/dm920hd/
       icon:                             alert-circle
 
 #    - title:                            Document Skeleton
@@ -32,25 +32,25 @@
       dropdown:
 
         - title:                        Present Images
-          href:                         /pages/start/roundtrip/present_images
+          href:                         /public/start/roundtrip/present_images
           icon:                         image
         - title:                        Cards
-          href:                         /pages/start/roundtrip/cards
+          href:                         /public/start/roundtrip/cards
           icon:                         cards-outline
         - title:                        Typography
-          href:                         /pages/start/roundtrip/typography/
+          href:                         /public/start/roundtrip/typography/
           icon:                         format-text
         - title:                        Material Design Icons
-          href:                         /pages/start/roundtrip/mdi_icon_font/
+          href:                         /public/start/roundtrip/mdi_icon_font/
           icon:                         emoticon-tongue
         - title:                        Asciidoc Extensions
-          href:                         /pages/start/roundtrip/asciidoc_extensions/
+          href:                         /public/start/roundtrip/asciidoc_extensions/
           icon:                         format-annotation-plus
         - title:                        Themes
-          href:                         /pages/start/roundtrip/themes/
+          href:                         /public/start/roundtrip/themes/
           icon:                         face
         - title:                        Modals
-          href:                         /pages/start/roundtrip/modals
+          href:                         /public/start/roundtrip/modals
           icon:                         image
 
     - title:                            Downloads
@@ -58,13 +58,13 @@
       dropdown:
 
         - title:                        Linux Starter
-          href:                         /pages/start/downloads/linux_starter/
+          href:                         /public/start/downloads/linux_starter/
           icon:                         linux
         - title:                        MacOS Starter
-          href:                         /pages/start/downloads/macos_starter/
+          href:                         /public/start/downloads/macos_starter/
           icon:                         apple
         - title:                        Windows Starter
-          href:                         /pages/start/downloads/windows_starter/
+          href:                         /public/start/downloads/windows_starter/
           icon:                         windows
 
     - title:                            Kickstarter
@@ -76,7 +76,7 @@
           dropdown:
 
           - title:                      Getting started
-            href:                       /pages/start/kickstarter/web_in_a_day/intro/
+            href:                       /public/start/kickstarter/web_in_a_day/intro/
             icon:                       bus-double-decker
 
         - title:                        FlexBox in a Day
@@ -84,22 +84,22 @@
           dropdown:
 
             - title:                    FLEX Basics
-              href:                     /pages/start/kickstarter/flex_in_a_day/intro/
+              href:                     /public/start/kickstarter/flex_in_a_day/intro/
               icon:                     airballoon
             - title:                    Visual Reference
-              href:                     /pages/start/kickstarter/flex_in_a_day/visual_reference/
+              href:                     /public/start/kickstarter/flex_in_a_day/visual_reference/
               icon:                     looks
             - title:                    Simple Layouts
-              href:                     /pages/start/kickstarter/flex_in_a_day/simple_layouts/
+              href:                     /public/start/kickstarter/flex_in_a_day/simple_layouts/
               icon:                     book
             - title:                    Advanced Layouts
-              href:                     /pages/start/kickstarter/flex_in_a_day/advanced_layouts/
+              href:                     /public/start/kickstarter/flex_in_a_day/advanced_layouts/
               icon:                     book-plus
             - title:                    Advanced Tasks
-              href:                     /pages/start/kickstarter/flex_in_a_day/advanced_tasks/
+              href:                     /public/start/kickstarter/flex_in_a_day/advanced_tasks/
               icon:                     note-plus
             - title:                    Summeries in Tables
-              href:                     /pages/start/kickstarter/flex_in_a_day/tables/
+              href:                     /public/start/kickstarter/flex_in_a_day/tables/
               icon:                     table
 
         - title:                        Jekyll Web Applications
@@ -107,20 +107,20 @@
           dropdown:
 
             - title:                    Introduction
-              href:                     /pages/start/kickstarter/jekyll_web_apps/intro/
+              href:                     /public/start/kickstarter/jekyll_web_apps/intro/
               icon:                     airballoon
             - title:                    Getting started
-              href:                     /pages/start/kickstarter/jekyll_web_apps/getting_started/
+              href:                     /public/start/kickstarter/jekyll_web_apps/getting_started/
               icon:                     bus-double-decker
             - title:                    Sinatra DSL
-              href:                     /pages/start/kickstarter/jekyll_web_apps/sinatra_dsl/
+              href:                     /public/start/kickstarter/jekyll_web_apps/sinatra_dsl/
               icon:                     math-compass
             - title:                    Authentication
-              href:                     /pages/start/kickstarter/jekyll_web_apps/auth/
+              href:                     /public/start/kickstarter/jekyll_web_apps/auth/
               icon:                     login
 
     - title:                            Change Me First
-      href:                             /pages/start/change_me_first/
+      href:                             /public/start/change_me_first/
       icon:                             pencil
 
 - item:                                 Blog

data/lib/starter_web/_data/modules/j1_banner.yml

@@ -66,7 +66,7 @@ banners:
                 icon:               rocket
                 icon_color:         md_white
                 icon_size:          lg
-                href:               /pages/start/kickstarter/web_in_a_day/intro/
+                href:               /public/start/kickstarter/web_in_a_day/intro/
 
             - button:
                 text:               Download 
@@ -74,7 +74,7 @@ banners:
                 icon:               download
                 icon_color:         md_white
                 icon_size:          lg
-                href:               /pages/start/downloads/quickstart/
+                href:               /public/start/downloads/quickstart/
 
   # --------------------------------------------------------
   # example_teaser_banner

data/lib/starter_web/_data/modules/j1_cookiebar.yml

@@ -47,8 +47,8 @@ declineFunction:                    null
 policyButton:                       true
 policyText:                         Privacy
 policyText_de:                      Datenschutzbestimmungen
-policyURL:                          /pages/legal/en/privacy/
-policyURL_de:                       /pages/legal/de/privacy/
+policyURL:                          /pages/public/legal/en/privacy/
+policyURL_de:                       /pages/public/legal/de/privacy/
 acceptOnContinue:                   false
 acceptOnScroll:                     false
 acceptAnyClick:                     false

data/lib/starter_web/_data/modules/j1_footer.yml

@@ -41,13 +41,13 @@ footer:
   - legal_info:
     - copyright_statement:            J1 · Copyright © 2018 · All Rights reserved
     - impress_statement:              Impress
-      impress_link:                   /pages/legal/en/impress/
+      impress_link:                   /pages/public/legal/en/impress/
     - terms_statement:                Terms Of Use
-      terms_link:                     /pages/legal/en/terms_of_use/
+      terms_link:                     /pages/public/legal/en/terms_of_use/
     - privacy_statement:              Privacy
-      privacy_link:                   /pages/legal/en/privacy/
+      privacy_link:                   /pages/public/legal/en/privacy/
     - license_statement:              License
-      license_link:                   /pages/legal/en/license_agreement/
+      license_link:                   /pages/public/legal/en/license_agreement/
     - support_statement:              Support
       support_link:
 

data/lib/starter_web/_data/modules/j1_navigator.yml

@@ -104,6 +104,7 @@ defaults:
 
   nav_sidebar:
     enabled:                            false
+    display_user_info:                  true
     display_theme:                      true
     icon_family:                        Material Design Icons
     icon_color:                         md_white
@@ -115,8 +116,6 @@ defaults:
   nav_authclient:
     enabled:                            false
     icon_family:                        Material Design Icons
-    icon_color:                         rgba_lighten
-    icon_color_hover:                   rgba_lighten_900
     signin_icon:                        login
     signout_icon:                       logout
 
@@ -163,16 +162,7 @@ nav_authclient:
                                         <b>NOTE:</b> To access protected pages of this site,
                                         authentication is needed only once.
                                         </br></br>
- 
-                           
-  auth_signout_modal:                        
-    title:                              SignOut
-    body_text: >
-                                        In order to <b>signing out completely</b>, check the switch
-                                        below <b>to on</b>.
-                                        After signing out from this site, you'll be <b>redirected</b>
-                                        to the provider you're currently authenticated. From your
-                                        home page at the provider, you can sign out completely.    
+
   auth_disqus:
     id:                                 1
     title:                              Disqus
@@ -198,7 +188,17 @@ nav_authclient:
     home_url:                           "https://twitter.com"
     title:                              Twitter
     text: >                             
-                                        SignIn to Twitter. Get access to all <b>PRIVATE</b> content pages.
+                                        SignIn to Twitter. Get access to all <b>PRIVATE</b> content pages. 
+                           
+  auth_signout_modal:                        
+    title:                              SignOut
+    body_text: >
+                                        In order to <b>signing out completely</b>, check the switch
+                                        below <b>to on</b>.
+                                        After signing out from this site, you'll be <b>redirected</b>
+                                        to the provider you're currently authenticated. From your
+                                        home page at the provider, you can sign out completely.    
+
 
 # ------------------------------------------------------------------------------
 # 6. Navigation sidebar settings
@@ -206,13 +206,14 @@ nav_authclient:
 nav_sidebar:
   enabled:                              true
   boxes:
+
     - box:
         title:                          Site Info
         type:                           linkbox
         links:
           About:                        /pages/about/
-          Impress:                      /pages/legal/en/impress/
-          Terms of Use:                 /pages/legal/en/terms_of_use/
-          Privacy:                      /pages/legal/en/privacy/
-          License Agreements:           /pages/legal/en/license_agreement/
+          Impress:                      /pages/public/legal/en/impress/
+          Terms of Use:                 /pages/public/legal/en/terms_of_use/
+          Privacy:                      /pages/public/legal/en/privacy/
+          License Agreements:           /pages/public/legal/en/license_agreement/
           Contact:                      mailto:contact@jekyll.one

data/lib/starter_web/_data/modules/j1_navigator_menu.yml

@@ -17,95 +17,83 @@
   sublevel:
 
     - title:                            Read Me First
-      href:                             /pages/start/read_me_first/
+      href:                             /pages/public/start/read_me_first/
       icon:                             alert-circle
 
-    - title:                            Manuals
-      icon:                             book-open-page-variant
-      dropdown:
-
-        - title:                        Header Module
-          href:                         /user_guide/modules/header/
-          icon:                         page-layout-header
+    - title:                            Change Me First
+      href:                             /pages/public/start/change_me_first/
+      icon:                             pencil
 
-        - title:                        Authentication Module
-          href:                         /user_guide/modules/auth_module/
-          icon:                         account-settings-variant
+    - title:                            Web in a Day
+      icon:                             rocket
+      dropdown:
+      - title:                          Getting started
+        href:                           /pages/public/start/kickstarter/web_in_a_day/intro/
+        icon:                           web
 
     - title:                            Roundtrip
       icon:                             wallet-travel
       dropdown:
         - title:                        Present Images
-          href:                         /pages/start/roundtrip/present_images
+          href:                         /pages/public/start/roundtrip/present_images
           icon:                         image
         - title:                        Cards
-          href:                         /pages/start/roundtrip/cards
+          href:                         /pages/public/start/roundtrip/cards
           icon:                         cards-outline
         - title:                        Typography
-          href:                         /pages/start/roundtrip/typography/
+          href:                         /pages/public/start/roundtrip/typography/
           icon:                         format-text
         - title:                        Material Design Icons
-          href:                         /pages/start/roundtrip/mdi_icon_font/
+          href:                         /pages/public/start/roundtrip/mdi_icon_font/
           icon:                         emoticon-tongue
         - title:                        Asciidoc Extensions
-          href:                         /pages/start/roundtrip/asciidoc_extensions/
+          href:                         /pages/public/start/roundtrip/asciidoc_extensions/
           icon:                         format-annotation-plus
         - title:                        Themes
-          href:                         /pages/start/roundtrip/themes/
+          href:                         /pages/public/start/roundtrip/themes/
           icon:                         face
         - title:                        Modals
-          href:                         /pages/start/roundtrip/modals
+          href:                         /pages/public/start/roundtrip/modals
           icon:                         image
 
-    - title:                            Kickstarter
-      icon:                             rocket
-      dropdown:
-        - title:                        Web in a Day
-          icon:                         web
-          dropdown:
-          - title:                      Getting started
-            href:                       /pages/start/kickstarter/web_in_a_day/intro/
-            icon:                       bus-double-decker
-
-    - title:                            Change Me First
-      href:                             /pages/start/change_me_first/
-      icon:                             pencil
-
 - item:                                 Blog
   sublevel:
+
     - title:                            Article Navigator
-      href:                             /pages/blog/navigator/
+      href:                             /pages/public/blog/navigator/
       icon:                             menu
     - title:                            Category Viewer
-      href:                             /pages/blog/navigator/archive/categoryview/
+      href:                             /pages/public/blog/navigator/archive/categoryview/
       icon:                             pin
     - title:                            Date Viewer
-      href:                             /pages/blog/navigator/archive/dateview/
+      href:                             /pages/public/blog/navigator/archive/dateview/
       icon:                             calendar
     - title:                            Tag Viewer
-      href:                             /pages/blog/navigator/archive/tagview/
+      href:                             /pages/public/blog/navigator/archive/tagview/
       icon:                             tag
     - title:                            All Posts
-      href:                             /pages/blog/navigator/archive/
+      href:                             /pages/public/blog/navigator/archive/
       icon:                             archive
 
 - item:                                 Collections
   sublevel:
+
     - title:                            About collections
-      href:                             /pages/bookshelf/about_collections/
+      href:                             /pages/premium/bookshelf/about_collections/
       icon:                             alert-circle
     - title:                            Biography
-      href:                             /pages/bookshelf/biography/
+      href:                             /pages/premium/bookshelf/biography/
       icon:                             nature-people
     - title:                            Fantasy
-      href:                             /pages/bookshelf/fantasy/
+      href:                             /pages/premium/bookshelf/fantasy/
       icon:                             pillar
     - title:                            Romance
-      href:                             /pages/bookshelf/romance/
+      href:                             /pages/premium/bookshelf/romance/
       icon:                             image-filter-vintage
 
 - item:                                 Themes
   theme_select:
+
     - local_themes:                     enabled
       title:                            THEMES from Jekyll-One
       icon:                             face
@@ -114,29 +102,25 @@
       icon:                             face-profile
     - preview:                          enabled
       title:                            THEME Previewer
-      href:                             /pages/previewer/theme/
+      href:                             /pages/public/previewer/theme/
       icon:                             eye
 
 - item:                                 Apps
   sublevel:
-    - title:                            Link Checker
-      href:                             /apps/link_checker/
-      icon:                             link
-    - title:                            Calendar
-      href:                             /apps/calendar/
-      icon:                             calendar-blank
+
     - title:                            Gallery Previewer
-      href:                             /pages/previewer/justified_gallery/
+      href:                             /pages/private/previewer/justified_gallery/
       icon:                             view-dashboard
     - title:                            MDI Icon Previewer
-      href:                             /pages/previewer/mdi_font/
+      href:                             /pages/private/previewer/mdi_font/
       icon:                             emoticon-tongue
     - title:                            Twitter Emoji Previewer
-      href:                             /pages/previewer/twitter_emoji/
+      href:                             /pages/private/previewer/twitter_emoji/
       icon:                             twitter
 
 - item:                                 Online
   megamenu:
+
     - title:                            Tools
       icon:                             wrench
       column:
@@ -247,19 +231,8 @@
 
 - item:                                 About
   sublevel:
+
     - title:                            This site
       icon:                             home-outline
-      href:                             /pages/about/site
-    - title:                            You
-      icon:                             account
-      href:                             /pages/about/you
-
-# - item:                                 Register
-#   auth_client:
-#     - title:                            SignIn
-#       icon:                             login
-#       mode:                             signin
-#     - title:                            SignOut
-#       icon:                             logout
-#       mode:                             signout
+      href:                             /pages/public/about/site