Merge branch 'master' into develop

mamweb/templates/graph.svg

@@ -78,11 +78,13 @@
         <text
            id="text4577"
            y="50.742676"
-           x="-280"
+           x="-210"
+           text-anchor="middle"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
            xml:space="preserve"><tspan
              y="50.742676"
-             x="-280"
+             x="-210"
+             text-anchor="middle"
              id="tspan4575"
              sodipodi:role="line">Strategické</tspan></text>
       </g>
@@ -104,11 +106,13 @@
         <text
            id="text4581"
            y="58.077408"
-           x="-412"
+           x="-372"
+           text-anchor="middle"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
            xml:space="preserve"><tspan
              y="58.077408"
-             x="-412"
+             x="-372"
+             text-anchor="middle"
              id="tspan4579"
              sodipodi:role="line">Běhací</tspan></text>
       </g>
@@ -129,12 +133,14 @@
         <text
            xml:space="preserve"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-           x="-610"
+           x="-530"
+           text-anchor="middle"
            y="76.414246"
            id="text4585"><tspan
              sodipodi:role="line"
              id="tspan4583"
-             x="-610"
+             x="-530"
+             text-anchor="middle"
              y="76.414246">Adrenalinové</tspan></text>
       </g>
     </a>
@@ -159,12 +165,14 @@
         <text
            xml:space="preserve"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-           x="-500"
+           x="-470"
+           text-anchor="middle"
            y="181.54544"
            id="text4593"><tspan
              sodipodi:role="line"
              id="tspan4591"
-             x="-500"
+             x="-470"
+             text-anchor="middle"
              y="181.54544">Jídlo</tspan></text>
       </g>
     </a>
@@ -189,12 +197,14 @@
         <text
            xml:space="preserve"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-           x="-300"
+           x="-235"
+           text-anchor="middle"
            y="187.65773"
            id="text4597"><tspan
              sodipodi:role="line"
              id="tspan4595"
-             x="-300"
+             x="-235"
+             text-anchor="middle"
              y="187.65773">Přednášky</tspan></text>
       </g>
     </a>
@@ -219,12 +229,14 @@
         <text
            xml:space="preserve"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-           x="-420"
+           x="-350"
+           text-anchor="middle"
            y="290.34402"
            id="text4601"><tspan
              sodipodi:role="line"
              id="tspan4599"
-             x="-420"
+             x="-350"
+             text-anchor="middle"
              y="290.34402">Soustředění</tspan></text>
       </g>
     </a>
@@ -249,12 +261,14 @@
         <text
            xml:space="preserve"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-           x="-195"
+           x="-150"
+           text-anchor="middle"
            y="252.44788"
            id="text4605"><tspan
              sodipodi:role="line"
              id="tspan4603"
-             x="-195"
+             x="-150"
+             text-anchor="middle"
              y="252.44788">Konfery</tspan></text>
       </g>
     </a>
@@ -309,12 +323,14 @@
         <text
            xml:space="preserve"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-           x="-627"
+           x="-575"
+           text-anchor="middle"
            y="285.45419"
            id="text4613"><tspan
              sodipodi:role="line"
              id="tspan4611"
-             x="-627"
+             x="-575"
+             text-anchor="middle"
              y="285.45419">Legenda</tspan></text>
       </g>
     </a>
@@ -339,12 +355,14 @@
         <text
            xml:space="preserve"
            style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:77.33333588px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#fdedd5;fill-opacity:1;stroke:none"
-           x="-435"
+           x="-350"
+           text-anchor="middle"
            y="451.70819"
            id="text4617"><tspan
              sodipodi:role="line"
              id="tspan4615"
-             x="-435"
+             x="-350"
+             text-anchor="middle"
              y="451.70819">M&amp;M</tspan></text>
       </g>
     </a>
@@ -369,12 +387,14 @@
         <text
            xml:space="preserve"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-           x="-395"
+           x="-347"
+           text-anchor="middle"
            y="565.39655"
            id="text4621"><tspan
              sodipodi:role="line"
              id="tspan4619"
-             x="-395"
+             x="-347"
+             text-anchor="middle"
              y="565.39655">Časopis</tspan></text>
       </g>
     </a>
@@ -399,12 +419,14 @@
         <text
            xml:space="preserve"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-           x="-180"
+           x="-138"
+           text-anchor="middle"
            y="597.18036"
            id="text4625"><tspan
              sodipodi:role="line"
              id="tspan4623"
-             x="-180"
+             x="-138"
+             text-anchor="middle"
              y="597.18036">Články</tspan></text>
       </g>
     </a>
@@ -428,12 +450,14 @@
         <text
            xml:space="preserve"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-           x="-180"
+           x="-110"
+           text-anchor="middle"
            y="713.31366"
            id="text4629"><tspan
              sodipodi:role="line"
              id="tspan4627"
-             x="-180"
+             x="-110"
+             text-anchor="middle"
              y="713.31366">Matematika</tspan></text>
       </g>
     </a>
@@ -458,12 +482,14 @@
         <text
            xml:space="preserve"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-           x="-274"
+           x="-235"
+           text-anchor="middle"
            y="771.99158"
            id="text4633"><tspan
              sodipodi:role="line"
              id="tspan4631"
-             x="-274"
+             x="-235"
+             text-anchor="middle"
              y="771.99158">Fyzika</tspan></text>
       </g>
     </a>
@@ -488,12 +514,14 @@
         <text
            xml:space="preserve"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-           x="-464"
+           x="-397"
+           text-anchor="middle"
            y="745.09753"
            id="text4637"><tspan
              sodipodi:role="line"
              id="tspan4635"
-             x="-464"
+             x="-397"
+             text-anchor="middle"
              y="745.09753">Informatika</tspan></text>
       </g>
     </a>
@@ -518,12 +546,14 @@
         <text
            xml:space="preserve"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-           x="-335"
+           x="-290"
+           text-anchor="middle"
            y="658.30322"
            id="text4645"><tspan
              sodipodi:role="line"
              id="tspan4643"
-             x="-335"
+             x="-290"
+             text-anchor="middle"
              y="658.30322">Témata</tspan></text>
       </g>
     </a>
@@ -548,11 +578,13 @@
         <text
            id="text4752"
            y="683.06036"
-           x="-512"
+           x="-487"
+             text-anchor="middle"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
            xml:space="preserve"><tspan
              y="683.06036"
-             x="-512"
+             x="-487"
+             text-anchor="middle"
              id="tspan4750"
              sodipodi:role="line">Dort</tspan></text>
       </g>
@@ -578,11 +610,13 @@
         <text
            id="text4758"
            y="591.75879"
-           x="-667"
+           x="-575"
+           text-anchor="middle"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
            xml:space="preserve"><tspan
              y="591.75879"
-             x="-667"
+             x="-575"
+             text-anchor="middle"
              id="tspan4756"
              sodipodi:role="line">Ceny pro vítěze</tspan></text>
       </g>
@@ -695,12 +729,14 @@
       <text
          xml:space="preserve"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-         x="-395"
+         x="-375"
+         text-anchor="middle"
          y="142.42686"
          id="text4589"><tspan
            sodipodi:role="line"
            id="tspan4587"
-           x="-395"
+           x="-375"
+           text-anchor="middle"
            y="142.42686">Hry</tspan></text>
       <g
          id="g919">
@@ -719,12 +755,14 @@
         <text
            xml:space="preserve"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-           x="-395"
+           x="-375"
+           text-anchor="middle"
            y="142.42686"
            id="text914"><tspan
              sodipodi:role="line"
              id="tspan912"
-             x="-395"
+             x="-375"
+             text-anchor="middle"
              y="142.42686">Hry</tspan></text>
       </g>
     </g>

seminar/admin.py

@@ -154,7 +154,7 @@ class ResitelInline(admin.TabularInline):
 	extra = 1
 
 
-admin.site.register(m.Pohadka)
+# admin.site.register(m.Pohadka)
 admin.site.register(m.Obrazek)
 admin.site.register(m.Nastaveni, SingletonModelAdmin)
 admin.site.register(m.Novinky)