Merge branch 'feature/styleguide-committee-promotion' into 'master'

Add part about committee promotion to styleguide

See merge request !584

website/thaliawebsite/locale/nl/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-03 13:54+0200\n"
-"PO-Revision-Date: 2017-09-03 13:55+0200\n"
+"POT-Creation-Date: 2017-09-24 17:42+0200\n"
+"PO-Revision-Date: 2017-09-24 17:47+0200\n"
 "Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.3\n"
+"X-Generator: Poedit 2.0.4\n"
 
 #: admin.py:4
 msgid "Thalia administration"
@@ -856,7 +856,7 @@ msgstr ""
 "voorkeur om magenta op zwart te gebruiken."
 
 #: templates/singlepages/styleguide.html:227
-#: templates/singlepages/styleguide.html:247
+#: templates/singlepages/styleguide.html:270
 msgid "Introshirts"
 msgstr "Introshirts"
 
@@ -875,34 +875,69 @@ msgstr ""
 "vervangen."
 
 #: templates/singlepages/styleguide.html:237
+msgid "Committee promotion"
+msgstr "Promotie commissies"
+
+#: templates/singlepages/styleguide.html:240
+msgid ""
+"Any committee is allowed to design a piece of clothing especially tailored "
+"for promotion and visibility of the assocation and the committee. However it "
+"would be unwise to have every committee wear the same colour, that would not "
+"improve the visibility of the committee. That means that committees are free "
+"to choose any color they want for their promotional material."
+msgstr ""
+"Elke commissie mag een kledingstuk ontwerpen speciaal gemaakt voor de "
+"promotie en zichtbaarheid van de vereniging en de commissie zelf. Maar het "
+"zou niet handig zijn als elke commissie dezelfde kleur draagt, dan is de "
+"zichtbaarheid van de commissie nog steeds niet beter. Daarom mogen "
+"commissies zelf beslissen wat voor kleur ze willen gebruiken voor hun "
+"promotiemateriaal."
+
+#: templates/singlepages/styleguide.html:252
+msgid ""
+"To prevent a jungle of different types of designs we would like every "
+"committee that wants some kind of clothing to use the same design for the "
+"front and one of the Thalia colours for the print. The standard front design "
+"exists of a Thalia-logo variant with the committee name and, if you want to, "
+"the wearer's name. The design for the back can be whatever you want."
+msgstr ""
+"Om te voorkomen dat er een oerwoud van verschillende ontwerpen ontstaat "
+"zouden we graag zien dat elke commissie die een kledingstuk wilt aanschaffen "
+"hetzelfde ontwerp voor de voorkant en een van de kleuren van Thalia "
+"gebruikt. Het standaard ontwerp voor de voorkant bestaat uit een variant van "
+"het Thalia-logo met hierin de commissienaam en, als daarvoor wordt gekozen, "
+"de naam van de drager. Het ontwerp voor de achterkant kan dan alles zijn wat "
+"je maar wilt."
+
+#: templates/singlepages/styleguide.html:260
 msgid "Downloads"
 msgstr "Downloads"
 
-#: templates/singlepages/styleguide.html:240
+#: templates/singlepages/styleguide.html:263
 msgid "Font"
 msgstr "Lettertype"
 
-#: templates/singlepages/styleguide.html:241
+#: templates/singlepages/styleguide.html:264
 msgid "Logos"
 msgstr "Logo’s"
 
-#: templates/singlepages/styleguide.html:242
+#: templates/singlepages/styleguide.html:265
 msgid "Logo variant template"
 msgstr "Templates logo varianten"
 
-#: templates/singlepages/styleguide.html:243
+#: templates/singlepages/styleguide.html:266
 msgid "Word documents"
 msgstr "Word-documenten"
 
-#: templates/singlepages/styleguide.html:244
+#: templates/singlepages/styleguide.html:267
 msgid "LaTeX template"
 msgstr "LaTeX-template"
 
-#: templates/singlepages/styleguide.html:245
+#: templates/singlepages/styleguide.html:268
 msgid "Presentation templates"
 msgstr "Presentatie-templates"
 
-#: templates/singlepages/styleguide.html:246
+#: templates/singlepages/styleguide.html:269
 msgid "Poster templates"
 msgstr "Posters & Banners"
 

website/thaliawebsite/templates/singlepages/styleguide.html

@@ -234,6 +234,33 @@
     {% endblocktrans %}
 </p>
 
+<h1>{% trans "Committee promotion" %}</h1>
+
+<p>
+    {% blocktrans trimmed %}
+    Any committee is allowed to design a piece of clothing especially tailored for promotion and visibility of the assocation and the committee.
+    However it would be unwise to have every committee wear the same colour, that would not improve the visibility of the committee.
+    That means that committees are free to choose any color they want for their promotional material.
+    {% endblocktrans %}
+</p>
+
+<p>
+    <img src="{% static 'styleguide/images/committee-promotion-front-example.png' %}" />
+</p>
+
+<p>
+    <img src="{% static 'styleguide/images/committee-promotion-back-example.png' %}" />
+</p>
+
+<p>
+    {% blocktrans trimmed %}
+    To prevent a jungle of different types of designs we would like every committee that wants some kind of clothing
+    to use the same design for the front and one of the Thalia colours for the print.
+    The standard front design exists of a Thalia-logo variant with the committee name and, if you want to, the wearer's name.
+    The design for the back can be whatever you want.
+    {% endblocktrans %}
+</p>
+
 <h1>{% trans "Downloads" %}</h1>
 
 <ul>