Use retweet when available

diff --git a/app/templates/twitter/tweets.html b/app/templates/twitter/tweets.html
index 45f65e059507ade53bf9110094aea22bf6e671b7..10b1d13faa8d6eb55c15036c76e85954824e4c6a 100644 (file)
--- a/app/templates/twitter/tweets.html
+++ b/app/templates/twitter/tweets.html
@@ -8,12 +8,20 @@
     {% for tweet in tweets %}
     <li class="tweets__tweet">
         <div class="col-xxs-3">
-            <img class="tweets__tweet-image" src="{{ tweet.profile_image_url|cut:"http:" }}" alt="{{ tweet.full_name }}">
+            {% if tweet.retweeter_full_name %}
+                <img class="tweets__tweet-image" src="{{ tweet.retweeter_profile_image_url|cut:"http:" }}" alt="{{ tweet.retweeter_full_name }}">
+            {% else %}
+                <img class="tweets__tweet-image" src="{{ tweet.profile_image_url|cut:"http:" }}" alt="{{ tweet.full_name }}">
+            {% endif %}
         </div>
         <div class="col-xxs-13 tweets__tweet-content">
             <h4 class="tweets__tweet-author">
-                {{ tweet.full_name }} <a href="http://twitter.com/{{ tweet.user_name }}" title="{{ tweet.full_name }}">@{{ tweet.user_name }}</a>
-                <span>{% blocktrans with sometime=tweet.created_at|timesince %}{{ sometime }} ago{% endblocktrans %}</span>
+                {% if tweet.retweeter_full_name %}
+                    {{ tweet.retweeter_full_name }} <a href="http://twitter.com/{{ tweet.retweeter_user_name }}" title="{{ tweet.retweeter_full_name }}">@{{ tweet.retweeter_user_name }}</a>
+                {% else %}
+                    {{ tweet.full_name }} <a href="http://twitter.com/{{ tweet.user_name }}" title="{{ tweet.full_name }}">@{{ tweet.user_name }}</a>
+                {% endif %}
+                    <span>{% blocktrans with sometime=tweet.created_at|timesince %}{{ sometime }} ago{% endblocktrans %}</span>
             </h4>
             <p class="tweets__tweet-body">
                 {{ tweet.text|safe }}<br>

diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda
index a072d9a6af89c14150df71544df53b7f77cf3bc8..677c2faeb8b46a52846d6663c7f4c1a3d9509e18 160000 (submodule)
--- a/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@ -1 +1 @@
-Subproject commit a072d9a6af89c14150df71544df53b7f77cf3bc8
+Subproject commit 677c2faeb8b46a52846d6663c7f4c1a3d9509e18

diff --git a/var b/var
index e35bbe738e298a0fe37160f2c46cf16d42265ccb..78283cae2019601d70fb3cf55e626225f03435cd 160000 (submodule)
--- a/var
+++ b/var
@@ -1 +1 @@
-Subproject commit e35bbe738e298a0fe37160f2c46cf16d42265ccb
+Subproject commit 78283cae2019601d70fb3cf55e626225f03435cd