j1-template 2020.0.21 → 2021.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b681224aa78c5feac1963cc0c68b8f6525d0a35a3d20706700d16ced3fd6d90
-  data.tar.gz: 77a63976580b15abb2d83b1d563334ded39a4ade3edd970e778c36e3cb7efb41
+  metadata.gz: eb4ea556df1c2514cded65555531b7add3ae38beec9740e551a4986e88540caa
+  data.tar.gz: 8ea1e5d4c28e135b48eace616080dc70471059094298be0d10c98b1af49d23dc
 SHA512:
-  metadata.gz: 3c5fe2db9d6b14fd5c1d24fcda6c5ae54584568169d922313806565a3341bbefac37d80731204ddbcede2d468b010efd401126ca697dc5b8416979dbc4306a5b
-  data.tar.gz: 366f13212b8612f231de02c87d163a0821e847660f2e41a2a3d3e03e09693edb12e9d8b63d2a15598c7b9c91058ed3b0b7eaba5e8fc5b1326ab0ee5a86abe42e
+  metadata.gz: 3506edd17e1231f53a8723d7f97aafe65ce741037108c8f1d5545c247cc456c65faa775712b8e94f4738ecb99ebd24492cbee04435d0b20f777fa85a12111ee7
+  data.tar.gz: 8e4f75ce3de082e7663cab7ab77226875ec2ad2e4f9505a5acece5ee2cee97fb890f14339a049764f19f3119ddf24d63eb3e56810555031265199506cf68e0b7

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (C) 2020 Juergen Adams
+Copyright (C) 2021 Juergen Adams
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/_includes/themes/j1/blocks/ads/ad.html

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  http://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
@@ -21,8 +21,8 @@
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign advertising           = site.data.template_settings.advertising.enabled %}
-{% assign advertising_provider  = site.data.template_settings.advertising.provider %}
+{% assign advertising           = site.data.j1_config.advertising.enabled %}
+{% assign advertising_provider  = site.data.j1_config.advertising.provider %}
 
 
 {% comment %} Main

data/_includes/themes/j1/blocks/footer/boxes/about_box.proc

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  http://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  Licensed under the Creative Commons Attribution 3.0 Unported License.
  #  See: http://creativecommons.org/licenses/by/3.0/.

data/_includes/themes/j1/blocks/footer/boxes/contacts_box.proc

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  http://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  Licensed under the Creative Commons Attribution 3.0 Unported License.
  #  See: http://creativecommons.org/licenses/by/3.0/.

data/_includes/themes/j1/blocks/footer/boxes/issue.proc

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  http://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  Licensed under the Creative Commons Attribution 3.0 Unported License.
  #  See: http://creativecommons.org/licenses/by/3.0/.

data/_includes/themes/j1/blocks/footer/boxes/legal_statements.proc

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  http://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  Licensed under the Creative Commons Attribution 3.0 Unported License.
  #  See: http://creativecommons.org/licenses/by/3.0/.

data/_includes/themes/j1/blocks/footer/boxes/links_box.proc

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  http://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  Licensed under the Creative Commons Attribution 3.0 Unported License.
  #  See: http://creativecommons.org/licenses/by/3.0/.

data/_includes/themes/j1/blocks/footer/boxes/news_box.proc

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  http://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  Licensed under the Creative Commons Attribution 3.0 Unported License.
  #  See: http://creativecommons.org/licenses/by/3.0/.

data/_includes/themes/j1/blocks/footer/boxes/social_media_icons.proc

@@ -6,7 +6,7 @@
  #  Product/Info:
  #  http://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ #  Copyright (C) 2021 Juergen Adams
  #
  #  Licensed under the Creative Commons Attribution 3.0 Unported License.
  #  See: http://creativecommons.org/licenses/by/3.0/.

data/_includes/themes/j1/blocks/footer/generator.html

@@ -6,7 +6,7 @@
  # Product/Info:
  # http://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
@@ -47,7 +47,7 @@
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign footer_options        = footer_defaults | merge: footer_settings %}
 
-{% if data.template_settings.analytics.enabled %}
+{% if data.j1_config.analytics.enabled %}
   {% include analytics %}
 {% endif %}
 

data/_includes/themes/j1/layouts/content_generator_app.html

@@ -6,7 +6,7 @@
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

data/_includes/themes/j1/layouts/content_generator_blog_archive.html

@@ -6,7 +6,7 @@
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
@@ -49,14 +49,14 @@
 
 {% assign previewer            = site.data.builder.blog_navigator.previewer %}
 {% assign paginate             = paginator_options.pagination.enabled %}
-{% assign rtext                = site.data.template_settings.typography.rtext %}
+{% assign rtext                = site.data.j1_config.typography.rtext %}
 {% assign page_rtext           = page.rtext %}
 {% assign page_rtext_size      = page.rtext_size %}
 
 {% comment %} rtext|size detection
 -------------------------------------------------------------------------------- {% endcomment %}
 {% if rtext %}
-  {% assign rtext_size = site.data.template_settings.typography.rtext_size %}
+  {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
 {% else %}
   {% assign rtext_size = 0 %}
 {% endif %}
@@ -104,10 +104,10 @@
                 <nav class="paginator">
                   <ul class="pagination raised-z0">
 
-                    <li class="page-item"><a class="page-link" href="{{category_view}}" title="View by Category">By Category</a></li>
-                    <li class="page-item"><a class="page-link" href="{{date_view}}" title="View by Date">By Date</a></li>
-                    <!-- li class="page-item"><a class="page-link" href="{{tag_view}}" title="View by Tag">By Tag</a></li -->
-                    <li class="page-item"><a class="page-link" href="{{all_view}}" title="View All">All Posts</a></li>
+                    <li class="page-item"><a class="page-link md-grey-800" href="{{category_view}}" title="View by Category">By Category</a></li>
+                    <li class="page-item"><a class="page-link md-grey-800" href="{{date_view}}" title="View by Date">By Date</a></li>
+                    <!-- li class="page-item"><a class="page-link md-grey-800" href="{{tag_view}}" title="View by Tag">By Tag</a></li -->
+                    <li class="page-item"><a class="page-link md-grey-800" href="{{all_view}}" title="View All">All Posts</a></li>
 
                   </ul>
                 </nav> <!-- end paginator -->
@@ -142,22 +142,22 @@
                     {% if paginator.previous_page %}
                       {% if paginator.previous_page > 1 %}
                         {% capture page_link %}{{paginator.previous_page_path}}#previewer{% endcapture %}
-                        <li class="page-item"><a class="page-link" href="{{page_link}}" title="Previous page">Previous</a></li>
+                        <li class="page-item"><a href="#" class="page-link md-grey-800" href="{{page_link}}" title="Previous page">Previous</a></li>
                       {% else %}
                         {% comment %} Back to FIRST page {% endcomment %}
                         {% assign navigator = page.url | remove_first:'page2/index.html' %}
                         {% capture page_link %}{{navigator}}#previewer{% endcapture %}
-                        <li class="page-item"><a class="page-link" href="{{page_link}}" title="First page">Previous</a></li>
+                        <li class="page-item"><a href="#" class="page-link md-grey-800" href="{{page_link}}" title="First page">Previous</a></li>
                       {% endif %}
                     {% else %}
-                        <li class="page-item disabled"><a class="page-link">First</a></li>
+                        <li class="page-item disabled"><a href="#" class="page-link md-grey-800">First</a></li>
                     {% endif %}
 
                     {% if paginator.next_page %}
                         {% capture page_link %}{{paginator.next_page_path}}#previewer{% endcapture %}
-                        <li class="page-item"><a class="page-link" href="{{page_link}}" title="Next page">Next</a></li>
+                        <li class="page-item"><a class="page-link md-grey-800" href="{{page_link}}" title="Next page">Next</a></li>
                     {% else %}
-                        <li class="page-item disabled"><a class="page-link">Last</a>
+                        <li class="page-item disabled"><a href="#" class="page-link md-grey-800">Last</a>
                     {% endif %}
                   </ul>
                 </nav>

data/_includes/themes/j1/layouts/content_generator_collection.html

@@ -6,7 +6,7 @@
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
@@ -25,7 +25,7 @@
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.template_settings %}
+{% assign template_config   = site.data.j1_config %}
 {% assign blocks            = site.data.blocks %}
 {% assign modules           = site.data.modules %}
 
@@ -52,7 +52,7 @@
 {% endif %}
 
 {% if rtext %}
-  {% assign rtext_size = site.data.template_settings.typography.rtext_size %}
+  {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
 {% else %}
   {% assign rtext_size = 0 %}
 {% endif %}

data/_includes/themes/j1/layouts/content_generator_page.html

@@ -1,12 +1,12 @@
 {% comment %}
  # -----------------------------------------------------------------------------
  # ~/_includes/themes/j1/layouts/content_generator_page.html
- # Liquid template to create the content portion for pages of type PAGE
+ # Liquid template to create the content portion for pages
  #
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
@@ -29,18 +29,18 @@
 
 {% comment %} set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.template_settings %}
+{% assign template_config   = site.data.j1_config %}
 
 {% comment %} set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign rtext             = site.data.template_settings.typography.rtext %}
+{% assign rtext             = site.data.j1_config.typography.rtext %}
 {% assign page_rtext        = page.rtext %}
 {% assign page_rtext_size   = page.rtext_size %}
 {% assign page_toccer       = page.toccer %}
 {% assign page_toc          = page.toc %}
 
 {% if rtext %}
-  {% assign rtext_size = site.data.template_settings.typography.rtext_size %}
+  {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
 {% else %}
   {% assign rtext_size = 0 %}
 {% endif %}

data/_includes/themes/j1/layouts/content_generator_post.html

@@ -1,12 +1,12 @@
 {% comment %}
  # -----------------------------------------------------------------------------
  # ~/_includes/themes/j1/layouts/content_generator_post.html
- # Liquid template to create the content portion for pages of type POST
+ # Liquid template to create the content portion for posts
  #
  # Product/Info:
  # https://jekyll.one
  #
- # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2021 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
  # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
@@ -27,37 +27,25 @@
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.template_settings %}
+{% assign template_config   = site.data.j1_config %}
 {% assign blocks            = site.data.blocks %}
 {% assign modules           = site.data.modules %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign toccer_defaults   = modules.defaults.toccer.defaults %}
-{% assign toccer_settings   = modules.toccer.settings %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign toccer_options    = toccer_defaults | merge: toccer_settings %}
-{% assign tocbot_enabled    = toccer_options.enabled %}
 
- {% assign rtext            = site.data.template_settings.typography.rtext %}
- {% assign page_rtext       = page.rtext %}
- {% assign page_rtext_size  = page.rtext_size %}
- {% assign page_toccer      = page.toccer %}
- {% assign page_toc         = page.toc %}
+{% assign rtext            = site.data.j1_config.typography.rtext %}
+{% assign page_rtext       = page.rtext %}
+{% assign page_rtext_size  = page.rtext_size %}
 
- {% if page_toc and tocbot_enabled %}
-   {% assign sidebar  = true %}
- {% else %}
-   {% assign sidebar  = false %}
- {% endif %}
-
- {% if rtext %}
-   {% assign rtext_size = site.data.template_settings.typography.rtext_size %}
- {% else %}
-   {% assign rtext_size = 0 %}
- {% endif %}
+{% if rtext %}
+ {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
+{% else %}
+ {% assign rtext_size = 0 %}
+{% endif %}
 
 
 {% comment %} Main
@@ -75,149 +63,63 @@
 
   {% comment %} Blog post CONTENT
   ------------------------------------------------------------------------------ {% endcomment %}
-
-  {% if sidebar == false %}
-    <!-- FULL page - no sidebar for page toc -->
-    <div class="row">
-      <main class="r-text-{{rtext_size}} js-toc-content">
-        <!-- Include a pager at top position -->
-        {% include {{pager}} %}
-        <!-- div class="featured-headline" -->
-        <div class="post-headline mt-4">
-          <h2 class="notoc">{{ page.date | date_to_long_string }}</h2>
+  <!-- FULL page - no sidebar for page toc -->
+  <div class="row">
+    <main class="r-text-{{rtext_size}} js-toc-content">
+      <!-- Include a pager at top position -->
+      {% include {{pager}} %}
+      <!-- div class="featured-headline" -->
+      <div class="post-headline mt-4">
+        <h2 class="notoc">{{ page.date | date_to_long_string }}</h2>
+      </div>
+
+      {% comment %} Place Blog post SERIES Navigation
+      ------------------------------------------------------------------------ {% endcomment %}
+      {% if page.series %}
+      <header class="bmd-layout-header">
+        <!-- div class="navbar navbar-dark bg-primary raised-z2 mb-4" -->
+        <div class="navbar navbar-dark bg-primary raised-z2">
+          <button class="bmd-drawer drawer-toggler animated fadeIn" type="button" data-toggle="drawer" data-target="#post_navigator">
+            <span class="mdi mdi-menu mdi-2x"></span>
+          </button>
+          <ul class="nav navbar-nav">
+            <li class="nav-item">
+              <span class="navbar-text">Series: {{page.series}}</span>
+            </li>
+          </ul>
         </div>
-
-        {% comment %} Place Blog post SERIES Navigation
-        ------------------------------------------------------------------------ {% endcomment %}
-        {% if page.series %}
-        <nav class="nav bmd-layout-container custom-size-350 bmd-drawer-f-l">
-
-          <header class="bmd-layout-header">
-            <!-- div class="navbar navbar-dark bg-primary raised-z2 mb-4" -->
-            <div class="navbar navbar-dark bg-primary raised-z2 mb-4">
-              <button class="bmd-drawer drawer-toggler animated fadeIn" type="button" data-toggle="drawer" data-target="#post_navigator">
-                <span class="mdi mdi-menu mdi-2x"></span>
-              </button>
-              <ul class="nav navbar-nav">
-                <li class="nav-item">
-                  <span class="navbar-text">Series: {{page.series}}</span>
-                </li>
-              </ul>
-            </div>
-          </header>
-
-          <!-- Drawer content -->
-          <div id="post_navigator" class="bmd-layout-drawer bg-faded">
-            <header><a class="navbar-brand ml-3 mb-3">{{page.title}}</a></header>
-            <!--  Series Navigator -->
-            {% comment %}{% include {{create_series_header}} page=page post=post readmore=page.readmore %}{% endcomment %}
-            {% include {{create_series_header}} page=page post=post readmore=false %}
-          </div>
-        {% endif %}
-        {% comment %} END SERIES Navigation
-        ------------------------------------------------------------------------ {% endcomment %}
-
-        {% comment %} Inherit CONTENT
-        ------------------------------------------------------------------------ {% endcomment %}
-        <!-- Content placed by post_content.html -->
-        <main class="bmd-layout-content">
-        {{content}}
-
-        {% comment %} Place additional headline for comments
-        ------------------------------------------------------------------------ {% endcomment %}
-        {% if page.comments %}
-        <h2 id="comments_leave_comment"> Leave a Comment </h2>
-        {% endif %}
-        </main>
-        <!-- End Content placed by post_content.html -->
-
-      {% if page.series %}</nav>{% endif %}
-
-      </div> <!-- end col-md-12 -->
-    </div> <!-- end row -->
-  {% else %}
-    <!-- SPLIT page. Place a sidebar e.g. for the document toc -->
-    <div class="row">
-      <!-- main class="col-md-9 col-xs-12 r-text-{{rtext_size}} js-toc-content" -->
-      <main class="r-text-{{rtext_size}} js-toc-content">
-
-        <!-- Include a pager at top position -->
-        {% include {{pager}} %}
-        <div class="post-headline mt-4">
-          <h2 id="blog_article_navigator" class="notoc">{{ page.date | date_to_long_string }}</h2>
+      </header>
+
+      <nav class="nav bmd-layout-container custom-size-350 bmd-drawer-f-l">
+        <!-- Drawer content -->
+        <div id="post_navigator" class="bmd-layout-drawer bg-faded">
+          <!-- header><a class="navbar-brand ml-3 mb-3">{{page.title}}</a></header -->
+          <header><a class="navbar-brand mb-3">{{page.title}}</a></header>
+          <!--  Series Navigator -->
+          {% comment %}{% include {{create_series_header}} page=page post=post readmore=page.readmore %}{% endcomment %}
+          {% include {{create_series_header}} page=page post=post readmore=false %}
         </div>
+      {% endif %}
+      {% comment %} END SERIES Navigation
+      ------------------------------------------------------------------------ {% endcomment %}
 
-        {% comment %} Place Blog post SERIES Navigation
-        ------------------------------------------------------------------------ {% endcomment %}
-        {% if page.series %}
-        <nav class="nav bmd-layout-container custom-size-350 bmd-drawer-f-l">
-
-          <header class="bmd-layout-header">
-            <!-- div class="navbar navbar-dark bg-primary raised-z2 mb-4" -->
-            <div class="navbar navbar-dark bg-primary raised-z2 mb-4">
-              <button class="bmd-drawer drawer-toggler animated fadeIn" type="button" data-toggle="drawer" data-target="#post_navigator">
-                <span class="mdi mdi-menu mdi-2x"></span>
-              </button>
-              <ul class="nav navbar-nav">
-                <li class="nav-item">
-                  <span class="navbar-text">Series: {{page.series}}</span>
-                </li>
-              </ul>
-            </div>
-          </header>
-
-          <script>
-          // See: https://jsfiddle.net/prathviraj080/vbbbw46a/1/
-          $('button.drawer-toggler').click(function(){
-            $('button.drawer-toggler span.mdi').toggleClass('mdi-menu mdi-close');
-          });
-          $('button.drawer-toggler').click(function(){
-            $('button.drawer-toggler').toggleClass('fadeIn rotateIn');
-          });
-          </script>
-
-          <!-- Drawer content -->
-          <div id="post_navigator" class="bmd-layout-drawer bg-faded">
-            <span class="navbar-brand mt-2 ml-3" style="font-weight: 500;">{{page.series|upcase}}</span>
-            <!--  Series Navigator -->
-            {% comment %}{% include {{create_series_header}} page=page post=post readmore=page.readmore %}{% endcomment %}
-            {% include {{create_series_header}} page=page post=post readmore=false %}
-          </div>
-        {% endif %}
-        {% comment %} END SERIES Navigation
-        ------------------------------------------------------------------------ {% endcomment %}
-
-        {% comment %} Inherit CONTENT
-        ------------------------------------------------------------------------ {% endcomment %}
-        <!-- Content placed by post_content.html -->
-        <main class="bmd-layout-content">
-        {{content}}
-
-        {% comment %} Place additional headline for comments
-        ------------------------------------------------------------------------ {% endcomment %}
-        {% if page.comments %}
-        <h2 id="comments_leave_comment"> Leave a Comment </h2>
-        {% endif %}
-        </main>
-        <!-- End Content placed by post_content.html -->
-
-        {% if page.series %}</nav>{% endif %}
-
-      </main> <!-- end col-md-9 -->
-
-      {% comment %} Place Sidebar|Tocbot
-      -------------------------------------------------------------------------- {% endcomment %}
-      <!-- NOTE: BS or Tocbot Affix is not used anymore. Replaced by CSS style "sticky" -->
-      {% comment %} tocbot and page_navigation (not used anymore)
-      --------------------------------------------------------------------------
-      <aside class="col-md-3 d-none d-md-block sticky">
-        <div id="sidebar">
-          <div id="j1-toc-mgr" class="toc js-toc"></div>
-        </div>
-      </aside>
-      -------------------------------------------------------------------------- {% endcomment %}
-    </div> <!-- end row -->
-  {% endif %} <!-- endif sidebar -->
+      {% comment %} Inherit CONTENT
+      ------------------------------------------------------------------------ {% endcomment %}
+      <!-- Content placed by post_content.html -->
+
+      {{content}}
+
+      {% comment %} Place additional headline for comments
+      ------------------------------------------------------------------------ {% endcomment %}
+      {% if page.comments %}
+      <h2 id="comments_leave_comment"> Leave a comment </h2>
+      {% endif %}
+      <!-- End Content placed by post_content.html -->
+
+    {% if page.series %}</nav>{% endif %}
+
+    </div> <!-- end col-md-12 -->
+  </div> <!-- end row -->
 
   {% comment %} END Blog post CONTENT
   ------------------------------------------------------------------------------ {% endcomment %}