Merge branch 'hromadne_pridavani_uloh' into test

mamweb/settings_common.py

@@ -48,6 +48,12 @@ STATICFILES_FINDERS = (
 LOGIN_URL = 'login'
 LOGIN_REDIRECT_URL = 'profil'
 
+# Odhlášení po zavření prohlížeče
+# (pozor nefunguje na firefox se znovuotevíráním oken po startu firefoxu)
+# default je False a SESSION_COOKIE_AGE = 3600*24*14 = 2 týdny
+SESSION_EXPIRE_AT_BROWSER_CLOSE = True
+DOBA_ODHLASENI_PRI_ZASKRTNUTI_NEODHLASOVAT = 365 * 24 * 3600  # rok
+
 # Modules configuration
 
 AUTHENTICATION_BACKENDS = (

mamweb/static/css/mamweb.css

@@ -1190,14 +1190,14 @@ div.gdpr {
 
 /* Jak řešit */
 
-.jakresit img {
+.jakresit svg {
 	width: 33%;
 	padding: 10px;
 	filter: none;
 }
 
 @media(max-width: 860px) {
-	.jakresit img {
+	.jakresit svg {
 		margin: auto;
 		display: grid;
 		width: 100%;

mamweb/static/images/jakresit_1.svg → mamweb/templates/jakresit_1.svg

@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:ns10="http://www.iki.fi/pav/software/textext/"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   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="90mm"
    height="190mm"
    viewBox="0 0 90 190"
    version="1.1"
    id="svg8"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   sodipodi:docname="jakresit_1.svg">
+   sodipodi:docname="jakresit_1.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:ns10="http://www.iki.fi/pav/software/textext/">
   <defs
      id="defs2">
     <marker
@@ -3840,23 +3841,24 @@
      inkscape:snap-text-baseline="false"
      inkscape:snap-page="true"
      inkscape:window-maximized="0"
-     inkscape:window-y="38"
+     inkscape:window-y="0"
-     inkscape:window-x="598"
+     inkscape:window-x="0"
-     inkscape:window-height="1040"
+     inkscape:window-height="765"
-     inkscape:window-width="1318"
+     inkscape:window-width="1267"
      showgrid="false"
      inkscape:document-rotation="0"
-     inkscape:current-layer="g49385"
+     inkscape:current-layer="a22843"
      inkscape:document-units="mm"
-     inkscape:cy="392.3678"
+     inkscape:cy="466.94302"
-     inkscape:cx="215.66676"
+     inkscape:cx="268.70058"
-     inkscape:zoom="0.98994949"
+     inkscape:zoom="1.979899"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      borderopacity="1.0"
      bordercolor="#666666"
      pagecolor="#ffffff"
-     id="base">
+     id="base"
+     inkscape:pagecheckerboard="0">
     <inkscape:grid
        spacingy="0.5"
        spacingx="0.5"
@@ -3875,7 +3877,6 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -11912,7 +11913,7 @@
        ns10:version="1.0.1"
        ns10:texconverter="pdflatex"
        ns10:pdfconverter="inkscape"
-       ns10:text="\\begin{minipage}{9cm}\n\\nadpis{\n\\faLightbulbO \\textbf{ Tipy}\n}\n\\vspace{-2 mm}\n\\podnadpis{\n\\begin{itemize}\n\\item P\u0159e\u010dti si v\u0161echna zad\xe1n\xed v \u010d\xedsle.\n\\item \u0158e\u0161 v\xedce t\xe9mat najednou, dozv\xed\u0161 se n\u011bco nov\xe9ho z r\u016fzn\xfdch oblast\xed.\n\\item Ptej se!\n\\begin{itemize}[leftmargin=*]\n\\item Ke ka\u017ed\xe9mu t\xe9m\xe1tku existuje e-mailov\xe1 konference,\nkde m\u016f\u017ee\u0161 diskutovat s ostatn\xedmi \u0159e\u0161iteli \u010di se pt\xe1t na nejasnosti.\n\\item St\xe1le nev\xed\u0161? Napi\u0161 p\u0159\xedmo vedouc\xedmu t\xe9m\xe1tka, r\xe1d ti porad\xed.\n\\end{itemize}\n\\item M\u016f\u017eu googlit?\n\\begin{itemize}[leftmargin=*]\n\\item Ano! Pokud v\u0161ak nebude uvedeno jinak, nehledej pros\xedm p\u0159\xedmo \u0159e\u0161en\xed\nzadan\xfdch \xfaloh, mohl(a) by ses tak ochudit o radost z objevov\xe1n\xed. \n\\end{itemize}\n\\item S odevzd\xe1n\xedm neot\xe1lej\n\\begin{itemize}[leftmargin=*]\n\\item Stihneme-li ti \u0159e\u0161en\xed opravit p\u0159ed 1.~deadlinem, m\u016f\u017ee\u0161 si jej je\u0161t\u011b zlep\u0161it.\n\\end{itemize}\n\\end{itemize}\n}\n\\end{minipage}"
+       ns10:text="\\begin{minipage}{9cm}\n\\nadpis{\n\\faLightbulbO \\textbf{ Tipy}\n}\n\\vspace{-2 mm}\n\\podnadpis{\n\\begin{itemize}\n\\item P\u0159e\u010dti si v\u0161echna zad\xe1n\xed v \u010d\xedsle.\n\\item \u0158e\u0161 v\xedce t\xe9mat najednou, dozv\xed\u0161 se n\u011bco nov\xe9ho z r\u016fzn\xfdch oblast\xed.\n\\item Ptej se!\n\\begin{itemize}[leftmargin=*]\n\\item Ke ka\u017ed\xe9mu t\xe9m\xe1tku existuje discordový kanál,\nkde m\u016f\u017ee\u0161 diskutovat s ostatn\xedmi \u0159e\u0161iteli \u010di se pt\xe1t na nejasnosti.\n\\item St\xe1le nev\xed\u0161? Napi\u0161 p\u0159\xedmo vedouc\xedmu t\xe9m\xe1tka, r\xe1d ti porad\xed.\n\\end{itemize}\n\\item M\u016f\u017eu googlit?\n\\begin{itemize}[leftmargin=*]\n\\item Ano! Pokud v\u0161ak nebude uvedeno jinak, nehledej pros\xedm p\u0159\xedmo \u0159e\u0161en\xed\nzadan\xfdch \xfaloh, mohl(a) by ses tak ochudit o radost z objevov\xe1n\xed. \n\\end{itemize}\n\\item S odevzd\xe1n\xedm neot\xe1lej\n\\begin{itemize}[leftmargin=*]\n\\item Stihneme-li ti \u0159e\u0161en\xed opravit p\u0159ed 1.~deadlinem, m\u016f\u017ee\u0161 si jej je\u0161t\u011b zlep\u0161it.\n\\end{itemize}\n\\end{itemize}\n}\n\\end{minipage}"
        ns10:preamble="/home/katerina/.config/inkscape/extensions/textext/default_packages.tex"
        ns10:scale="1.0"
        ns10:alignment="middle center"
@@ -13802,188 +13803,15 @@
         </g>
         <g
            id="id-a3516585-3e24-4c6e-984f-4b7327cf13e7"
-           style="fill:#000000;fill-opacity:1">
+           style="fill:#000000;fill-opacity:1" />
-          <g
-             transform="translate(213.749,141.622)"
-             id="g54346">
-            <path
-               id="id-d4b89d71-857b-4c37-b8df-595545ba19b4"
-               d="M 4.125,-2.1875 C 4.125,-2.515625 4.109375,-3.265625 3.734375,-3.875 3.3125,-4.484375 2.71875,-4.59375 2.359375,-4.59375 1.25,-4.59375 0.34375,-3.53125 0.34375,-2.25 c 0,1.3125 0.96875,2.359375 2.15625,2.359375 0.625,0 1.203125,-0.234375 1.59375,-0.515625 L 4.03125,-1.0625 C 3.40625,-0.53125 2.734375,-0.5 2.515625,-0.5 1.71875,-0.5 1.078125,-1.203125 1.046875,-2.1875 Z M 3.5625,-2.734375 H 1.09375 c 0.15625,-0.75 0.6875,-1.25 1.265625,-1.25 0.515625,0 1.0625,0.328125 1.203125,1.25 z m 0,0"
-               style="stroke:none"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(218.177,141.622)"
-             id="g54349">
-            <path
-               id="id-0572db3d-e394-4766-bd4d-bf3c1c3d964a"
-               d="M 2.75,-1.921875 V -2.5 H 0.109375 v 0.578125 z m 0,0"
-               style="stroke:none"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(221.498,141.622)"
-             id="g54352">
-            <path
-               id="id-7f36d3d3-fbcf-47e0-8f60-c9c7eeea54b6"
-               d="m 7.109375,0 v -2.96875 c 0,-0.671875 -0.15625,-1.5625 -1.375,-1.5625 -0.59375,0 -1.109375,0.28125 -1.484375,0.8125 -0.25,-0.75 -0.953125,-0.8125 -1.265625,-0.8125 -0.71875,0 -1.1875,0.40625 -1.453125,0.765625 v -0.71875 H 0.8125 V 0 h 0.765625 v -2.4375 c 0,-0.6875 0.28125,-1.484375 1.015625,-1.484375 0.921875,0 0.96875,0.640625 0.96875,1.015625 V 0 h 0.78125 v -2.4375 c 0,-0.6875 0.265625,-1.484375 1.015625,-1.484375 0.921875,0 0.96875,0.640625 0.96875,1.015625 V 0 Z m 0,0"
-               style="stroke:none"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(229.413,141.622)"
-             id="g54355">
-            <path
-               id="id-a582af27-852f-4a1b-a3c2-f5fb8ee4542c"
-               d="m 4.078125,0 v -2.875 c 0,-1.015625 -0.734375,-1.71875 -1.640625,-1.71875 -0.65625,0 -1.109375,0.15625 -1.5625,0.421875 l 0.046875,0.65625 C 1.453125,-3.875 1.9375,-4 2.4375,-4 c 0.46875,0 0.859375,0.390625 0.859375,1.125 v 0.4375 C 1.796875,-2.421875 0.53125,-2 0.53125,-1.125 c 0,0.421875 0.28125,1.234375 1.140625,1.234375 0.140625,0 1.078125,-0.015625 1.65625,-0.46875 V 0 Z m -0.78125,-1.3125 c 0,0.1875 0,0.4375 -0.34375,0.625 C 2.671875,-0.515625 2.296875,-0.5 2.1875,-0.5 1.703125,-0.5 1.25,-0.734375 1.25,-1.140625 1.25,-1.84375 2.875,-1.90625 3.296875,-1.9375 Z m 0,0"
-               style="stroke:none"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(234.201,141.622)"
-             id="g54358">
-            <path
-               id="id-a61fcc03-21f9-46b8-9fc9-a6a0edf90416"
-               d="m 1.5625,0 v -4.421875 h -0.75 V 0 Z M 1.640625,-5.640625 V -6.53125 H 0.75 v 0.890625 z m 0,0"
-               style="stroke:none"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(236.581,141.622)"
-             id="g54361">
-            <path
-               id="id-4d3e2ab7-28c5-4ae8-9afb-0b5abc290214"
-               d="m 1.5625,0 v -6.921875 h -0.75 V 0 Z m 0,0"
-               style="stroke:none"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(238.961,141.622)"
-             id="g54364">
-            <path
-               id="id-9a5feb64-5325-48ae-845a-afd4001b03a2"
-               d="m 4.671875,-2.1875 c 0,-1.34375 -1,-2.40625 -2.171875,-2.40625 -1.234375,0 -2.203125,1.09375 -2.203125,2.40625 0,1.3125 1.015625,2.296875 2.1875,2.296875 1.1875,0 2.1875,-1 2.1875,-2.296875 z m -0.78125,-0.109375 c 0,1.1875 -0.671875,1.765625 -1.40625,1.765625 -0.6875,0 -1.40625,-0.5625 -1.40625,-1.765625 0,-1.203125 0.75,-1.6875 1.40625,-1.6875 0.703125,0 1.40625,0.515625 1.40625,1.6875 z m 0,0"
-               style="stroke:none"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(243.943,141.622)"
-             id="g54367">
-            <path
-               id="id-2d2129a4-0a3a-42cb-b451-cfbf9fbe9393"
-               d="m 4.453125,-4.421875 h -0.75 l -0.796875,2.0625 C 2.703125,-1.796875 2.390625,-1 2.3125,-0.53125 H 2.296875 C 2.25,-0.890625 1.984375,-1.578125 1.890625,-1.84375 L 0.921875,-4.421875 H 0.140625 L 1.859375,0 h 0.875 z m 0,0"
-               style="stroke:none"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(248.536,141.622)"
-             id="g54370">
-            <path
-               id="id-e419ba0d-791f-4b7c-924b-a588753b6c4f"
-               d="m 4.078125,0 v -2.875 c 0,-1.015625 -0.734375,-1.71875 -1.640625,-1.71875 -0.65625,0 -1.109375,0.15625 -1.5625,0.421875 l 0.046875,0.65625 C 1.453125,-3.875 1.9375,-4 2.4375,-4 c 0.46875,0 0.859375,0.390625 0.859375,1.125 v 0.4375 C 1.796875,-2.421875 0.53125,-2 0.53125,-1.125 c 0,0.421875 0.28125,1.234375 1.140625,1.234375 0.140625,0 1.078125,-0.015625 1.65625,-0.46875 V 0 Z m -0.78125,-1.3125 c 0,0.1875 0,0.4375 -0.34375,0.625 C 2.671875,-0.515625 2.296875,-0.5 2.1875,-0.5 1.703125,-0.5 1.25,-0.734375 1.25,-1.140625 1.25,-1.84375 2.875,-1.90625 3.296875,-1.9375 Z m 0.5,-5.609375 H 3.015625 L 1.6875,-5.25 h 0.609375 z m 0,0"
-               style="stroke:none"
-               inkscape:connector-curvature="0" />
-          </g>
-        </g>
-        <g
-           id="id-968e70a9-86d5-4c10-99ac-c2d8cfc939f2"
-           style="fill:#000000;fill-opacity:1">
-          <g
-             transform="translate(257.28,141.622)"
-             id="g54374">
-            <path
-               id="id-edff8c8b-837d-4110-8425-cbc11e28bf82"
-               d="M 4.6875,0 2.796875,-2.71875 4.46875,-4.421875 H 3.578125 l -2.015625,2.0625 v -4.5625 H 0.84375 V 0 h 0.6875 V -1.40625 L 2.328125,-2.234375 3.875,0 Z m 0,0"
-               style="stroke:none"
-               inkscape:connector-curvature="0" />
-          </g>
-        </g>
         <g
            id="id-532f0253-d24d-4378-8676-f3e38496c34b"
            style="fill:#000000;fill-opacity:1">
-          <g
-             transform="translate(261.871,141.622)"
-             id="g54378">
-            <path
-               id="id-dba78890-38e3-4eaa-95a5-5cef82db381c"
-               d="m 4.671875,-2.1875 c 0,-1.34375 -1,-2.40625 -2.171875,-2.40625 -1.234375,0 -2.203125,1.09375 -2.203125,2.40625 0,1.3125 1.015625,2.296875 2.1875,2.296875 1.1875,0 2.1875,-1 2.1875,-2.296875 z m -0.78125,-0.109375 c 0,1.1875 -0.671875,1.765625 -1.40625,1.765625 -0.6875,0 -1.40625,-0.5625 -1.40625,-1.765625 0,-1.203125 0.75,-1.6875 1.40625,-1.6875 0.703125,0 1.40625,0.515625 1.40625,1.6875 z m 0,0"
-               style="stroke:none"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(266.853,141.622)"
-             id="g54381">
-            <path
-               id="id-69e37a3e-257c-4668-b3fe-61d03ee9c8f1"
-               d="m 4.34375,0 v -2.96875 c 0,-0.65625 -0.15625,-1.5625 -1.375,-1.5625 -0.890625,0 -1.390625,0.671875 -1.4375,0.75 V -4.484375 H 0.8125 V 0 h 0.765625 v -2.4375 c 0,-0.65625 0.25,-1.484375 1.015625,-1.484375 0.953125,0 0.96875,0.703125 0.96875,1.015625 V 0 Z m 0,0"
-               style="stroke:none"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(272,141.622)"
-             id="g54384">
-            <path
-               id="id-f3e05acf-7f9c-429d-87b3-0381b32cb160"
-               d="M 3.453125,-6.25 V -6.921875 C 3.34375,-6.953125 3.03125,-7.03125 2.65625,-7.03125 1.71875,-7.03125 1,-6.3125 1,-5.328125 v 0.90625 H 0.265625 V -3.84375 H 1 V 0 h 0.75 v -3.84375 h 1.09375 v -0.578125 h -1.125 v -1.1875 c 0,-0.734375 0.671875,-0.8125 0.9375,-0.8125 0.1875,0 0.46875,0.015625 0.796875,0.171875 z m 0,0"
-               style="stroke:none"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(275.045,141.622)"
-             id="g54387">
-            <path
-               id="id-1aa54445-60ef-46a1-9212-99399194ec2b"
-               d="M 4.125,-2.1875 C 4.125,-2.515625 4.109375,-3.265625 3.734375,-3.875 3.3125,-4.484375 2.71875,-4.59375 2.359375,-4.59375 1.25,-4.59375 0.34375,-3.53125 0.34375,-2.25 c 0,1.3125 0.96875,2.359375 2.15625,2.359375 0.625,0 1.203125,-0.234375 1.59375,-0.515625 L 4.03125,-1.0625 C 3.40625,-0.53125 2.734375,-0.5 2.515625,-0.5 1.71875,-0.5 1.078125,-1.203125 1.046875,-2.1875 Z M 3.5625,-2.734375 H 1.09375 c 0.15625,-0.75 0.6875,-1.25 1.265625,-1.25 0.515625,0 1.0625,0.328125 1.203125,1.25 z m 0,0"
-               style="stroke:none"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(279.473,141.622)"
-             id="g54390">
-            <path
-               id="id-4ab68c8f-0ff1-4e07-baad-0d30c60cea60"
-               d="m 3.265625,-3.875 v -0.65625 c -0.890625,0 -1.4375,0.5 -1.75,0.953125 v -0.90625 H 0.8125 V 0 h 0.75 V -2.140625 C 1.5625,-3.125 2.28125,-3.84375 3.265625,-3.875 Z m 0,0"
-               style="stroke:none"
-               inkscape:connector-curvature="0" />
-          </g>
           <g
              transform="translate(282.878,141.622)"
-             id="g54393">
+             id="g54393" />
-            <path
-               id="id-91213a74-32e2-4d8e-9c3a-188b30413cb2"
-               d="M 4.125,-2.1875 C 4.125,-2.515625 4.109375,-3.265625 3.734375,-3.875 3.3125,-4.484375 2.71875,-4.59375 2.359375,-4.59375 1.25,-4.59375 0.34375,-3.53125 0.34375,-2.25 c 0,1.3125 0.96875,2.359375 2.15625,2.359375 0.625,0 1.203125,-0.234375 1.59375,-0.515625 L 4.03125,-1.0625 C 3.40625,-0.53125 2.734375,-0.5 2.515625,-0.5 1.71875,-0.5 1.078125,-1.203125 1.046875,-2.1875 Z M 3.5625,-2.734375 H 1.09375 c 0.15625,-0.75 0.6875,-1.25 1.265625,-1.25 0.515625,0 1.0625,0.328125 1.203125,1.25 z m 0,0"
-               style="stroke:none"
-               inkscape:connector-curvature="0" />
-          </g>
           <g
-             transform="translate(287.306,141.622)"
+             transform="translate(304.31,141.622)"
-             id="g54396">
-            <path
-               id="id-fb7c5866-f92b-42b1-b7ac-ceaaba52f2cd"
-               d="m 4.34375,0 v -2.96875 c 0,-0.65625 -0.15625,-1.5625 -1.375,-1.5625 -0.890625,0 -1.390625,0.671875 -1.4375,0.75 V -4.484375 H 0.8125 V 0 h 0.765625 v -2.4375 c 0,-0.65625 0.25,-1.484375 1.015625,-1.484375 0.953125,0 0.96875,0.703125 0.96875,1.015625 V 0 Z m 0,0"
-               style="stroke:none"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(292.454,141.622)"
-             id="g54399">
-            <path
-               id="id-e98ad4f6-7e6d-4fa6-8ecb-3d8a0d4febf0"
-               d="m 4.140625,-0.40625 -0.0625,-0.65625 c -0.515625,0.390625 -1.046875,0.53125 -1.5625,0.53125 -0.828125,0 -1.375,-0.71875 -1.375,-1.6875 C 1.140625,-3 1.5,-3.953125 2.5625,-3.953125 c 0.515625,0 0.859375,0.078125 1.40625,0.4375 l 0.125,-0.65625 C 3.5,-4.5 3.15625,-4.59375 2.546875,-4.59375 c -1.375,0 -2.1875,1.203125 -2.1875,2.375 0,1.234375 0.90625,2.328125 2.15625,2.328125 0.53125,0 1.078125,-0.140625 1.625,-0.515625 z m 0,0"
-               style="stroke:none"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(296.882,141.622)"
-             id="g54402">
-            <path
-               id="id-1e71b837-6dbf-4aec-9e7b-e5b975775165"
-               d="M 4.125,-2.1875 C 4.125,-2.515625 4.109375,-3.265625 3.734375,-3.875 3.3125,-4.484375 2.71875,-4.59375 2.359375,-4.59375 1.25,-4.59375 0.34375,-3.53125 0.34375,-2.25 c 0,1.3125 0.96875,2.359375 2.15625,2.359375 0.625,0 1.203125,-0.234375 1.59375,-0.515625 L 4.03125,-1.0625 C 3.40625,-0.53125 2.734375,-0.5 2.515625,-0.5 1.71875,-0.5 1.078125,-1.203125 1.046875,-2.1875 Z M 3.5625,-2.734375 H 1.09375 c 0.15625,-0.75 0.6875,-1.25 1.265625,-1.25 0.515625,0 1.0625,0.328125 1.203125,1.25 z m 0,0"
-               style="stroke:none"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(301.31,141.622)"
              id="g54405">
             <path
                id="id-66e99794-5e3b-4b98-8aff-3afc4907fb22"
@@ -26843,5 +26671,105 @@
         </g>
       </g>
     </g>
+    <a
+       id="a22843"
+       xlink:href="https://discord.gg/MxPjKsDFWG">
+      <a
+         id="a50303"
+         xlink:href="https://discord.gg/MxPjKsDFWG">
+        <g
+           aria-label="jeden discordový kanál"
+           id="text12419"
+           style="font-size:2.82223px;line-height:1.25;stroke-width:0.264583;stroke:none;stroke-opacity:1;fill:#6f2509;fill-opacity:1">
+          <path
+             d="m 63.518556,129.64917 h 0.25356 v 1.57097 q 0,0.2949 -0.113,0.4272 -0.111621,0.13229 -0.361047,0.13229 h -0.09646 v -0.21498 h 0.06752 q 0.144695,0 0.197061,-0.0675 0.05236,-0.0661 0.05236,-0.27699 z m 0,-0.60082 h 0.25356 v 0.32108 h -0.25356 z"
+             id="path28518"
+             style="stroke:none;stroke-opacity:1;fill:#6f2509;fill-opacity:1" />
+          <path
+             d="m 65.622826,130.35749 v 0.12402 h -1.165823 q 0.01654,0.26183 0.157097,0.39963 0.141938,0.13643 0.39412,0.13643 0.146072,0 0.282498,-0.0358 0.137804,-0.0358 0.272852,-0.10749 v 0.23978 q -0.136426,0.0579 -0.279742,0.0882 -0.143316,0.0303 -0.290767,0.0303 -0.369315,0 -0.585668,-0.21497 -0.214974,-0.21497 -0.214974,-0.58153 0,-0.37897 0.20395,-0.60083 0.205328,-0.22324 0.552595,-0.22324 0.311437,0 0.491961,0.20119 0.181901,0.19982 0.181901,0.54433 z m -0.253559,-0.0744 q -0.0028,-0.20808 -0.117134,-0.3321 -0.112999,-0.12403 -0.300413,-0.12403 -0.212219,0 -0.340377,0.11989 -0.126779,0.11989 -0.146072,0.33762 z"
+             id="path28520"
+             style="stroke:none;stroke-opacity:1;fill:#6f2509;fill-opacity:1" />
+          <path
+             d="m 67.054612,129.88344 v -0.83509 h 0.25356 v 2.14423 h -0.25356 v -0.23151 q -0.07993,0.1378 -0.202572,0.20533 -0.121268,0.0661 -0.292145,0.0661 -0.279743,0 -0.456132,-0.22324 -0.175011,-0.22324 -0.175011,-0.58704 0,-0.36381 0.175011,-0.58705 0.176389,-0.22324 0.456132,-0.22324 0.170877,0 0.292145,0.0675 0.122646,0.0662 0.202572,0.20395 z m -0.864032,0.53882 q 0,0.27974 0.114377,0.43959 0.115756,0.15848 0.31695,0.15848 0.201194,0 0.316949,-0.15848 0.115756,-0.15985 0.115756,-0.43959 0,-0.27975 -0.115756,-0.43822 -0.115755,-0.15985 -0.316949,-0.15985 -0.201194,0 -0.31695,0.15985 -0.114377,0.15847 -0.114377,0.43822 z"
+             id="path28522"
+             style="stroke:none;stroke-opacity:1;fill:#6f2509;fill-opacity:1" />
+          <path
+             d="m 69.150614,130.35749 v 0.12402 H 67.98479 q 0.01654,0.26183 0.157097,0.39963 0.141938,0.13643 0.39412,0.13643 0.146073,0 0.282499,-0.0358 0.137804,-0.0358 0.272852,-0.10749 v 0.23978 q -0.136426,0.0579 -0.279742,0.0882 -0.143317,0.0303 -0.290767,0.0303 -0.369316,0 -0.585668,-0.21497 -0.214975,-0.21497 -0.214975,-0.58153 0,-0.37897 0.20395,-0.60083 0.205329,-0.22324 0.552595,-0.22324 0.311438,0 0.491961,0.20119 0.181902,0.19982 0.181902,0.54433 z m -0.25356,-0.0744 q -0.0028,-0.20808 -0.117133,-0.3321 -0.113,-0.12403 -0.300414,-0.12403 -0.212218,0 -0.340376,0.11989 -0.12678,0.11989 -0.146072,0.33762 z"
+             id="path28524"
+             style="stroke:none;stroke-opacity:1;fill:#6f2509;fill-opacity:1" />
+          <path
+             d="m 70.84974,130.26102 v 0.93156 h -0.25356 v -0.92329 q 0,-0.21911 -0.08544,-0.32797 -0.08544,-0.10887 -0.256316,-0.10887 -0.205328,0 -0.323839,0.13092 -0.118512,0.13091 -0.118512,0.35691 v 0.8723 h -0.254938 v -1.54341 h 0.254938 v 0.23978 q 0.09095,-0.13918 0.213596,-0.20808 0.124024,-0.0689 0.285255,-0.0689 0.265962,0 0.402388,0.16536 0.136427,0.16399 0.136427,0.48369 z"
+             id="path28526"
+             style="stroke:none;stroke-opacity:1;fill:#6f2509;fill-opacity:1" />
+          <path
+             d="m 73.268204,129.88344 v -0.83509 h 0.25356 v 2.14423 h -0.25356 v -0.23151 q -0.07993,0.1378 -0.202572,0.20533 -0.121268,0.0661 -0.292145,0.0661 -0.279743,0 -0.456132,-0.22324 -0.175012,-0.22324 -0.175012,-0.58704 0,-0.36381 0.175012,-0.58705 0.176389,-0.22324 0.456132,-0.22324 0.170877,0 0.292145,0.0675 0.122645,0.0662 0.202572,0.20395 z m -0.864033,0.53882 q 0,0.27974 0.114378,0.43959 0.115755,0.15848 0.31695,0.15848 0.201194,0 0.316949,-0.15848 0.115756,-0.15985 0.115756,-0.43959 0,-0.27975 -0.115756,-0.43822 -0.115755,-0.15985 -0.316949,-0.15985 -0.201195,0 -0.31695,0.15985 -0.114378,0.15847 -0.114378,0.43822 z"
+             id="path28528"
+             style="stroke:none;stroke-opacity:1;fill:#6f2509;fill-opacity:1" />
+          <path
+             d="m 74.044041,129.64917 h 0.25356 v 1.54341 h -0.25356 z m 0,-0.60082 h 0.25356 v 0.32108 h -0.25356 z"
+             id="path28530"
+             style="stroke:none;stroke-opacity:1;fill:#6f2509;fill-opacity:1" />
+          <path
+             d="m 75.812069,129.69465 v 0.23978 q -0.107487,-0.0551 -0.223242,-0.0827 -0.115756,-0.0276 -0.23978,-0.0276 -0.188791,0 -0.283876,0.0579 -0.09371,0.0579 -0.09371,0.17364 0,0.0882 0.06752,0.13918 0.06752,0.0496 0.271474,0.0951 l 0.08682,0.0193 q 0.270096,0.0579 0.383095,0.16398 0.114378,0.10473 0.114378,0.29353 0,0.21497 -0.170877,0.34037 -0.169499,0.1254 -0.467157,0.1254 -0.124023,0 -0.259071,-0.0248 -0.133671,-0.0234 -0.282499,-0.0717 v -0.26183 q 0.14056,0.073 0.276986,0.11025 0.136427,0.0358 0.270097,0.0358 0.179145,0 0.275608,-0.0606 0.09646,-0.062 0.09646,-0.17363 0,-0.10335 -0.07028,-0.15848 -0.0689,-0.0551 -0.304547,-0.10611 l -0.08819,-0.0207 q -0.235645,-0.0496 -0.340377,-0.15158 -0.104731,-0.10335 -0.104731,-0.2825 0,-0.21773 0.154341,-0.33624 0.154341,-0.11851 0.438217,-0.11851 0.140561,0 0.264584,0.0207 0.124024,0.0207 0.228755,0.062 z"
+             id="path28532"
+             style="stroke:none;stroke-opacity:1;fill:#6f2509;fill-opacity:1" />
+          <path
+             d="m 77.40922,129.70843 v 0.23702 q -0.107488,-0.0592 -0.216353,-0.0882 -0.107487,-0.0303 -0.217731,-0.0303 -0.246669,0 -0.383095,0.1571 -0.136427,0.15572 -0.136427,0.43822 0,0.28249 0.136427,0.43959 0.136426,0.15572 0.383095,0.15572 0.110244,0 0.217731,-0.0289 0.108865,-0.0303 0.216353,-0.0896 v 0.23427 q -0.10611,0.0496 -0.220487,0.0744 -0.113,0.0248 -0.241158,0.0248 -0.348644,0 -0.553972,-0.2191 -0.205329,-0.21911 -0.205329,-0.59118 0,-0.37759 0.206707,-0.59394 0.208084,-0.21635 0.569131,-0.21635 0.117134,0 0.228755,0.0248 0.111621,0.0234 0.216353,0.0717 z"
+             id="path28534"
+             style="stroke:none;stroke-opacity:1;fill:#6f2509;fill-opacity:1" />
+          <path
+             d="m 78.448264,129.82694 q -0.20395,0 -0.322462,0.15985 -0.118512,0.15848 -0.118512,0.43547 0,0.27698 0.117134,0.43684 0.118511,0.15847 0.32384,0.15847 0.202572,0 0.321084,-0.15985 0.118511,-0.15986 0.118511,-0.43546 0,-0.27423 -0.118511,-0.43409 -0.118512,-0.16123 -0.321084,-0.16123 z m 0,-0.21497 q 0.33073,0 0.519522,0.21497 0.188791,0.21498 0.188791,0.59532 0,0.37896 -0.188791,0.59531 -0.188792,0.21497 -0.519522,0.21497 -0.332108,0 -0.5209,-0.21497 -0.187414,-0.21635 -0.187414,-0.59531 0,-0.38034 0.187414,-0.59532 0.188792,-0.21497 0.5209,-0.21497 z"
+             id="path28536"
+             style="stroke:none;stroke-opacity:1;fill:#6f2509;fill-opacity:1" />
+          <path
+             d="m 80.47123,129.8862 q -0.04272,-0.0248 -0.09371,-0.0358 -0.04961,-0.0124 -0.110243,-0.0124 -0.214975,0 -0.33073,0.14056 -0.114378,0.13918 -0.114378,0.40101 v 0.81304 h -0.254937 v -1.54341 h 0.254937 v 0.23978 q 0.07993,-0.14056 0.208085,-0.20808 0.128158,-0.0689 0.311437,-0.0689 0.02618,0 0.05788,0.004 0.03169,0.003 0.07028,0.01 z"
+             id="path28538"
+             style="stroke:none;stroke-opacity:1;fill:#6f2509;fill-opacity:1" />
+          <path
+             d="m 81.703199,129.88344 v -0.83509 h 0.253559 v 2.14423 h -0.253559 v -0.23151 q -0.07993,0.1378 -0.202573,0.20533 -0.121267,0.0661 -0.292145,0.0661 -0.279742,0 -0.456131,-0.22324 -0.175012,-0.22324 -0.175012,-0.58704 0,-0.36381 0.175012,-0.58705 0.176389,-0.22324 0.456131,-0.22324 0.170878,0 0.292145,0.0675 0.122646,0.0662 0.202573,0.20395 z m -0.864033,0.53882 q 0,0.27974 0.114378,0.43959 0.115755,0.15848 0.316949,0.15848 0.201194,0 0.31695,-0.15848 0.115756,-0.15985 0.115756,-0.43959 0,-0.27975 -0.115756,-0.43822 -0.115756,-0.15985 -0.31695,-0.15985 -0.201194,0 -0.316949,0.15985 -0.114378,0.15847 -0.114378,0.43822 z"
+             id="path28540"
+             style="stroke:none;stroke-opacity:1;fill:#6f2509;fill-opacity:1" />
+          <path
+             d="m 83.077106,129.82694 q -0.20395,0 -0.322462,0.15985 -0.118511,0.15848 -0.118511,0.43547 0,0.27698 0.117133,0.43684 0.118512,0.15847 0.32384,0.15847 0.202572,0 0.321084,-0.15985 0.118512,-0.15986 0.118512,-0.43546 0,-0.27423 -0.118512,-0.43409 -0.118512,-0.16123 -0.321084,-0.16123 z m 0,-0.21497 q 0.33073,0 0.519522,0.21497 0.188792,0.21498 0.188792,0.59532 0,0.37896 -0.188792,0.59531 -0.188792,0.21497 -0.519522,0.21497 -0.332108,0 -0.5209,-0.21497 -0.187414,-0.21635 -0.187414,-0.59531 0,-0.38034 0.187414,-0.59532 0.188792,-0.21497 0.5209,-0.21497 z"
+             id="path28542"
+             style="stroke:none;stroke-opacity:1;fill:#6f2509;fill-opacity:1" />
+          <path
+             d="m 84.023823,129.64917 h 0.268718 l 0.482315,1.29536 0.482314,-1.29536 h 0.268719 l -0.578778,1.54341 H 84.6026 Z"
+             id="path28544"
+             style="stroke:none;stroke-opacity:1;fill:#6f2509;fill-opacity:1" />
+          <path
+             d="m 86.518079,131.3359 q -0.107487,0.27561 -0.209463,0.35967 -0.101975,0.0841 -0.272852,0.0841 h -0.202572 v -0.21222 h 0.148828 q 0.104732,0 0.162609,-0.0496 0.05788,-0.0496 0.128158,-0.23427 l 0.04548,-0.11575 -0.624253,-1.51861 h 0.268718 l 0.482315,1.20717 0.482314,-1.20717 h 0.268719 z m 0.118511,-2.40055 h 0.274231 l -0.449242,0.51814 h -0.21084 z"
+             id="path28546"
+             style="stroke:none;stroke-opacity:1;fill:#6f2509;fill-opacity:1" />
+          <path
+             d="m 88.433556,129.04835 h 0.254938 v 1.26642 l 0.756545,-0.6656 h 0.32384 l -0.818557,0.7221 0.853008,0.82131 H 89.4726 l -0.784106,-0.75379 v 0.75379 h -0.254938 z"
+             id="path28548"
+             style="stroke:none;stroke-opacity:1;fill:#6f2509;fill-opacity:1" />
+          <path
+             d="m 90.729375,130.41674 q -0.307303,0 -0.425815,0.0703 -0.118511,0.0703 -0.118511,0.23978 0,0.13505 0.08819,0.21498 0.08957,0.0786 0.242536,0.0786 0.21084,0 0.33762,-0.14883 0.128158,-0.15021 0.128158,-0.39826 v -0.0565 z m 0.505742,-0.10473 v 0.88057 h -0.25356 v -0.23427 q -0.08682,0.14056 -0.216353,0.20809 -0.129536,0.0661 -0.316949,0.0661 -0.237024,0 -0.377584,-0.13229 -0.139182,-0.13367 -0.139182,-0.35691 0,-0.26045 0.173633,-0.39274 0.175011,-0.13229 0.5209,-0.13229 h 0.355535 v -0.0248 q 0,-0.17501 -0.115756,-0.2701 -0.114377,-0.0965 -0.322462,-0.0965 -0.132292,0 -0.257693,0.0317 -0.125402,0.0317 -0.241158,0.0951 v -0.23427 q 0.139182,-0.0537 0.270096,-0.0799 0.130914,-0.0276 0.254938,-0.0276 0.334864,0 0.500229,0.17363 0.165366,0.17363 0.165366,0.52641 z"
+             id="path28550"
+             style="stroke:none;stroke-opacity:1;fill:#6f2509;fill-opacity:1" />
+          <path
+             d="m 93.040351,130.26102 v 0.93156 h -0.253559 v -0.92329 q 0,-0.21911 -0.08544,-0.32797 -0.08544,-0.10887 -0.256316,-0.10887 -0.205328,0 -0.32384,0.13092 -0.118511,0.13091 -0.118511,0.35691 v 0.8723 h -0.254938 v -1.54341 h 0.254938 v 0.23978 q 0.09095,-0.13918 0.213596,-0.20808 0.124024,-0.0689 0.285255,-0.0689 0.265962,0 0.402388,0.16536 0.136426,0.16399 0.136426,0.48369 z"
+             id="path28552"
+             style="stroke:none;stroke-opacity:1;fill:#6f2509;fill-opacity:1" />
+          <path
+             d="m 94.247516,130.41674 q -0.307303,0 -0.425815,0.0703 -0.118512,0.0703 -0.118512,0.23978 0,0.13505 0.08819,0.21498 0.08957,0.0786 0.242535,0.0786 0.210841,0 0.337621,-0.14883 0.128158,-0.15021 0.128158,-0.39826 v -0.0565 z m 0.505741,-0.10473 v 0.88057 h -0.253559 v -0.23427 q -0.08682,0.14056 -0.216353,0.20809 -0.129536,0.0661 -0.31695,0.0661 -0.237023,0 -0.377583,-0.13229 -0.139182,-0.13367 -0.139182,-0.35691 0,-0.26045 0.173633,-0.39274 0.175011,-0.13229 0.5209,-0.13229 h 0.355535 v -0.0248 q 0,-0.17501 -0.115756,-0.2701 -0.114377,-0.0965 -0.322462,-0.0965 -0.132292,0 -0.257694,0.0317 -0.125401,0.0317 -0.241157,0.0951 v -0.23427 q 0.139182,-0.0537 0.270096,-0.0799 0.130914,-0.0276 0.254938,-0.0276 0.334864,0 0.500229,0.17363 0.165365,0.17363 0.165365,0.52641 z m -0.463022,-1.37666 h 0.274231 l -0.449242,0.51814 h -0.210841 z"
+             id="path28554"
+             style="stroke:none;stroke-opacity:1;fill:#6f2509;fill-opacity:1" />
+          <path
+             d="m 95.275535,129.04835 h 0.25356 v 2.14423 h -0.25356 z"
+             id="path28556"
+             style="stroke:none;stroke-opacity:1;fill:#6f2509;fill-opacity:1" />
+        </g>
+      </a>
+      <rect
+         style="fill:#6f2509;fill-opacity:0;stroke:none;stroke-width:0.264583;stroke-opacity:1"
+         id="rect50155"
+         width="33.275055"
+         height="4.1426778"
+         x="62.620697"
+         y="128.15434" />
+    </a>
   </g>
 </svg>

seminar/templates/generic_form.html

@@ -0,0 +1,19 @@
+{% extends "base.html" %}
+{% load static %}
+
+
+{% block content %}
+<h1>
+  {% block nadpis1a %}
+    {{ nadpis }}
+  {% endblock %}
+</h1>
+<form action="{% url form_url %}" method="post">
+  {% csrf_token %}
+  <table class="form">
+    {{ form.as_table }}
+</table>
+    <input type="submit" value="Odeslat">
+</form>
+
+{% endblock %}

seminar/templates/seminar/jak-resit.html

@@ -8,9 +8,9 @@
 
 <div class=jakresit>
 
-<img class="jakresit_obrazek" alt="" src="{% static 'images/jakresit_1.svg' %}" />
+{% include 'jakresit_1.svg' %}
-<img class="jakresit_obrazek" alt="" src="{% static 'images/jakresit_2.svg' %}" />
+{% include 'jakresit_2.svg' %}
-<img class="jakresit_obrazek" alt="" src="{% static 'images/jakresit_3.svg' %}" />
+{% include 'jakresit_3.svg' %}
 
 </div>
 {% endblock %}

seminar/urls.py

@@ -105,4 +105,11 @@ urlpatterns = [
 	path('', views.TitulniStranaView.as_view(), name='titulni_strana'),
 	path('jak-resit/', views.JakResitView.as_view(), name='jak_resit'),
 	path('stare-novinky/', views.StareNovinkyView.as_view(), name='stare_novinky'),
+
+	# Dočasné & neodladěné:
+	path(
+		'hidden/hromadne_pridani',
+		org_required(views.HromadnePridaniView.as_view()),
+		name="hromadne_pridani"
+	),
 ]

seminar/views/docasne.py

@@ -1,4 +1,9 @@
 from http import HTTPStatus
+
+from django.db import transaction
+from django.forms import Form, CharField, IntegerField
+from django.views.generic import FormView
+
 import seminar.models as m
 from django.shortcuts import render, get_object_or_404
 
@@ -14,3 +19,49 @@ def problemView(request, pk):
 	status_code = HTTPStatus.NOT_FOUND
 	return render(request, template, context=ctx, status=status_code)
 
+
+# FIXME Tohle možná patří do forms.py
+# FIXME Tohle není odladěné, selhává to nekontrolovaně
+#  a obecně je to fujky nekomentovaný kód
+class HromadnePridaniForm(Form):
+	tema = CharField(label="Název tématu:")
+	dil = IntegerField(label="Díl:", min_value=1)
+	body = CharField(label="Počty bodů (0 pro problém) oddělené čárkami:")
+
+
+# FIXME Tohle není odladěné, selhává to nekontrolovaně
+#  a obecně je to fujky nekomentovaný kód
+class HromadnePridaniView(FormView):
+	form_class = HromadnePridaniForm
+	template_name = "generic_form.html"
+	success_url = 'hromadne_pridani'
+
+	def get_context_data(self, **kwargs):
+		context = super().get_context_data()
+		context["nadpis"] = "Hromadné přidání úloh"
+		context["form_url"] = "hromadne_pridani"
+		return context
+
+	def form_valid(self, form):
+		cd = form.cleaned_data
+		tema = cd["tema"]
+		dil = cd["dil"]
+		body = list(map(int, cd["body"].split(",")))
+
+		t = m.Problem.objects.get(nazev__exact=tema, nadproblem=None)
+		with transaction.atomic():
+			pfx = f"{t.nazev}, díl {dil}, "
+
+			for k, b in enumerate(body):
+				u = m.Uloha.objects.create(
+					nadproblem=t,
+					nazev=pfx + f"{'úloha' if b > 0 else 'problém'} {k + 1}",
+					autor=t.autor,
+					garant=t.garant,
+					max_body=b,
+					cislo_zadani=m.Cislo.get(t.rocnik.rocnik, dil),
+					kod=k,
+					stav=m.Problem.STAV_ZADANY,
+				)
+				u.opravovatele.set(t.opravovatele.all())
+		return super().form_valid(form)

various/autentizace/forms.py

@@ -0,0 +1,16 @@
+"""
+Formuláře (:class:`django.forms.Form`) umožňují jednoduchou tvorbu formulářů,
+které lze pak jednoduše dát do frontendu i zpracovat na backendu.
+
+Pro přidání políčka do formuláře je potřeba
+ - mít v modelu tu položku, kterou chci upravovat
+ - přidat do views (prihlaskaView, resitelEditView)
+ - přidat do forms
+ - includovat do html
+"""
+
+from django.contrib.auth.forms import AuthenticationForm
+from django.forms import BooleanField
+
+class LoginForm(AuthenticationForm):
+    disable_logout = BooleanField(label="Neodhlašovat", required=False)

various/autentizace/views.py

@@ -1,10 +1,24 @@
+from django.conf import settings
+from django.http import HttpResponseRedirect
 from django.urls import reverse_lazy
 from django.contrib.auth import views as auth_views
 
+from django.contrib.auth import login as auth_login
+
+from various.autentizace.forms import LoginForm
+
 
 class LoginView(auth_views.LoginView):
 	# Jen vezmeme vestavěný a dáme mu vhodný template a přesměrovací URL
 	template_name = 'autentizace/login.html'
+	authentication_form = LoginForm
+
+	def form_valid(self, form):
+		""" Okopírováno z django/contrib/auth/views.py s přidáním nekonečného přihlášení """
+		auth_login(self.request, form.get_user())
+		if form.cleaned_data["disable_logout"]:
+			form.request.session.set_expiry(settings.DOBA_ODHLASENI_PRI_ZASKRTNUTI_NEODHLASOVAT)
+		return HttpResponseRedirect(self.get_success_url())
 
 
 class LogoutView(auth_views.LogoutView):