Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
1b446ea8
Commit
1b446ea8
authored
Sep 18, 2017
by
Bram in 't Zandt
Browse files
Boards can now enter an optional description that will be diplayed on their detail page.
parent
6b5cb6f4
Changes
4
Hide whitespace changes
Inline
Side-by-side
website/activemembers/admin.py
View file @
1b446ea8
...
...
@@ -58,8 +58,8 @@ class BoardAdmin(TranslatedModelAdmin):
exclude
=
(
'is_board'
,)
filter_horizontal
=
(
'permissions'
,)
fields
=
(
'name'
,
'photo'
,
'permissions'
,
'contact_mailinglist'
,
'contact_email'
,
'since'
,
'until'
,)
fields
=
(
'name'
,
'description'
,
'photo'
,
'permissions'
,
'contact_mailinglist'
,
'contact_email'
,
'since'
,
'until'
,)
@
admin
.
register
(
models
.
CommitteeMembership
)
...
...
website/activemembers/locale/nl/LC_MESSAGES/django.mo
View file @
1b446ea8
No preview for this file type
website/activemembers/locale/nl/LC_MESSAGES/django.po
View file @
1b446ea8
...
...
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-
13 19:42
+0200\n"
"PO-Revision-Date: 2017-09-
13
1
9
:5
0
+0200\n"
"POT-Creation-Date: 2017-09-
25 15:55
+0200\n"
"PO-Revision-Date: 2017-09-
25
1
5
:5
5
+0200\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
...
...
@@ -78,7 +78,7 @@ msgstr ""
msgid "A board already exists for those years"
msgstr "Er bestaat al een bestuur voor die jaren"
#: models.py:211 models.py:35
0
#: models.py:211 models.py:35
3
msgid "Member"
msgstr "Lid"
...
...
@@ -128,35 +128,35 @@ msgstr "De einddatum kan niet voor de startdatum liggen"
msgid "End date can't be in the future"
msgstr "De einddatum kan niet in de toekomst liggen"
#: models.py:27
6
#: models.py:27
7
msgid "Start date can't be before committee start date"
msgstr "De begindatum kan niet voor de begindatum van de commissie liggen"
#: models.py:2
79
#: models.py:2
82
msgid "Start date can't be after committee end date"
msgstr "De begindatum kan niet na de einddatum van de commissie liggen"
#: models.py:28
4
#: models.py:28
7
msgid "End date cannot be set for boards"
msgstr "Voor besturen kan geen einddatum worden opgegeven"
#: models.py:30
7
#: models.py:3
1
0
msgid "There already is a chair for this time period"
msgstr "Er is al een voorzitter voor deze periode"
#: models.py:32
4
#: models.py:32
7
msgid "This member is already in the committee for this period"
msgstr "Deze persoon is al lid van deze commissie in de aangegeven periode"
#: models.py:34
2
#: models.py:34
5
msgid "committee membership"
msgstr "commissielidmaatschap"
#: models.py:34
3
#: models.py:34
6
msgid "committee memberships"
msgstr "commissielidmaatschappen"
#: models.py:35
5
#: models.py:35
8
#, python-brace-format
msgid "{name} mentor in {year}"
msgstr "{name} mentor in {year}"
...
...
@@ -176,16 +176,21 @@ msgstr "Bestuur"
msgid "Boards"
msgstr "Besturen"
#: templates/activemembers/board_detail.html:27
#: templates/activemembers/board_detail.html:28
#, python-format
msgid "About %(name)s"
msgstr "Over %(name)s"
#: templates/activemembers/board_detail.html:33
msgid "Board members"
msgstr "Bestuursleden"
#: templates/activemembers/board_detail.html:4
3
#: templates/activemembers/board_detail.html:4
9
#: templates/activemembers/committee_detail.html:45
msgid "Chair"
msgstr "Voorzitter"
#: templates/activemembers/board_detail.html:6
0
#: templates/activemembers/board_detail.html:6
6
msgid "This board doesn't have any members?"
msgstr "Dit bestuur heeft geen leden?"
...
...
website/activemembers/templates/activemembers/board_detail.html
View file @
1b446ea8
...
...
@@ -23,6 +23,12 @@
<img
alt=
"{{ board.name }}"
class=
"span12"
src=
"{% static 'activemembers/images/placeholder.png' %}"
>
{% endif %}
</div>
{% if board.description %}
<div>
<h1
class=
"midhead"
>
{% blocktrans with name=board.name%}About {{ name }}{% endblocktrans %}
</h1>
<p
class=
"text-center"
>
{{ board.description }}
</p>
</div>
{% endif %}
<div
class=
"clearfix member-directory"
>
<h1
class=
"midhead"
>
{% trans 'Board members' %}
</h1>
<ul
class=
"row"
id=
"commissieleden"
>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment