Merge pull request #930 from akvo/926_update_list

[#926] Added data to updates listing page
akvo · Nov 27, 2014 · c35f3b6 · c35f3b6
2 parents fcd8844 + f4d10f6
commit c35f3b6
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 27 deletions.
diff --git a/akvo/templates/base.html b/akvo/templates/base.html
@@ -24,10 +24,10 @@
 
     {# React #}
     <script src="http://fb.me/react-0.10.0.js"></script>
-    
+
     {# Fonts #}
     <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
-    <link href='//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700,400italic,600italic,300italic|Montserrat:400,700|Raleway:400,500,600,700|Dancing+Script:400,700' rel='stylesheet' type='text/css'>
+    <link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700,400italic,600italic,300italic%7CMontserrat:400,700%7CRaleway:400,500,600,700%7CDancing+Script:400,700" rel="stylesheet" type="text/css">
 
 
     {% compressed_css 'rsr_v3_style' %}

diff --git a/akvo/templates/update_directory.html b/akvo/templates/update_directory.html
@@ -61,31 +61,38 @@
 </div>
 
     <section class="main-list updates">
-        <ul class="container">
-            {% for u in page %}
-            <li class="row updateAsset">
-                <div class="col-sm-3 col-md-2 col-xs-4 col-lg-2 thumbImg">
-                    <a href="{% url 'update-main' u.project.id u.id %}">
-                      {% img u 220 220 u.title %}
-                    </a>
-                </div>
-                <div class="col-sm-4 col-xs-8 col-md-5 col-lg-5">
-                    <h1><a href="{% url 'update-main' u.project.id u.id %}">{{u.title}}</a></h1>
-                    <p class="small"><span class="glyphicon glyphicon-folder-close"></span>
-                      <a href="{% url 'project-main' u.project.pk %}">{{u.project.title}}</a><br>
-                    <span class="glyphicon glyphicon-user"></span> {% trans "Person" %} (Partner)<br>
-                    <span class="glyphicon glyphicon-map-marker"></span> {% trans "Location" %}
-                    {{u.primary_location.country.continent}}, {{u.primary_location.country}} <br>
-                    {{u.created_at|date:"d-M-Y"}}</p>
-                </div>   
-                <div class="excerpt small col-sm-5 col-xs-12  col-md-5 col-lg-5 hidden-xs">
-                    {% autoescape off %}
-                      {{ u.text|force_escape|urlize|apply_markup:"markdown" }}
-                    {% endautoescape %}
-                </div>            
-            </li>
-            {% endfor %}
-        </ul>
+      <ul class="container">
+        {% for u in page %}
+        <li class="row updateAsset">
+          <div class="col-sm-3 col-md-2 col-xs-4 col-lg-2 thumbImg">
+            <a href="{% url 'update-main' u.project.id u.id %}">
+              {% img u 220 220 u.title %}
+            </a>
+          </div>
+          <div class="col-sm-4 col-xs-8 col-md-5 col-lg-5">
+            <h1><a href="{% url 'update-main' u.project.id u.id %}">{{u.title}}</a></h1>
+            <p class="small"><span class="glyphicon glyphicon-folder-close"></span> <a href="{% url 'project-main' u.project.pk %}">{{u.project.title}}</a><br>
+              <span class="glyphicon glyphicon-user"></span> {{u.user.first_name}} {{u.user.last_name}}
+                {% if u.user.approved_organisations %}
+                  {% with org=u.user.approved_organisations.0 %}
+                    (<a href="{% url 'organisation-main' org.pk %}">{{org.long_name}}</a>)
+                  {% endwith %}
+                {% endif %}
+              <br>
+              {% if u.primary_location.country %}
+              <span class="glyphicon glyphicon-map-marker"></span> {{u.primary_location.country}}, {{u.primary_location.country.continent}}<br>
+              {% endif %}
+              <span class="glyphicon glyphicon-calendar"></span> {{u.created_at|date:"d-M-Y"}}
+            </p>
+          </div>
+          <div class="excerpt small col-sm-5 col-xs-12  col-md-5 col-lg-5 hidden-xs">
+            {% autoescape off %}
+              {{ u.text|force_escape|urlize|apply_markup:"markdown" }}
+            {% endautoescape %}
+          </div>
+        </li>
+        {% endfor %}
+      </ul>
     </section>
 
 <div class="container-fluid">