From 572ed79615b3000c3ccac1adaea30778fcd4f690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kate=C5=99ina=20=C4=8C=C3=AD=C5=BEkov=C3=A1?= Date: Wed, 6 May 2020 22:43:39 +0200 Subject: [PATCH 1/8] =?UTF-8?q?galerie=20=C5=A1ipky?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- galerie/static/galerie/prvky/dalsi.svg | 36 ++++++++++++++++++-- galerie/static/galerie/prvky/predchozi.svg | 38 +++++++++++++++++++--- 2 files changed, 67 insertions(+), 7 deletions(-) diff --git a/galerie/static/galerie/prvky/dalsi.svg b/galerie/static/galerie/prvky/dalsi.svg index bd3274b6..e928adb2 100644 --- a/galerie/static/galerie/prvky/dalsi.svg +++ b/galerie/static/galerie/prvky/dalsi.svg @@ -5,11 +5,39 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="25.135418mm" height="42.333332mm" viewBox="0 0 25.135418 42.333331" version="1.1" - id="svg851"> + id="svg851" + sodipodi:docname="dalsi.svg" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)"> + + + + id="path44-3" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccccc" /> diff --git a/galerie/static/galerie/prvky/predchozi.svg b/galerie/static/galerie/prvky/predchozi.svg index af139f7e..b7a491ed 100644 --- a/galerie/static/galerie/prvky/predchozi.svg +++ b/galerie/static/galerie/prvky/predchozi.svg @@ -5,11 +5,39 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="25.135418mm" height="42.333332mm" viewBox="0 0 25.135418 42.333331" version="1.1" - id="svg851"> + id="svg851" + sodipodi:docname="predchozi.svg" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)"> + + + + transform="matrix(1.0282842,0,0,1,-86.319083,-88.415315)"> + id="path44-3" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccccc" /> From 57dae38cf9ff5b2a07c908afc3f78b0c7bb67845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kate=C5=99ina=20=C4=8C=C3=AD=C5=BEkov=C3=A1?= Date: Wed, 6 May 2020 22:45:27 +0200 Subject: [PATCH 2/8] =?UTF-8?q?formul=C3=A1=C5=99e=20vzhled=20jako=20tabul?= =?UTF-8?q?ky?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/static/seminar/prihlaska.js | 10 +- seminar/templates/seminar/edit.html | 89 ++++++---- seminar/templates/seminar/login.html | 7 +- seminar/templates/seminar/prihlaska.html | 168 +++++++++--------- .../templates/seminar/prihlaska_field.html | 27 ++- 5 files changed, 170 insertions(+), 131 deletions(-) diff --git a/seminar/static/seminar/prihlaska.js b/seminar/static/seminar/prihlaska.js index 81f91d28..c3565450 100644 --- a/seminar/static/seminar/prihlaska.js +++ b/seminar/static/seminar/prihlaska.js @@ -3,7 +3,7 @@ function addrCountryChanged(){ var stat_text = document.getElementById('id_li_stat_text'); var stat = stat_select[stat_select.selectedIndex].value; if (stat === "other"){ - stat_text.style.display="block"; + stat_text.style.display="revert"; } else { stat_text.style.display="none"; $('#id_stat_text').val(""); @@ -12,18 +12,22 @@ function addrCountryChanged(){ function hideSchoolTextfields(){ var skola_nazev = document.getElementById('id_li_skola_nazev'); var skola_adresa = document.getElementById('id_li_skola_adresa'); + var skola_vypln = document.getElementById('id_li_skola_vypln'); skola_nazev.style.display="none"; skola_adresa.style.display="none"; + skola_vypln.style.display="none"; } function schoolNotInList(){ var skola_nazev = document.getElementById('id_li_skola_nazev'); var skola_adresa = document.getElementById('id_li_skola_adresa'); + var skola_vypln = document.getElementById('id_li_skola_vypln'); // FIXME nefunguje a nevim proc (TypeError: $(...).select2 is not a function) //var skola_select = $('#id_skola').select2(); //skola_select.val(null).trigger('change'); - skola_nazev.style.display="block"; - skola_adresa.style.display="block"; + skola_vypln.style.display="revert"; + skola_nazev.style.display="revert"; + skola_adresa.style.display="revert"; } document.addEventListener("DOMContentLoaded", function(){ diff --git a/seminar/templates/seminar/edit.html b/seminar/templates/seminar/edit.html index 3f3e0d99..bc78312c 100644 --- a/seminar/templates/seminar/edit.html +++ b/seminar/templates/seminar/edit.html @@ -15,59 +15,77 @@
{% csrf_token %} {{form.non_field_errors}} -
    -
  • - Přihlašovací údaje -
  • + +
    + +

    + Přihlašovací údaje +

    + {% include "seminar/prihlaska_field.html" with field=form.username %} -
  • +
  • + +
    + +

    Osobní údaje -

  • + + {% include "seminar/prihlaska_field.html" with field=form.jmeno %} -
  • {% include "seminar/prihlaska_field.html" with field=form.prijmeni %} -
  • {% include "seminar/prihlaska_field.html" with field=form.pohlavi_muz%} -
  • {% include "seminar/prihlaska_field.html" with field=form.email %} -
  • {% include "seminar/prihlaska_field.html" with field=form.telefon %} -
  • {% include "seminar/prihlaska_field.html" with field=form.datum_narozeni %} -
  • +
  • +
    - Bydliště -
  • + +

    + Bydliště +

    + {% include "seminar/prihlaska_field.html" with field=form.ulice %} -
  • {% include "seminar/prihlaska_field.html" with field=form.mesto %} -
  • {% include "seminar/prihlaska_field.html" with field=form.psc %} -
  • {% include "seminar/prihlaska_field.html" with field=form.stat %} -
  • -
  • - {% include "seminar/prihlaska_field.html" with field=form.stat_text %} -
  • + {% include "seminar/prihlaska_field.html" with field=form.stat_text id="id_li_stat_text"%} +
  • +
    + +

    + Škola +

    + {% include "seminar/prihlaska_field.html" with field=form.skola %} -
  • - -
  • -
  • - Vyplň prosím celý název a adresu školy.
    - {% include "seminar/prihlaska_field.html" with field=form.skola_nazev %} -
  • -
  • - {% include "seminar/prihlaska_field.html" with field=form.skola_adresa %} -
  • +
  • + + {% include "seminar/prihlaska_field.html" with field=form.skola_nazev id="id_li_skola_nazev" %} + {% include "seminar/prihlaska_field.html" with field=form.skola_adresa id="id_li_skola_adresa" %} {% include "seminar/prihlaska_field.html" with field=form.rok_maturity %} -
  • +
  • Vyplň prosím celý název a adresu školy.
    + +
    + +

    + Pošta +

    + {% include "seminar/prihlaska_field.html" with field=form.zasilat %} -
  • +
  • + +
    + +

    + Zasílání propagačních materiálů +

    + {% include "seminar/prihlaska_field.html" with field=form.spam %} - - +
    + +
    +
  • {% endblock %} - diff --git a/seminar/templates/seminar/login.html b/seminar/templates/seminar/login.html index 6319ecc0..9769a41a 100644 --- a/seminar/templates/seminar/login.html +++ b/seminar/templates/seminar/login.html @@ -10,9 +10,9 @@
    {% csrf_token %} -
      - {{ form.as_ul }} -
    + + {{ form.as_table }} +
    {# Django si posílá jméno další stránky jako obsah formuláře a výchozí hodnota (mi přišlo, že) nejde změnit... #} @@ -23,4 +23,3 @@ {% endblock %} - diff --git a/seminar/templates/seminar/prihlaska.html b/seminar/templates/seminar/prihlaska.html index 8b17c0bd..baf4ec47 100644 --- a/seminar/templates/seminar/prihlaska.html +++ b/seminar/templates/seminar/prihlaska.html @@ -14,92 +14,93 @@ {% endblock %}{% endblock %} - {% csrf_token %} {{form.non_field_errors}} -
      -
    • - Přihlašovací údaje -
    • -
    • - {% include "seminar/prihlaska_field.html" with field=form.username %} -
    • -
    • - {% include "seminar/prihlaska_field.html" with field=form.password %} -
    • -
    • - {% include "seminar/prihlaska_field.html" with field=form.password_check %} -
    • -
    • - Osobní údaje -
    • -
    • - {% include "seminar/prihlaska_field.html" with field=form.jmeno %} -
    • -
    • - {% include "seminar/prihlaska_field.html" with field=form.prijmeni %} -
    • -
    • - {% include "seminar/prihlaska_field.html" with field=form.pohlavi_muz%} -
    • -
    • - {% include "seminar/prihlaska_field.html" with field=form.email %} -
    • -
    • - {% include "seminar/prihlaska_field.html" with field=form.telefon %} -
    • -
    • - {% include "seminar/prihlaska_field.html" with field=form.datum_narozeni %} -
    • -
    • -
      - Bydliště -
    • -
    • - {% include "seminar/prihlaska_field.html" with field=form.ulice %} -
    • -
    • - {% include "seminar/prihlaska_field.html" with field=form.mesto %} -
    • -
    • - {% include "seminar/prihlaska_field.html" with field=form.psc %} -
    • -
    • - {% include "seminar/prihlaska_field.html" with field=form.stat %} -
    • -
    • - {% include "seminar/prihlaska_field.html" with field=form.stat_text %} -
    • - -
    • -
      - {% include "seminar/prihlaska_field.html" with field=form.skola %} -
    • -
    • - -
    • -
    • - Vyplň prosím celý název a adresu školy.
      - {% include "seminar/prihlaska_field.html" with field=form.skola_nazev %} -
    • -
    • - {% include "seminar/prihlaska_field.html" with field=form.skola_adresa %} -
    • -
    • - {% include "seminar/prihlaska_field.html" with field=form.rok_maturity %} -
    • -
    • - {% include "seminar/prihlaska_field.html" with field=form.zasilat %} -
    • -
    • - {% include "seminar/gdpr.html" %} - {% include "seminar/prihlaska_field.html" with field=form.gdpr %} -
    • -
    • - {% include "seminar/prihlaska_field.html" with field=form.spam %} -
    • -
    + + +
    +

    + Přihlašovací údaje +

    + + {% include "seminar/prihlaska_field.html" with field=form.username %} + {% include "seminar/prihlaska_field.html" with field=form.password %} + {% include "seminar/prihlaska_field.html" with field=form.password_check %} +
    + +
    + +

    + Osobní údaje +

    + + {% include "seminar/prihlaska_field.html" with field=form.jmeno %} + {% include "seminar/prihlaska_field.html" with field=form.prijmeni %} + {% include "seminar/prihlaska_field.html" with field=form.pohlavi_muz%} + {% include "seminar/prihlaska_field.html" with field=form.email %} + {% include "seminar/prihlaska_field.html" with field=form.telefon %} + {% include "seminar/prihlaska_field.html" with field=form.datum_narozeni %} +
    + +
    + +

    + Bydliště +

    + + {% include "seminar/prihlaska_field.html" with field=form.ulice %} + {% include "seminar/prihlaska_field.html" with field=form.mesto %} + {% include "seminar/prihlaska_field.html" with field=form.psc %} + {% include "seminar/prihlaska_field.html" with field=form.stat %} + {% include "seminar/prihlaska_field.html" with field=form.stat_text id="id_li_stat_text"%} +
    + +
    + +

    + Škola +

    + + {% include "seminar/prihlaska_field.html" with field=form.skola %} + + + {% include "seminar/prihlaska_field.html" with field=form.skola_nazev id="id_li_skola_nazev" %} + {% include "seminar/prihlaska_field.html" with field=form.skola_adresa id="id_li_skola_adresa" %} + {% include "seminar/prihlaska_field.html" with field=form.rok_maturity %} +
    Vyplň prosím celý název a adresu školy.
    + +
    + +

    + Pošta +

    + + {% include "seminar/prihlaska_field.html" with field=form.zasilat %} +
    +
    + +

    + GDPR +

    + {% include "seminar/gdpr.html" %} + + {% include "seminar/prihlaska_field.html" with field=form.gdpr %} +
    + +
    + +

    + Zasílání propagačních materiálů +

    + + {% include "seminar/prihlaska_field.html" with field=form.spam %} +
    + + + +
    +