Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb

mamweb/static/css/mamweb.css

@@ -58,10 +58,17 @@ h2 {
 #header {
 	position: relative;
 	font-size: 250%;
-	background: url("../images/header-bg.png") no-repeat left top;
+	background: url("../images/header-bg-uvod.png") no-repeat center top;
-	height: 353px;
+	height: 255px;
 	top: -1px;
 }
+
+#header.cojemam { background: url("../images/header-bg-uvod.png") no-repeat center top; }
+#header.soustredeni { background: url("../images/header-bg-soustredeni.png") no-repeat center top; }
+#header.zadani { background: url("../images/header-bg-zadani.png") no-repeat center top; }
+#header.clanky { background: url("../images/header-bg-clanek.png") no-repeat center top; }
+#header.archiv { background: url("../images/header-bg-archiv.png") no-repeat center top; }
+
 #header img.logo {
 	position: absolute;
 	top: 20px;
@@ -85,9 +92,10 @@ h2 {
 
 #menu {
 	position: relative;
-	top: -1px;
+	top: -10px;
-	background: url("../images/menu-bg-vertical.png") no-repeat left top, url("../images/menu-bg-horizontal.png") repeat-x left top;
+	z-index: 10;
-	background-color: #ffb52d;
+	background: url("../images/menu-bg.png") no-repeat left top;
+	height: 60px;
 }
 #menu ul {
 	padding: 0px;
@@ -97,12 +105,12 @@ h2 {
 	display: inline-block;
 	border-radius: 0px;
 	
-	padding: 0px;
+	padding: 6px 0px 0px 0px;
 	width: 16.66%;
 	min-width: 140px;
 	text-align: center;
 	
-	font-size: 130%;
+	font-size: 140%;
 	font-weight: 400;
 	font-variant: small-caps;
 	border-bottom-left-radius: 8px;
@@ -112,24 +120,27 @@ h2 {
 	display: block;
 	padding: 8px 10px;
 	color: #006400;
+	height: 48px;
 }
 #menu a:hover {
-	background: url("../images/submenu-bg-vertical.png") no-repeat left top, url("../images/submenu-bg-horizontal.png") repeat-x left top;
+	background: url("../images/menu-bg-selected.png") no-repeat left -7px;
-	background-color: #ffa500;
+	background-size: 100% 68px;
 	text-decoration: none;
 	color: #003c00;
 }
-#menu li.selected {
+#menu li.selected a {
-	border-bottom-left-radius: 0px;
+	background: url("../images/menu-bg-selected.png") no-repeat left -7px;
-	border-bottom-right-radius: 0px;
+	background-size: 100% 68px;
-	background-color:#cc9024;
+	text-decoration: none;
+	color: #003c00;
+	z-index: 15px;
 }
 
 #submenu {
 	position: relative;
-	top: -1px;
+	top: -15px;
-	background: url("../images/submenu-bg-vertical.png") no-repeat left top, url("../images/submenu-bg-horizontal.png") repeat-x left top;
+	background: url("../images/submenu-bg.png") no-repeat left top;
-	background-color: #ffa500;
+	height: 60px;
 }
 #submenu ul {
 	padding: 0px 15px;
@@ -137,8 +148,9 @@ h2 {
 	font-weight: 400;
 }
 #submenu li {
-	padding: 6px 20px;
+	padding: 4px 20px;
 	display: inline-block;
+	height: 40px;
 }
 #submenu li>a {
 	color: #003c00;
@@ -148,8 +160,11 @@ h2 {
 	color: #3c003c;
 }
 #submenu li.selected {
-	background-color: #cc8400;
+	background: url("../images/submenu-bg-selected.png") no-repeat center;
-	
+	background-size: 150% 150%;
+}
+#submenu li.selected>a {
+	color: #3c003c;
 }
 /*#submenu li:first-child {
 	border-top-left-radius: 7px;
@@ -175,3 +190,34 @@ div.zadani_azad_termin {
 	font-size: large;
 	font-weight: bold
 }
+
+/**********
+ * Footer 
+**********/
+
+#footer {
+	background: url("../images/footer-bg.png") no-repeat -100px 0px;
+	padding: 20px 30px;
+	height: 210px;
+}
+
+#footer p.license {
+	text-align: center;
+	font-weight: 400;
+}
+
+#footer p.organize {
+	text-align: center;
+	margin-top: 40px;
+	margin-left: 90px;
+}
+
+#footer img.logo-left {
+	padding: 30px 0px;
+	float: left;
+}
+
+#footer img.logo-right {
+	float: right;
+}
+

mamweb/templates/base.html

@@ -74,18 +74,26 @@
 	  </div>
 	  <div class='row'>
 	    <div class='col-md-12'>
-		  <div id='submenu'>
 		  {% block submenu %}
 		  {% endblock %}
 	    </div>
 	  </div>
-	  </div>
 	<div class='row content'>
 	  <div class='col-md-12'>
 	    {% block content %}
 	    {% endblock content %}
 	  </div>
     </div>
+	<div class='row'>
+	  <div class='col-md-12'>
+		<div id="footer">
+			<p class="license">S obsahem webu M&amp;M je možné nakládat dle licence <a href="https://creativecommons.org/licenses/by/3.0/cz/">Creative Commons Attribution 3.0</a>.</p>
+		    <a href="http://jcmf.cz/"><img class="logo-left" src="{% static 'images/logo-jcmf.png' %}" /></a>
+		    <a href="http://mff.cuni.cz"><img class="logo-right" src="{% static 'images/logo-mff.png' %}" /></a>
+			<p class="organize"><a href="/kontakt">Korespondenční seminář M&amp;M</a> organizují převážně studenti MFF UK. Organizaci semináře a vydávání časopisu podporuje <a href="http://jcmf.cz">Jednota českých matematiků a fyziků</a>.</p>
+		</div>
+	  </div>
+	</div>
     </div>
     <script src="{% static 'js/bootstrap.js' %}"></script>
     <script src="{% static 'js/jquery.jcarousel-core.js' %}" type="text/javascript"></script>

seminar/models.py

@@ -579,7 +579,7 @@ class Soustredeni(SeminarModelBase):
         db_table = 'seminar_soustredeni'
         verbose_name = u'Soustředění'
         verbose_name_plural = u'Soustředění'
-        ordering = ['rocnik__rocnik', 'datum_zacatku']
+        ordering = ['-rocnik__rocnik', '-datum_zacatku']
 
     # Interní ID
     id = models.AutoField(primary_key = True)

seminar/templates/seminar/archiv/submenu.html

@@ -1,11 +1,13 @@
 {% with "/archiv" as cesta %}
 
+<div id='submenu'>
 <ul>
   <li class="{% if selected == "cisla" %}selected{% endif %}"><a href="{{cesta}}/cisla/">Čísla</a>
   {# TODO zprovoznit až budou témata v db <li class="{% if selected == "temata" %}selected{% endif %}"><a href="{{cesta}}/temata/">Témata</a> #}
   {# TODO zprovoznit až budou úlohy v db <li class="{% if selected == "ulohy" %}selected{% endif %}"><a href="{{cesta}}/ulohy/">Úlohy</a> #}
   <li class="{% if selected == "vysledky" %}selected{% endif %}"><a href="{{cesta}}/vysledky/">Výsledkové listiny</a>
 </ul>
+</div>
 
 {% endwith %}
 

seminar/templates/seminar/clanky/submenu.html

@@ -1,11 +1,13 @@
 {% with "/clanky" as cesta %}
 
+<div id='submenu'>
 <ul>
   <li class="{% if selected == "uvod" %}selected{% endif %}"><a href="{{cesta}}/uvod/">Úvod</a>
   <li class="{% if selected == "org" %}selected{% endif %}"><a href="{{cesta}}/org/">Organizátorské články</a>
   <li class="{% if selected == "resitel" %}selected{% endif %}"><a href="{{cesta}}/resitel/">Řešitelské články</a>
   <li class="{% if selected == "jak-psat-vedecky-clanek" %}selected{% endif %}"><a href="{{cesta}}/jak-psat-vedecky-clanek/">Jak napsat článek</a>
 </ul>
+</div>
 
 {% endwith %}
 

seminar/templates/seminar/cojemam/submenu.html

@@ -1,11 +1,13 @@
 {% with "/co-je-MaM" as cesta %}
 
+<div id='submenu'>
 <ul>
   <li class="{% if selected == "uvod" %}selected{% endif %}"><a href="{{cesta}}/uvod/">Úvod</a>
   <li class="{% if selected == "jak-resit" %}selected{% endif %}"><a href="{{cesta}}/jak-resit/">Jak řešit</a>
   <li class="{% if selected == "org" %}selected{% endif %}"><a href="{{cesta}}/organizatori/">Organizátoři</a>
   <li class="{% if selected == "FAQ" %}selected{% endif %}"><a href="{{cesta}}/FAQ/">Často kladené dotazy</a>
 </ul>
+</div>
 
 {% endwith %}
 

seminar/templates/seminar/soustredeni/seznam_soustredeni.html

@@ -9,13 +9,13 @@
 
 {# zmena fotky #}{% block header %}soustredeni{% endblock %}
 
-{% block content %}{% if user.is_authenticated %}{# PRACUJE SE STRANKA #}
+{% block nadpis1a %}{% block nadpis1b %}
-
-  <h2>
-    {% block nadpis1a %}{% block nadpis1b %}
   Soustředění
-    {% endblock %}{% endblock %}
+{% endblock %}{% endblock %}
-  </h2>
+
+{% block content %}
+{#% if user.is_authenticated %#}{# PRACUJE SE STRANKA #}
+
 
   {# Projdi vsechna soustredeni #}
   {% for soustredeni in object_list %}
@@ -29,13 +29,16 @@
         že jste přihlášení. <br>
       {% endif %}
       {# misto soustredeni TODO upravit#}
-      {% if soustredeni.misto %}
         <h2>
-          Soustředění v&nbsp;{{soustredeni.misto}}
+	  {{soustredeni.get_typ_display}} 
-          od {{soustredeni.datum_zacatku}} do {{soustredeni.datum_konce}}
+	  {{soustredeni.misto}}
-          při {{soustredeni.rocnik.rocnik}}. ročníku M&M
         </h2>
-      {% endif %}
+	<ul>
+	<li>
+		{{soustredeni.datum_zacatku}}&thinsp;&ndash;&thinsp;{{soustredeni.datum_konce}}
+	</li>
+	</ul>
+      {% if user.is_authenticated %}
         {# popis soustredeni #}
         {% if soustredeni.text %}
           {% autoescape off %}{{soustredeni.text}}{% endautoescape %}
@@ -50,9 +53,12 @@
         {% endfor %}
         </ul>
       {% endif %}
+    {% endif %}
   {% empty %}
     Žádná soustředění zatím neproběhla!
   {% endfor %}
 
-{% else %}{% include 'seminar/pracuje_se.html' %}{% endif %}{% endblock %}
+{#% else %}{% include 'seminar/pracuje_se.html' %}{% endif %#}
+
+{% endblock %}
 

seminar/templates/seminar/soustredeni/submenu.html

@@ -1,9 +1,11 @@
 {% with "/soustredeni" as cesta %}
 
+<div id='submenu'>
 <ul>
   <li class="{% if selected == "uvod" %}selected{% endif %}"><a href="{{cesta}}/">Úvod</a>
   <li class="{% if selected == "pripravujeme" %}selected{% endif %}"><a href="{{cesta}}/pripravujeme/">Připravujeme</a>
   <li class="{% if selected == "probehlo" %}selected{% endif %}"><a href="{{cesta}}/probehlo/">Proběhlo</a>
 </ul>
+</div>
 
 {% endwith %}

seminar/templates/seminar/zadani/submenu.html

@@ -1,10 +1,12 @@
 {% with "/zadani" as cesta %}
 
+<div id='submenu'>
 <ul>
   <li class="{% if selected == "aktualni" %}selected{% endif %}"><a href="{{cesta}}/aktualni/">Aktuální zadání</a>
   <li class="{% if selected == "temata" %}selected{% endif %}"><a href="{{cesta}}/temata/">Témata</a>
 {#  <li class="{% if selected == "aktualni-cislo" %}selected{% endif %}"><a href="{{cesta}}/aktualni-cislo/">Aktuální číslo</a> #}
   <li class="{% if selected == "vysledkova-listina" %}selected{% endif %}"><a href="{{cesta}}/vysledkova-listina/">Výsledková listina</a>
 </ul>
+</div>
 
 {% endwith %}