Browse Source

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

remotes/origin/vyslbez12
Aneta 9 years ago
parent
commit
34ee437b53
  1. 4
      mamweb/static/css/mamweb.css
  2. 4
      seminar/templates/seminar/novinky.html

4
mamweb/static/css/mamweb.css

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

4
seminar/templates/seminar/novinky.html

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

Loading…
Cancel
Save