nicer twitter image layout, better typesetting on people + program pages,...

nicer twitter image layout, better typesetting on people + program pages, customizeable header buttons

main/migrations/0035_rename_contact_newcomers_mainhomepage_contact_newcomers_link_and_more.py

+# Generated by Django 4.0.7 on 2022-12-08 17:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0034_alter_mainpeoplepage_perex'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='mainhomepage',
+            old_name='contact_newcomers',
+            new_name='contact_newcomers_link',
+        ),
+        migrations.RenameField(
+            model_name='mainhomepage',
+            old_name='donation_page',
+            new_name='donation_page_link',
+        ),
+        migrations.AddField(
+            model_name='mainhomepage',
+            name='contact_newcomers_text',
+            field=models.TextField(blank=True, default='Nalodit se', null=True, verbose_name='Text na tlačítku pro zájemce o členství'),
+        ),
+        migrations.AddField(
+            model_name='mainhomepage',
+            name='donation_page_text',
+            field=models.TextField(blank=True, default='Darovat', null=True, verbose_name='Text na tlačítku pro příjem darů'),
+        ),
+    ]

main/models.py

@@ -52,19 +52,31 @@ class MainHomePage(
 ):
     # header
 
-    contact_newcomers = models.URLField(
+    contact_newcomers_link = models.URLField(
         "URL pro zájemce o členství",
         blank=True,
         null=True,
         default="https://nalodeni.pirati.cz",
     )
+    contact_newcomers_text = models.TextField(
+        "Text na tlačítku pro zájemce o členství",
+        blank=True,
+        null=True,
+        default="Nalodit se",
+    )
 
-    donation_page = models.URLField(
+    donation_page_link = models.URLField(
         "URL pro příjem darů (tlačítko Dary)",
         blank=True,
         null=True,
         default="https://dary.pirati.cz",
     )
+    donation_page_text = models.TextField(
+        "Text na tlačítku pro příjem darů",
+        blank=True,
+        null=True,
+        default="Darovat",
+    )
 
     # content
     content = StreamField(
@@ -133,9 +145,11 @@ class MainHomePage(
     promote_panels = make_promote_panels(admin_help.build(admin_help.IMPORTANT_TITLE))
 
     settings_panels = [
-        FieldPanel("contact_newcomers"),
+        FieldPanel("contact_newcomers_link"),
+        FieldPanel("contact_newcomers_text"),
         PageChooserPanel("gdpr_and_cookies_page"),
-        FieldPanel("donation_page"),
+        FieldPanel("donation_page_link"),
+        FieldPanel("donation_page_text"),
         FieldPanel("social_links"),
         FieldPanel("matomo_id"),
         FieldPanel("twitter_usernames"),

main/templates/main/includes/layout/header.html

@@ -37,19 +37,19 @@
         </div>
 
         <div class="flex-row flex pb-8 xl:pb-0 gap-4 xl:pr-5">
-          {% if page.root_page.contact_newcomers %}
-            <a href="{{ page.root_page.contact_newcomers }}"
+          {% if page.root_page.contact_newcomers_link and page.root_page.contact_newcomers_text %}
+            <a href="{{ page.root_page.contact_newcomers_link }}"
                class="btn btn--yellow-500 btn--to-yellow-600 btn--hoveractive uppercase" target="_blank">
               <div class="btn__body-wrap w-32 h-11">
-                <div class="btn__body w-32 h-11 xl:w-auto ">Nalodění</div>
+                <div class="btn__body w-32 h-11 xl:w-auto ">{{ page.root_page.contact_newcomers_text }}</div>
               </div>
             </a>
           {% endif %}
-          {% if page.root_page.donation_page %}
-            <a href="{{ page.root_page.donation_page }}"
+          {% if page.root_page.donation_page_link and page.root_page.donation_page_text %}
+            <a href="{{ page.root_page.donation_page_link }}"
                class="btn btn--white btn--to-grey-175 btn--hoveractive uppercase" target="_blank">
               <div class="btn__body-wrap w-32 h-11">
-                <div class="btn__body w-32 h-11 xl:w-auto">Dary</div>
+                <div class="btn__body w-32 h-11 xl:w-auto">{{ page.root_page.donation_page_text }}</div>
               </div>
             </a>
           {% endif %}

main/templates/main/includes/person_contact_big.html

@@ -16,12 +16,14 @@
       <span class="leading-6 mb-4 xl:mb-6 w-10/12">
         {{ person_page.position | default_if_none:'' }}
       </span>
-      <span class="font-bold mb-2 text-grey-300">
-        {{ person_page.phone | default_if_none:'' }}
-      </span>
-      <span class="text-turquoise-500 underline">
-        {{ person_page.email | default_if_none:'' }}
-      </span>
+      <a
+        class="font-bold mb-2 text-grey-300"
+        href="tel:{{ person_page.phone | default_if_none:'' }}"
+      >{{ person_page.phone | default_if_none:'' }}</a>
+      <a
+        class="text-turquoise-500"
+        href="mailto:{{ person_page.email | default_if_none:'' }}"
+      >{{ person_page.email | default_if_none:'' }}</a>
     </div>
     <div>
       {% include 'main/includes/href_button.html' with btn_link=person_page.url btn_text="Zobrazit více" %}

main/templates/main/includes/twitter_widget.html

@@ -3,9 +3,9 @@
     <div class="flex max-w-sm max-w-xs w-full">
       <a
         href="https://twitter.com/{{ tweet.author_username }}"
-        class="mb-5 w-full flex flex-col align-center overflow-hidden text-center border border-grey-100 sm:mb-0 hover:no-underline"
+        class="group mb-5 w-full flex flex-col align-center overflow-hidden text-center border border-grey-100 relative sm:mb-0 hover:no-underline"
       >
-        <div class="md:min-h-[21rem] p-4">
+        <div class="md:min-h-[21rem] p-4{% if tweet.image %} opacity-0 group-focus:opacity-100 group-hover:opacity-100 duration-150 z-10{% endif %}">
           <div class="flex flex-col items-center">
             <div class="mb-4 flex items-center justify-between xl:flex-col gap-3">
               <img
@@ -33,7 +33,7 @@
         </div>
 
         {% if tweet.image %}
-          <div class="flex-shrink-0">
+          <div class="absolute inset-0 flex-shrink-0 z-0 duration-150 group-focus:blur-lg group-focus:opacity-25 group-hover:blur-lg group-hover:opacity-25">
             <img src="{{ tweet.image.url }}"
                  class="tweet-image"
                  alt="Obrázek Tweetu"

main/templates/main/main_people_page.html

@@ -8,7 +8,7 @@
 <main role="main" class="mb-4 xl:mb-20">
   <div class="grid-container">
     <div class="grid-content">
-      <div class="prose font-condensed text-xl leading-7 mb-12">
+      <div class="prose max-w-none font-condensed text-xl text-black leading-7 mb-12 program-perex">
         {{ page.perex|richtext }}
       </div>
     </div>

main/templates/main/main_program_page.html

@@ -7,7 +7,7 @@
   <main role="main" class="mb-4 xl:mb-20">
     <div class="grid-container">
       <div class="grid-content">
-        <div class="prose font-condensed text-xl leading-7 mb-12 program-perex">
+        <div class="prose max-w-none font-condensed text-xl text-black leading-7 mb-12 program-perex">
           {{ page.perex|richtext }}
         </div>
       </div>