Merge pull request #16 from toulibre/talklist
Improve talk list a little
This commit is contained in:
commit
4a2b239038
Binary file not shown.
|
@ -8,7 +8,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2016-08-09 22:01+0000\n"
|
||||
"POT-Creation-Date: 2016-08-09 22:21+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
@ -233,7 +233,7 @@ msgstr "Français"
|
|||
msgid "Home"
|
||||
msgstr "Accueil"
|
||||
|
||||
#: ponyconf/templates/base.html:47
|
||||
#: ponyconf/templates/base.html:47 proposals/templates/proposals/talks.html:9
|
||||
#: proposals/templates/proposals/user_details.html:15
|
||||
msgid "Talks"
|
||||
msgstr "Exposés"
|
||||
|
@ -244,6 +244,7 @@ msgid "Topics"
|
|||
msgstr "Thèmes"
|
||||
|
||||
#: ponyconf/templates/base.html:50 proposals/models.py:54
|
||||
#: proposals/templates/proposals/speaker_list.html:9
|
||||
msgid "Speakers"
|
||||
msgstr "Orateurs"
|
||||
|
||||
|
@ -287,7 +288,7 @@ msgstr "Résumé"
|
|||
msgid "Format"
|
||||
msgstr "Format"
|
||||
|
||||
#: proposals/templates/proposals/_talk_list.html:24
|
||||
#: proposals/templates/proposals/_talk_list.html:23
|
||||
msgid "No talks"
|
||||
msgstr "Aucun exposé"
|
||||
|
||||
|
@ -296,11 +297,6 @@ msgstr "Aucun exposé"
|
|||
msgid "Welcome to %(confname)s!"
|
||||
msgstr "Bienvenue à la conférence %(confname)s !"
|
||||
|
||||
#: proposals/templates/proposals/speaker_list.html:9
|
||||
#: proposals/templates/proposals/talk_detail.html:25
|
||||
msgid "Speakers:"
|
||||
msgstr "Orateurs :"
|
||||
|
||||
#: proposals/templates/proposals/speaker_list.html:15
|
||||
#: proposals/templates/proposals/topic_list.html:23
|
||||
#: proposals/templates/proposals/topic_list.html:27
|
||||
|
@ -328,6 +324,10 @@ msgstr "Description :"
|
|||
msgid "No description provided."
|
||||
msgstr "Aucune description fournie."
|
||||
|
||||
#: proposals/templates/proposals/talk_detail.html:25
|
||||
msgid "Speakers:"
|
||||
msgstr "Orateurs :"
|
||||
|
||||
#: proposals/templates/proposals/talk_detail.html:35
|
||||
msgid "Topics:"
|
||||
msgstr "Thèmes :"
|
||||
|
@ -366,16 +366,20 @@ msgid "Messages:"
|
|||
msgstr "Messages :"
|
||||
|
||||
#: proposals/templates/proposals/talk_edit.html:9
|
||||
#: proposals/templates/proposals/talks.html:9
|
||||
#: proposals/templates/proposals/talks.html:11
|
||||
msgid "Propose a talk"
|
||||
msgstr "Proposer un exposé"
|
||||
|
||||
#: proposals/templates/proposals/talks.html:12
|
||||
msgid "My participing talks:"
|
||||
#: proposals/templates/proposals/talks.html:14
|
||||
#, fuzzy
|
||||
#| msgid "My participing talks:"
|
||||
msgid "My participing talks"
|
||||
msgstr "Exposés auquels je participe :"
|
||||
|
||||
#: proposals/templates/proposals/talks.html:17
|
||||
msgid "Others talks:"
|
||||
#: proposals/templates/proposals/talks.html:19
|
||||
#, fuzzy
|
||||
#| msgid "Others talks:"
|
||||
msgid "Others talks"
|
||||
msgstr "Autres exposés :"
|
||||
|
||||
#: proposals/templates/proposals/topic_form.html:14
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
{% load i18n %}
|
||||
<ul>
|
||||
{% regroup talk_list by event as event_list %}
|
||||
{% for event in event_list %}
|
||||
<li>{{ event.list.0.get_event_display }}
|
||||
<h3>{{ event.list.0.get_event_display }}</h3>
|
||||
<ul>{% for talk in event.list %}
|
||||
<li>
|
||||
{{ talk.get_link }}
|
||||
|
@ -22,5 +21,4 @@
|
|||
{% endfor %}
|
||||
</ul>
|
||||
{% empty %}{% trans "No talks" %}
|
||||
</li>{% endfor %}
|
||||
</ul>
|
||||
{% endfor %}
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
{% block content %}
|
||||
|
||||
<h1>{% trans "Speakers:" %}</h1>
|
||||
<h1>{% trans "Speakers" %}</h1>
|
||||
|
||||
<ul>
|
||||
{% for speaker in user_list %}
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
<h1>{{ talk.title }}</h1>
|
||||
|
||||
{% if edit_perm %}
|
||||
<a class="btn btn-primary" href="{% url 'edit-talk' talk.slug %}">edit</a><br />
|
||||
<a class="btn btn-success" href="{% url 'edit-talk' talk.slug %}">{% trans "Edit" %}</a><br />
|
||||
{% endif %}
|
||||
|
||||
<p>{{ talk.get_event_display }}</p>
|
||||
|
|
|
@ -6,16 +6,18 @@
|
|||
|
||||
{% block content %}
|
||||
|
||||
<h1>{% trans "Talks" %}</h1>
|
||||
|
||||
<a class="btn btn-success" href="{% url 'add-talk' %}">{% trans "Propose a talk" %}</a>
|
||||
|
||||
{% if my_talks %}
|
||||
<div class="h3">{% trans "My participing talks:" %}</div>
|
||||
{% include "proposals/_talk_list.html" with talk_list=my_talks %}
|
||||
<h2>{% trans "My participing talks" %}</h2>
|
||||
{% include "proposals/_talk_list.html" with talk_list=my_talks %}
|
||||
{% endif %}
|
||||
|
||||
{% if other_talks %}
|
||||
<div class="h3">{% trans "Others talks:" %}</div>
|
||||
{% include "proposals/_talk_list.html" with talk_list=other_talks %}
|
||||
<h2>{% trans "Others talks" %}</h2>
|
||||
{% include "proposals/_talk_list.html" with talk_list=other_talks %}
|
||||
{% endif %}
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
@ -7,6 +7,10 @@
|
|||
|
||||
<h1>{{ profile }}</h1>
|
||||
|
||||
{% if request|edit_profile:profile %}
|
||||
<a href="{% url 'edit-participant' profile.user.username %}" class="btn btn-success">{% trans "Edit" %}</a>
|
||||
{% endif %}
|
||||
|
||||
<img class="pull-right" src="{% avatar_url profile.user 160 %}" />
|
||||
|
||||
<h2>{% trans "Biography" %}</h2>
|
||||
|
@ -18,7 +22,6 @@
|
|||
{% if request|edit_profile:profile %}
|
||||
<h2>{% trans "Notes" %}</h2>
|
||||
<p>{{ profile.notes }}</p>
|
||||
<a href="{% url 'edit-participant' profile.user.username %}" class="btn btn-success">{% trans "Edit" %}</a>
|
||||
{% endif %}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue