ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor template fixes.

Browse Source
This commit is contained in:
Emanuel Schuetze 2012-03-22 17:30:02 +01:00
parent d4b86574e9
commit a11ed6cfdb
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/assignment/templates/assignment/view.html
View File

@ -44,7 +44,7 @@
<h4></h4> <h4></h4>
<a href='{% url assignment_activate_item assignment.id %}'> <a href='{% url assignment_activate_item assignment.id %}'>
<span class="button"> <span class="button">
<span class="icon projector">{%trans 'Beam assignment' %}</span> <span class="icon projector">{%trans 'Beam election' %}</span>
</span> </span>
</a> </a>

11
openslides/projector/templates/projector/base_projector.html
View File

@ -6,12 +6,17 @@
{% block title %}{{ block.super}} – {% trans 'Projector' %} {% endblock %} {% block title %}{{ block.super}} – {% trans 'Projector' %} {% endblock %}
{% block submenu %} {% block submenu %}
{% url item_overview as url_itemoverview %} {% url projector_control as url_projectoroverview %}
{% url item_new as url_itemnew %} {% url projector_new as url_projectornew %}
<h4 class="sectiontitle">{%trans "Projector" %}</h4> <h4 class="sectiontitle">{%trans "Projector" %}</h4>
<ul> <ul>
{% if perms.projector.can_manage_projector %}
<li class="{% if request.path == url_projectoroverview %}selected{% endif %}">
<a href="{% url projector_control %}">{% trans 'Overview' %}</a></li>
{% endif %}
{% if perms.projector.can_see_projector %} {% if perms.projector.can_see_projector %}
<li><a href="{% url projector_new %}">{% trans 'New Slide' %}</a></li> <li class="{% if request.path == url_projectornew %}selected{% endif %}">
<a href="{% url projector_new %}">{% trans 'New Slide' %}</a></li>
<li><a href="{% url projector_show %}"><img src="/static/images/icons/video-projector.png"> {% trans 'Projector view' %}</a></li> <li><a href="{% url projector_show %}"><img src="/static/images/icons/video-projector.png"> {% trans 'Projector view' %}</a></li>
{% endif %} {% endif %}
</ul> </ul>

2
openslides/templates/base.html
View File

@ -22,7 +22,7 @@
<ul> <ul>
{% if user.is_authenticated %} {% if user.is_authenticated %}
<li>|<a href="{% url user_logout %}">{%trans "Logout" %}</a></li> <li>|<a href="{% url user_logout %}">{%trans "Logout" %}</a></li>
<li>|<a href="{% url user_settings %}">{%trans "Usersettings" %}</a></li> <li>|<a href="{% url user_settings %}">{%trans "User Settings" %}</a></li>
<li>{%trans "Welcome" %}, <strong>{{ user.username }}</strong></li> <li>{%trans "Welcome" %}, <strong>{{ user.username }}</strong></li>
{% else %} {% else %}
<li><a href="{% url user_login %}">{%trans "Login" %}</a></li> <li><a href="{% url user_login %}">{%trans "Login" %}</a></li>