From a2795556a7fe56b453d41d35c804994603bbbdfc Mon Sep 17 00:00:00 2001
From: Kasper Brandt <kasperbrandt87@gmail.com>
Date: Wed, 26 Nov 2014 14:18:46 +0100
Subject: [PATCH 1/3] [#926] Added data to updates listing page

---
 akvo/templates/update_directory.html | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/akvo/templates/update_directory.html b/akvo/templates/update_directory.html
index 1ecb8681dc..69aa255a62 100644
--- a/akvo/templates/update_directory.html
+++ b/akvo/templates/update_directory.html
@@ -73,10 +73,19 @@
                     <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>
+                    <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 %}

From 905e30a78009520220ad9d9faad1b5f482277c22 Mon Sep 17 00:00:00 2001
From: Kasper Brandt <kasperbrandt87@gmail.com>
Date: Thu, 27 Nov 2014 10:42:32 +0100
Subject: [PATCH 2/3] [#926] Layout changed to template file

---
 akvo/templates/update_directory.html | 66 ++++++++++++++--------------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/akvo/templates/update_directory.html b/akvo/templates/update_directory.html
index 69aa255a62..7986ad422c 100644
--- a/akvo/templates/update_directory.html
+++ b/akvo/templates/update_directory.html
@@ -61,40 +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> {{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>
+      <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">

From f4d10f657a06eba9baad5ceca0fc32b4b44c982d Mon Sep 17 00:00:00 2001
From: Daniel Karlsson <daniel@kardans.com>
Date: Thu, 27 Nov 2014 14:29:50 +0100
Subject: [PATCH 3/3] [#926] Escaped | character in URI

---
 akvo/templates/base.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/akvo/templates/base.html b/akvo/templates/base.html
index 8b99b0a1e5..fb63929172 100644
--- 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' %}