jekyll-theme-pirati 7.6.2 → 7.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b9ceca11b797dc79627a96b3f59d57072fb27ebf567d73b3c34ead8bc035e60
-  data.tar.gz: a48815af6f928a0e02128f5e13645adef9c58e64d89ff83ef20d72f061eaaa12
+  metadata.gz: 573944f836836fb81e21fbb110724eaaf509f3927373a29f12dae087a1e86be9
+  data.tar.gz: 71c4e0e2dcb03f4d2a81056c9e150103fb74603dc327b19bfc8c5e6e73a2e3be
 SHA512:
-  metadata.gz: 714f8d053aad3414d47a1f2f32ffdf06f4bc6ca2712acab7911be02bb1d76ab78d3b0fa66a36090aa6a126987146db92ae2d4b216afb169650d8ab8fb4c74b1a
-  data.tar.gz: f33bb582218e415fc316620b426a7a3d1f990f87dac4badff383ff9158c0c999b0415a3c854c2e460e943c215993e19c917fdc94866bf6159d73ad7bd2a0c188
+  metadata.gz: dd8c121ec23b490c14f4c155178282b5a838b9e8315e47946e326731d7d90c0636d64ceabe36b7829c4e7280a34afe1f8e7bc81dc0f58e21f60c07d6491630cb
+  data.tar.gz: 861c8a93de623ffe2821942b1c69ef2ed18667ca71c29e1df79a3ad69459564f3def60fb1f0900ce0b5f4797aaca828f420207b533d2a081f429c9543e225d5c

data/_data/menu.yml

@@ -25,7 +25,10 @@ main:
         match: lide
       - link: /regiony/
         name: Místní sdružení
-        match: reriony
+        match: regiony
+      - link: /regiony/index2.html
+        name: Jiný rozcestník
+        match: index2
   - link: /komunalni-volby/praha2018
     name: Komunální volby
     match: komunalni-volby

data/_includes/articles/tag-filtered-news.html

@@ -0,0 +1,16 @@
+{% assign posts = "" | split: ", " %}
+{% for tag in include.tags %}
+    {% assign tagPosts = site.posts | where_exp: "item","item.tags contains tag" %}
+    {% assign posts = posts | concat: tagPosts %}
+{% endfor %}
+{% assign posts = posts | sort: "date" | reverse %}
+
+<section class="o-section o-section--spaceBot">
+  <div class="o-section-inner o-section-inner--leftBlock">
+    {% for article in posts limit: include.limit %} {% include articles/horizontal-article.html article=article %}
+    {% endfor %}
+    <div class="c-BlogPosting-excerpt-nextBox">
+      <a href="{{'/aktuality/' | relative_url}}" rel="next" class="button expanded large">Další články</a>
+    </div>
+  </div>
+</section>

data/_includes/articles/vertical-article.html

@@ -1,11 +1,15 @@
 <!-- include.article -->
 <article itemtype="http://schema.org/BlogPosting" class="c-article-listing c-article-listing--vertical" itemscope="">
-  <link itemprop="mainEntityOfPage" href="{{ include.article.url | absolute_url }}">
+  <link itemprop="mainEntityOfPage" href="{{ include.article.url }}">
 
   <div class="c-article-listing__photobox">
-    <a href="{{ include.article.url | relative_url }}">
+    <a href="{{ include.article.url }}">
       <div itemprop="image" itemtype="http://schema.org/ImageObject" class="c-article-listing__image {% if include.article.youtubeVideoId %}c-article-listing__image--videoicon{% endif %}" itemscope="">
-        {% capture imgPath %}{% asset '{{ include.article.image }}' magick:resize='751x422^' magick:gravity='center' magick:crop='751x422+0+0' @path %}{% endcapture %}
+        {% if site.mediaStorage %}
+            {% capture imgPath %}https://a.pirati.cz/resize/348x232/{{ site.mediaStorage }}/img/{{ include.article.image }}{% endcapture %}
+        {% else %}
+            {% capture imgPath %}{% asset '{{ include.article.image }}' magick:resize='751x422^' magick:gravity='center' magick:crop='751x422+0+0' @path %}{% endcapture %}
+        {% endif %}
         <img src="{{ imgPath }}" alt="{{ include.article.title }}">
         <meta itemprop="url" content="{{ imgPath }}">
       </div>

data/_includes/candidate-badge.html

@@ -2,7 +2,15 @@
   <a class="c-program-candidate-badge__body" href="{{ include.candidatePage.url | relative_url }}">
       <span class="c-program-candidate-badge__rank"><span>{{ include.rank }}</span></span>
       <div class="c-program-candidate-badge__avatar">
-          {% capture img %}{% if include.candidatePage.img %}{% asset '{{ include.candidatePage.img }}' magick:resize='225x225^' magick:gravity='center' magick:crop='225x225+0+0' @path %}{% else %}{{ 'assets/img/people/unknown-pirate.svg' | relative_url }}{% endif %}{% endcapture %}
+          {% if include.candidatePage.img %}
+            {% if site.mediaStorage %}
+                {% capture img %}https://a.pirati.cz/resize/225x225/{{ site.mediaStorage }}/img/{{ include.candidatePage.img }}{% endcapture %}
+            {%- else -%}
+                {% capture img %}{% asset '{{ include.candidatePage.img }}' magick:resize='225x225^' magick:gravity='center' magick:crop='225x225+0+0' @path %}{% endcapture %}
+            {%- endif -%}
+          {% else %}
+            {% capture img %}https://a.pirati.cz/common/img/people/unknown-pirate.svg{% endcapture %}
+          {% endif %}
           <img src="{{ img }}" alt="{% include people/fullname.html person=include.candidatePage plain=true %}" class="c-program-candidate-badge__avatar-image">
       </div>
       <div class="c-program-candidate-badge__description">

data/_includes/head.html

@@ -43,11 +43,19 @@
     <meta property="og:title"         content="{{ title }}" />
     <meta property="og:description"   content="{{ description }}" />
     {% if page.layout == 'post' %}
-    {% capture img_path %}{% asset '{{ page.image }}' @path %}{% endcapture %}
-    <meta property="og:image"         content="{{ img_path | absolute_url }}" />
+        {% if site.mediaStorage %}
+            {% capture imgPath %}https://a.pirati.cz/{{ site.mediaStorage }}/img/{{ include.image }}{% endcapture %}
+        {% else %}
+            {% capture img_path %}{% asset '{{ page.image }}' @path %}{% endcapture %}
+        {% endif %}
+        <meta property="og:image"         content="{{ img_path | absolute_url }}" />
     {% elsif page.img %}
-    {% capture img_path %}{% asset '{{ page.img }}' @path %}{% endcapture %}
-    <meta property="og:image"         content="{{ img_path | absolute_url }}" />
+        {% if site.mediaStorage %}
+            {% capture imgPath %}https://a.pirati.cz/{{ site.mediaStorage }}/img/{{ include.img }}{% endcapture %}
+        {% else %}
+            {% capture img_path %}{% asset '{{ page.img }}' @path %}{% endcapture %}
+        {% endif %}
+        <meta property="og:image"         content="{{ img_path | absolute_url }}" />
     {% else %}
     <meta property="og:image"         content="{{ 'assets/img/brand/logo-round.png' | absolute_url }}" />
     {% endif %}

data/_includes/headline-media.html

@@ -1,7 +1,12 @@
 <div class="o-section-block o-section-block-fill">
   <div class="c-headline-media">
-    {% capture imgPath %}{% asset '{{ include.image }}' magick:resize='751x422^' magick:gravity='center' magick:crop='751x422+0+0' @path %}{% endcapture %}
+    {% if site.mediaStorage %}
+        {% capture imgPath %}https://a.pirati.cz/crop/751x422/{{ site.mediaStorage }}/img/{{ include.image }}{% endcapture %}
+    {% else %}
+        {% capture imgPath %}{% asset '{{ include.image }}' magick:resize='751x422^' magick:gravity='center' magick:crop='751x422+0+0' @path %}{% endcapture %}
+    {% endif %}
     <div class="c-headline-media__background" style="background-image: url({{ imgPath }})"></div>
+
     <div class="row c-headline-media__body">
       <div class="small-12 columns">
         {% comment %}If youtube video id is provided, it takes precendece over the image{% endcomment %}

data/_includes/homepage/news-with-rbar.html

@@ -9,7 +9,7 @@
           {% include articles/horizontal-article.html article=article %}
         {% endfor %}
         <div class="c-BlogPosting-excerpt-nextBox">
-          <a href="{{'/aktuality/' | relative_url}}" rel="next" class="button expanded large">Další články</a>
+          <a href="{{ '/aktuality/' }}" rel="next" class="button expanded large">Další články</a>
         </div>
       </div>
     </section>

data/_includes/people/profile-badge.html

@@ -8,17 +8,23 @@
 {% endif %}
 <div class="c-profile-badge {% if include.style == 'card' %}c-profile-badge--card{% endif %} {% if include.class %}{{ include.class }}{% endif %}">
     <div class="c-profile-badge__avatar">
-      {%- capture img -%}
         {%- if include.item.img -%}
-          {%- if include.imgSize != 'big' -%}
-            {% asset '{{ include.item.img }}' magick:resize='100x100^' magick:gravity='center' magick:crop='100x100+0+0' @path %}
-          {%- else -%}
-            {% asset '{{ include.item.img }}' magick:resize='165x165^' magick:gravity='center' magick:crop='165x165+0+0' @path %}
-          {%- endif -%}
-        {%- else -%}
-          {{ 'assets/img/people/unknown-pirate.svg' | relative_url }}
-        {%- endif -%}
-      {%- endcapture -%}
+            {% if site.mediaStorage %}
+              {%- if include.imgSize != 'big' -%}
+                {% capture img %}https://a.pirati.cz/crop/100x100/{{ site.mediaStorage }}/img/{{ include.item.img }}{% endcapture %}
+              {%- else -%}
+                {% capture img %}https://a.pirati.cz/crop/165x165/{{ site.mediaStorage }}/img/{{ include.item.img }}{% endcapture %}
+              {%- endif -%}
+            {%- else -%}
+              {%- if include.imgSize != 'big' -%}
+                {% capture img %}{% asset '{{ include.item.img }}' magick:resize='100x100^' magick:gravity='center' magick:crop='100x100+0+0' @path %}{% endcapture %}
+              {%- else -%}
+                {% capture img %}{% asset '{{ include.item.img }}' magick:resize='165x165^' magick:gravity='center' magick:crop='165x165+0+0' @path %}{% endcapture %}
+              {%- endif -%}
+            {%- endif -%}
+        {% else %}
+            {% capture img %}https://a.pirati.cz/common/img/people/unknown-pirate.svg{% endcapture %}
+        {% endif %}
       <a class="c-profile-badge__anchor" href="{{ url }}"><img src="{{ img }}" alt="{{ label }}" class="c-profile-badge__image {% if include.imgStyle == 'round' %}c-profile-badge__image--round{% endif %} {% if include.imgSize != 'big' %}c-profile-badge__image--smaller{% endif %}"></a>
     </div>
 

data/_includes/regions/crossroad2.html

@@ -0,0 +1,5 @@
+<section class="pk-election-crossroad row u-uniform-size-row">
+  {% for place in include.places %}
+     {% include regions/item.html img=place.img name=place.name area=place.area link=place.link president=place.president fb=place.fb %}
+  {% endfor %}
+</section>

data/_includes/regions/item.html

@@ -0,0 +1,26 @@
+<div class="large-4 medium-6 small-12 columns end" style="padding-bottom: 2em;">
+<div class="c-content-card">
+  <div class="c-content-card-img">
+      <a href={{include.link}}> {% asset {{include.img}} alt=include.name %} </a>
+  </div>
+  <div class="c-content-card-content-box">
+    <h3 class="c-content-card-title">
+        <a href="{{include.link}}"> {{ include.name}} </a>
+    </h3>
+    <ul>
+      <li>Působnost: {{ include.area }}</li>
+      {% assign person = site.people | where_exp:"item","item.uid contains include.president" | first %}
+      {% if person %}
+        <li>Předseda: <a href={{person.url}}> {{person.name}}</a> </li>
+      {% else %}
+        <li>Předseda: {{include.president}} </li>
+      {% endif %}
+      {% if include.fb %}
+        <li>
+            <i class="fa fa-facebook" aria-hidden="true"></i>
+            <a href="https://www.facebook.com/{{include.fb}}"> {{include.fb}}</a> </li>
+      {% endif %}
+    </ul>
+  </div>
+</div>
+</div>

data/_includes/right-bar/bar_board.html

@@ -0,0 +1,32 @@
+
+{% if page.board %}
+  <aside class="o-section">
+    <div class="o-section-inner o-section-inner--rightBlock">
+      <div class="o-section-block">
+        <div class="c-widget-accordion" data-accordion="" data-allow-all-closed="true">
+          <div class="c-widget-accordion-content" data-tab-content="">
+            {% if page.boardName %}
+              <h3> {{ page.boardName }} </h3>
+            {% else %}
+              <h3>Předsednictvo</h3>
+            {% endif %}
+            <ul>
+              {% for chair in page.board %}
+                {% if chair.uid %}
+                    {% assign person = site.people | where_exp: "item","item.uid contains chair.uid" | first %}
+                    <li> {{chair.position}}: <strong> <a href="{{person.url}}" > {{ person.name }} </a> </strong> </li>
+                {% else %}
+                    <li> {{chair.position}}: <strong> {{ chair.name }} </strong> </li>
+                {% endif %}
+              {% endfor %}
+
+            </ul>
+            {% if page.boardTurn %}
+                konec mandátu: <a href="{{ page.boardTurn.electionUrl }}" style="text-decoration:underline"> {{ page.boardTurn.endDate }} </a></li>
+            {% endif %}
+          </div>
+        </div>
+      </div>
+    </div>
+  </aside>
+{% endif %}

data/_includes/right-bar/bar_foto.html

@@ -1,22 +1,30 @@
-{% if page.profiles.flickr and page.img %}
-       <div class="c-widget-accordion-content__cta">
-       </div>
-<div class="o-section-block">
-    <ul class="c-widget-accordion" data-accordion="" data-allow-all-closed="true">
-      <li class="c-widget-accordion-item is-active" data-accordion-item="">
-        <div class="c-widget-accordion-content" data-tab-content="">
-          {% asset '{{ page.img }}' alt='{{ page.name }}' magick:resize="350x" class='c-person-image' %}
-          <div class="c-widget-accordion-content__cta">
-            {% assign peopleCol = site.collections | where: "label", "people" | first %}
-            <a class="expanded button large u-0margin" href="{{page.profiles.flickr}}"> Zobrazit více fotografií </a>
+{% if page.img %}
+
+{% if site.mediaStorage %}
+    {% capture img %}https://a.pirati.cz/resize/225x225/{{ site.mediaStorage }}/img/{{ page.img }}{% endcapture %}
+{%- else -%}
+    {% capture img %}{% asset '{{ page.img }}' alt='{{ page.name }}' magick:resize="350x" class='c-person-image' %}{% endcapture %}
+{%- endif -%}
+
+{% if page.profiles.flickr %}
+    <div class="c-widget-accordion-content__cta"> </div>
+    <div class="o-section-block">
+      <ul class="c-widget-accordion" data-accordion="" data-allow-all-closed="true">
+        <li class="c-widget-accordion-item is-active" data-accordion-item="">
+          <div class="c-widget-accordion-content" data-tab-content="">
+            <img src="{{ img }}" alt="{{ page.name }}">
+            <div class="c-widget-accordion-content__cta">
+              {% assign peopleCol = site.collections | where: "label", "people" | first %}
+              <a class="expanded button large u-0margin" href="{{page.profiles.flickr}}"> Zobrazit více fotografií </a>
+            </div>
           </div>
-        </div>
-      </li>
-     </ul>
-</div>
+        </li>
+      </ul>
+    </div>
 {% else %}
-	{% if page.img %}
-	{% asset '{{ page.img }}' alt='{{ page.name }}' magick:resize="350x" class='c-person-image' %}
-	{% endif %}
+    <img src="{{ img }}" alt="{{ page.name }}">
+{% endif %}
+
+
 {% endif %}
 

data/_includes/right-bar/bar_page_contact.html

@@ -0,0 +1,12 @@
+<aside class="o-section">
+<div class="o-section-inner o-section-inner--rightBlock">
+  <div class="o-section-block">
+    <div class="c-widget-accordion" data-accordion="" data-allow-all-closed="true">
+      <div class="c-widget-accordion-content" data-tab-content="">
+        <h3>Kontakty</h3>
+            {% include right-bar/rbar_profiles.html %}
+      </div>
+    </div>
+  </div>
+</div>
+</aside>

data/_includes/right-bar/bar_person_articles.html

@@ -0,0 +1,6 @@
+
+{% assign posts = site.posts | where_exp: "item","item.authorId contains page.uid" | sort:"date" %}
+
+{% if posts %}
+    {% include right-bar/rbar_articles.html posts=posts title="Seznam článku" %}
+{% endif %}

data/_includes/right-bar/bar_tag_articles.html

@@ -0,0 +1,10 @@
+{% assign posts = "" | split: ", " %}
+{% for tag in page.tags %}
+    {% assign tagPosts = site.posts | where_exp: "item","item.tags contains tag" %}
+    {% assign posts = posts | concat: tagPosts %}
+{% endfor %}
+{% assign posts = posts | sort: "date" | reverse %}
+
+{% if posts %}
+    {% include right-bar/rbar_articles.html posts=posts title="Seznam článku" %}
+{% endif %}

data/_includes/right-bar/rbar.html

@@ -37,6 +37,18 @@
         {% if rbar contains 'map' %}
           {% include right-bar/bar_map.html %}
         {% endif %}
+        {% if rbar contains 'personArticles' %}
+          {% include right-bar/bar_person_articles.html %}
+        {% endif %}
+        {% if rbar contains 'board' %}
+          {% include right-bar/bar_board.html %}
+        {% endif %}
+        {% if rbar contains 'tagArticles' %}
+          {% include right-bar/bar_tag_articles.html %}
+        {% endif %}
+        {% if rbar contains 'pageContact' %}
+          {% include right-bar/bar_page_contact.html %}
+        {% endif %}
 
         {% comment %}Allows to append custom right bars variants{% endcomment %}
         {% include right-bar/custom-bars.html rbar=rbar %}

data/_includes/right-bar/rbar_articles.html

@@ -0,0 +1,21 @@
+<div class="o-section-block--spaceBot show-for-large">
+    <ul class="c-widget-accordion" data-accordion="" data-allow-all-closed="true">
+        <li class="c-widget-accordion-item is-active" data-accordion-item="">
+            <a href="#toc" class="c-widget-accordion-link">
+                <span class="c-widget-accordion__title">{{ include.title }}</span>
+            </a>
+            <div class="c-widget-accordion-content" data-tab-content="" id="toc">
+                <ul class="c-widget-accordion-list"> <ul>
+                {% assign posts = include.posts | sort: "date" | reverse %}
+                {% for post in posts limit: 30 %}
+                    <li>
+                        <a href="{{ post.url }}">
+                            {{ post.title }}
+                        </a>
+                    </li>
+                {% endfor %}
+                </ul> </ul>
+            </div>
+        </li>
+    </ul>
+</div>

data/_layouts/post.html

@@ -10,7 +10,7 @@ layout: default
           <div class="o-section-inner">
             <div class="medium-12 columns">
               <!-- Article -->
-              <link itemprop="mainEntityOfPage" href="{{ page.url | absolute_url }}">
+              <link itemprop="mainEntityOfPage" href="{{ page.url }}">
               <header class="c-page-header">
                 <h1 itemprop="headline" class="c-page-title"> {{ page.title }} </h1>
                 <div class="c-metadata-block">

data/_layouts/regions2.html

@@ -0,0 +1,9 @@
+---
+layout: page
+---
+
+<div class="o-section">
+    <div class="c-content-block c-emphasized-text">{{ content }}</div>
+</div>
+
+{% include regions/crossroad2.html places=page.regions %}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-pirati
 version: !ruby/object:Gem::Version
-  version: 7.6.2
+  version: 7.7.0
 platform: ruby
 authors:
 - Jitka Novotná
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2020-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -73,6 +73,7 @@ files:
 - _includes/articles/horizontal-article.html
 - _includes/articles/list-responsive.html
 - _includes/articles/pagination.html
+- _includes/articles/tag-filtered-news.html
 - _includes/articles/vertical-article.html
 - _includes/candidate-badge.html
 - _includes/contacts/residence.html
@@ -104,21 +105,28 @@ files:
 - _includes/program/list.html
 - _includes/program/priorities.html
 - _includes/regions/crossroad.html
+- _includes/regions/crossroad2.html
+- _includes/regions/item.html
+- _includes/right-bar/bar_board.html
 - _includes/right-bar/bar_cal.html
 - _includes/right-bar/bar_fb.html
 - _includes/right-bar/bar_foto.html
 - _includes/right-bar/bar_garant.html
 - _includes/right-bar/bar_kodo.html
 - _includes/right-bar/bar_map.html
+- _includes/right-bar/bar_page_contact.html
 - _includes/right-bar/bar_people.html
+- _includes/right-bar/bar_person_articles.html
 - _includes/right-bar/bar_person_contact.html
 - _includes/right-bar/bar_program.html
+- _includes/right-bar/bar_tag_articles.html
 - _includes/right-bar/bar_textbox.html
 - _includes/right-bar/bar_tw.html
 - _includes/right-bar/bar_video.html
 - _includes/right-bar/custom-bars.html
 - _includes/right-bar/program-extras.html
 - _includes/right-bar/rbar.html
+- _includes/right-bar/rbar_articles.html
 - _includes/right-bar/rbar_profiles.html
 - _includes/social.html
 - _includes/submenu.html
@@ -138,6 +146,7 @@ files:
 - _layouts/program-post.html
 - _layouts/redirected.html
 - _layouts/regions.html
+- _layouts/regions2.html
 - _layouts/taglist.html
 - _sass/_base.scss
 - _sass/_fonts.scss