non-teasing teaser (digital olympiad stub)

diff --git a/edumed/static/css/base.css b/edumed/static/css/base.css
index 2d17d6e..99182a2 100644 (file)
--- a/edumed/static/css/base.css
+++ b/edumed/static/css/base.css
@@ -116,6 +116,42 @@ header.main {
   header.main nav .menu-kontakt:hover:before {
     background: url(../img/menu/kontakt_active.png) no-repeat 0 0;
     background-size: 100%; }
   header.main nav .menu-kontakt:hover:before {
     background: url(../img/menu/kontakt_active.png) no-repeat 0 0;
     background-size: 100%; }

+  header.main nav .menu-oc-program:before {
+    background: url(../img/menu/olimpiada/program.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-harmonogram:before {
+    background: url(../img/menu/olimpiada/harmonogram.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-regulamin:before {
+    background: url(../img/menu/olimpiada/regulamin.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-literatura:before {
+    background: url(../img/menu/olimpiada/literatura.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-komitet:before {
+    background: url(../img/menu/olimpiada/komitet.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-kontakt:before {
+    background: url(../img/menu/olimpiada/kontakt.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-program:hover:before {
+    background: url(../img/menu/olimpiada/program_active.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-harmonogram:hover:before {
+    background: url(../img/menu/olimpiada/harmonogram_active.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-regulamin:hover:before {
+    background: url(../img/menu/olimpiada/regulamin_active.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-literatura:hover:before {
+    background: url(../img/menu/olimpiada/literatura_active.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-komitet:hover:before {
+    background: url(../img/menu/olimpiada/komitet_active.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-kontakt:hover:before {
+    background: url(../img/menu/olimpiada/kontakt_active.png) no-repeat 0 0;
+    background-size: 100%; }

   header.main #tagline {
     clear: both;
     float: left;
   header.main #tagline {
     clear: both;
     float: left;

diff --git a/edumed/static/css/base.scss b/edumed/static/css/base.scss
index b422a2d..88d2033 100644 (file)
--- a/edumed/static/css/base.scss
+++ b/edumed/static/css/base.scss
@@ -117,6 +117,24 @@ header.main {
         .menu-o-nas:hover:before { background: url(../img/menu/o-nas_active.png) no-repeat 0 0; background-size: 100%;}
         .menu-kontakt:hover:before { background: url(../img/menu/kontakt_active.png) no-repeat 0 0; background-size: 100%;}
 
         .menu-o-nas:hover:before { background: url(../img/menu/o-nas_active.png) no-repeat 0 0; background-size: 100%;}
         .menu-kontakt:hover:before { background: url(../img/menu/kontakt_active.png) no-repeat 0 0; background-size: 100%;}
 

+        .menu-oc-program:before { background: url(../img/menu/olimpiada/program.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-harmonogram:before { background: url(../img/menu/olimpiada/harmonogram.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-regulamin:before { background: url(../img/menu/olimpiada/regulamin.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-literatura:before { background: url(../img/menu/olimpiada/literatura.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-komitet:before { background: url(../img/menu/olimpiada/komitet.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-kontakt:before { background: url(../img/menu/olimpiada/kontakt.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-program:hover:before {
+            background: url(../img/menu/olimpiada/program_active.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-harmonogram:hover:before {
+            background: url(../img/menu/olimpiada/harmonogram_active.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-regulamin:hover:before {
+            background: url(../img/menu/olimpiada/regulamin_active.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-literatura:hover:before {
+            background: url(../img/menu/olimpiada/literatura_active.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-komitet:hover:before {
+            background: url(../img/menu/olimpiada/komitet_active.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-kontakt:hover:before {
+            background: url(../img/menu/olimpiada/kontakt_active.png) no-repeat 0 0; background-size: 100%;}

     }
 
     #tagline {
     }
 
     #tagline {

diff --git a/edumed/static/img/menu/olimpiada/harmonogram.png b/edumed/static/img/menu/olimpiada/harmonogram.png
new file mode 100644 (file)
index 0000000..06e9c92
Binary files /dev/null and b/edumed/static/img/menu/olimpiada/harmonogram.png differ

diff --git a/edumed/static/img/menu/olimpiada/harmonogram_active.png b/edumed/static/img/menu/olimpiada/harmonogram_active.png
new file mode 100644 (file)
index 0000000..68c9721
Binary files /dev/null and b/edumed/static/img/menu/olimpiada/harmonogram_active.png differ

diff --git a/edumed/static/img/menu/olimpiada/komitet.png b/edumed/static/img/menu/olimpiada/komitet.png
new file mode 100644 (file)
index 0000000..2837890
Binary files /dev/null and b/edumed/static/img/menu/olimpiada/komitet.png differ

diff --git a/edumed/static/img/menu/olimpiada/komitet_active.png b/edumed/static/img/menu/olimpiada/komitet_active.png
new file mode 100644 (file)
index 0000000..b70ad4c
Binary files /dev/null and b/edumed/static/img/menu/olimpiada/komitet_active.png differ

diff --git a/edumed/static/img/menu/olimpiada/kontakt.png b/edumed/static/img/menu/olimpiada/kontakt.png
new file mode 100644 (file)
index 0000000..e94d178
Binary files /dev/null and b/edumed/static/img/menu/olimpiada/kontakt.png differ

diff --git a/edumed/static/img/menu/olimpiada/kontakt_active.png b/edumed/static/img/menu/olimpiada/kontakt_active.png
new file mode 100644 (file)
index 0000000..58e597a
Binary files /dev/null and b/edumed/static/img/menu/olimpiada/kontakt_active.png differ

diff --git a/edumed/static/img/menu/olimpiada/literatura.png b/edumed/static/img/menu/olimpiada/literatura.png
new file mode 100644 (file)
index 0000000..f252351
Binary files /dev/null and b/edumed/static/img/menu/olimpiada/literatura.png differ

diff --git a/edumed/static/img/menu/olimpiada/literatura_active.png b/edumed/static/img/menu/olimpiada/literatura_active.png
new file mode 100644 (file)
index 0000000..98719ac
Binary files /dev/null and b/edumed/static/img/menu/olimpiada/literatura_active.png differ

diff --git a/edumed/static/img/menu/olimpiada/program.png b/edumed/static/img/menu/olimpiada/program.png
new file mode 100644 (file)
index 0000000..56760e1
Binary files /dev/null and b/edumed/static/img/menu/olimpiada/program.png differ

diff --git a/edumed/static/img/menu/olimpiada/program_active.png b/edumed/static/img/menu/olimpiada/program_active.png
new file mode 100644 (file)
index 0000000..9b6ec98
Binary files /dev/null and b/edumed/static/img/menu/olimpiada/program_active.png differ

diff --git a/edumed/static/img/menu/olimpiada/regulamin.png b/edumed/static/img/menu/olimpiada/regulamin.png
new file mode 100644 (file)
index 0000000..449ac1c
Binary files /dev/null and b/edumed/static/img/menu/olimpiada/regulamin.png differ

diff --git a/edumed/static/img/menu/olimpiada/regulamin_active.png b/edumed/static/img/menu/olimpiada/regulamin_active.png
new file mode 100644 (file)
index 0000000..1a1516b
Binary files /dev/null and b/edumed/static/img/menu/olimpiada/regulamin_active.png differ

diff --git a/edumed/static/img/menu/olimpiada/svg/harmonogram.svg b/edumed/static/img/menu/olimpiada/svg/harmonogram.svg
new file mode 100644 (file)
index 0000000..64a3a3e
--- /dev/null
+++ b/edumed/static/img/menu/olimpiada/svg/harmonogram.svg
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   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"
+   version="1.1"
+   id="Capa_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 58 58"
+   style="enable-background:new 0 0 58 58;"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   width="100%"
+   height="100%"
+   sodipodi:docname="harmonogram.svg"><metadata
+     id="metadata93"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs91" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="692"
+     id="namedview89"
+     showgrid="false"
+     inkscape:zoom="5.7543862"
+     inkscape:cx="29"
+     inkscape:cy="29"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Capa_1" /><g
+     id="g3889"><path
+       style="fill:#96928b;fill-opacity:1"
+       d="M 42.899,4.5 C 42.434,2.221 40.415,0.5 38,0.5 c -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 1.654,0 3,1.346 3,3 0,1.654 -1.346,3 -3,3 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 2.414,0 4.434,-1.721 4.899,-4 H 56 v 9 H 2 v -9 h 14 3 c 0.553,0 1,-0.447 1,-1 0,-0.553 -0.447,-1 -1,-1 h -1.816 c 0.414,-1.162 1.514,-2 2.816,-2 1.654,0 3,1.346 3,3 0,1.654 -1.346,3 -3,3 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 2.757,0 5,-2.243 5,-5 0,-2.757 -2.243,-5 -5,-5 -2.414,0 -4.434,1.721 -4.899,4 H 0 v 13 40 h 58 v -40 -13 H 42.899 z M 56,55.5 H 2 v -38 h 54 v 38 z"
+       id="path5"
+       inkscape:connector-curvature="0" /><path
+       style="fill:#96928b;fill-opacity:1"
+       d="m 26,2.5 c 1.654,0 3,1.346 3,3 0,1.654 -1.346,3 -3,3 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 2.757,0 5,-2.243 5,-5 0,-2.757 -2.243,-5 -5,-5 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 z"
+       id="path7"
+       inkscape:connector-curvature="0" /><path
+       style="fill:#96928b;fill-opacity:1"
+       d="m 32,2.5 c 1.654,0 3,1.346 3,3 0,1.654 -1.346,3 -3,3 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 2.757,0 5,-2.243 5,-5 0,-2.757 -2.243,-5 -5,-5 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 z"
+       id="path9"
+       inkscape:connector-curvature="0" /><path
+       id="circle11"
+       d="m 23,24.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle13"
+       d="m 30,24.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle15"
+       d="m 37,24.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle17"
+       d="m 44,24.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle19"
+       d="m 51,24.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle21"
+       d="m 9,32.5 c 0,0.552285 -0.4477153,1 -1,1 -0.5522847,0 -1,-0.447715 -1,-1 0,-0.552285 0.4477153,-1 1,-1 0.5522847,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle23"
+       d="m 16,32.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle25"
+       d="m 23,32.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle27"
+       d="m 30,32.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle29"
+       d="m 37,32.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle31"
+       d="m 44,32.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle33"
+       d="m 51,32.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle35"
+       d="m 9,39.5 c 0,0.552285 -0.4477153,1 -1,1 -0.5522847,0 -1,-0.447715 -1,-1 0,-0.552285 0.4477153,-1 1,-1 0.5522847,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle37"
+       d="m 16,39.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle39"
+       d="m 23,39.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle41"
+       d="m 30,39.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle43"
+       d="m 37,39.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle45"
+       d="m 44,39.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle47"
+       d="m 51,39.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle49"
+       d="m 9,47.5 c 0,0.552285 -0.4477153,1 -1,1 -0.5522847,0 -1,-0.447715 -1,-1 0,-0.552285 0.4477153,-1 1,-1 0.5522847,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle51"
+       d="m 16,47.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle53"
+       d="m 23,47.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle55"
+       d="m 30,47.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /><path
+       id="circle57"
+       d="m 37,47.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#96928b;fill-opacity:1" /></g><g
+     id="g59" /><g
+     id="g61" /><g
+     id="g63" /><g
+     id="g65" /><g
+     id="g67" /><g
+     id="g69" /><g
+     id="g71" /><g
+     id="g73" /><g
+     id="g75" /><g
+     id="g77" /><g
+     id="g79" /><g
+     id="g81" /><g
+     id="g83" /><g
+     id="g85" /><g
+     id="g87" /></svg>
\ No newline at end of file

diff --git a/edumed/static/img/menu/olimpiada/svg/harmonogram_active.svg b/edumed/static/img/menu/olimpiada/svg/harmonogram_active.svg
new file mode 100644 (file)
index 0000000..f690251
--- /dev/null
+++ b/edumed/static/img/menu/olimpiada/svg/harmonogram_active.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   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"
+   version="1.1"
+   id="Capa_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 58 58"
+   style="enable-background:new 0 0 58 58;"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   width="100%"
+   height="100%"
+   sodipodi:docname="harmonogram.svg"><metadata
+     id="metadata93"><rdf:RDF><cc:Work
+         rdf:about=""><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><defs
+     id="defs91" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="692"
+     id="namedview89"
+     showgrid="false"
+     inkscape:zoom="5.7543862"
+     inkscape:cx="29"
+     inkscape:cy="29"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Capa_1" /><g
+     id="g3889"
+     style="fill:#ed7831;fill-opacity:1"><path
+       style="fill:#ed7831;fill-opacity:1"
+       d="M 42.899,4.5 C 42.434,2.221 40.415,0.5 38,0.5 c -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 1.654,0 3,1.346 3,3 0,1.654 -1.346,3 -3,3 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 2.414,0 4.434,-1.721 4.899,-4 H 56 v 9 H 2 v -9 h 14 3 c 0.553,0 1,-0.447 1,-1 0,-0.553 -0.447,-1 -1,-1 h -1.816 c 0.414,-1.162 1.514,-2 2.816,-2 1.654,0 3,1.346 3,3 0,1.654 -1.346,3 -3,3 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 2.757,0 5,-2.243 5,-5 0,-2.757 -2.243,-5 -5,-5 -2.414,0 -4.434,1.721 -4.899,4 H 0 v 13 40 h 58 v -40 -13 H 42.899 z M 56,55.5 H 2 v -38 h 54 v 38 z"
+       id="path5"
+       inkscape:connector-curvature="0" /><path
+       style="fill:#ed7831;fill-opacity:1"
+       d="m 26,2.5 c 1.654,0 3,1.346 3,3 0,1.654 -1.346,3 -3,3 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 2.757,0 5,-2.243 5,-5 0,-2.757 -2.243,-5 -5,-5 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 z"
+       id="path7"
+       inkscape:connector-curvature="0" /><path
+       style="fill:#ed7831;fill-opacity:1"
+       d="m 32,2.5 c 1.654,0 3,1.346 3,3 0,1.654 -1.346,3 -3,3 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 2.757,0 5,-2.243 5,-5 0,-2.757 -2.243,-5 -5,-5 -0.553,0 -1,0.447 -1,1 0,0.553 0.447,1 1,1 z"
+       id="path9"
+       inkscape:connector-curvature="0" /><path
+       id="circle11"
+       d="m 23,24.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle13"
+       d="m 30,24.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle15"
+       d="m 37,24.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle17"
+       d="m 44,24.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle19"
+       d="m 51,24.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle21"
+       d="m 9,32.5 c 0,0.552285 -0.4477153,1 -1,1 -0.5522847,0 -1,-0.447715 -1,-1 0,-0.552285 0.4477153,-1 1,-1 0.5522847,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle23"
+       d="m 16,32.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle25"
+       d="m 23,32.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle27"
+       d="m 30,32.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle29"
+       d="m 37,32.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle31"
+       d="m 44,32.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle33"
+       d="m 51,32.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle35"
+       d="m 9,39.5 c 0,0.552285 -0.4477153,1 -1,1 -0.5522847,0 -1,-0.447715 -1,-1 0,-0.552285 0.4477153,-1 1,-1 0.5522847,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle37"
+       d="m 16,39.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle39"
+       d="m 23,39.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle41"
+       d="m 30,39.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle43"
+       d="m 37,39.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle45"
+       d="m 44,39.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle47"
+       d="m 51,39.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle49"
+       d="m 9,47.5 c 0,0.552285 -0.4477153,1 -1,1 -0.5522847,0 -1,-0.447715 -1,-1 0,-0.552285 0.4477153,-1 1,-1 0.5522847,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle51"
+       d="m 16,47.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle53"
+       d="m 23,47.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle55"
+       d="m 30,47.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       id="circle57"
+       d="m 37,47.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+       style="fill:#ed7831;fill-opacity:1" /></g><g
+     id="g59" /><g
+     id="g61" /><g
+     id="g63" /><g
+     id="g65" /><g
+     id="g67" /><g
+     id="g69" /><g
+     id="g71" /><g
+     id="g73" /><g
+     id="g75" /><g
+     id="g77" /><g
+     id="g79" /><g
+     id="g81" /><g
+     id="g83" /><g
+     id="g85" /><g
+     id="g87" /></svg>
\ No newline at end of file

diff --git a/edumed/static/img/menu/olimpiada/svg/komitet.svg b/edumed/static/img/menu/olimpiada/svg/komitet.svg
new file mode 100644 (file)
index 0000000..d04c979
--- /dev/null
+++ b/edumed/static/img/menu/olimpiada/svg/komitet.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   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"
+   version="1.1"
+   id="Capa_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 60 60"
+   style="enable-background:new 0 0 60 60;"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   width="100%"
+   height="100%"
+   sodipodi:docname="komitet.svg"><metadata
+     id="metadata39"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs37" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="692"
+     id="namedview35"
+     showgrid="false"
+     inkscape:zoom="3.9333333"
+     inkscape:cx="-16.779661"
+     inkscape:cy="30"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Capa_1" /><path
+     d="M55.517,46.55l-9.773-4.233c-0.23-0.115-0.485-0.396-0.704-0.771l6.525-0.005c0.114,0.011,2.804,0.257,4.961-0.67  c0.817-0.352,1.425-1.047,1.669-1.907c0.246-0.868,0.09-1.787-0.426-2.523c-1.865-2.654-6.218-9.589-6.354-16.623  c-0.003-0.121-0.397-12.083-12.21-12.18c-1.739,0.014-3.347,0.309-4.81,0.853c-0.319-0.813-0.789-1.661-1.488-2.459  C30.854,3.688,27.521,2.5,23,2.5s-7.854,1.188-9.908,3.53c-2.368,2.701-2.148,5.976-2.092,6.525v5.319c-0.64,0.729-1,1.662-1,2.625  v4c0,1.217,0.553,2.352,1.497,3.109c0.916,3.627,2.833,6.36,3.503,7.237v3.309c0,0.968-0.528,1.856-1.377,2.32l-8.921,4.866  C1.801,46.924,0,49.958,0,53.262V57.5h44h2h14v-3.697C60,50.711,58.282,47.933,55.517,46.55z M44,55.5H2v-2.238  c0-2.571,1.402-4.934,3.659-6.164l8.921-4.866C16.073,41.417,17,39.854,17,38.155v-4.019l-0.233-0.278  c-0.024-0.029-2.475-2.994-3.41-7.065l-0.091-0.396l-0.341-0.22C12.346,25.803,12,25.176,12,24.5v-4c0-0.561,0.238-1.084,0.67-1.475  L13,18.728V12.5l-0.009-0.131c-0.003-0.027-0.343-2.799,1.605-5.021C16.253,5.458,19.081,4.5,23,4.5  c3.905,0,6.727,0.951,8.386,2.828c0.825,0.932,1.24,1.973,1.447,2.867c0.016,0.07,0.031,0.139,0.045,0.208  c0.014,0.071,0.029,0.142,0.04,0.21c0.013,0.078,0.024,0.152,0.035,0.226c0.008,0.053,0.016,0.107,0.022,0.158  c0.015,0.124,0.027,0.244,0.035,0.355c0.001,0.009,0.001,0.017,0.001,0.026c0.007,0.108,0.012,0.21,0.015,0.303  c0,0.018,0,0.033,0.001,0.051c0.002,0.083,0.002,0.162,0.001,0.231c0,0.01,0,0.02,0,0.03c-0.004,0.235-0.02,0.375-0.02,0.378  L33,18.728l0.33,0.298C33.762,19.416,34,19.939,34,20.5v4c0,0.873-0.572,1.637-1.422,1.899l-0.498,0.153l-0.16,0.495  c-0.669,2.081-1.622,4.003-2.834,5.713c-0.297,0.421-0.586,0.794-0.837,1.079L28,34.123v4.125c0,0.253,0.025,0.501,0.064,0.745  c0.008,0.052,0.022,0.102,0.032,0.154c0.039,0.201,0.091,0.398,0.155,0.59c0.015,0.045,0.031,0.088,0.048,0.133  c0.078,0.209,0.169,0.411,0.275,0.605c0.012,0.022,0.023,0.045,0.035,0.067c0.145,0.256,0.312,0.499,0.504,0.723l0.228,0.281h0.039  c0.343,0.338,0.737,0.632,1.185,0.856l9.553,4.776C42.513,48.374,44,50.78,44,53.457V55.5z M58,55.5H46v-2.043  c0-3.439-1.911-6.53-4.986-8.068l-6.858-3.43c0.169-0.386,0.191-0.828,0.043-1.254c-0.245-0.705-0.885-1.16-1.63-1.16h-2.217  c-0.046-0.081-0.076-0.17-0.113-0.256c-0.05-0.115-0.109-0.228-0.142-0.349C30.036,38.718,30,38.486,30,38.248v-3.381  c0.229-0.28,0.47-0.599,0.719-0.951c1.239-1.75,2.232-3.698,2.954-5.799C35.084,27.47,36,26.075,36,24.5v-4  c0-0.963-0.36-1.896-1-2.625v-5.319c0.026-0.25,0.082-1.069-0.084-2.139c1.288-0.506,2.731-0.767,4.29-0.78  c9.841,0.081,10.2,9.811,10.21,10.221c0.147,7.583,4.746,14.927,6.717,17.732c0.169,0.24,0.22,0.542,0.139,0.827  c-0.046,0.164-0.178,0.462-0.535,0.615c-1.68,0.723-3.959,0.518-4.076,0.513h-6.883c-0.643,0-1.229,0.327-1.568,0.874  c-0.338,0.545-0.37,1.211-0.086,1.783c0.313,0.631,0.866,1.474,1.775,1.927l9.747,4.222C56.715,49.396,58,51.482,58,53.803V55.5z"
+     id="path3"
+     style="fill:#96928b;fill-opacity:1" /><g
+     id="g5" /><g
+     id="g7" /><g
+     id="g9" /><g
+     id="g11" /><g
+     id="g13" /><g
+     id="g15" /><g
+     id="g17" /><g
+     id="g19" /><g
+     id="g21" /><g
+     id="g23" /><g
+     id="g25" /><g
+     id="g27" /><g
+     id="g29" /><g
+     id="g31" /><g
+     id="g33" /></svg>
\ No newline at end of file

diff --git a/edumed/static/img/menu/olimpiada/svg/komitet_active.svg b/edumed/static/img/menu/olimpiada/svg/komitet_active.svg
new file mode 100644 (file)
index 0000000..9202ac9
--- /dev/null
+++ b/edumed/static/img/menu/olimpiada/svg/komitet_active.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   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"
+   version="1.1"
+   id="Capa_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 60 60"
+   style="enable-background:new 0 0 60 60;"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   width="100%"
+   height="100%"
+   sodipodi:docname="komitet.svg"><metadata
+     id="metadata39"><rdf:RDF><cc:Work
+         rdf:about=""><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><defs
+     id="defs37" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="692"
+     id="namedview35"
+     showgrid="false"
+     inkscape:zoom="3.9333333"
+     inkscape:cx="-16.779661"
+     inkscape:cy="30"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Capa_1" /><path
+     d="M55.517,46.55l-9.773-4.233c-0.23-0.115-0.485-0.396-0.704-0.771l6.525-0.005c0.114,0.011,2.804,0.257,4.961-0.67  c0.817-0.352,1.425-1.047,1.669-1.907c0.246-0.868,0.09-1.787-0.426-2.523c-1.865-2.654-6.218-9.589-6.354-16.623  c-0.003-0.121-0.397-12.083-12.21-12.18c-1.739,0.014-3.347,0.309-4.81,0.853c-0.319-0.813-0.789-1.661-1.488-2.459  C30.854,3.688,27.521,2.5,23,2.5s-7.854,1.188-9.908,3.53c-2.368,2.701-2.148,5.976-2.092,6.525v5.319c-0.64,0.729-1,1.662-1,2.625  v4c0,1.217,0.553,2.352,1.497,3.109c0.916,3.627,2.833,6.36,3.503,7.237v3.309c0,0.968-0.528,1.856-1.377,2.32l-8.921,4.866  C1.801,46.924,0,49.958,0,53.262V57.5h44h2h14v-3.697C60,50.711,58.282,47.933,55.517,46.55z M44,55.5H2v-2.238  c0-2.571,1.402-4.934,3.659-6.164l8.921-4.866C16.073,41.417,17,39.854,17,38.155v-4.019l-0.233-0.278  c-0.024-0.029-2.475-2.994-3.41-7.065l-0.091-0.396l-0.341-0.22C12.346,25.803,12,25.176,12,24.5v-4c0-0.561,0.238-1.084,0.67-1.475  L13,18.728V12.5l-0.009-0.131c-0.003-0.027-0.343-2.799,1.605-5.021C16.253,5.458,19.081,4.5,23,4.5  c3.905,0,6.727,0.951,8.386,2.828c0.825,0.932,1.24,1.973,1.447,2.867c0.016,0.07,0.031,0.139,0.045,0.208  c0.014,0.071,0.029,0.142,0.04,0.21c0.013,0.078,0.024,0.152,0.035,0.226c0.008,0.053,0.016,0.107,0.022,0.158  c0.015,0.124,0.027,0.244,0.035,0.355c0.001,0.009,0.001,0.017,0.001,0.026c0.007,0.108,0.012,0.21,0.015,0.303  c0,0.018,0,0.033,0.001,0.051c0.002,0.083,0.002,0.162,0.001,0.231c0,0.01,0,0.02,0,0.03c-0.004,0.235-0.02,0.375-0.02,0.378  L33,18.728l0.33,0.298C33.762,19.416,34,19.939,34,20.5v4c0,0.873-0.572,1.637-1.422,1.899l-0.498,0.153l-0.16,0.495  c-0.669,2.081-1.622,4.003-2.834,5.713c-0.297,0.421-0.586,0.794-0.837,1.079L28,34.123v4.125c0,0.253,0.025,0.501,0.064,0.745  c0.008,0.052,0.022,0.102,0.032,0.154c0.039,0.201,0.091,0.398,0.155,0.59c0.015,0.045,0.031,0.088,0.048,0.133  c0.078,0.209,0.169,0.411,0.275,0.605c0.012,0.022,0.023,0.045,0.035,0.067c0.145,0.256,0.312,0.499,0.504,0.723l0.228,0.281h0.039  c0.343,0.338,0.737,0.632,1.185,0.856l9.553,4.776C42.513,48.374,44,50.78,44,53.457V55.5z M58,55.5H46v-2.043  c0-3.439-1.911-6.53-4.986-8.068l-6.858-3.43c0.169-0.386,0.191-0.828,0.043-1.254c-0.245-0.705-0.885-1.16-1.63-1.16h-2.217  c-0.046-0.081-0.076-0.17-0.113-0.256c-0.05-0.115-0.109-0.228-0.142-0.349C30.036,38.718,30,38.486,30,38.248v-3.381  c0.229-0.28,0.47-0.599,0.719-0.951c1.239-1.75,2.232-3.698,2.954-5.799C35.084,27.47,36,26.075,36,24.5v-4  c0-0.963-0.36-1.896-1-2.625v-5.319c0.026-0.25,0.082-1.069-0.084-2.139c1.288-0.506,2.731-0.767,4.29-0.78  c9.841,0.081,10.2,9.811,10.21,10.221c0.147,7.583,4.746,14.927,6.717,17.732c0.169,0.24,0.22,0.542,0.139,0.827  c-0.046,0.164-0.178,0.462-0.535,0.615c-1.68,0.723-3.959,0.518-4.076,0.513h-6.883c-0.643,0-1.229,0.327-1.568,0.874  c-0.338,0.545-0.37,1.211-0.086,1.783c0.313,0.631,0.866,1.474,1.775,1.927l9.747,4.222C56.715,49.396,58,51.482,58,53.803V55.5z"
+     id="path3"
+     style="fill:#ed7831;fill-opacity:1;" /><g
+     id="g5" /><g
+     id="g7" /><g
+     id="g9" /><g
+     id="g11" /><g
+     id="g13" /><g
+     id="g15" /><g
+     id="g17" /><g
+     id="g19" /><g
+     id="g21" /><g
+     id="g23" /><g
+     id="g25" /><g
+     id="g27" /><g
+     id="g29" /><g
+     id="g31" /><g
+     id="g33" /></svg>
\ No newline at end of file

diff --git a/edumed/static/img/menu/olimpiada/svg/kontakt.svg b/edumed/static/img/menu/olimpiada/svg/kontakt.svg
new file mode 100644 (file)
index 0000000..1e9339f
--- /dev/null
+++ b/edumed/static/img/menu/olimpiada/svg/kontakt.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   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"
+   version="1.1"
+   id="Capa_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 59.999 59.999"
+   style="enable-background:new 0 0 59.999 59.999;"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   width="100%"
+   height="100%"
+   sodipodi:docname="kontakt.svg"><metadata
+     id="metadata47"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs45" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="769"
+     inkscape:window-height="480"
+     id="namedview43"
+     showgrid="false"
+     inkscape:zoom="3.9333989"
+     inkscape:cx="29.9995"
+     inkscape:cy="29.9995"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Capa_1" /><g
+     id="g3"
+     style="fill:#96928b;fill-opacity:1"><path
+       d="M36.176,49.999c-1.93,0-3.5,1.57-3.5,3.5s1.57,3.5,3.5,3.5s3.5-1.57,3.5-3.5S38.105,49.999,36.176,49.999z M36.176,54.999   c-0.827,0-1.5-0.673-1.5-1.5s0.673-1.5,1.5-1.5s1.5,0.673,1.5,1.5S37.003,54.999,36.176,54.999z"
+       id="path5"
+       style="fill:#96928b;fill-opacity:1" /><path
+       d="M40.676,36.999c2.206,0,4-1.794,4-4s-1.794-4-4-4s-4,1.794-4,4S38.469,36.999,40.676,36.999z M40.676,30.999   c1.103,0,2,0.897,2,2s-0.897,2-2,2s-2-0.897-2-2S39.573,30.999,40.676,30.999z"
+       id="path7"
+       style="fill:#96928b;fill-opacity:1" /><path
+       d="M16.676,11.999c0.256,0,0.512-0.098,0.707-0.293l2-2c0.391-0.391,0.391-1.023,0-1.414s-1.023-0.391-1.414,0l-2,2   c-0.391,0.391-0.391,1.023,0,1.414C16.164,11.901,16.42,11.999,16.676,11.999z"
+       id="path9"
+       style="fill:#96928b;fill-opacity:1" /><path
+       d="M52.676,29.747c0-0.88-0.343-1.707-0.965-2.329l-0.557-0.557c0.949-0.84,1.521-2.055,1.521-3.362   c0-2.481-2.019-4.5-4.5-4.5c-0.182,0-0.362,0.018-0.54,0.04c0.022-0.179,0.04-0.357,0.04-0.54c0-2.481-2.019-4.5-4.5-4.5   c-0.182,0-0.362,0.018-0.54,0.04c0.022-0.179,0.04-0.357,0.04-0.54c0-2.481-2.019-4.5-4.5-4.5c-0.182,0-0.362,0.018-0.54,0.04   c0.022-0.179,0.04-0.357,0.04-0.54c0-2.481-2.019-4.5-4.5-4.5c-1.308,0-2.522,0.573-3.362,1.521l-0.794-0.794l-3.763-3.763   c-1.285-1.285-3.375-1.285-4.658,0L8.286,13.275c-1.283,1.285-1.283,3.374,0,4.659l3.763,3.763l4.91,4.91   c-1.356,0.776-2.283,2.221-2.283,3.892c0,1.563,0.803,2.941,2.017,3.748c0.061,0.081,0.132,0.161,0.227,0.242l10.756,10.715v1.796   h-2v13h18h8v-13h-2V43.97c1.913-1.621,3-3.952,3-6.471c0-1.74-0.543-3.43-1.536-4.852l0.571-0.571   C52.333,31.454,52.676,30.627,52.676,29.747z M50.676,23.499c0,0.768-0.354,1.479-0.937,1.947l-3.511-3.511   c0.468-0.583,1.18-0.937,1.947-0.937C49.554,20.999,50.676,22.12,50.676,23.499z M45.676,18.499c0,0.768-0.354,1.479-0.937,1.947   l-3.511-3.511c0.468-0.583,1.18-0.937,1.947-0.937C44.554,15.999,45.676,17.12,45.676,18.499z M40.676,13.499   c0,0.768-0.354,1.479-0.937,1.947l-3.511-3.511c0.468-0.583,1.18-0.937,1.947-0.937C39.554,10.999,40.676,12.12,40.676,13.499z    M33.176,5.999c1.379,0,2.5,1.121,2.5,2.5c0,0.768-0.354,1.479-0.937,1.947l-3.511-3.511C31.696,6.353,32.408,5.999,33.176,5.999z    M9.7,16.521c-0.504-0.505-0.504-1.326,0-1.831L22.012,2.378c0.125-0.125,0.271-0.219,0.426-0.282   c0.07-0.029,0.149-0.028,0.223-0.044c0.178-0.038,0.354-0.038,0.532,0c0.074,0.016,0.153,0.015,0.223,0.044   c0.155,0.063,0.3,0.157,0.426,0.282l2.349,2.349L12.049,18.869L9.7,16.521z M27.605,6.141l1.178,1.178l5,5l0.573,0.573l4.427,4.427   l0.573,0.573l4.427,4.427l0.573,0.573l5,5l0.94,0.94c0.505,0.505,0.505,1.325,0,1.83L49.859,31.1l0,0L37.985,42.975   c-0.503,0.504-1.326,0.506-1.831,0l-7.975-7.976h0.996c2.481,0,4.5-2.019,4.5-4.5s-2.019-4.5-4.5-4.5h-9.997l-5.716-5.716   L27.605,6.141z M18.636,28.061l0.415-0.047c0.041-0.006,0.082-0.015,0.124-0.015h10c1.379,0,2.5,1.121,2.5,2.5s-1.121,2.5-2.5,2.5   h-2.996h-2.828h-4.176c-1.379,0-2.5-1.121-2.5-2.5C16.676,29.306,17.517,28.309,18.636,28.061z M27.676,57.999v-9h8.426   c3.073,0,5.574,2.501,5.574,5.574v3.426H27.676z M49.676,57.999h-6v-3.426c0-2.206-0.954-4.188-2.464-5.574h8.464V57.999z    M49.701,34.087c0.634,1.021,0.975,2.202,0.975,3.412c0,2.055-0.948,3.946-2.602,5.191l-0.398,0.3v4.009H36.101h-6.426v-2.718   l-0.353-0.299c-0.045-0.039-0.093-0.075-0.18-0.14l-8.877-8.844h5.085l9.389,9.39c0.643,0.642,1.486,0.963,2.329,0.963   c0.844,0,1.688-0.321,2.33-0.963L49.701,34.087z"
+       id="path11"
+       style="fill:#96928b;fill-opacity:1" /></g><g
+     id="g13" /><g
+     id="g15" /><g
+     id="g17" /><g
+     id="g19" /><g
+     id="g21" /><g
+     id="g23" /><g
+     id="g25" /><g
+     id="g27" /><g
+     id="g29" /><g
+     id="g31" /><g
+     id="g33" /><g
+     id="g35" /><g
+     id="g37" /><g
+     id="g39" /><g
+     id="g41" /></svg>
\ No newline at end of file

diff --git a/edumed/static/img/menu/olimpiada/svg/kontakt_active.svg b/edumed/static/img/menu/olimpiada/svg/kontakt_active.svg
new file mode 100644 (file)
index 0000000..940e21e
--- /dev/null
+++ b/edumed/static/img/menu/olimpiada/svg/kontakt_active.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   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"
+   version="1.1"
+   id="Capa_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 59.999 59.999"
+   style="enable-background:new 0 0 59.999 59.999;"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   width="100%"
+   height="100%"
+   sodipodi:docname="kontakt.svg"><metadata
+     id="metadata47"><rdf:RDF><cc:Work
+         rdf:about=""><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><defs
+     id="defs45" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="769"
+     inkscape:window-height="480"
+     id="namedview43"
+     showgrid="false"
+     inkscape:zoom="3.9333989"
+     inkscape:cx="29.9995"
+     inkscape:cy="29.9995"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Capa_1" /><g
+     id="g3"
+     style="fill:#ed7831;fill-opacity:1"><path
+       d="M36.176,49.999c-1.93,0-3.5,1.57-3.5,3.5s1.57,3.5,3.5,3.5s3.5-1.57,3.5-3.5S38.105,49.999,36.176,49.999z M36.176,54.999   c-0.827,0-1.5-0.673-1.5-1.5s0.673-1.5,1.5-1.5s1.5,0.673,1.5,1.5S37.003,54.999,36.176,54.999z"
+       id="path5"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       d="M40.676,36.999c2.206,0,4-1.794,4-4s-1.794-4-4-4s-4,1.794-4,4S38.469,36.999,40.676,36.999z M40.676,30.999   c1.103,0,2,0.897,2,2s-0.897,2-2,2s-2-0.897-2-2S39.573,30.999,40.676,30.999z"
+       id="path7"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       d="M16.676,11.999c0.256,0,0.512-0.098,0.707-0.293l2-2c0.391-0.391,0.391-1.023,0-1.414s-1.023-0.391-1.414,0l-2,2   c-0.391,0.391-0.391,1.023,0,1.414C16.164,11.901,16.42,11.999,16.676,11.999z"
+       id="path9"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       d="M52.676,29.747c0-0.88-0.343-1.707-0.965-2.329l-0.557-0.557c0.949-0.84,1.521-2.055,1.521-3.362   c0-2.481-2.019-4.5-4.5-4.5c-0.182,0-0.362,0.018-0.54,0.04c0.022-0.179,0.04-0.357,0.04-0.54c0-2.481-2.019-4.5-4.5-4.5   c-0.182,0-0.362,0.018-0.54,0.04c0.022-0.179,0.04-0.357,0.04-0.54c0-2.481-2.019-4.5-4.5-4.5c-0.182,0-0.362,0.018-0.54,0.04   c0.022-0.179,0.04-0.357,0.04-0.54c0-2.481-2.019-4.5-4.5-4.5c-1.308,0-2.522,0.573-3.362,1.521l-0.794-0.794l-3.763-3.763   c-1.285-1.285-3.375-1.285-4.658,0L8.286,13.275c-1.283,1.285-1.283,3.374,0,4.659l3.763,3.763l4.91,4.91   c-1.356,0.776-2.283,2.221-2.283,3.892c0,1.563,0.803,2.941,2.017,3.748c0.061,0.081,0.132,0.161,0.227,0.242l10.756,10.715v1.796   h-2v13h18h8v-13h-2V43.97c1.913-1.621,3-3.952,3-6.471c0-1.74-0.543-3.43-1.536-4.852l0.571-0.571   C52.333,31.454,52.676,30.627,52.676,29.747z M50.676,23.499c0,0.768-0.354,1.479-0.937,1.947l-3.511-3.511   c0.468-0.583,1.18-0.937,1.947-0.937C49.554,20.999,50.676,22.12,50.676,23.499z M45.676,18.499c0,0.768-0.354,1.479-0.937,1.947   l-3.511-3.511c0.468-0.583,1.18-0.937,1.947-0.937C44.554,15.999,45.676,17.12,45.676,18.499z M40.676,13.499   c0,0.768-0.354,1.479-0.937,1.947l-3.511-3.511c0.468-0.583,1.18-0.937,1.947-0.937C39.554,10.999,40.676,12.12,40.676,13.499z    M33.176,5.999c1.379,0,2.5,1.121,2.5,2.5c0,0.768-0.354,1.479-0.937,1.947l-3.511-3.511C31.696,6.353,32.408,5.999,33.176,5.999z    M9.7,16.521c-0.504-0.505-0.504-1.326,0-1.831L22.012,2.378c0.125-0.125,0.271-0.219,0.426-0.282   c0.07-0.029,0.149-0.028,0.223-0.044c0.178-0.038,0.354-0.038,0.532,0c0.074,0.016,0.153,0.015,0.223,0.044   c0.155,0.063,0.3,0.157,0.426,0.282l2.349,2.349L12.049,18.869L9.7,16.521z M27.605,6.141l1.178,1.178l5,5l0.573,0.573l4.427,4.427   l0.573,0.573l4.427,4.427l0.573,0.573l5,5l0.94,0.94c0.505,0.505,0.505,1.325,0,1.83L49.859,31.1l0,0L37.985,42.975   c-0.503,0.504-1.326,0.506-1.831,0l-7.975-7.976h0.996c2.481,0,4.5-2.019,4.5-4.5s-2.019-4.5-4.5-4.5h-9.997l-5.716-5.716   L27.605,6.141z M18.636,28.061l0.415-0.047c0.041-0.006,0.082-0.015,0.124-0.015h10c1.379,0,2.5,1.121,2.5,2.5s-1.121,2.5-2.5,2.5   h-2.996h-2.828h-4.176c-1.379,0-2.5-1.121-2.5-2.5C16.676,29.306,17.517,28.309,18.636,28.061z M27.676,57.999v-9h8.426   c3.073,0,5.574,2.501,5.574,5.574v3.426H27.676z M49.676,57.999h-6v-3.426c0-2.206-0.954-4.188-2.464-5.574h8.464V57.999z    M49.701,34.087c0.634,1.021,0.975,2.202,0.975,3.412c0,2.055-0.948,3.946-2.602,5.191l-0.398,0.3v4.009H36.101h-6.426v-2.718   l-0.353-0.299c-0.045-0.039-0.093-0.075-0.18-0.14l-8.877-8.844h5.085l9.389,9.39c0.643,0.642,1.486,0.963,2.329,0.963   c0.844,0,1.688-0.321,2.33-0.963L49.701,34.087z"
+       id="path11"
+       style="fill:#ed7831;fill-opacity:1" /></g><g
+     id="g13" /><g
+     id="g15" /><g
+     id="g17" /><g
+     id="g19" /><g
+     id="g21" /><g
+     id="g23" /><g
+     id="g25" /><g
+     id="g27" /><g
+     id="g29" /><g
+     id="g31" /><g
+     id="g33" /><g
+     id="g35" /><g
+     id="g37" /><g
+     id="g39" /><g
+     id="g41" /></svg>
\ No newline at end of file

diff --git a/edumed/static/img/menu/olimpiada/svg/literatura.svg b/edumed/static/img/menu/olimpiada/svg/literatura.svg
new file mode 100644 (file)
index 0000000..a004d7e
--- /dev/null
+++ b/edumed/static/img/menu/olimpiada/svg/literatura.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   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"
+   version="1.1"
+   id="Capa_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 60 60"
+   style="enable-background:new 0 0 60 60;"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   width="100%"
+   height="100%"
+   sodipodi:docname="literatura.svg"><metadata
+     id="metadata39"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs37" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="769"
+     inkscape:window-height="480"
+     id="namedview35"
+     showgrid="false"
+     inkscape:zoom="3.9333333"
+     inkscape:cx="30"
+     inkscape:cy="30"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Capa_1" /><path
+     d="M13,0c-1.547,0-3.033,0.662-4.078,1.817C7.895,2.954,7.389,4.476,7.525,6H7.5v48.958C7.5,57.738,9.762,60,12.542,60H52.5V11  V9V0H13z M9.5,54.958V9.998c0.836,0.629,1.875,1.002,3,1.002v46.996C10.842,57.973,9.5,56.621,9.5,54.958z M50.5,58h-36V11h3v25.201  c0,0.682,0.441,1.262,1.099,1.444c0.137,0.037,0.273,0.056,0.408,0.056c0.015,0,0.029-0.005,0.044-0.006  c0.045-0.001,0.088-0.012,0.133-0.017c0.103-0.012,0.202-0.033,0.299-0.066c0.048-0.016,0.093-0.035,0.138-0.056  c0.094-0.043,0.18-0.097,0.263-0.159c0.036-0.027,0.073-0.05,0.106-0.08c0.111-0.099,0.212-0.211,0.292-0.346l4.217-7.028  l4.217,7.029c0.327,0.545,0.939,0.801,1.55,0.687c0.045-0.008,0.089-0.002,0.134-0.014c0.657-0.183,1.099-0.763,1.099-1.444V11h19  V58z M29.64,9.483l-0.003,0.007L29.5,9.764v0.042l-0.1,0.23l0.1,0.152v0.112V34.39l-5-8.333l-5,8.333V10.236L21.118,7h9.764  L29.64,9.483z M32.118,9l2-4H19.882l-2,4h-4.67c-1.894,0-3.516-1.379-3.693-3.14c-0.101-0.998,0.214-1.957,0.887-2.701  C11.071,2.422,12.017,2,13,2h37.5v1h-5c-0.553,0-1,0.447-1,1s0.447,1,1,1h5v1h-4c-0.553,0-1,0.447-1,1s0.447,1,1,1h4v1H32.118z"
+     id="path3"
+     style="stroke:none;stroke-opacity:1;fill:#96928b;fill-opacity:1;" /><g
+     id="g5" /><g
+     id="g7" /><g
+     id="g9" /><g
+     id="g11" /><g
+     id="g13" /><g
+     id="g15" /><g
+     id="g17" /><g
+     id="g19" /><g
+     id="g21" /><g
+     id="g23" /><g
+     id="g25" /><g
+     id="g27" /><g
+     id="g29" /><g
+     id="g31" /><g
+     id="g33" /></svg>
\ No newline at end of file

diff --git a/edumed/static/img/menu/olimpiada/svg/literatura_active.svg b/edumed/static/img/menu/olimpiada/svg/literatura_active.svg
new file mode 100644 (file)
index 0000000..20395e7
--- /dev/null
+++ b/edumed/static/img/menu/olimpiada/svg/literatura_active.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   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"
+   version="1.1"
+   id="Capa_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 60 60"
+   style="enable-background:new 0 0 60 60;"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   width="100%"
+   height="100%"
+   sodipodi:docname="literatura.svg"><metadata
+     id="metadata39"><rdf:RDF><cc:Work
+         rdf:about=""><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><defs
+     id="defs37" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="769"
+     inkscape:window-height="480"
+     id="namedview35"
+     showgrid="false"
+     inkscape:zoom="3.9333333"
+     inkscape:cx="30"
+     inkscape:cy="30"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Capa_1" /><path
+     d="M13,0c-1.547,0-3.033,0.662-4.078,1.817C7.895,2.954,7.389,4.476,7.525,6H7.5v48.958C7.5,57.738,9.762,60,12.542,60H52.5V11  V9V0H13z M9.5,54.958V9.998c0.836,0.629,1.875,1.002,3,1.002v46.996C10.842,57.973,9.5,56.621,9.5,54.958z M50.5,58h-36V11h3v25.201  c0,0.682,0.441,1.262,1.099,1.444c0.137,0.037,0.273,0.056,0.408,0.056c0.015,0,0.029-0.005,0.044-0.006  c0.045-0.001,0.088-0.012,0.133-0.017c0.103-0.012,0.202-0.033,0.299-0.066c0.048-0.016,0.093-0.035,0.138-0.056  c0.094-0.043,0.18-0.097,0.263-0.159c0.036-0.027,0.073-0.05,0.106-0.08c0.111-0.099,0.212-0.211,0.292-0.346l4.217-7.028  l4.217,7.029c0.327,0.545,0.939,0.801,1.55,0.687c0.045-0.008,0.089-0.002,0.134-0.014c0.657-0.183,1.099-0.763,1.099-1.444V11h19  V58z M29.64,9.483l-0.003,0.007L29.5,9.764v0.042l-0.1,0.23l0.1,0.152v0.112V34.39l-5-8.333l-5,8.333V10.236L21.118,7h9.764  L29.64,9.483z M32.118,9l2-4H19.882l-2,4h-4.67c-1.894,0-3.516-1.379-3.693-3.14c-0.101-0.998,0.214-1.957,0.887-2.701  C11.071,2.422,12.017,2,13,2h37.5v1h-5c-0.553,0-1,0.447-1,1s0.447,1,1,1h5v1h-4c-0.553,0-1,0.447-1,1s0.447,1,1,1h4v1H32.118z"
+     id="path3"
+     style="stroke:none;stroke-opacity:1;fill:#ed7831;fill-opacity:1" /><g
+     id="g5" /><g
+     id="g7" /><g
+     id="g9" /><g
+     id="g11" /><g
+     id="g13" /><g
+     id="g15" /><g
+     id="g17" /><g
+     id="g19" /><g
+     id="g21" /><g
+     id="g23" /><g
+     id="g25" /><g
+     id="g27" /><g
+     id="g29" /><g
+     id="g31" /><g
+     id="g33" /></svg>
\ No newline at end of file

diff --git a/edumed/static/img/menu/olimpiada/svg/program.svg b/edumed/static/img/menu/olimpiada/svg/program.svg
new file mode 100644 (file)
index 0000000..2418f09
--- /dev/null
+++ b/edumed/static/img/menu/olimpiada/svg/program.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   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"
+   version="1.1"
+   id="Capa_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 54 54"
+   style="enable-background:new 0 0 54 54;"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   width="100%"
+   height="100%"
+   sodipodi:docname="program.svg"><metadata
+     id="metadata57"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs55" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="769"
+     inkscape:window-height="480"
+     id="namedview53"
+     showgrid="false"
+     inkscape:zoom="4.3703704"
+     inkscape:cx="27"
+     inkscape:cy="27"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Capa_1" /><g
+     id="g3"
+     style="fill:#96928b;fill-opacity:1;"><path
+       d="M53.516,1.143c-0.3-0.182-0.674-0.19-0.983-0.027L36,9.869L19.468,1.116c-0.013-0.007-0.028-0.009-0.041-0.015   c-0.048-0.023-0.097-0.04-0.147-0.055c-0.028-0.008-0.055-0.017-0.083-0.023c-0.055-0.011-0.111-0.015-0.168-0.017   c-0.025-0.001-0.05-0.004-0.076-0.003c-0.054,0.003-0.107,0.013-0.16,0.025c-0.03,0.006-0.06,0.01-0.089,0.019   c-0.007,0.002-0.014,0.002-0.02,0.004l-18,6C0.275,7.187,0,7.569,0,8v43c0,0.321,0.154,0.623,0.416,0.812   C0.588,51.935,0.793,52,1,52c0.106,0,0.213-0.017,0.316-0.052l17.646-5.882l16.657,6.859c0.014,0.006,0.03,0.004,0.044,0.009   C35.773,52.973,35.885,53,36,53c0.09,0,0.179-0.015,0.266-0.039c0.028-0.008,0.054-0.021,0.082-0.031   c0.04-0.015,0.082-0.026,0.12-0.046l17-9C53.795,43.711,54,43.37,54,43V2C54,1.649,53.816,1.324,53.516,1.143z M2,8.721l16-5.333   v26.992c-0.43,0.078-0.854,0.166-1.264,0.274c-0.534,0.142-0.852,0.689-0.71,1.223c0.119,0.448,0.523,0.744,0.966,0.744   c0.084,0,0.171-0.011,0.257-0.033c0.24-0.064,0.502-0.096,0.751-0.148v11.84L2,49.612V8.721z M20,32.16   c0.321-0.025,0.632-0.066,0.961-0.073c0.552-0.012,0.99-0.469,0.979-1.021c-0.012-0.545-0.457-0.979-1-0.979   c-0.007,0-0.015,0-0.022,0c-0.31,0.007-0.615,0.024-0.918,0.045V3.661l15,7.941v21.194c-0.714-0.031-1.44-0.115-2.201-0.262   c-0.544-0.107-1.067,0.249-1.172,0.791s0.25,1.067,0.792,1.172c0.886,0.172,1.746,0.256,2.582,0.289v15.721L20,44.33V32.16z    M52,42.397l-15,7.941v-15.66c0.372-0.169,0.62-0.549,0.587-0.98c-0.029-0.374-0.269-0.674-0.587-0.821V11.602l15-7.941V42.397z"
+       id="path5"
+       style="fill:#96928b;fill-opacity:1" /><path
+       d="M11,9c-2.757,0-5,2.243-5,5c0,2.415,1.721,4.434,4,4.899V21c0,0.553,0.448,1,1,1s1-0.447,1-1v-2.101   c2.279-0.465,4-2.484,4-4.899C16,11.243,13.757,9,11,9z M11,17c-1.654,0-3-1.346-3-3s1.346-3,3-3s3,1.346,3,3S12.654,17,11,17z"
+       id="path7"
+       style="fill:#96928b;fill-opacity:1" /><path
+       d="M45.07,27.673c0.12,0.047,0.243,0.068,0.364,0.068c0.4,0,0.777-0.241,0.932-0.636c0.47-1.199,0.847-2.553,1.123-4.024   c0.102-0.542-0.256-1.064-0.799-1.167c-0.546-0.09-1.065,0.257-1.167,0.8c-0.252,1.348-0.595,2.58-1.019,3.663   C44.303,26.89,44.556,27.471,45.07,27.673z"
+       id="path9"
+       style="fill:#96928b;fill-opacity:1" /><path
+       d="M12.805,32.342c-1.207,0.757-2.295,1.705-3.235,2.82c-0.356,0.422-0.302,1.053,0.12,1.409   c0.188,0.158,0.417,0.235,0.644,0.235c0.285,0,0.567-0.121,0.765-0.355c0.806-0.956,1.737-1.769,2.768-2.414   c0.468-0.294,0.609-0.911,0.316-1.379C13.89,32.19,13.272,32.048,12.805,32.342z"
+       id="path11"
+       style="fill:#96928b;fill-opacity:1" /><path
+       d="M8.627,38.276c-0.502-0.23-1.096-0.013-1.327,0.489c-1.026,2.226-1.28,4.023-1.291,4.099   c-0.075,0.547,0.307,1.05,0.854,1.125c0.046,0.007,0.093,0.01,0.138,0.01c0.491,0,0.919-0.362,0.99-0.861   c0.002-0.016,0.231-1.597,1.125-3.534C9.347,39.101,9.128,38.508,8.627,38.276z"
+       id="path13"
+       style="fill:#96928b;fill-opacity:1" /><path
+       d="M40.423,33.729c0.153,0,0.309-0.035,0.454-0.109c1.292-0.661,2.431-1.599,3.384-2.786c0.346-0.431,0.277-1.061-0.154-1.406   c-0.43-0.343-1.06-0.276-1.406,0.154c-0.776,0.967-1.696,1.726-2.735,2.257c-0.492,0.252-0.687,0.854-0.435,1.346   C39.709,33.53,40.06,33.729,40.423,33.729z"
+       id="path15"
+       style="fill:#96928b;fill-opacity:1" /><path
+       d="M29.17,31.432c-0.441-0.185-0.699-0.313-0.716-0.322c-0.065-0.033-0.134-0.06-0.205-0.078   c-1.083-0.278-2.15-0.498-3.173-0.654c-0.545-0.086-1.056,0.291-1.14,0.837c-0.083,0.546,0.292,1.057,0.838,1.14   c0.926,0.142,1.893,0.34,2.877,0.59c0.134,0.064,0.39,0.185,0.748,0.334c0.126,0.053,0.257,0.077,0.385,0.077   c0.391,0,0.763-0.23,0.923-0.614C29.92,32.23,29.68,31.644,29.17,31.432z"
+       id="path17"
+       style="fill:#96928b;fill-opacity:1" /><path
+       d="M46.923,19.931c0.022,0.001,0.043,0.002,0.065,0.002c0.523,0,0.963-0.406,0.997-0.937c0.062-0.961,0.093-1.978,0.093-3.02   c0-0.347-0.003-0.699-0.01-1.058c-0.01-0.553-0.49-0.973-1.018-0.982c-0.552,0.01-0.992,0.466-0.982,1.018   c0.006,0.347,0.01,0.688,0.01,1.022c0,1-0.03,1.973-0.089,2.893C45.954,19.42,46.372,19.895,46.923,19.931z"
+       id="path19"
+       style="fill:#96928b;fill-opacity:1" /><path
+       d="M8.293,28.707C8.488,28.902,8.744,29,9,29s0.512-0.098,0.707-0.293L11,27.414l1.293,1.293C12.488,28.902,12.744,29,13,29   s0.512-0.098,0.707-0.293c0.391-0.391,0.391-1.023,0-1.414L12.414,26l1.293-1.293c0.391-0.391,0.391-1.023,0-1.414   s-1.023-0.391-1.414,0L11,24.586l-1.293-1.293c-0.391-0.391-1.023-0.391-1.414,0s-0.391,1.023,0,1.414L9.586,26l-1.293,1.293   C7.902,27.683,7.902,28.316,8.293,28.707z"
+       id="path21"
+       style="fill:#96928b;fill-opacity:1" /></g><g
+     id="g23"
+     style="fill:#96928b;fill-opacity:1;" /><g
+     id="g25"
+     style="fill:#96928b;fill-opacity:1;" /><g
+     id="g27"
+     style="fill:#96928b;fill-opacity:1;" /><g
+     id="g29"
+     style="fill:#96928b;fill-opacity:1;" /><g
+     id="g31"
+     style="fill:#96928b;fill-opacity:1;" /><g
+     id="g33"
+     style="fill:#96928b;fill-opacity:1;" /><g
+     id="g35"
+     style="fill:#96928b;fill-opacity:1;" /><g
+     id="g37"
+     style="fill:#96928b;fill-opacity:1;" /><g
+     id="g39"
+     style="fill:#96928b;fill-opacity:1;" /><g
+     id="g41"
+     style="fill:#96928b;fill-opacity:1;" /><g
+     id="g43"
+     style="fill:#96928b;fill-opacity:1;" /><g
+     id="g45"
+     style="fill:#96928b;fill-opacity:1;" /><g
+     id="g47"
+     style="fill:#96928b;fill-opacity:1;" /><g
+     id="g49"
+     style="fill:#96928b;fill-opacity:1;" /><g
+     id="g51"
+     style="fill:#96928b;fill-opacity:1;" /></svg>
\ No newline at end of file

diff --git a/edumed/static/img/menu/olimpiada/svg/program_active.svg b/edumed/static/img/menu/olimpiada/svg/program_active.svg
new file mode 100644 (file)
index 0000000..cf39f15
--- /dev/null
+++ b/edumed/static/img/menu/olimpiada/svg/program_active.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   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"
+   version="1.1"
+   id="Capa_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 54 54"
+   style="enable-background:new 0 0 54 54;"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   width="100%"
+   height="100%"
+   sodipodi:docname="program.svg"><metadata
+     id="metadata57"><rdf:RDF><cc:Work
+         rdf:about=""><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><defs
+     id="defs55" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="769"
+     inkscape:window-height="480"
+     id="namedview53"
+     showgrid="false"
+     inkscape:zoom="4.3703704"
+     inkscape:cx="27"
+     inkscape:cy="27"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Capa_1" /><g
+     id="g3"
+     style="fill:#ed7831;fill-opacity:1"><path
+       d="M53.516,1.143c-0.3-0.182-0.674-0.19-0.983-0.027L36,9.869L19.468,1.116c-0.013-0.007-0.028-0.009-0.041-0.015   c-0.048-0.023-0.097-0.04-0.147-0.055c-0.028-0.008-0.055-0.017-0.083-0.023c-0.055-0.011-0.111-0.015-0.168-0.017   c-0.025-0.001-0.05-0.004-0.076-0.003c-0.054,0.003-0.107,0.013-0.16,0.025c-0.03,0.006-0.06,0.01-0.089,0.019   c-0.007,0.002-0.014,0.002-0.02,0.004l-18,6C0.275,7.187,0,7.569,0,8v43c0,0.321,0.154,0.623,0.416,0.812   C0.588,51.935,0.793,52,1,52c0.106,0,0.213-0.017,0.316-0.052l17.646-5.882l16.657,6.859c0.014,0.006,0.03,0.004,0.044,0.009   C35.773,52.973,35.885,53,36,53c0.09,0,0.179-0.015,0.266-0.039c0.028-0.008,0.054-0.021,0.082-0.031   c0.04-0.015,0.082-0.026,0.12-0.046l17-9C53.795,43.711,54,43.37,54,43V2C54,1.649,53.816,1.324,53.516,1.143z M2,8.721l16-5.333   v26.992c-0.43,0.078-0.854,0.166-1.264,0.274c-0.534,0.142-0.852,0.689-0.71,1.223c0.119,0.448,0.523,0.744,0.966,0.744   c0.084,0,0.171-0.011,0.257-0.033c0.24-0.064,0.502-0.096,0.751-0.148v11.84L2,49.612V8.721z M20,32.16   c0.321-0.025,0.632-0.066,0.961-0.073c0.552-0.012,0.99-0.469,0.979-1.021c-0.012-0.545-0.457-0.979-1-0.979   c-0.007,0-0.015,0-0.022,0c-0.31,0.007-0.615,0.024-0.918,0.045V3.661l15,7.941v21.194c-0.714-0.031-1.44-0.115-2.201-0.262   c-0.544-0.107-1.067,0.249-1.172,0.791s0.25,1.067,0.792,1.172c0.886,0.172,1.746,0.256,2.582,0.289v15.721L20,44.33V32.16z    M52,42.397l-15,7.941v-15.66c0.372-0.169,0.62-0.549,0.587-0.98c-0.029-0.374-0.269-0.674-0.587-0.821V11.602l15-7.941V42.397z"
+       id="path5"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       d="M11,9c-2.757,0-5,2.243-5,5c0,2.415,1.721,4.434,4,4.899V21c0,0.553,0.448,1,1,1s1-0.447,1-1v-2.101   c2.279-0.465,4-2.484,4-4.899C16,11.243,13.757,9,11,9z M11,17c-1.654,0-3-1.346-3-3s1.346-3,3-3s3,1.346,3,3S12.654,17,11,17z"
+       id="path7"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       d="M45.07,27.673c0.12,0.047,0.243,0.068,0.364,0.068c0.4,0,0.777-0.241,0.932-0.636c0.47-1.199,0.847-2.553,1.123-4.024   c0.102-0.542-0.256-1.064-0.799-1.167c-0.546-0.09-1.065,0.257-1.167,0.8c-0.252,1.348-0.595,2.58-1.019,3.663   C44.303,26.89,44.556,27.471,45.07,27.673z"
+       id="path9"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       d="M12.805,32.342c-1.207,0.757-2.295,1.705-3.235,2.82c-0.356,0.422-0.302,1.053,0.12,1.409   c0.188,0.158,0.417,0.235,0.644,0.235c0.285,0,0.567-0.121,0.765-0.355c0.806-0.956,1.737-1.769,2.768-2.414   c0.468-0.294,0.609-0.911,0.316-1.379C13.89,32.19,13.272,32.048,12.805,32.342z"
+       id="path11"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       d="M8.627,38.276c-0.502-0.23-1.096-0.013-1.327,0.489c-1.026,2.226-1.28,4.023-1.291,4.099   c-0.075,0.547,0.307,1.05,0.854,1.125c0.046,0.007,0.093,0.01,0.138,0.01c0.491,0,0.919-0.362,0.99-0.861   c0.002-0.016,0.231-1.597,1.125-3.534C9.347,39.101,9.128,38.508,8.627,38.276z"
+       id="path13"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       d="M40.423,33.729c0.153,0,0.309-0.035,0.454-0.109c1.292-0.661,2.431-1.599,3.384-2.786c0.346-0.431,0.277-1.061-0.154-1.406   c-0.43-0.343-1.06-0.276-1.406,0.154c-0.776,0.967-1.696,1.726-2.735,2.257c-0.492,0.252-0.687,0.854-0.435,1.346   C39.709,33.53,40.06,33.729,40.423,33.729z"
+       id="path15"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       d="M29.17,31.432c-0.441-0.185-0.699-0.313-0.716-0.322c-0.065-0.033-0.134-0.06-0.205-0.078   c-1.083-0.278-2.15-0.498-3.173-0.654c-0.545-0.086-1.056,0.291-1.14,0.837c-0.083,0.546,0.292,1.057,0.838,1.14   c0.926,0.142,1.893,0.34,2.877,0.59c0.134,0.064,0.39,0.185,0.748,0.334c0.126,0.053,0.257,0.077,0.385,0.077   c0.391,0,0.763-0.23,0.923-0.614C29.92,32.23,29.68,31.644,29.17,31.432z"
+       id="path17"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       d="M46.923,19.931c0.022,0.001,0.043,0.002,0.065,0.002c0.523,0,0.963-0.406,0.997-0.937c0.062-0.961,0.093-1.978,0.093-3.02   c0-0.347-0.003-0.699-0.01-1.058c-0.01-0.553-0.49-0.973-1.018-0.982c-0.552,0.01-0.992,0.466-0.982,1.018   c0.006,0.347,0.01,0.688,0.01,1.022c0,1-0.03,1.973-0.089,2.893C45.954,19.42,46.372,19.895,46.923,19.931z"
+       id="path19"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       d="M8.293,28.707C8.488,28.902,8.744,29,9,29s0.512-0.098,0.707-0.293L11,27.414l1.293,1.293C12.488,28.902,12.744,29,13,29   s0.512-0.098,0.707-0.293c0.391-0.391,0.391-1.023,0-1.414L12.414,26l1.293-1.293c0.391-0.391,0.391-1.023,0-1.414   s-1.023-0.391-1.414,0L11,24.586l-1.293-1.293c-0.391-0.391-1.023-0.391-1.414,0s-0.391,1.023,0,1.414L9.586,26l-1.293,1.293   C7.902,27.683,7.902,28.316,8.293,28.707z"
+       id="path21"
+       style="fill:#ed7831;fill-opacity:1" /></g><g
+     id="g23"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g25"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g27"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g29"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g31"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g33"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g35"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g37"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g39"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g41"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g43"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g45"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g47"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g49"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g51"
+     style="fill:#ed7831;fill-opacity:1" /></svg>
\ No newline at end of file

diff --git a/edumed/static/img/menu/olimpiada/svg/regulamin.svg b/edumed/static/img/menu/olimpiada/svg/regulamin.svg
new file mode 100644 (file)
index 0000000..61c274e
--- /dev/null
+++ b/edumed/static/img/menu/olimpiada/svg/regulamin.svg
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   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"
+   version="1.1"
+   id="Capa_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 60 60"
+   style="enable-background:new 0 0 60 60;"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   width="100%"
+   height="100%"
+   sodipodi:docname="regulamin.svg"><metadata
+     id="metadata53"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs51" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="769"
+     inkscape:window-height="480"
+     id="namedview49"
+     showgrid="false"
+     inkscape:zoom="3.9333333"
+     inkscape:cx="30"
+     inkscape:cy="30"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Capa_1" /><g
+     id="g3"
+     style="fill:#96928b;fill-opacity:1"><path
+       d="M38.914,0H6.5v60h47V14.586L38.914,0z M39.5,3.414L50.086,14H39.5V3.414z M8.5,58V2h29v14h14v42H8.5z"
+       id="path5"
+       style="fill:#96928b;fill-opacity:1" /><path
+       d="M42.5,21h-16c-0.552,0-1,0.447-1,1s0.448,1,1,1h16c0.552,0,1-0.447,1-1S43.052,21,42.5,21z"
+       id="path7"
+       style="fill:#96928b;fill-opacity:1" /><path
+       d="M22.875,18.219l-4.301,3.441l-1.367-1.367c-0.391-0.391-1.023-0.391-1.414,0s-0.391,1.023,0,1.414l2,2   C17.987,23.901,18.243,24,18.5,24c0.22,0,0.441-0.072,0.624-0.219l5-4c0.432-0.346,0.501-0.975,0.156-1.406   C23.936,17.943,23.306,17.874,22.875,18.219z"
+       id="path9"
+       style="fill:#96928b;fill-opacity:1" /><path
+       d="M42.5,32h-16c-0.552,0-1,0.447-1,1s0.448,1,1,1h16c0.552,0,1-0.447,1-1S43.052,32,42.5,32z"
+       id="path11"
+       style="fill:#96928b;fill-opacity:1" /><path
+       d="M22.875,29.219l-4.301,3.441l-1.367-1.367c-0.391-0.391-1.023-0.391-1.414,0s-0.391,1.023,0,1.414l2,2   C17.987,34.901,18.243,35,18.5,35c0.22,0,0.441-0.072,0.624-0.219l5-4c0.432-0.346,0.501-0.975,0.156-1.406   C23.936,28.943,23.306,28.874,22.875,29.219z"
+       id="path13"
+       style="fill:#96928b;fill-opacity:1" /><path
+       d="M42.5,43h-16c-0.552,0-1,0.447-1,1s0.448,1,1,1h16c0.552,0,1-0.447,1-1S43.052,43,42.5,43z"
+       id="path15"
+       style="fill:#96928b;fill-opacity:1" /><path
+       d="M22.875,40.219l-4.301,3.441l-1.367-1.367c-0.391-0.391-1.023-0.391-1.414,0s-0.391,1.023,0,1.414l2,2   C17.987,45.901,18.243,46,18.5,46c0.22,0,0.441-0.072,0.624-0.219l5-4c0.432-0.346,0.501-0.975,0.156-1.406   C23.936,39.943,23.306,39.874,22.875,40.219z"
+       id="path17"
+       style="fill:#96928b;fill-opacity:1" /></g><g
+     id="g19"
+     style="fill:#96928b;fill-opacity:1" /><g
+     id="g21"
+     style="fill:#96928b;fill-opacity:1" /><g
+     id="g23"
+     style="fill:#96928b;fill-opacity:1" /><g
+     id="g25"
+     style="fill:#96928b;fill-opacity:1" /><g
+     id="g27"
+     style="fill:#96928b;fill-opacity:1" /><g
+     id="g29"
+     style="fill:#96928b;fill-opacity:1" /><g
+     id="g31"
+     style="fill:#96928b;fill-opacity:1" /><g
+     id="g33"
+     style="fill:#96928b;fill-opacity:1" /><g
+     id="g35"
+     style="fill:#96928b;fill-opacity:1" /><g
+     id="g37"
+     style="fill:#96928b;fill-opacity:1" /><g
+     id="g39"
+     style="fill:#96928b;fill-opacity:1" /><g
+     id="g41"
+     style="fill:#96928b;fill-opacity:1" /><g
+     id="g43"
+     style="fill:#96928b;fill-opacity:1" /><g
+     id="g45"
+     style="fill:#96928b;fill-opacity:1" /><g
+     id="g47"
+     style="fill:#96928b;fill-opacity:1" /></svg>
\ No newline at end of file

diff --git a/edumed/static/img/menu/olimpiada/svg/regulamin_active.svg b/edumed/static/img/menu/olimpiada/svg/regulamin_active.svg
new file mode 100644 (file)
index 0000000..50f8f6d
--- /dev/null
+++ b/edumed/static/img/menu/olimpiada/svg/regulamin_active.svg
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   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"
+   version="1.1"
+   id="Capa_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 60 60"
+   style="enable-background:new 0 0 60 60;"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   width="100%"
+   height="100%"
+   sodipodi:docname="regulamin.svg"><metadata
+     id="metadata53"><rdf:RDF><cc:Work
+         rdf:about=""><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><defs
+     id="defs51" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="769"
+     inkscape:window-height="480"
+     id="namedview49"
+     showgrid="false"
+     inkscape:zoom="3.9333333"
+     inkscape:cx="30"
+     inkscape:cy="30"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Capa_1" /><g
+     id="g3"
+     style="fill:#ed7831;fill-opacity:1"><path
+       d="M38.914,0H6.5v60h47V14.586L38.914,0z M39.5,3.414L50.086,14H39.5V3.414z M8.5,58V2h29v14h14v42H8.5z"
+       id="path5"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       d="M42.5,21h-16c-0.552,0-1,0.447-1,1s0.448,1,1,1h16c0.552,0,1-0.447,1-1S43.052,21,42.5,21z"
+       id="path7"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       d="M22.875,18.219l-4.301,3.441l-1.367-1.367c-0.391-0.391-1.023-0.391-1.414,0s-0.391,1.023,0,1.414l2,2   C17.987,23.901,18.243,24,18.5,24c0.22,0,0.441-0.072,0.624-0.219l5-4c0.432-0.346,0.501-0.975,0.156-1.406   C23.936,17.943,23.306,17.874,22.875,18.219z"
+       id="path9"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       d="M42.5,32h-16c-0.552,0-1,0.447-1,1s0.448,1,1,1h16c0.552,0,1-0.447,1-1S43.052,32,42.5,32z"
+       id="path11"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       d="M22.875,29.219l-4.301,3.441l-1.367-1.367c-0.391-0.391-1.023-0.391-1.414,0s-0.391,1.023,0,1.414l2,2   C17.987,34.901,18.243,35,18.5,35c0.22,0,0.441-0.072,0.624-0.219l5-4c0.432-0.346,0.501-0.975,0.156-1.406   C23.936,28.943,23.306,28.874,22.875,29.219z"
+       id="path13"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       d="M42.5,43h-16c-0.552,0-1,0.447-1,1s0.448,1,1,1h16c0.552,0,1-0.447,1-1S43.052,43,42.5,43z"
+       id="path15"
+       style="fill:#ed7831;fill-opacity:1" /><path
+       d="M22.875,40.219l-4.301,3.441l-1.367-1.367c-0.391-0.391-1.023-0.391-1.414,0s-0.391,1.023,0,1.414l2,2   C17.987,45.901,18.243,46,18.5,46c0.22,0,0.441-0.072,0.624-0.219l5-4c0.432-0.346,0.501-0.975,0.156-1.406   C23.936,39.943,23.306,39.874,22.875,40.219z"
+       id="path17"
+       style="fill:#ed7831;fill-opacity:1" /></g><g
+     id="g19"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g21"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g23"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g25"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g27"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g29"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g31"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g33"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g35"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g37"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g39"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g41"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g43"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g45"
+     style="fill:#ed7831;fill-opacity:1" /><g
+     id="g47"
+     style="fill:#ed7831;fill-opacity:1" /></svg>
\ No newline at end of file

diff --git a/edumed/templates/base.html b/edumed/templates/base.html
index d336201..96641ad 100644 (file)
--- a/edumed/templates/base.html
+++ b/edumed/templates/base.html
@@ -9,7 +9,7 @@
     <li><a class="menu-lekcje" href="{% url "catalogue_lessons" %}">Lekcje</a></li>
     {% comment %}<li><a class="menu-wspolpraca" href="{% url "info" "wspolpraca/" %}">Współpraca</a></li>{% endcomment %}
     <li><a class="menu-kompetencje" href="{% url "curriculum" %}">Kompetencje</a></li>
     <li><a class="menu-lekcje" href="{% url "catalogue_lessons" %}">Lekcje</a></li>
     {% comment %}<li><a class="menu-wspolpraca" href="{% url "info" "wspolpraca/" %}">Współpraca</a></li>{% endcomment %}
     <li><a class="menu-kompetencje" href="{% url "curriculum" %}">Kompetencje</a></li>

-    <li><a class="menu-szkolenia" href="{% url "olimpiada" %}">Olimpiada</a></li>
+    <li><a class="menu-szkolenia" href="https://olimpiadacyfrowa.pl">Olimpiada</a></li>

     <li><a class="menu-o-nas" href="{% url "info" "dlatrenera/" %}">Dla trenera</a></li>
     <li><a class="menu-wesprzyj" href="{% url "info" "wesprzyj/" %}">Wesprzyj nas</a></li>
     <li><a class="menu-kontakt" href="{% url "info" "o-nas/" %}">O projekcie</a></li>
     <li><a class="menu-o-nas" href="{% url "info" "dlatrenera/" %}">Dla trenera</a></li>
     <li><a class="menu-wesprzyj" href="{% url "info" "wesprzyj/" %}">Wesprzyj nas</a></li>
     <li><a class="menu-kontakt" href="{% url "info" "o-nas/" %}">O projekcie</a></li>

diff --git a/edumed/templates/base_super.html b/edumed/templates/base_super.html
index 73080d4..497a868 100644 (file)
--- a/edumed/templates/base_super.html
+++ b/edumed/templates/base_super.html
@@ -60,11 +60,13 @@
             </div>
 
             <div id="tagline">{% block tagline %}{% endblock %}</div>
             </div>
 
             <div id="tagline">{% block tagline %}{% endblock %}</div>

-            <div id="search">
-                <form action="{% url 'haystack_search' None %}">
-                    <input name="q" placeholder="szukaj" /><button><span>&rarr;</span></button>
-                </form>
-            </div>
+            {% block searchbox %}
+              <div id="search">
+                  <form action="{% url 'haystack_search' None %}">
+                      <input name="q" placeholder="szukaj" /><button><span>&rarr;</span></button>
+                  </form>
+              </div>
+            {% endblock %}

             <div class="clr"></div>
         </header>
         </div>
             <div class="clr"></div>
         </header>
         </div>


@@ -97,6 +99,7 @@
                 Jeśli nie oznaczono inaczej, wszystkie materiały na stronie są objęte wolną licencją
                 <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.pl">Creative Commons Uznanie autorstwa
                 – Na tych samych warunkach 3.0</a>.
                 Jeśli nie oznaczono inaczej, wszystkie materiały na stronie są objęte wolną licencją
                 <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.pl">Creative Commons Uznanie autorstwa
                 – Na tych samych warunkach 3.0</a>.

+                {% block copyrights %}{% endblock %}

                 </p>
             </div>
             {% block sponsors %}
                 </p>
             </div>
             {% block sponsors %}

diff --git a/edumed/templates/olimpiada_teaser.html b/edumed/templates/olimpiada_teaser.html
index 071e68e..51b8c02 100644 (file)
--- a/edumed/templates/olimpiada_teaser.html
+++ b/edumed/templates/olimpiada_teaser.html
@@ -1,15 +1,28 @@
 {% extends "base_super.html" %}
 {% extends "base_super.html" %}

+{% load textile_pl from fnp_markup %}

 
 

-{% block logo %}{% endblock %}
-{% block title %}Olimpiada cyfrowa{% endblock %}
+{% block full_title %}Olimpiada cyfrowa{% endblock %}
+
+{% block logo %}<img src="http://edukacjamedialna.edu.pl/media/chunks/attachment/olimpiada_cyfrowa_logo.png" height="73" alt="Olimpiada cyfrowa"/>{% endblock %}
+
+{% block searchbox %}{% endblock %}
+
+{% block top_navigation %}
+  <li><a class="menu-oc-regulamin" href="/regulamin/">Regulamin</a></li>
+  <li><a class="menu-oc-program" href="/program/">Program</a></li>
+  <li><a class="menu-oc-literatura" href="/literatura/">Literatura</a></li>
+  <li><a class="menu-oc-harmonogram" href="/harmonogram/">Harmonogram</a></li>
+  <li><a class="menu-oc-komitet" href="/sklad/">Rada i komitet</a></li>
+  <li><a class="menu-oc-kontakt" href="/kontakt/">Kontakt</a></li>
+{% endblock %}

 
 {% block body %}
 
 {% block body %}

-  <img src="http://edukacjamedialna.edu.pl/media/chunks/attachment/olimpiada_cyfrowa-srednie.png"/>
-  <h1>Tutaj będzie coś zajebistego!</h1>
-  <p>Podaj swój adres e-mail, żeby dostać powiadomienie:</p>
-  <form method="post" action="">
-    {% csrf_token %}
-    <label><input type="text" name="email"/></label>
-    <input type="submit" value="Wyślij">
-  </form>
+  <div id="main-bar" class="flatpage">
+    {{ flatpage.content|textile_pl }}
+  </div>
+{% endblock %}
+
+{% block copyrights %}
+  <br/>Ikonki w menu:
+  <a href="http://www.flaticon.com/authors/freepik">Designed by Freepik and distributed by Flaticon</a>

 {% endblock %}
\ No newline at end of file
 {% endblock %}
\ No newline at end of file

diff --git a/edumed/urls.py b/edumed/urls.py
index 2d0d0a0..a62aee3 100644 (file)
--- a/edumed/urls.py
+++ b/edumed/urls.py
@@ -4,8 +4,7 @@ from django.conf import settings
 from django.contrib.flatpages.views import flatpage
 from django.shortcuts import redirect
 
 from django.contrib.flatpages.views import flatpage
 from django.shortcuts import redirect
 

-from .views import HomeView, AvatarlessProfileEditView
-
+from .views import HomeView, AvatarlessProfileEditView, flatpage_with_template

 
 urlpatterns = patterns(
     '',
 
 urlpatterns = patterns(
     '',


@@ -15,7 +14,9 @@ urlpatterns = patterns(
     url(r'^info/(?P<url>.*)$', flatpage, name="info"),
     url(r'^olimpiada/$', lambda request: flatpage(request, 'turniej/'), name='olimpiada'),
     url(r'^olimpiada/(?P<url>.*)$', lambda request, url: flatpage(request, 'turniej/' + url), name='olimpiada'),
     url(r'^info/(?P<url>.*)$', flatpage, name="info"),
     url(r'^olimpiada/$', lambda request: flatpage(request, 'turniej/'), name='olimpiada'),
     url(r'^olimpiada/(?P<url>.*)$', lambda request, url: flatpage(request, 'turniej/' + url), name='olimpiada'),

-    url(r'^olimpiada-teaser/$', 'edumed.views.olimpiada_teaser', name='olimpiada_teaser'),
+    url(r'^olimpiada-teaser/(?P<url>.*)$',
+        lambda request, url: flatpage_with_template(request, 'turniej/' + url, 'olimpiada_teaser.html'),
+        name='olimpiada_teaser'),

     url(r'^szukaj/', include('haystack.urls')),
     url(r'^zglos/', include('contact.urls')),
     url(r'^forum/profile/edit/$', AvatarlessProfileEditView.as_view(), name='edit_profile'),
     url(r'^szukaj/', include('haystack.urls')),
     url(r'^zglos/', include('contact.urls')),
     url(r'^forum/profile/edit/$', AvatarlessProfileEditView.as_view(), name='edit_profile'),

diff --git a/edumed/views.py b/edumed/views.py
index 1ba6137..af9bad5 100644 (file)
--- a/edumed/views.py
+++ b/edumed/views.py
@@ -1,15 +1,9 @@
 # -*- coding: utf-8 -*-
 from django.contrib.flatpages.views import flatpage
 # -*- coding: utf-8 -*-
 from django.contrib.flatpages.views import flatpage

-from django.core.exceptions import ValidationError
-from django.core.validators import EmailValidator
-from django.http.response import HttpResponseRedirect
-from django.shortcuts import render_to_response
-from django.template.context import RequestContext

 from django.views.defaults import page_not_found
 from django.views.generic import TemplateView
 from pybb.views import ProfileEditView
 
 from django.views.defaults import page_not_found
 from django.views.generic import TemplateView
 from pybb.views import ProfileEditView
 

-from contact.models import Contact

 from .forms import AvatarlessEditProfileForm
 
 
 from .forms import AvatarlessEditProfileForm
 
 


@@ -37,17 +31,34 @@ class AvatarlessProfileEditView(ProfileEditView):
     form_class = AvatarlessEditProfileForm
 
 
     form_class = AvatarlessEditProfileForm
 
 

-def olimpiada_teaser(request):
-    if request.POST:
-        email = request.POST.get('email')
-        try:
-            EmailValidator()(email)
-            Contact.objects.create(
-                contact=email,
-                body={},
-                ip=request.META['REMOTE_ADDR'],
-                form_tag='olimpiada-teaser')
-        except ValidationError:
-            pass
-        return HttpResponseRedirect(request.path)
-    return render_to_response('olimpiada_teaser.html', context_instance=RequestContext(request))
+def flatpage_with_template(request, url, template_name):
+    """
+    Public interface to the flat page view.
+
+    Models: `flatpages.flatpages`
+    Templates: Uses the template defined by the ``template_name`` field,
+        or :template:`flatpages/default.html` if template_name is not defined.
+    Context:
+        flatpage
+            `flatpages.flatpages` object
+    """
+    from django.conf import settings
+    from django.contrib.flatpages.models import FlatPage
+    from django.contrib.flatpages.views import render_flatpage
+    from django.contrib.sites.models import get_current_site
+    from django.http.response import Http404, HttpResponsePermanentRedirect
+    from django.shortcuts import get_object_or_404
+    if not url.startswith('/'):
+        url = '/' + url
+    site_id = get_current_site(request).id
+    try:
+        f = get_object_or_404(FlatPage, url__exact=url, sites__id__exact=site_id)
+    except Http404:
+        if not url.endswith('/') and settings.APPEND_SLASH:
+            url += '/'
+            get_object_or_404(FlatPage, url__exact=url, sites__id__exact=site_id)
+            return HttpResponsePermanentRedirect('%s/' % request.path)
+        else:
+            raise
+    f.template_name = template_name
+    return render_flatpage(request, f)