mam/mamweb
11
0
Fork 0
Code Issues Pull requests 7 Projects Wiki Activity Actions

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

Browse source
This commit is contained in:
Aneta 2015-09-12 14:46:23 +02:00
commit 34ee437b53
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mamweb/static/css/mamweb.css
View file

@ -158,3 +158,7 @@ h2 {
#submenu li>a:hover { #submenu li>a:hover {
text-decoration: none; text-decoration: none;
}*/ }*/
.novinky.name {
float: left
}

4
seminar/templates/seminar/novinky.html
View file

@ -20,11 +20,11 @@
{% endif %} {% endif %}
{# autor #} {# autor #}
{% if user.is_staff %} {% if user.is_staff %}
<div>{{novinka.autor.first_name}} <div class=novinky.name><i>{{novinka.autor.first_name}}
{% if novinka.autor.organizator.prezdivka%} {% if novinka.autor.organizator.prezdivka%}
&bdquo;{{novinka.autor.organizator.prezdivka}}&ldquo; &bdquo;{{novinka.autor.organizator.prezdivka}}&ldquo;
{% endif %} {% endif %}
{{novinka.autor.last_name}} {{novinka.autor.last_name}}</i>
</div> </div>
{% endif %} {% endif %}
</div> </div>