hezký web

mamweb/settings_local.py

@@ -73,11 +73,11 @@ LOGGING = {
     },
     'loggers': {
 	 # Vypisovani databazovych dotazu do konzole
-         'django.db.backends': {
-             'level': 'DEBUG',
-             'handlers': ['console'],
-             'propagate': False,
-         },
+         #'django.db.backends': {
+         #    'level': 'DEBUG',
+         #    'handlers': ['console'],
+         #    'propagate': False,
+         #},
         '': {
             'handlers': ['console'],
             'level': 'DEBUG',

mamweb/static/css/mamweb.css

@@ -3,6 +3,16 @@
 body {
 	font-family: 'Open Sans', sans-serif;
 	font-weight: 400;
+	background-color: #fffbf6;
+}
+
+div.container {
+	width: 970px;
+	margin: auto;
+}
+
+a {
+	color: #6f2509;
 }
 
 .org-logged-in .mam-text-plugin {
@@ -44,7 +54,6 @@ table .border-b {
 }
 
 div.container {
-	background-color: #fff8eb;
 	padding: 0px;
 }
 
@@ -65,33 +74,53 @@ h1 {
 
 /* Headline & Header */
 
+#title { /*dělá blbosti šířka, je to kvůli fixed pozici, zatím natvrdo, vyřešit*/
+	height: 55px;
+	width: 970px;
+	position: fixed;
+	z-index: 10;
+	background-color: #e84e10;
+	filter: drop-shadow(0px 5px 5px rgba(0, 0, 0, 0.4));
+
+	font-size: 200%;
+	color: #fffbf6;
+	font-weight: 400;
+	font-variant: small-caps;
+	text-align: center;
+	text-decoration: bold;
+	padding-top: 8px 
+}
+
+
 #header {
 	position: relative;
-	font-size: 250%;
-	background: url("../images/header-bg-uvod.jpg") no-repeat center top;
-	height: 255px;
-	top: -1px;
+	background: url("../images/uvod.jpg") no-repeat center top;
+	background-size: 100%;
+	top: 58px;
 }
 
+/*todo: rozumné fotky*/
 
-#header.cojemam { background-image: url("../images/header-bg-uvod.jpg"); }
-#header.soustredeni { background-image: url("../images/header-bg-soustredeni.jpg"); }
-#header.zadani { background-image: url("../images/header-bg-zadani.jpg"); }
-#header.clanky { background-image: url("../images/header-bg-clanek.jpg"); }
-#header.archiv { background-image: url("../images/header-bg-archiv.jpg"); }
+#header.cojemam { background-image: url("../images/uvod.jpg");}
+#header.soustredeni { background-image: url("../images/noc.jpg");}
+#header.zadani { background-image: url("../images/noc.jpg");}
+#header.clanky { background-image: url("../images/stiny.jpg");}
+#header.archiv { background-image: url("../images/ohen.jpg");}
+
+#header.NOC {background-image: url("../images/uvod.jpg");}
+#header.NOCcojemam { background-image: url("../images/noc.jpg");}
+#header.NOCsoustredeni { background-image: url("../images/stiny.jpg");}
+#header.NOCzaani { background-image: url("../images/ohen.jpg");}
+#header.NOCclanky { background-image: url("../images/ohen.jpg");}
+#header.NOCarchiv { background-image: url("../images/uvod.jpg");}
 
-#header.NOC {background-image: url("../images/header-bg-uvod-NOC.jpg"); }
-#header.NOCcojemam { background-image: url("../images/header-bg-uvod-NOC.jpg"); }
-#header.NOCsoustredeni { background-image: url("../images/header-bg-soustredeni-NOC.jpg"); }
-#header.NOCzadani { background-image: url("../images/header-bg-zadani-NOC.jpg"); }
-#header.NOCclanky { background-image: url("../images/header-bg-clanek-NOC.jpg"); }
-#header.NOCarchiv { background-image: url("../images/header-bg-archiv-NOC.jpg"); }
 
 #header img.logo {
-	position: absolute;
-	top: 40px;
-	left: 55px;
+	position: absolute center;
+	width: 100%;
+	filter: drop-shadow(0px 5px 5px rgba(0, 0, 0, 0.4));
 }
+
 /*
 #header h1 {
 	font-size: 130%;
@@ -101,6 +130,7 @@ h1 {
 	height: 110px;
 }
 */
+
 #header img.header {
 	margin: -25px 20px 0px 0px;
 	height: 145px;
@@ -108,6 +138,7 @@ h1 {
 	visibility: hidden;
 }
 
+
 /* Menu */
 
 div.menu.mobile {
@@ -118,10 +149,8 @@ div.menu.desktop {
 }
 div.menu {
 	position: relative;
-	top: -10px;
-	z-index: 10;
-	background: url("../images/menu-bg.png") no-repeat left top;
 	height: 60px;
+	top: 12px;
 }
 div.menu ul {
 	padding: 0px;
@@ -145,21 +174,20 @@ div.menu li {
 div.menu a {
 	display: block;
 	padding: 8px 10px;
-	color: #006400;
+	color: #6f2509;
 	height: 48px;
 }
 div.menu a:hover {
-	background: url("../images/menu-bg-selected.png") no-repeat left -7px;
-	background-size: 100% 68px;
+	color: black;
 	text-decoration: none;
-	color: #003c00;
+	/*background: url("../images/menu-selected.svg") no-repeat center -4px;*/
 }
+
 div.menu li.selected a {
-	background: url("../images/menu-bg-selected.png") no-repeat left -7px;
-	background-size: 100% 68px;
+	/*background: url("../images/menu-selected.svg") no-repeat center -4px;
+	background-size: 98% 68px;*/
 	text-decoration: none;
-	color: #003c00;
-	z-index: 15px;
+	color: black;
 }
 
 h1 a:hover {
@@ -168,35 +196,39 @@ h1 a:hover {
 
 #submenu {
 	position: relative;
-	top: -15px;
-	background: url("../images/submenu-bg.png") no-repeat left top;
-	height: 60px;
+	top: 4px;
+	background: url("../images/submenu.svg") no-repeat left top;
+	background-size: 100%;
+	filter: drop-shadow(0px 5px 5px rgba(0, 0, 0, 0.4));
+	width: 100%;
 }
+
 #submenu ul {
-	padding: 0px 15px;
+	padding: 10px 30px;
 	font-size: 120%;
 	font-weight: 400;
 }
 #submenu li {
 	padding: 4px 20px;
 	display: inline-block;
-	height: 40px;
+	height: 60px;
 }
 #submenu li>a {
-	color: #003c00;
+	color: #f9d59e;
 	text-decoration: none;
 }
 #submenu li>a:hover {
 	color: #3c003c;
 }
+/*
 #submenu li.selected {
-	background: url("../images/submenu-bg-selected.png") no-repeat center;
+	background: url("../images/submenu-bg-selected.png") no-repeat center -11px;
 	background-size: 150% 150%;
 }
 #submenu li.selected>a {
 	color: #3c003c;
 }
-/*#submenu li:first-child {
+#submenu li:first-child {
 	border-top-left-radius: 7px;
 	border-top-right-radius: 7px;
 	padding-top: 8px;
@@ -226,15 +258,10 @@ div.zadani_azad_termin {
 **********/
 
 #footer {
-	background: url("../images/footer-bg-top.png") no-repeat top center;
+	background: url("../images/footer.svg") no-repeat top center;
 	background-color: #ffd546;
 	padding: 20px 30px 0px 30px;
-	min-height: 210px;
-}
-
-#footer-extra {
-	background: url("../images/footer-bg-bottom.png") no-repeat bottom center;
-	height: 39px;
+	width: 100%;
 }
 
 #footer p.license {
@@ -275,8 +302,6 @@ div.zadani_azad_termin {
 		background-size: 100% 100%;
 	}
 	#header img.logo {
-		top: 27px;
-		left: 35px;
 		height: 140px;
 	}
 	div.menu li {

mamweb/templates/base.html

@@ -4,7 +4,7 @@
   <head>
     <title>{% block title %}{% block nadpis1a %}{% endblock %} – Korespondenční seminář M&amp;M{% endblock title %}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="shortcut icon" href="{% static 'favicon.ico' %}" type="image/x-icon">
+    <link rel="shortcut icon" href="{% static 'images/MATFYZ_MM_barevne.svg' %}" type="image/x-icon">
     {% render_block "css" %}
     <link href="{% static 'css/bootstrap-theme.css' %}" rel="stylesheet">
     <link href="{% static 'css/bootstrap.css' %}" rel="stylesheet">
@@ -34,8 +34,11 @@
 
   </head>
   <body class='{% if user.is_staff %}org-logged-in{% endif %}'>
+
+   <div class="container">
+
   {% if user.is_staff %}
-    <div class="login-bar" style='background: #F80;'>
+    <div class="login-bar" style='background: #6a0043;'>
       {% if view.object %}
 	Objekt {{ view.object }}: {{ view.object }}
 	{% if view.object.admin_url %}<a href='{{ view.object.admin_url }}'>[admin]</a>{% endif %}
@@ -47,12 +50,13 @@
     </div>
   {% endif %}
 
-    <div class="container">
+    
 	  <div class='row'>
 		<div class='col-md-12'>
           <a href='/'>
+	    <div id="title" >M&M - korepsondenční seminář a časopis MFF UK</div>
             <div id="header" class="{% if noc %}NOC{% endif %}{% block header %}{% endblock %}">
-		      <img class="logo" src="{% static 'images/logo.png' %}" />
+		<img class="logo" src="{% static 'images/logo.svg' %}" />
               <!--<h1>{% block nadpis1b %}Nadpis 1. úrovně{% endblock %}</h1>-->
             </div>
             </a>
@@ -109,10 +113,11 @@
 		    <a href="http://jcmf.cz/"><img class="logo-left" src="{% static 'images/logo-jcmf.png' %}" /></a>
 			<p class="organize"><a href="/co-je-MaM/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>
 		    <a href="http://mff.cuni.cz"><img class="logo-right" src="{% static 'images/logo-mff.png' %}" /></a>
-		</div><div id="footer-extra"></div>
+		</div>
 	  </div>
 	</div>
     </div>
+
     <script src="{% static 'js/bootstrap.js' %}"></script>
     <script src="{% static 'js/jquery.jcarousel-core.js' %}" type="text/javascript"></script>
     <script src="{% static 'js/jquery.prettyPhoto.js' %}" type="text/javascript" charset="utf-8"></script>

seminar/templates/seminar/cojemam/organizatori.html

@@ -26,7 +26,7 @@
   {% for org in object_list %}
     <h1>
     {{org.osoba.jmeno}}
-    {% if org.prezdivka %}
+    {% if org.osoba.prezdivka %}
       &bdquo;{{org.osoba.prezdivka}}&ldquo;
     {% endif %}
     {{org.osoba.prijmeni}}
@@ -55,11 +55,14 @@
       {% if org.skola %}
         <li>{{org.studuje}} na {{org.skola}}
       {% endif %}
+
       {% if org.osoba.email %}
         <li>Pošta:
         {# zobrazeni e-mailu (na jednom radku, aby nevznikaly mezery navic) #}
-        {% for znak in org.osoba.email %}{% if znak == '@' %} &#60;zavináč&#62; {% elif znak == '.' %} &#60;tečka&#62; {% else %}{{znak}}{% endif %}{% endfor %}
+        {% for znak in org.osoba.email %}{% if znak == '@' %} &#60;at&#62; {% elif znak == '.' %} &#60;dot&#62; {% else %}{{znak}}{% endif %}{% endfor %}
       {% endif %}
+
+
     </ul>
     {# {{org.strucny_popis_organizatora}} #}
     </td>