Merge branch 'feature/pirati-cz' into feature/pirati-cz-martin

main/templates/main/main_articles_page.html

@@ -47,7 +47,7 @@
           </div>
         {% endfor %}
         <div class="flex justify-center">
-          {% include 'main/includes/button_animated.html' with btn_text="Zobrazit další" %}
+          {% include 'main/includes/button_animated.html' with btn_text="Zobrazit starší" %}
         </div>
       </div>
     </div>

main/templates/main/main_people_page.html

@@ -16,15 +16,15 @@
   <div class="container--medium">
     <div class="__js-root">
       <ui-view-provider
-        :initial="{ {% for people_group in page.people %}'{{ people_group.value.slug }}': {% if forloop.counter0 %}false{% else %}true{% endif %},{% endfor %} }"
+        :initial="{ {% for people_group in page.people %}'{{ people_group.value.slug }}-{{ forloop.counter }}': {% if forloop.counter0 %}false{% else %}true{% endif %},{% endfor %} }"
         :sync-location="true"
         v-slot="{ isCurrentView, toggleView }"
       >
         <div class="flex justify-center mb-12">
           <div class="switch">
           {% for people_group in page.people %}
-            <a @click="toggleView('{{ people_group.value.slug }}')" class="switch__item"
-               :class="{'switch__item--active': isCurrentView('{{ people_group.value.slug }}')}"
+            <a @click="toggleView('{{ people_group.value.slug }}-{{ forloop.counter }}')" class="switch__item"
+               :class="{'switch__item--active': isCurrentView('{{ people_group.value.slug }}-{{ forloop.counter }}')}"
             >
               {{ people_group.value.title }}
             </a>
@@ -33,7 +33,7 @@
         </div>
         <div class="flex flex-wrap justify-center mb-12">
           {% for people_group in page.people %}
-            <template v-if="isCurrentView('{{ people_group.value.slug }}')">
+            <template v-if="isCurrentView('{{ people_group.value.slug }}-{{ forloop.counter }}')">
               {% for person_page in people_group.value.person_list %}
                 {% include 'main/includes/person_contact_big.html' %}
               {% endfor %}

main/templates/main/main_person_page.html

@@ -11,38 +11,31 @@
       <section class="grid-container person-grid-container">
         <div class="grid-content leading-6">
           <article class="mb-4 xl:mb-24 xl:mr-2">
-            <p class="font-alt mb-5">
+            <p class="font-alt text-xl leading-7 mb-5">
               {{ page.perex }}
             </p>
-            <p class="font-alt mb-5">
-              {{ page.text|richtext }}
+            <p class="mb-5">
+              {{ paga.text|richtext }}
             </p>
           </article>
         </div>
-        {% if page.email or page.phone %}
         <div class="grid-right-side mb-8 xl:mb-0">
-          <div class="bg-grey-100 mb-1 px-7 py-9">
-            {% if page.email %}
+          <div class="bg-grey-100 flex flex-col justify-center mb-1 px-7 py-4 xl:py-9">
             <div class="flex mb-2">
               <i class="ico--envelope mr-2"></i>
               <a href="mailto:{{ page.email }}" class="text-turquoise-500 underline">
                 {{ page.email }}
               </a>
             </div>
-            {% endif %}
-            {% if page.phone %}
-              <div class="flex mb-2">
+            <div class="flex">
               <i class="ico--phone mr-2"></i>
-                <a href="tel:+{{ page.phone }}">
+              <a href="tel:{{ page.phone }}">
                 {{ page.phone }}
               </a>
             </div>
-            {% endif %}
           </div>
-        {% endif %}
           {% if page.social_links %}
-          <div class="bg-grey-100 px-7 py-9">
-
+            <div class="bg-grey-100 flex flex-col justify-center px-7 py-4 xl:py-9">
               {% for social_block in page.social_links %}
                 <div class="flex mb-2">
                   <i class="{{ social_block.value.icon }} mr-2"></i>
@@ -52,8 +45,8 @@
                 </div>
               {% endfor %}
             </div>
-          </div>
           {% endif %}
+        </div>
       </section>
     </div>
     {% if tweet_list %}
@@ -66,12 +59,12 @@
             {% for tweet in page.tweet_list %}
               <div class="md:w-1/3 lg:w-1/4">
                 <div class="p-4 flex flex-col items-center text-center border border-grey-100">
-                  <img class="rounded-full shadow-sm w-12 mb-2" src="https://randomuser.me/api/portraits/women/56.jpg"
+                  <img class="rounded-full shadow-sm w-12 mb-2" src="{{ tweet.author_img_url }}"
                        alt="user image"/>
                   <h5 class="font-alt mb-2">{{ tweet.author_name }}</h5>
                   <small class="mb-4 text-turquoise-400">@{{ tweet.author_username }}</small>
                   <p class="text-base leading-6 mb-2">{{ tweet.text }}</p>
-                  <a href="" class="hover:no-underline">
+                  <a href="twitter.com/{{ tweet.author_username }}" class="hover:no-underline">
                     <i class="ico--twitter text-turquoise-400 text-xl"></i>
                   </a>
                 </div>
@@ -82,7 +75,7 @@
       </section>
     {% endif %}
     {% if article_page_list %}
-      <section class="grid-container mb-4 justify-start xl:mb-14">
+      <section class="grid-container mb-4 xl:mb-20 justify-start">
         <div class="grid-content">
           <div class="leading-6">
             <h2 class="head-4xl">
@@ -91,9 +84,9 @@
             {% for article_preview in article_page_list %}
               <div class="flex flex-col justify-between items-start mb-9">
                 <div class="flex font-bold mb-4 text-xs text-white uppercase">
-                  <span class="bg-green-400 mr-1 px-1">{{ article_preview.date }}</span>
+                  <span class="bg-green-500 mr-1 px-1">{{ article_preview.date }}</span>
                   {% for tag in article_preview.tags.all %}
-                    <span class="bg-violet-400 mr-1 px-1">{{ tag }}</span>
+                    <span class="bg-violet-600 mr-1 px-1">{{ tag }}</span>
                   {% endfor %}
                 </div>
                 <h4 class="head-3xl mb-4">
@@ -110,14 +103,14 @@
       </section>
     {% endif %}
     {% for people_group in page.people %}
-      <section class="grid-container person-grid-container mb-4 justify-start xl:mb-14">
+      <section class="grid-container person-grid-container mb-4 xl:mb-20 justify-start">
         <div class="grid-content-with-right-side">
           <h2 class="head-4xl text-left">
             {{ people_group.value.title }}
           </h2>
-          {% for person in people_group.value.person_list %}
           <div class="flex flex-wrap">
-            <div class="flex mb-16 person-box-medium">
+            {% for person in people_group.value.person_list %}
+              <div class="flex person-box-medium mb-4 xl:mb-12">
                 <div class="shrink-0 mr-4">
                   {% image person.profile_image fill-250x250 as profile_image %}
                   <img
@@ -131,21 +124,19 @@
                     <h4 class="head-3xl">
                       {{ person.title }}
                     </h4>
-                  <span
-                    class="text-sm xl:text-base leading-6 mb-6">{{ person.position|default_if_none:"" }}</span>
+                    <span class="text-sm xl:text-base leading-6 mb-6">{{ person.position|default_if_none:"" }}</span>
+                  </div>
                   <div>
                     {% include 'main/includes/button_animated.html' with btn_link=person.url btn_text="Detail" %}
                   </div>
                 </div>
-
-              </div>
               </div>
             {% endfor %}
           </div>
+
         </div>
       </section>
     {% endfor %}
-    </div>
 
     {% include 'main/includes/newsletter_section.html' %}
 

main/templates/main/main_program_page.html

@@ -15,15 +15,15 @@
     <div class="container--medium">
       <div class="__js-root">
         <ui-view-provider
-          :initial="{ {% for program_group in page.program %}'{{ program_group.value.slug }}':{% if forloop.counter0 %}false{% else %}true{% endif %},{% endfor %} }"
+          :initial="{ {% for program_group in page.program %}'{{ program_group.value.slug }}-{{ forloop.counter }}':{% if forloop.counter0 %}false{% else %}true{% endif %},{% endfor %} }"
           :sync-location="true"
           v-slot="{ isCurrentView, toggleView }"
         >
           <div class="mb-12">
             <div class="switch">
               {% for program_group in page.program %}
-                <a @click="toggleView('{{ program_group.value.slug }}')" class="switch__item"
-                   :class="{'switch__item--active': isCurrentView('{{ program_group.value.slug }}')}">
+                <a @click="toggleView('{{ program_group.value.slug }}-{{ forloop.counter }}')" class="switch__item"
+                   :class="{'switch__item--active': isCurrentView('{{ program_group.value.slug }}-{{ forloop.counter }}')}">
                   {{ program_group.value.title }}
                 </a>
               {% endfor %}
@@ -32,7 +32,7 @@
 
           <div class="mb-12">
             {% for program_group in page.program %}
-              <template v-if="isCurrentView('{{ program_group.value.slug }}')">
+              <template v-if="isCurrentView('{{ program_group.value.slug }}-{{ forloop.counter }}')">
                 {% for item in program_group.value.point_list %}
                   <div class="flex mb-6">
                     {% image item.icon fill-150x150 as icon %}