Merge pull request #616 from emanuelschuetze/last-1.4a1-changes

Minor template fixes
This commit is contained in:
Oskar Hahn 2013-04-24 05:06:52 -07:00
commit 8c9d1d134e
4 changed files with 4 additions and 6 deletions

View File

@ -64,7 +64,7 @@
</a>
{% endif %}
<a href="{% url 'print_assignment' assignment.id %}" class="btn btn-mini" title="{% trans 'Print election as PDF' %}">
<i class="icon-print"></i>
<i class="icon-print"></i> PDF
</a>
</span>
</td>

View File

@ -158,9 +158,9 @@
{{ poll.get_ballot }}. {% trans 'ballot' %}
{% if perms.assignment.can_manage_assignment %}
<br>
<a class="publish_link btn btn-mini {% if poll.published %}btn-primary{% endif %}"
<a class="publish_link btn btn-mini btn-danger {% if poll.published %}btn-primary{% endif %}"
href="{% url 'assignment_poll_publish_status' poll.id %}"
rel="tooltip" data-original-title="{% trans 'Publish/unpublish results' %}">
rel="tooltip" data-original-title="{% trans 'Publish results' %}">
{% if poll.published %}
<i class="icon-checked-new_white"></i>
{% else %}

View File

@ -9,7 +9,7 @@
<h1>{% trans 'Media' %}
<small class="pull-right">
{% if perms.mediafile.can_upload %}
<a href="{% url 'mediafile_create' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New media' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
<a href="{% url 'mediafile_create' %}" class="btn btn-mini btn-primary" rel="tooltip" data-original-title="{% trans 'New media' %}"><i class="icon-plus icon-white"></i> {% trans "New" %}</a>
{% endif %}
</small>
</h1>

View File

@ -87,11 +87,9 @@
<a href="{% model_url motion 'edit' %}" title="{% trans 'Edit' %}" class="btn btn-mini">
<i class="icon-pencil"></i>
</a>
{% if "delete" in useractions %}
<a href="{% model_url motion 'delete' %}" title="{% trans 'Delete' %}" class="btn btn-mini">
<i class="icon-remove"></i>
</a>
{% endif %}
{% endif %}
<a href="{% url 'motion_detail_pdf' motion.id %}" class="btn btn-mini" title="{% trans 'Print motion as PDF' %}">
<i class="icon-print"></i> PDF