From: Jan Szejko <janek37@gmail.com>
Date: Fri, 21 Apr 2017 10:32:05 +0000 (+0200)
Subject: adapt audience display for multiple values
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/a74c48a5de6d9a00f76f7c10b41bd4a26691a22f?hp=b6d961cf3b454e6fcc9365a1121c34501f5f9106

adapt audience display for multiple values
---

diff --git a/apps/catalogue/templates/catalogue/book_text.html b/apps/catalogue/templates/catalogue/book_text.html
index efe23be6..453157ee 100644
--- a/apps/catalogue/templates/catalogue/book_text.html
+++ b/apps/catalogue/templates/catalogue/book_text.html
@@ -147,7 +147,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00000000', e
 <div id="cover">
     <div id="cover-info" class="row">
         <div class="col-md-4 col-md-offset-2">
-{% trans "Audience" %}: {{ doc.meta.audience|default:"–" }}
+{% trans "Audience" %}: {{ doc.meta.audience|join:", "|default:"–" }}
         </div>
         <div class="col-md-4">
 <a class="btn btn-default" href="{% url 'catalogue_pdf' doc.pk revision.pk %}"
diff --git a/apps/catalogue/templates/catalogue/finished.html b/apps/catalogue/templates/catalogue/finished.html
index 40153e82..6b861903 100644
--- a/apps/catalogue/templates/catalogue/finished.html
+++ b/apps/catalogue/templates/catalogue/finished.html
@@ -1,34 +1,10 @@
 {% extends "catalogue/base.html" %}
-{% load i18n thumbnail catalogue_files %}
+{% load i18n %}
 
 
 {% block inner_content %}
-
-
-<h1>{% trans "Finished resources" %}</h1>
-{% for doc in objects_list %}
-    <div class="resource-box" style="width: 182px; height: 180px; position: relative; border: 1px solid #aaa; margin: 10px; display: inline-block; padding: 0px; vertical-align: bottom">
-        <a style='display:block' href="{% url 'catalogue_html' doc.pk %}">
-        {% if doc.meta.cover_url %}
-            {% thumbnail doc.meta.cover_url|as_media_for:doc "180x120" crop="center" format="PNG"  as th %}
-            <img src="{{ th.url }}">
-            {% endthumbnail %}
-        {% elif doc.owner_organization.logo %}
-            {% thumbnail doc.owner_organization.logo "160x100" format="PNG"  padding=True as th %}
-            <img src="{{ th.url }}">
-            {% endthumbnail %}
-        {% endif %}
-        <div style="position: absolute; bottom: 10px; left: 10px; width: 160px; height: 40px; overflow:hidden">{{ doc.meta.title }}</div>
-        <div class="box-overlay" style="position: absolute; top:0; left: 0; padding: 5px; width: 180px; height: 120px; background: black; color: white; opacity: .7">
-            {% if doc.meta.audience %}
-                {% trans "Audience" %}: {{ doc.meta.audience }}<br>
-            {% endif %}
-            {% trans "Owner" %}: {{ doc.owner_organization|default:"" }}
-            {{ doc.owner_user.get_full_name }}<br/>
-        </div>
-        </a>
-    </div>
-{% endfor %}
-
-
+    <h1>{% trans "Finished resources" %}</h1>
+    {% for doc in objects_list %}
+        {% include "catalogue/resource_box.html" with link_url='catalogue_html' %}
+    {% endfor %}
 {% endblock %}
diff --git a/apps/catalogue/templates/catalogue/resource_box.html b/apps/catalogue/templates/catalogue/resource_box.html
new file mode 100644
index 00000000..9e022c6b
--- /dev/null
+++ b/apps/catalogue/templates/catalogue/resource_box.html
@@ -0,0 +1,24 @@
+{% load i18n %}
+{% load thumbnail %}
+{% load catalogue_files %}
+<div class="resource-box" style="width: 182px; height: 180px; position: relative; border: 1px solid #aaa; margin: 10px; display: inline-block; padding: 0; vertical-align: bottom">
+    <a style='display:block' href="{% url link_url doc.pk %}">
+    {% if doc.meta.cover_url %}
+        {% thumbnail doc.meta.cover_url|as_media_for:doc "180x120" crop="center" format="PNG"  as th %}
+        <img src="{{ th.url }}">
+        {% endthumbnail %}
+    {% elif doc.owner_organization.logo %}
+        {% thumbnail doc.owner_organization.logo "160x100" format="PNG"  padding=True as th %}
+        <img src="{{ th.url }}" style="margin: 10px;">
+        {% endthumbnail %}
+    {% endif %}
+    <div style="position: absolute; bottom: 10px; left: 10px; width: 160px; height: 40px; overflow:hidden">{{ doc.meta.title }}</div>
+    <div class="box-overlay" style="position: absolute; top:0; left: 0; padding: 5px; width: 180px; height: 120px; background: black; color: white; opacity: .7">
+        {% if doc.meta.audience %}
+            {% trans "Audience" %}: {{ doc.meta.audience|join:", " }}<br>
+        {% endif %}
+        {% trans "Owner" %}: {{ doc.owner_organization|default:"" }}
+        {{ doc.owner_user.get_full_name }}<br/>
+    </div>
+    </a>
+</div>
diff --git a/apps/catalogue/templates/catalogue/upcoming.html b/apps/catalogue/templates/catalogue/upcoming.html
index a95c9b36..9a8ae8c5 100644
--- a/apps/catalogue/templates/catalogue/upcoming.html
+++ b/apps/catalogue/templates/catalogue/upcoming.html
@@ -1,33 +1,10 @@
 {% extends "catalogue/base.html" %}
 {% load i18n %}
-{% load thumbnail catalogue_files %}
 
 
 {% block inner_content %}
-
-<h1>{% trans "Upcoming resources" %}</h1>
-{% for doc in objects_list %}
-    <div class="resource-box" style="width: 182px; height: 180px; position: relative; border: 1px solid #aaa; margin: 10px; display: inline-block; padding: 0px; vertical-align: bottom">
-        <a style='display:block' href="{% url 'catalogue_preview' doc.pk %}">
-        {% if doc.meta.cover_url %}
-            {% thumbnail doc.meta.cover_url|as_media_for:doc "180x120" crop="center" format="PNG"  as th %}
-            <img src="{{ th.url }}">
-            {% endthumbnail %}
-        {% elif doc.owner_organization.logo %}
-            {% thumbnail doc.owner_organization.logo "160x100" format="PNG"  padding=True as th %}
-            <img src="{{ th.url }}" style="margin: 10px;">
-            {% endthumbnail %}
-        {% endif %}
-        <div style="position: absolute; bottom: 10px; left: 10px; width: 160px; height: 40px; overflow:hidden">{{ doc.meta.title }}</div>
-        <div class="box-overlay" style="position: absolute; top:0; left: 0; padding: 5px; width: 180px; height: 120px; background: black; color: white; opacity: .7">
-            {% if doc.meta.audience %}
-                {% trans "Audience" %}: {{ doc.meta.audience }}<br>
-            {% endif %}
-            {% trans "Owner" %}: {{ doc.owner_organization|default:"" }}
-            {{ doc.owner_user.get_full_name }}<br/>
-        </div>
-        </a>
-    </div>
-{% endfor %}
-
+    <h1>{% trans "Upcoming resources" %}</h1>
+    {% for doc in objects_list %}
+        {% include "catalogue/resource_box.html" with link_url='catalogue_preview' %}
+    {% endfor %}
 {% endblock %}
diff --git a/redakcja/templates/main.html b/redakcja/templates/main.html
index 64421c38..7d28701e 100644
--- a/redakcja/templates/main.html
+++ b/redakcja/templates/main.html
@@ -1,7 +1,7 @@
 {% extends "catalogue/base.html" %}
 {% load i18n %}
 {% load thumbnail %}
-{% load catalogue_files %}
+{% load static %}
 
 
 {% block content %}
@@ -28,7 +28,7 @@
 <div class="col-md-6">
     {#<a href="/competition/" class="btn btn-success btn-lg">{% trans "Competition" %}</a>#}
     <p style="margin-top: 17px;">{% trans "Joint project by:" %}</p>
-    <a target="_blank" href="http://evensfoundation.be"><img style="margin-top: 20px; width: 145px;margin-right: 40px;" src="/static/img/evens2.png"></a>
+    <a target="_blank" href="http://evensfoundation.be"><img style="margin-top: 20px; width: 145px;margin-right: 40px;" src="{% static 'img/evens2.png' %}"></a>
     <a target="_blank" href="https://nowoczesnapolska.org.pl"><img style="margin-top: 20px; width: 135px;" src="//nowoczesnapolska.org.pl/wp-content/themes/koed/images/nowoczesnapolska.org.pl.png"></a>
 </div>
 </div>
@@ -46,7 +46,7 @@
 <section>
 <h1>{% trans "See active organizations and join" %}</h1>
 {% for org in organizations %}
-    <div style="width: 182px; height: 180px; position: relative; border: 1px solid #aaa; margin: 10px; display: inline-block; padding: 0px; vertical-align: bottom">
+    <div style="width: 182px; height: 180px; position: relative; border: 1px solid #aaa; margin: 10px; display: inline-block; padding: 0; vertical-align: bottom">
         <a style='display:block' href="{% url 'organizations_main' org.pk %}">
         {% if org.logo %}
             {% thumbnail org.logo "160x100" format="PNG"  padding=True as th %}
@@ -68,27 +68,7 @@
 <section>
 <h1>{% trans "Finished resources" %}</h1>
 {% for doc in finished %}
-    <div class="resource-box" style="width: 182px; height: 180px; position: relative; border: 1px solid #aaa; margin: 10px; display: inline-block; padding: 0px; vertical-align: bottom">
-        <a style='display:block' href="{% url 'catalogue_html' doc.pk %}">
-        {% if doc.meta.cover_url %}
-            {% thumbnail doc.meta.cover_url|as_media_for:doc "180x120" crop="center" format="PNG"  as th %}
-            <img src="{{ th.url }}">
-            {% endthumbnail %}
-        {% elif doc.owner_organization.logo %}
-            {% thumbnail doc.owner_organization.logo "160x100" format="PNG"  padding=True as th %}
-            <img src="{{ th.url }}">
-            {% endthumbnail %}
-        {% endif %}
-        <div style="position: absolute; bottom: 10px; left: 10px; width: 160px; height: 40px; overflow:hidden">{{ doc.meta.title }}</div>
-        <div class="box-overlay" style="position: absolute; top:0; left: 0; padding: 5px; width: 180px; height: 120px; background: black; color: white; opacity: .7">
-            {% if doc.meta.audience %}
-                {% trans "Audience" %}: {{ doc.meta.audience }}<br>
-            {% endif %}
-            {% trans "Owner" %}: {{ doc.owner_organization|default:"" }}
-            {{ doc.owner_user.get_full_name }}<br/>
-        </div>
-        </a>
-    </div>
+    {% include "catalogue/resource_box.html" with link_url='catalogue_html' %}
 {% endfor %}
 {% if more_finished %}
 <p style="text-align: right"><a href="{% url 'catalogue_finished' %}">{% trans "More finished resources" %}</a></p>
@@ -98,27 +78,7 @@
 <section>
 <h1>{% trans "Upcoming resources" %}</h1>
 {% for doc in upcoming %}
-    <div class="resource-box" style="width: 182px; height: 180px; position: relative; border: 1px solid #aaa; margin: 10px; display: inline-block; padding: 0px; vertical-align: bottom">
-        <a style='display:block' href="{% url 'catalogue_preview' doc.pk %}">
-        {% if doc.meta.cover_url %}
-            {% thumbnail doc.meta.cover_url|as_media_for:doc "180x120" crop="center" format="PNG"  as th %}
-            <img src="{{ th.url }}">
-            {% endthumbnail %}
-        {% elif doc.owner_organization.logo %}
-            {% thumbnail doc.owner_organization.logo "160x100" format="PNG"  padding=True as th %}
-            <img src="{{ th.url }}" style="margin: 10px;">
-            {% endthumbnail %}
-        {% endif %}
-        <div style="position: absolute; bottom: 10px; left: 10px; width: 160px; height: 40px; overflow:hidden">{{ doc.meta.title }}</div>
-        <div class="box-overlay" style="position: absolute; top:0; left: 0; padding: 5px; width: 180px; height: 120px; background: black; color: white; opacity: .7">
-            {% if doc.meta.audience %}
-                {% trans "Audience" %}: {{ doc.meta.audience }}<br>
-            {% endif %}
-            {% trans "Owner" %}: {{ doc.owner_organization|default:"" }}
-            {{ doc.owner_user.get_full_name }}<br/>
-        </div>
-        </a>
-    </div>
+    {% include "catalogue/resource_box.html" with link_url='catalogue_preview' %}
 {% endfor %}
 {% if more_upcoming %}
 <p style="text-align: right"><a href="{% url 'catalogue_upcoming' %}">{% trans "More upcoming resources" %}</a></p>