jekyll-theme-pirati 8.1.0 → 8.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36af05f7dada0b1bd73b5d669832b2971d505be7f73ca6202142b1e53390f938
-  data.tar.gz: a96935836900ec028757ee40ec6515c3e8bee10048508d4c42a83dda79649bc4
+  metadata.gz: 2dbfde991de21ef4a5db73761ddb4b85fd4c69d497e47fe959fdd8263d87814d
+  data.tar.gz: d381268cc7b5b24169e514528dee49421e88ee41addfa558c3a6ded0e6b06a5b
 SHA512:
-  metadata.gz: 3bd8dd3bf90e9285322d0f3d33df1f3594321abc08ef8fb97f5056d4637cfd8a9e7e6629b527eb3e0a82d1c3547c9c29100366cebc1d3a0499b84b2e989bbdfb
-  data.tar.gz: 6552a452d352a5693fdfd988d69199fb7e64f30e350a33e488f9f53ac4b3c896d2b2c4e26f055aeff3bc49e39616788050d58ddb56eb7bc946cd9925b904a380
+  metadata.gz: 060feea377f69bb7c95d613cc2b7ff4fafc2d5da0dc540db8cd0facebf85ede0edec0b5b7bfeaa611c0763d4d5043791f642716cda969662e3c54cec74a3f2ef
+  data.tar.gz: 466bb391e754273f024fbe8e2c247bb113dae35f8947f28c49e7caa3453dbe29a72de6f4637bc4e71c797f645a854b1cf973be3a55017c225f2f5d8be23ebb65

data/README.md

@@ -106,6 +106,12 @@ To use it fully, provide `heroImg` in the person markdown file.
 
 These will show as the [emphasized variant in black](https://styleguide.pir-test.eu/latest/?p=viewall-molecules-article-card).
 
+#### Organizations can personalise their onboard and donate links in header and footer
+
+Set `organization.donateLink` (defaults to dary.pirati.cz) and
+`organization.onboardingLink` (defaults to nalodeni.pirati.cz) in the Jekyll
+config.
+
 
 ### Backwards incompatible changes
 

data/_includes/candidate-badge.html

@@ -22,12 +22,19 @@
           <a href="{{ include.candidatePage.url|relative_url }}">{% include people/fullname.html person=include.candidatePage %}</a>
         </h1>
         {% if include.candidatePage.mail %}
-          <a href="mailto:{{ include.candidatePage.mail }}" class="block font-light mb-4">{{ include.candidatePage.mail }}</a>
+          <a href="mailto:{{ include.candidatePage.mail }}" class="block candidate-card__bio-item mb-4">{{ include.candidatePage.mail }}</a>
+        {% endif %}
+        <h2 class=" candidate-card__bio-item">{{ include.candidate.profession }}</h2>
+        {% if include.candidate.city %}
+          <h2 class="head-allcaps-4xs mt-4">
+            {{ include.candidate.city }}
+          </h2>
         {% endif %}
-        <h2 class="head-allcaps-4xs md:head-allcaps-3xs">{{ include.candidate.profession }}</h2>
       </div>
       <div class="candidate-card__affiliation">
-        {% if include.candidate.age %}<div>{{ include.candidate.age }} let</div>{% endif %}
+        {% if include.candidate.age %}
+          <div>{{ include.candidate.age }} let</div>
+        {% endif %}
 
         {% if include.candidate.partyUid %}
           {% include party.html uid=include.candidate.partyUid %}
@@ -37,11 +44,13 @@
         {% if include.candidate.description %}
           <p class="font-light text-sm leading-snug italic mb-4 hidden md:block">{{ include.candidate.description }}</p>
         {% endif %}
-        {% if include.candidatePage %}
-        <div class="social-icon-group space-x-2">
-          {% include social-icons.html profiles=include.candidatePage.profiles %}
-        </div>
-        {% endif %}
+        {% unless include.hideSocialProfiles %}
+          {% if include.candidatePage %}
+          <div class="social-icon-group space-x-2">
+            {% include social-icons.html profiles=include.candidatePage.profiles %}
+          </div>
+          {% endif %}
+        {% endunless %}
       </div>
     </div>
   </div>

data/_includes/elections-header.html

@@ -0,0 +1,21 @@
+{% if include.bgImg %}
+  {% if site.mediaStorage %}
+      {% capture imgBgPath %}https://a.pirati.cz/{{ site.mediaStorage }}/img/{{ include.bgImg }}{% endcapture %}
+  {% else %}
+    {% capture imgBgPath %}{% asset '{{ include.bgImg }}' @path %}{% endcapture %}
+    {% assign imgBgPath = imgBgPath | absolute_url %}
+  {% endif %}
+{% endif %}
+
+{% if include.mainContent %}
+  {% capture mainContent %}{{ include.mainContent }}{% endcapture %}
+{% else %}
+  {% capture mainContent %}
+    {% if include.candidateListNumber %}
+      <div class="flag bg-violet-400 text-white head-alt-base mb-6">Volte č. {{ include.candidateListNumber }}</div>
+    {% endif %}
+    <h1 class="head-alt-md md:head-alt-xl">{{ page.title }}</h1>
+  {% endcapture %}
+{% endif %}
+
+{% include hero/advanced.html img=include.img bgImg=imgBgPath mainContent=mainContent subContent=include.subContent contentClass="content-block" imgClass="h-32 lg:h-80 lg:m-auto hidden md:block" %}

data/_includes/footer.html

@@ -33,7 +33,7 @@
             {% endif %}
           </div>
           <div class="flex flex-col md:flex-row lg:flex-col lg:items-end space-y-2 md:space-y-0 md:space-x-2 lg:space-x-0 lg:space-y-2">
-            <a href="https://dary.pirati.cz" rel="noopener noreferrer" target="_blank" class="btn btn--icon btn--cyan-200 btn--hoveractive text-lg btn--fullwidth sm:btn--autowidth">
+            <a href="{{ site.organization.donateLink | default: 'https://dary.pirati.cz' }}" rel="noopener noreferrer" target="_blank" class="btn btn--icon btn--cyan-200 btn--hoveractive text-lg btn--fullwidth sm:btn--autowidth">
               <div class="btn__body-wrap">
                 <div class="btn__body ">Přispěj</div>
                 <div class="btn__icon ">
@@ -42,7 +42,7 @@
               </div>
             </a>
 
-            <a href="https://nalodeni.pirati.cz" rel="noopener noreferrer" target="_blank" class="btn btn--icon btn--blue-300 btn--hoveractive text-lg btn--fullwidth sm:btn--autowidth">
+            <a href="{{ site.organization.onboardingLink | default: 'https://nalodeni.pirati.cz' }}" rel="noopener noreferrer" target="_blank" class="btn btn--icon btn--blue-300 btn--hoveractive text-lg btn--fullwidth sm:btn--autowidth">
               <div class="btn__body-wrap">
                 <div class="btn__body ">Naloď se</div>
                 <div class="btn__icon ">

data/_includes/header.html

@@ -44,7 +44,7 @@
             {% endif %}
           </div>
           <div v-if="show || isLgScreenSize" class="navbar__actions navbar__section navbar__section--expandable container-padding--zero lg:container-padding--auto self-start flex flex-col sm:flex-row lg:flex-col sm:space-x-4 space-y-2 sm:space-y-0 lg:space-y-2 xl:flex-row xl:space-x-2 xl:space-y-0">
-            <a href="https://dary.pirati.cz" rel="noopener noreferrer" target="_blank" class="btn btn--icon btn--cyan-200 btn--hoveractive btn--condensed btn--fullwidth md:btn--autowidth lg:text-sm xl:text-base">
+            <a href="{{ site.organization.donateLink | default: 'https://dary.pirati.cz' }}" rel="noopener noreferrer" target="_blank" class="btn btn--icon btn--cyan-200 btn--hoveractive btn--condensed btn--fullwidth md:btn--autowidth lg:text-sm xl:text-base">
               <div class="btn__body-wrap">
                 <div class="btn__body ">Přispěj</div>
                 <div class="btn__icon ">
@@ -52,7 +52,7 @@
                 </div>
               </div>
             </a>
-            <a href="https://nalodeni.pirati.cz" rel="noopener noreferrer" target="_blank" class="btn btn--icon btn--blue-300 btn--hoveractive btn--condensed btn--fullwidth md:btn--autowidth lg:text-sm xl:text-base">
+            <a href="{{ site.organization.onboardingLink | default: 'https://nalodeni.pirati.cz' }}" rel="noopener noreferrer" target="_blank" class="btn btn--icon btn--blue-300 btn--hoveractive btn--condensed btn--fullwidth md:btn--autowidth lg:text-sm xl:text-base">
               <div class="btn__body-wrap">
                 <div class="btn__body ">Naloď se</div>
                 <div class="btn__icon ">

data/_includes/people/profile-badge.html

@@ -1,10 +1,12 @@
 {% capture label %}
     {% if include.label %}{{ include.label }}{% elsif include.item.name %}{{ include.item.name }}{% else %}{{ include.item.title }}{% endif %}
 {% endcapture %}
-{% if include.item.url contains 'http' %}
-    {% assign url = include.item.url %}
-{% else %}
-    {% assign url = include.item.url | relative_url %}
+{% if include.item.url %}
+  {% if include.item.url contains 'http' %}
+      {% assign url = include.item.url %}
+  {% else %}
+      {% assign url = include.item.url | relative_url %}
+  {% endif %}
 {% endif %}
 {% capture avatarClass %}
   badge__avatar {% if include.avatarClass %}{{ include.avatarClass }}{% else %}avatar--sm{% endif %}
@@ -35,7 +37,11 @@
 
   <div class="badge__body">
     <h2 class="{% if include.headlineClass %}{{ include.headlineClass }}{% else %}head-heavy-2xs{% endif %} badge__title">
-      <a href="{{ url }}" title="{{ label }}" class="content-block--nostyle">{{ label }}</a>
+      {% if url %}
+        <a href="{{ url }}" title="{{ label }}" class="content-block--nostyle">{{ label }}</a>
+      {% else %}
+        {{ label }}
+      {% endif %}
     </h2>
 
     {% unless include.showDescription == false %}

data/_includes/right-bar/bar_people.html

@@ -1,14 +1,16 @@
 
-<div class="content-block">
-  <h2>Lidé</h2>
-</div>
+<div class="hidden lg:block">
+  <div class="content-block">
+    <h2>Lidé</h2>
+  </div>
 
-<div class="space-y-4">
-  {% assign persons = site.people | sample:3 %}
-  {% for person in persons %}
-    {% include people/profile-badge.html item=person style='card' showContactInfo=false %}
-  {% endfor %}
-</div>
+  <div class="space-y-4">
+    {% assign persons = site.people | sample:3 %}
+    {% for person in persons %}
+      {% include people/profile-badge.html item=person style='card' showContactInfo=false %}
+    {% endfor %}
+  </div>
 
-{% capture href %}{% if peopleCol.root %}{{ peopleCol.root }}{% else %}{{ '/lide/' | relative_url }}{% endif %}{% endcapture %}
-{% include buttons/icon.html icon="ico--chevron-right" class="btn--violet-500 btn--fullwidth btn--hoveractive pt-4" cta="Poznejte celý náš tým" href=href %}
+  {% capture href %}{% if peopleCol.root %}{{ peopleCol.root }}{% else %}{{ '/lide/' | relative_url }}{% endif %}{% endcapture %}
+  {% include buttons/icon.html icon="ico--chevron-right" class="btn--violet-500 btn--fullwidth btn--hoveractive pt-4" cta="Poznejte celý náš tým" href=href %}
+</div>

data/_includes/right-bar/bar_profile.html

@@ -51,7 +51,7 @@
     <h2>Asistenti</h2>
     <div class="space-y-4 mt-4">
       {% for asistent in page.asistenti %}
-        {% include people/profile-badge.html class="badge--condensed" item=asistent description=asistent.position %}
+        {% include people/profile-badge.html class="badge--condensed" item=asistent description=asistent.position hideAvatar=true %}
       {% endfor %}
     </div>
   {% endif %}

data/_layouts/communal-elections.html

@@ -15,33 +15,23 @@ layout: default
   {% endif %}
 {% endif %}
 
-{% if page.heroBgImg %}
-  {% if site.mediaStorage %}
-      {% capture imgBgPath %}https://a.pirati.cz/{{ site.mediaStorage }}/img/{{ page.heroBgImg }}{% endcapture %}
-  {% else %}
-    {% capture imgBgPath %}{% asset '{{ page.heroBgImg }}' @path %}{% endcapture %}
-    {% assign imgBgPath = imgBgPath | absolute_url %}
-  {% endif %}
-{% endif %}
 
 <div class="__js-root">
-  <ui-view-provider inline-template :initial="{candidates: true, program: false}" v-slot="{ isCurrentView, toggleView }">
+  <ui-view-provider inline-template :initial="{kandidati: true, program: false}" :sync-location="true" location-param="pohled" v-slot="{ isCurrentView, showView }">
     <main>
-      {% capture mainContent %}
-        {% if candidates.number %}
-          <div class="flag bg-violet-400 text-white head-alt-base mb-6">Volte č. {{ candidates.number }}</div>
-        {% endif %}
-        <h1 class="head-alt-md md:head-alt-xl">{{ page.title }}</h1>
-      {% endcapture %}
-      {% include hero/advanced.html img=page.img bgImg=imgBgPath mainContent=mainContent subContent=content contentClass="content-block" imgClass="h-32 lg:h-80 lg:m-auto hidden md:block" %}
+      {% comment %} Support for customized elections header content. {% endcomment %}
+      {% if page.customizeHeader %}
+        {{ content }}
+      {% else %}
+        {% include elections-header.html img=page.img bgImg=page.heroBgImg subContent=content candidateListNumber=candidates.number %}
+      {% endif %}
 
       <div class="container container--default pt-8 {% unless group.subLinks %}pb-8{% endunless %} lg:py-24">
-
         {% if programCategories.size > 0 %}
           <div class="text-center">
             <div class="switch">
-              <a @click="toggleView('candidates')" class="switch__item" :class="{'switch__item--active': isCurrentView('candidates')}">Kandidáti</a>
-              <a @click="toggleView('program')" class="switch__item" :class="{'switch__item--active': isCurrentView('program')}">Program</a>
+              <a @click="showView('kandidati')" class="switch__item" :class="{'switch__item--active': isCurrentView('kandidati')}">Kandidáti</a>
+              <a @click="showView('program')" class="switch__item" :class="{'switch__item--active': isCurrentView('program')}">Program</a>
             </div>
           </div>
 
@@ -77,13 +67,13 @@ layout: default
           </template>
         {% endif %}
 
-        <template v-if="isCurrentView('candidates')">
+        <template v-if="isCurrentView('kandidati')">
           <h1 class="head-alt-md text-center py-8 lg:pt-24 lg:pb-8">{{ candidates.title }}</h1>
 
           {% assign leaderCandidate = site.people | where: "uid", candidates.leader.uid | first %}
 
           <div class="candidate-card-list grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
-            {% include candidate-badge.html candidate=candidates.leader candidatePage=leaderCandidate rank=1 wrapperClass="candidate-card__wrapper sm:candidate-card-list__item-wrapper md:candidate-card-list__item-wrapper--border" %}
+            {% include candidate-badge.html candidate=candidates.leader candidatePage=leaderCandidate rank=1 wrapperClass="candidate-card__wrapper sm:candidate-card-list__item-wrapper md:candidate-card-list__item-wrapper--border" hideSocialProfiles=page.hideCandidateSocialProfiles %}
 
             {% if candidates.head.size %}
                 {% for candidate in candidates.head %}
@@ -101,8 +91,7 @@ layout: default
                     {% capture classes %}candidate-card__wrapper sm:candidate-card-list__item-wrapper sm:candidate-card-list__item-wrapper--noborder md:candidate-card-list__item-wrapper--border lg:candidate-card-list__item-wrapper--noborder{% endcapture %}
                   {% endif %}
 
-                  {% include candidate-badge.html candidate=candidate candidatePage=candidatePage leader=false rank=candidateRank wrapperClass=classes %}
-
+                  {% include candidate-badge.html candidate=candidate candidatePage=candidatePage leader=false rank=candidateRank wrapperClass=classes hideSocialProfiles=page.hideCandidateSocialProfiles %}
                 {% endfor %}
             {% endif %}
           </div>
@@ -139,8 +128,8 @@ layout: default
                   <{% if candidatePage %}a href="{{ candidatePage.url }}"{% else %}div{% endif %} class="candidate-table-row">
                     <div class="candidate-table-row__position head-allcaps-heavy-2xs text-right">{{ candidateRank }}</div>
                     {% include avatar.html class="avatar--sm candidate-table-row__avatar" src=img alt=candidate.name %}
-                    <div class="candidate-table-row__name head-heavy-2xs font-bold">{% if candidatePage %}{{ candidatePage.name }}{% else %}{{ candidate.name }}{% endif %}</div>
-                    <div class="candidate-table-row__bio head-allcaps-3xs">{% if candidate.age %}{{ candidate.age }} let{% endif %}{% if candidate.age and candidate.profession %}, {{ candidate.profession }}{% endif %}</div>
+                    <div class="candidate-table-row__name head-heavy-2xs font-bold">{% if candidatePage %}{% include people/fullname.html person=candidatePage plain=true %}{% else %}{{ candidate.name }}{% endif %}</div>
+                    <div class="candidate-table-row__bio font-condensed">{% if candidate.age %}{{ candidate.age }} let{% endif %}{% if candidate.profession %}{% if candidate.age %}, {% endif %}{{ candidate.profession }}{% endif %}{% if candidate.city %}{% if candidate.profession or candidate.age %}, {% endif %}{{ candidate.city }}{% endif %}</div>
                     {% if candidate.partyUid %}
                       <div class="candidate-table-row__affiliation">
                         {% include party.html uid=candidate.partyUid %}

data/_layouts/person.html

@@ -24,7 +24,7 @@ layout: default
   include hero/simple.html
   headline=personName
   description=page.profession
-  headlineClass="text-center lg:text-left mx-auto"
+  headlineClass="text-center lg:text-left mx-auto lg:mx-0"
   descriptionClass="max-w-xl mx-auto text-center lg:text-left"
   heroSpacing="pt-16 pb-24 lg:pt-32 pb-24"
   class="candidate-detail__hero"
@@ -41,8 +41,6 @@ layout: default
       </section>
       <section class="lg:w-2/5 xl:w-1/3 pt-8 lg:pt-0 order-first lg:order-last candidate-detail__sidebar">
         {% include right-bar/rbar.html %}
-        <!-- Mobile divider -->
-        <hr class="block lg:hidden" />
       </section>
     </div>
   </main>

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-pirati
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 8.4.0
 platform: ruby
 authors:
 - Jitka Novotná
 - Filip Vařecha
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-13 00:00:00.000000000 Z
+date: 2020-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -53,7 +53,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: 
+description:
 email:
 - jitka@ucw.cz
 - filip.varecha@pirati.cz
@@ -87,6 +87,7 @@ files:
 - _includes/contacts/summary-table.html
 - _includes/countdown.html
 - _includes/disqus_comments.html
+- _includes/elections-header.html
 - _includes/footer.html
 - _includes/google-analytics.html
 - _includes/head-custom.html
@@ -302,7 +303,7 @@ homepage: https://github.com/pirati-web/jekyll-theme-pirati#readme
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -317,9 +318,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Basic theme for Czech pirate party
 test_files: []