Some minor renames (applications # -> no., beamer -> projector etc.)

This commit is contained in:
Emanuel Schuetze 2011-09-06 23:23:05 +02:00
parent 1708c148ad
commit d8a880105a
5 changed files with 16 additions and 14 deletions

View File

@ -53,7 +53,7 @@
{% endif %} {% endif %}
<table id="menu-overview" class="agendatable"> <table id="menu-overview" class="agendatable">
<tr> <tr>
<th style="width: 1px;">{% trans "Beamer" %}</th> <th style="width: 1px;">{% trans "Projector" %}</th>
<th>{% trans "Item" %}</th> <th>{% trans "Item" %}</th>
{% if perms.agenda.can_manage_agenda %} {% if perms.agenda.can_manage_agenda %}
<th>{% trans "Type" %}</th> <th>{% trans "Type" %}</th>

View File

@ -5,7 +5,7 @@
{% block submenu %} {% block submenu %}
{{ block.super }} {{ block.super }}
<br> <br>
<h3>{%trans "Application" %} #{{ poll.application.number }}</h3> <h3>{%trans "Application No." %} {{ poll.application.number }}</h3>
<ul> <ul>
<li><a href="{% url print_application_poll poll.id %}"><img src="/static/images/icons/application-pdf.png"> {%trans 'Print vote' %}</a></li> <li><a href="{% url print_application_poll poll.id %}"><img src="/static/images/icons/application-pdf.png"> {%trans 'Print vote' %}</a></li>
</ul> </ul>
@ -13,7 +13,7 @@
{% endif %} {% endif %}
{% block content %} {% block content %}
<h1>{%trans "Application" %} #{{ poll.application.number }} - {%trans "Vote" %}</h1> <h1>{%trans "Application No." %} {{ poll.application.number }} - {%trans "Vote" %}</h1>
<h3>{{ poll.application.title }}</h3> <h3>{{ poll.application.title }}</h3>
<p>{%trans "Results of" %} {{ ballot }}. {%trans "Vote" %}</p> <p>{%trans "Results of" %} {{ ballot }}. {%trans "Vote" %}</p>

View File

@ -206,12 +206,13 @@
<div> <div>
<h1>{% trans "Application" %} <h1>
{% if application.number != None %} {% if application.number != None %}
#{{ application.number }} {% trans "Application No." %} {{ application.number }}
{% else %} {% else %}
<i>[no number]</i> {% trans "Application" %} <i>[no number]</i>
{% endif %}</h1> {% endif %}
</h1>
{% trans "Version" %} {{ version.aid }} {% trans "Version" %} {{ version.aid }}
{% if application.public_version != application.last_version %} {% if application.public_version != application.last_version %}
{% if version == application.public_version %} {% if version == application.public_version %}

View File

@ -14,8 +14,8 @@
<li><a href="{% url user_group_new %}">{%trans "New user group" %}</a></li> <li><a href="{% url user_group_new %}">{%trans "New user group" %}</a></li>
<li><a href="{% url user_print %}"><img src="/static/images/icons/application-pdf.png"> {%trans 'Print participant list' %}</a></li> <li><a href="{% url user_print %}"><img src="/static/images/icons/application-pdf.png"> {%trans 'Print participant list' %}</a></li>
<li><a href="{% url user_import %}"> {%trans 'Import participant' %}</a></li> <li><a href="{% url user_import %}"> {%trans 'Import participant' %}</a></li>
<li><a href="{% url user_gen_passwords %}">{% trans 'Generate first passwords' %}</a></li> <li><a href="{% url user_gen_passwords %}">{% trans 'Generate first time passwords' %}</a></li>
<li><a href="{% url print_passwords %}"><img src="/static/images/icons/application-pdf.png"> {% trans 'Print password list' %}</a></li> <li><a href="{% url print_passwords %}"><img src="/static/images/icons/application-pdf.png"> {% trans 'Print first time passwords' %}</a></li>
{% endif %} {% endif %}
</ul> </ul>
{% endblock %} {% endblock %}

View File

@ -337,7 +337,7 @@ def get_application(application, story):
if application.number is None: if application.number is None:
story.append(Paragraph(_("Application No.")+" [-]", stylesheet['Heading1'])) story.append(Paragraph(_("Application No.")+" [-]", stylesheet['Heading1']))
else: else:
story.append(Paragraph(_("Application Nr.")+" %s" % application.number, stylesheet['Heading1'])) story.append(Paragraph(_("Application No.")+" %s" % application.number, stylesheet['Heading1']))
# title # title
story.append(Paragraph(_("Subject")+": "+application.title, stylesheet['Heading3'])) story.append(Paragraph(_("Subject")+": "+application.title, stylesheet['Heading3']))
@ -359,6 +359,7 @@ def get_application(application, story):
cell2b = [] cell2b = []
for s in application.supporter.all(): for s in application.supporter.all():
cell2b.append(Paragraph("<seq id='counter'/>.&nbsp; %s" % unicode(s.profile), stylesheet['Signaturefield'])) cell2b.append(Paragraph("<seq id='counter'/>.&nbsp; %s" % unicode(s.profile), stylesheet['Signaturefield']))
if application.status == "pub":
for x in range(0,application.missing_supporters): for x in range(0,application.missing_supporters):
cell2b.append(Paragraph("<seq id='counter'/>.&nbsp; __________________________________________",stylesheet['Signaturefield'])) cell2b.append(Paragraph("<seq id='counter'/>.&nbsp; __________________________________________",stylesheet['Signaturefield']))
cell2b.append(Spacer(0,0.2*cm)) cell2b.append(Spacer(0,0.2*cm))
@ -421,7 +422,7 @@ def print_application(request, application_id=None):
story.append(Paragraph(_("Applications"), stylesheet['Heading1'])) story.append(Paragraph(_("Applications"), stylesheet['Heading1']))
# List of applications # List of applications
for application in Application.objects.exclude(number=None).order_by('number'): for application in Application.objects.exclude(number=None).order_by('number'):
story.append(Paragraph(_("Application")+" #%s: %s" % (application.number, application.title), stylesheet['Heading3'])) story.append(Paragraph(_("Application No.")+" %s: %s" % (application.number, application.title), stylesheet['Heading3']))
# Applications details (each application on single page) # Applications details (each application on single page)
for application in Application.objects.exclude(number=None).order_by('number'): for application in Application.objects.exclude(number=None).order_by('number'):
story.append(PageBreak()) story.append(PageBreak())
@ -449,7 +450,7 @@ def print_application_poll(request, poll_id=None):
circle = "<img src='%s' width='15' height='15'/>&nbsp;&nbsp;" % imgpath circle = "<img src='%s' width='15' height='15'/>&nbsp;&nbsp;" % imgpath
cell = [] cell = []
cell.append(Spacer(0,0.8*cm)) cell.append(Spacer(0,0.8*cm))
cell.append(Paragraph(_("Application")+" #"+str(poll.application.number), stylesheet['Ballot_title'])) cell.append(Paragraph(_("Application No.")+" "+str(poll.application.number), stylesheet['Ballot_title']))
cell.append(Paragraph(poll.application.title, stylesheet['Ballot_subtitle'])) cell.append(Paragraph(poll.application.title, stylesheet['Ballot_subtitle']))
cell.append(Paragraph(str(poll.ballot)+". "+_("Vote"), stylesheet['Ballot_description'])) cell.append(Paragraph(str(poll.ballot)+". "+_("Vote"), stylesheet['Ballot_description']))
cell.append(Spacer(0,0.5*cm)) cell.append(Spacer(0,0.5*cm))