Improve topic list

This commit is contained in:
numahell 2016-08-08 00:08:54 +02:00
parent f4efcf6dfd
commit 2975836c96
3 changed files with 58 additions and 50 deletions

Binary file not shown.

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-08-07 07:11+0000\n"
"POT-Creation-Date: 2016-08-07 21:51+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"
@ -21,7 +21,9 @@ msgstr ""
#: accounts/forms.py:19
msgid ""
"For example, you need to be back on saturday evening, you cannot eat meat."
msgstr "Par exemple, vous devez rentrer le samedi soir, vous ne pouvez pas manger de viande, etc."
msgstr ""
"Par exemple, vous devez rentrer le samedi soir, vous ne pouvez pas manger de "
"viande, etc."
#: accounts/models.py:17 proposals/templates/proposals/user_details.html:12
msgid "Biography"
@ -55,11 +57,11 @@ msgstr "Licence vidéo"
msgid "Notes"
msgstr "Notes"
#: accounts/signals.py:30
#: accounts/signals.py:31
msgid "Welcome!"
msgstr "Bienvenue !"
#: accounts/signals.py:35
#: accounts/signals.py:36
msgid "Goodbye!"
msgstr "Au revoir !"
@ -223,11 +225,12 @@ msgstr "Accueil"
msgid "Talks"
msgstr "Exposés"
#: ponyconf/templates/base.html:48 proposals/models.py:48
#: ponyconf/templates/base.html:48 proposals/models.py:58
#: proposals/templates/proposals/topic_list.html:9
msgid "Topics"
msgstr "Thèmes"
#: ponyconf/templates/base.html:50 proposals/models.py:44
#: ponyconf/templates/base.html:50 proposals/models.py:54
msgid "Speakers"
msgstr "Orateurs"
@ -239,23 +242,23 @@ msgstr "Sinscrire"
msgid "Powered by"
msgstr "Propulsé par"
#: proposals/models.py:22
#: proposals/models.py:31
msgid "Name"
msgstr "Nom"
#: proposals/models.py:25
msgid "Reviewers"
msgstr "Responsables"
#: proposals/models.py:45
msgid "Title"
msgstr "Titre"
#: proposals/models.py:47
#: proposals/models.py:33 proposals/models.py:57
msgid "Description"
msgstr "Description"
#: proposals/models.py:49
#: proposals/models.py:35
msgid "Reviewers"
msgstr "Responsables"
#: proposals/models.py:55
msgid "Title"
msgstr "Titre"
#: proposals/models.py:59
msgid "Format"
msgstr "Format"
@ -274,7 +277,8 @@ msgid "Speakers:"
msgstr "Orateurs :"
#: proposals/templates/proposals/speaker_list.html:15
#: proposals/templates/proposals/topic_list.html:18
#: proposals/templates/proposals/topic_list.html:23
#: proposals/templates/proposals/topic_list.html:25
msgid "talk"
msgstr "exposé"
@ -288,7 +292,6 @@ msgid "Description:"
msgstr "Description :"
#: proposals/templates/proposals/talk_detail.html:31
#: proposals/templates/proposals/topic_list.html:9
msgid "Topics:"
msgstr "Thèmes :"
@ -329,22 +332,18 @@ msgstr "Autres exposés :"
msgid "Topic"
msgstr "Thème"
#: proposals/templates/proposals/topic_list.html:16
#: proposals/templates/proposals/topic_list.html:12
msgid "Add a topic"
msgstr "Ajouter un thème"
#: proposals/templates/proposals/topic_list.html:21
msgid "reviewer"
msgstr "Responsable"
#: proposals/templates/proposals/topic_list.html:17
msgid "and"
msgstr "et"
#: proposals/templates/proposals/topic_list.html:24
#: proposals/templates/proposals/topic_list.html:29
msgid "No topics."
msgstr "Aucun thèmes."
#: proposals/templates/proposals/topic_list.html:29
msgid "Add a topic"
msgstr "Ajouter un thème"
#: proposals/templates/proposals/user_details.html:21
msgid "Edit"
msgstr "Éditer"
@ -352,7 +351,7 @@ msgstr "Éditer"
#: proposals/views.py:38
#, python-format
msgid "Talks related to %s:"
msgstr "Exposés portant sur la thèmatique %s :"
msgstr "Exposés portant sur la thématique %s :"
#: proposals/views.py:57
msgid "Talk modified successfully!"
@ -369,3 +368,9 @@ msgstr "A voté !"
#: proposals/views.py:131
msgid "Vote successfully updated"
msgstr "Vote mis à jour"
#~ msgid "see details"
#~ msgstr "voir en détail"
#~ msgid "and"
#~ msgstr "et"

View File

@ -1,32 +1,35 @@
{% extends 'base.html' %}
{% load accounts_tags i18n %}
{% load bootstrap3 accounts_tags i18n %}
{% block topictab %} class="active"{% endblock %}
{% block content %}
<h1>{% trans "Topics:" %}</h1>
<ul>
{% for topic in topic_list %}
<li>
{% if request|staff %}
{{ topic }}:
<a href="{% url 'edit-topic' topic.slug %}">{{ topic.reviewers.count }} {% trans "reviewer" %}{{ topic.reviewers.count|pluralize }}</a>
{% trans "and" %}
<a href="{{ topic.get_absolute_url }}">{{ topic.talk_set.count }} {% trans "talk" %}{{ topic.talk_set.count|pluralize }}</a>
{% else %}
<a href="{{ topic.get_absolute_url }}">{{ topic }}</a>
{% endif %}
</li>
{% empty %}
<li><i>{% trans "No topics." %}</i></li>
{% endfor %}
</ul>
<h1>{% trans "Topics" %}</h1>
{% if request|orga %}
<a href="{% url 'add-topic' %}" class="btn btn-success">{% trans "Add a topic" %}</a>
<p><a href="{% url 'add-topic' %}" class="btn btn-success">{% trans "Add a topic" %}</a><p>
{% endif %}
<div class="row">
{% for topic in topic_list %}
<div class="col-xs-6 col-sm-4">
<h2>{{ topic }}</h2>
<p>{{ topic.description }}</p>
{% if request|staff %}
{{ topic.reviewers.count }} {% trans "reviewer" %}{{ topic.reviewers.count|pluralize }}
|
<a href="{{ topic.get_absolute_url }}">{{ topic.talk_set.count }} {% trans "talk" %}{{ topic.talk_set.count|pluralize }}</a>
|
<a href="{% url 'edit-topic' topic.slug %}">{% bootstrap_icon "pencil" %}</a>
{% else %}
<a href="{{ topic.get_absolute_url }}">{% trans "talk" %}{{ topic.talk_set.count|pluralize }}</a>
{% endif %}
</div><div class="{% cycle '' 'clearfix visible-xs' 'clearfix hidden-xs' %}"></div>
{% empty %}
<div><em>{% trans "No topics." %}</em></div>
{% endfor %}
</div>
{% endblock %}