From 0aee5b9bdb723a9a92095d7829aee31d67b68553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Tue, 26 Nov 2024 19:33:44 +0100 Subject: [PATCH 1/2] =?UTF-8?q?=C5=98e=C5=A1itelsk=C3=BD=20r=C3=A1me=C4=8D?= =?UTF-8?q?ek=20(aneb=20resitel-only;=20pro=20neve=C5=99ejn=C3=A9=20v?= =?UTF-8?q?=C4=9Bci=20=C5=99e=C5=A1itele)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mamweb/static/css/constants.css | 2 ++ mamweb/static/css/modules.css | 16 ++++++++++++++++ .../soustredeni/seznam_soustredeni.html | 16 ++++++++++------ 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/mamweb/static/css/constants.css b/mamweb/static/css/constants.css index 959897b4..361e01dc 100644 --- a/mamweb/static/css/constants.css +++ b/mamweb/static/css/constants.css @@ -10,6 +10,8 @@ --orgovska-fialova: #6a0043; --orgovska-svetla-fialova: #eee4ec; + --resitelska-fialova: #f296b3; + --resitelska-svetla-fialova: #f2E5EF; --barva-pozadi: #fffbf6; } diff --git a/mamweb/static/css/modules.css b/mamweb/static/css/modules.css index 6f612f27..56cda331 100644 --- a/mamweb/static/css/modules.css +++ b/mamweb/static/css/modules.css @@ -25,6 +25,22 @@ margin: -2px 0; } } + +.mam-resitel-only { + background: var(--resitelska-svetla-fialova); + padding: 10px; + margin: 10px -10px; + border: var(--resitelska-fialova) 2px dashed; + + & .mam-resitel-only { + border: 0; + } + + & li { + padding: 3px 0; + margin: -2px 0; + } +} /**********************************/ diff --git a/soustredeni/templates/soustredeni/seznam_soustredeni.html b/soustredeni/templates/soustredeni/seznam_soustredeni.html index 7ba6cd29..c35ebd88 100644 --- a/soustredeni/templates/soustredeni/seznam_soustredeni.html +++ b/soustredeni/templates/soustredeni/seznam_soustredeni.html @@ -36,12 +36,16 @@ {% endfor %} {% endif %} - {% for i in soustredeni.ucastnici.all %} - {% if i.osoba.user == user %} - {% if soustredeni.kontaktnicek_pdf %}
  • kontaktnicek pdf
  • {% endif %} - {% if soustredeni.kontaktnicek_vcf %}
  • kontaktnicek vcf
  • {% endif %} - {% endif %} - {% endfor %} + {% if soustredeni.kontaktnicek_pdf or soustredeni.kontaktnicek_vcf %} +
    + {% for i in soustredeni.ucastnici.all %} + {% if i.osoba.user == user %} + {% if soustredeni.kontaktnicek_pdf %}
  • kontaktnicek pdf
  • {% endif %} + {% if soustredeni.kontaktnicek_vcf %}
  • kontaktnicek vcf
  • {% endif %} + {% endif %} + {% endfor %} +
    + {% endif %} {% if user.je_org %} -- 2.39.5 From e87b84b0281797df21da39207cd47d54aea0b787 Mon Sep 17 00:00:00 2001 From: MaM Web user Date: Tue, 3 Dec 2024 20:59:03 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Fix=20r=C3=A1me=C4=8Dku=20u=20soust=C5=99ed?= =?UTF-8?q?=C4=9Bn=C3=AD,=20kde=20jsem=20nebyl=20=C3=BA=C4=8Dastn=C3=ADk?= =?UTF-8?q?=20(Jid=C3=A1=C5=A1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- soustredeni/templates/soustredeni/seznam_soustredeni.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/soustredeni/templates/soustredeni/seznam_soustredeni.html b/soustredeni/templates/soustredeni/seznam_soustredeni.html index c35ebd88..75db6f37 100644 --- a/soustredeni/templates/soustredeni/seznam_soustredeni.html +++ b/soustredeni/templates/soustredeni/seznam_soustredeni.html @@ -37,14 +37,14 @@ {% endif %} {% if soustredeni.kontaktnicek_pdf or soustredeni.kontaktnicek_vcf %} -
    {% for i in soustredeni.ucastnici.all %} {% if i.osoba.user == user %} +
    {% if soustredeni.kontaktnicek_pdf %}
  • kontaktnicek pdf
  • {% endif %} {% if soustredeni.kontaktnicek_vcf %}
  • kontaktnicek vcf
  • {% endif %} +
    {% endif %} {% endfor %} -
    {% endif %} -- 2.39.5