Merge branch 'Petr'
This commit is contained in:
		
						commit
						678b8a3096
					
				
					 7 changed files with 15 additions and 1 deletions
				
			
		|  | @ -48,7 +48,7 @@ | |||
| 	  <div class='row'> | ||||
| 		<div class='col-md-12'> | ||||
|           <a href='/'> | ||||
| 	  	    <div id="header"> | ||||
|           <div id="header" class="{% block header %}{% endblock %}"> | ||||
| 		      <img class="logo" src="{% static 'images/logo.png' %}" /> | ||||
|               <!--<h1>{% block nadpis1b %}Nadpis 1. úrovně{% endblock %}</h1>--> | ||||
|             </div> | ||||
|  |  | |||
|  | @ -100,4 +100,7 @@ | |||
| {% block menu_clanky %}{% if "/clanky/" in flatpage.url %}selected{% endif %}{% endblock %} | ||||
| {% block menu_archiv %}{% if "/archiv/" in flatpage.url %}selected{% endif %}{% endblock %} | ||||
| 
 | ||||
| {# zmena titulniho obrazku #} | ||||
| {% block header %}{% if "/co-je-MaM/" in flatpage.url %}cojemam{% elif "/soustredeni/" in flatpage.url %}soustredeni{% elif "/zadani/" in flatpage.url %}zadani{% elif "/clanky/" in flatpage.url %}clanky{% elif "/archiv/" in flatpage.url %}archiv{% else %}odeslat{% endif %}{% endblock header %} | ||||
| 
 | ||||
| {# TODO zvirazneni submenu #} | ||||
|  |  | |||
|  | @ -2,3 +2,5 @@ | |||
| 
 | ||||
| {% block menu_archiv %}selected{% endblock %} | ||||
| 
 | ||||
| {# zmena fotky #}{% block header %}archiv{% endblock %} | ||||
| 
 | ||||
|  |  | |||
|  | @ -2,6 +2,8 @@ | |||
| 
 | ||||
| {% block menu_clanky %}selected{% endblock %} | ||||
| 
 | ||||
| {# zmena fotky #}{% block header %}clanky{% endblock %} | ||||
| 
 | ||||
| {% block submenu %} | ||||
|   {% include "seminar/clanky/submenu.html" %} | ||||
| {% endblock %} | ||||
|  |  | |||
|  | @ -7,6 +7,7 @@ | |||
|   {% endif %} | ||||
| {% endblock%}{% endblock%} | ||||
| 
 | ||||
| {# podbarveni menu a submenu #} | ||||
| {% block menu_uvod %}selected{% endblock %} | ||||
| {% block submenu %} | ||||
|   {% with "org" as selected %} | ||||
|  | @ -14,6 +15,8 @@ | |||
|   {% endwith %} | ||||
| {% endblock %} | ||||
| 
 | ||||
| {# zmena fotky #}{% block header %}cojemam{% endblock %} | ||||
| 
 | ||||
| {% block content %} | ||||
| <div> | ||||
|   {% if not aktivni %} | ||||
|  |  | |||
|  | @ -7,6 +7,8 @@ | |||
|   {% endwith %} | ||||
| {% endblock submenu %} | ||||
| 
 | ||||
| {# zmena fotky #}{% block header %}soustredeni{% endblock %} | ||||
| 
 | ||||
| {% block content %}{% if user.is_authenticated %}{# PRACUJE SE STRANKA #} | ||||
| 
 | ||||
|   <h2> | ||||
|  |  | |||
|  | @ -2,6 +2,8 @@ | |||
| 
 | ||||
| {% block menu_zadani %}selected{% endblock %} | ||||
| 
 | ||||
| {# zmena fotky #}{% block header %}zadani{% endblock %} | ||||
| 
 | ||||
| {% block submenu %} | ||||
|   {% include 'seminar/zadani/submenu.html' %} | ||||
| {% endblock submenu %} | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue
	
	 Bc. Petr Pecha
						Bc. Petr Pecha