mam
/
mamweb
11
0
Fork 0
Code Issues Pull Requests 9 Projects Releases Wiki Activity
Browse Source

menu ve dvou řadách

export_seznamu_prednasek
Kateřina Čížková 5 years ago
parent
14304132db
commit
ddcb6ecc2d
4 changed files with 62 additions and 169 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 150
      mamweb/static/css/mamweb.css
  2. 48
      mamweb/templates/base.html
  3. 23
      mamweb/templates/menu.html
  4. 4
      mamweb/templates/submenu.html

150
mamweb/static/css/mamweb.css
View File

@ -11,6 +11,10 @@ div.container {
margin: auto;
}
div.login-bar {
background: #6a0043;
}
/* odkazy a nadpisy */
a {
@ -180,16 +184,6 @@ h1 {
display: none;
}
/*
#header h1 {
font-size: 130%;
position: absolute;
top: 125px;
left: 30px;
height: 110px;
}
*/
#header img.header {
margin: -25px 20px 0px 0px;
height: 145px;
@ -206,51 +200,6 @@ div.menu.mobile {
div.menu.desktop {
display: block;
}
div.menu {
position: relative;
height: 60px;
top: 12px;
}
/*
div.menu ul {
padding: 0px;
margin: 0px;
}
*/
div.menu li {
display: inline-block;
border-radius: 0px;
padding: 6px 0px 0px 0px;
width: 16.66%;
min-width: 140px;
text-align: center;
font-size: 140%;
font-weight: 400;
font-variant: small-caps;
border-bottom-left-radius: 8px;
border-bottom-right-radius: 8px;
}
div.menu a {
display: block;
padding: 8px 10px;
color: #6f2509;
height: 48px;
text-shadow: none;
}
div.menu a:hover {
color: black;
text-decoration: none;
/*background: url("../images/menu-selected.svg") no-repeat center -4px;*/
}
div.menu li.selected a {
/*background: url("../images/menu-selected.svg") no-repeat center -4px;
background-size: 98% 68px;*/
text-decoration: none;
color: black;
}
h1 a:hover {
text-decoration: none;
@ -263,100 +212,67 @@ img.decor { /*todo bug při zmenšování okna */
filter: drop-shadow(0px 5px 5px rgba(0, 0, 0, 0.4));
}
/* testování nového menu */
/* nové menu */
ul.row-menu {
background-color: green;
display: inline-block;
}
ul.menu {
width: 100%;
padding: 0px;
margin: 20px 0px 0px 0px;
padding: 6px 0px 0px 0px;
div.menu-item {
display: inline-block;
background-color: yellow;
font-variant: small-caps;
}
ul.menu a {
text-decoration: none;
}
div.menu-item li.active {
background-color: black;
ul.menu li>a:active {
color: black;
}
ul.row-menu li {
ul.menu li {
display: inline-block;
border-radius: 0px;
width: 16.3%;
padding: 6px 0px 0px 0px;
width: 16.66%;
min-width: 140px;
text-align: center;
font-size: 140%;
font-weight: 400;
font-variant: small-caps;
border-bottom-left-radius: 8px;
border-bottom-right-radius: 8px;
}
ul.row-submenu {
position: absolute;
left: -400px;
}
ul.submenu {
ul.row-submenu li {
background-color: red;
padding: 0px;
min-width: 100px;
font-size:80%;
display: inline-block;
background-color: #e84e10;
margin: 10px 0px 10px 0px;
padding-top: 10px;
padding-bottom: 5px;
filter: drop-shadow(0px 5px 5px rgba(0, 0, 0, 0.4));
}
/* konec testování nového menu */
#submenu {
position: relative;
top: 3px;
ul.submenu {
background-color: #e84e10;
width: 100%;
z-index: 5;
}
#submenu ul {
font-size: 120%;
font-weight: 400;
margin-bottom: 0px;
}
#submenu li {
padding: 15px 20px 0px 20px;
ul.submenu li {
width: auto;
padding: 0px 20px 0px 20px;
display: inline-block;
}
#submenu li>a {
ul.submenu li>a {
color: #f9d59e;
text-decoration: none;
text-shadow: none;
}
#submenu li>a:hover {
ul.submenu li>a:hover {
color: black;
}
#submenu li.selected>a {
color: black;
}
/*
#submenu li:first-child {
border-top-left-radius: 7px;
border-top-right-radius: 7px;
padding-top: 8px;
}
#submenu li:last-child {
border-bottom-left-radius: 7px;
border-bottom-right-radius: 7px;
padding-bottom: 8px;
}
#submenu li>a:hover {
text-decoration: none;
}*/
/* konec nového menu */
div.novinky_name {
text-align: right;

48
mamweb/templates/base.html
View File

@ -12,6 +12,7 @@
<link href="{% static 'css/mamweb.css' %}" rel="stylesheet">
<link href="{% static 'css/prettyPhoto.css' %}" rel="stylesheet" type="text/css" media="screen" charset="utf-8" />
<script src="{% static 'js/jquery-1.11.1.js' %}"></script>
<script src="{% static '/jquery-3.4.1.js' %}"></script>
{% include 'autocomplete_light/static.html' %}
<link rel="stylesheet" type="text/css" href="{% static 'fluent_comments/css/ajaxcomments.css' %}" />
@ -39,7 +40,7 @@
<div class="container">
{% if user.is_staff %}
<div class="login-bar" style='background: #6a0043;'>
<div class="login-bar" >
{% if view.object %}
Objekt {{ view.object }}: {{ view.object }}
{% if view.object.admin_url %}<a href='{{ view.object.admin_url }}'>[admin]</a>{% endif %}
@ -66,49 +67,14 @@
</div>
<div class='row'>
<div class='col-md-12'>
{# ========= MOBILE MENU ========== #}
<!--
<div class="menu mobile">
<div class="dropdown">
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Menu
<span class="glyphicon glyphicon-th-list"></span></button>
<ul class="dropdown-menu">
<li class=""><a href="/co-je-MaM/uvod/">Co je M&amp;M</a>
<li class=""><a href="/soustredeni/">Soustředění</a>
<li class=""><a href="/zadani/aktualni/">Zadání</a>
<li class=""><a href="/clanky/uvod/">Články</a>
<li class=""><a href="/archiv/cisla/">Archiv</a>
<li class=""><a href="/co-je-MaM/kontakt/">Kontakt</a>
</ul>
</div>
</div>
{# ============= MENU ============== #}
<div class="menu desktop">
<ul>
<li class="{% block menu_uvod %}{% endblock %}"><a href="/co-je-MaM/uvod/">Co je M&amp;M</a>
{# ukazka jak pouzit tag url <li class="{% block menu_soustredeni %}{% endblock %}"><a href="{% url 'seminar_seznam_soustredeni' %}">Soustředění</a> #}
<li class="{% block menu_soustredeni %}{% endblock %}"><a href="/soustredeni/">Soustředění</a>
<li class="{% block menu_zadani %}{% endblock %}"><a href="/zadani/aktualni/">Zadání</a>
<li class="{% block menu_clanky %}{% endblock %}"><a href="/clanky/uvod/">Články</a>
<li class="{% block menu_archiv %}{% endblock %}"><a href="/archiv/cisla/">Archiv</a>
<li class="{% block menu_odevzdat %}{% endblock %}"><a href="/co-je-MaM/kontakt/">Kontakt</a>
</ul>
</div>
{# ======== KONEC MENU =============#}
</div>
</div>
<div class='row'>
<div class='col-md-12'>
{% block submenu %}
{% endblock %}
<img class="decor" src="{% static 'images/submenu.svg' %}" />
</div>
</div>
-->
{# ========= MENU ========== #}
{% sitetree_menu from "main_menu" include "trunk" template "menu.html" %}
<div class='row content'>
{% sitetree_menu from "main_menu" include "trunk" template "menu.html" %}
<div class='col-md-12'>
{% block content %}

23
mamweb/templates/menu.html
View File

@ -1,21 +1,34 @@
{% load sitetree %}
<ul class="row-menu">
<ul class="menu">
{% for item in sitetree_items %}
<div class="menu-item">
<li class="{% if item.has_children %}dropdown{% endif %} {% if item.is_current or item.in_current_branch %}active{% endif %}" >
<a href="{% sitetree_url for item %}" >
{{ item.title_resolved }}
</a>
<div class="submenu">
{% if item.is_current or item.in_current_branch %}
<div class="submenu active">
{% sitetree_children of item for menu template "submenu.html" %}
</div>
{% endif %}
</div>
</li>
</div>
{% endfor %}
<div class="submenu-newline">
</div>
<script>
$( ".submenu" ).prependTo( ".submenu-newline" ); {# api.jquery.com/prependTo #}
</script>
</ul>

4
mamweb/templates/submenu.html
View File

@ -1,10 +1,8 @@
{% load sitetree %}
<div class="submenu">
<ul class="row-submenu">
<ul class="submenu">
{% for item in sitetree_items %}
<li {% if item.is_current or item.in_current_branch %}class="active"{% endif %}>
<a href="{% sitetree_url for item %}" {% if item.hint %}title="{{ item.hint }}"{% endif %}>{{ item.title_resolved }}</a>
</li>
{% endfor %}
</ul>
</div>

Write Preview
Loading…
Cancel
Save