From 48fc1654e7a8c7fb1bd6b9e4e3f41faf0631dfe3 Mon Sep 17 00:00:00 2001
From: Axel Haustant <axel.haustant@data.gouv.fr>
Date: Thu, 31 Jan 2019 17:17:03 +0100
Subject: [PATCH] Use followers accross all searches

Fix etalab/data.gouv.fr#110
---
 CHANGELOG.md                                    |  1 +
 udata/templates/dataset/list.html               | 10 +++++-----
 udata/templates/dataset/search-result.html      |  2 +-
 udata/templates/organization/search-result.html | 11 +----------
 udata/templates/reuse/search-result.html        |  4 ++--
 5 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c84089bad..407cecca4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - Major form fixes [#2000](https://github.com/opendatateam/udata/pull/2000)
 - Improved admin errors handling: visual feedback on all errors, `Sentry-ID` header if present, hide organization unauthorized actions [#2005](https://github.com/opendatateam/udata/pull/2005)
 - Expose and import licenses `alternate_urls` and `alternate_titles` fields [#2006](https://github.com/opendatateam/udata/pull/2006)
+- Be consistent on search results wording and picto (Stars vs Followers)
 
 ## 1.6.2 (2018-11-05)
 
diff --git a/udata/templates/dataset/list.html b/udata/templates/dataset/list.html
index 7702dab175..15ca8c09fb 100644
--- a/udata/templates/dataset/list.html
+++ b/udata/templates/dataset/list.html
@@ -15,7 +15,7 @@
 
 {% block breadcrumb %}
     <li class="active">
-    
+
         {{ _('Datasets') }}
 
         {% if datasets.total > 0 %}
@@ -24,7 +24,7 @@
                 end=datasets.page_end,
                 total=datasets.total) }}</small>
 		{% endif %}
-        
+
         {% include "dataset/search-labels.html" %}
     </li>
 {% endblock %}
@@ -41,7 +41,7 @@
     created=(_('Creation date'), 'desc'),
     last_modified=(_('Last modification date'), 'desc'),
     reuses=(_('Reuses'), 'desc'),
-    followers=(_('Stars'), 'desc')
+    followers=(_('Followers'), 'desc')
 ) }}
 </div>
 {% endblock %}
@@ -49,7 +49,7 @@
 {% block main_content %}
 <div class="row">
 
-    {% if datasets %} 
+    {% if datasets %}
         <div class="col-md-8 col-lg-9 smaller">
 
             <ul class="search-results">
@@ -67,7 +67,7 @@
     <aside class="col-md-4 col-lg-3">
     {% include theme('dataset/search-panel.html') %}
     </aside>
-    {% else %} 
+    {% else %}
         <p class="text-center">
             <strong>
                 {{ _('No results found, try to be less specific.') }}
diff --git a/udata/templates/dataset/search-result.html b/udata/templates/dataset/search-result.html
index 95c513b2b9..134cd0dbf6 100644
--- a/udata/templates/dataset/search-result.html
+++ b/udata/templates/dataset/search-result.html
@@ -103,7 +103,7 @@ <h4 class="result-title ellipsis">{{ dataset.full_title }}</h4>
 
             <li>
                 <a class="btn btn-xs" v-tooltip tooltip-placement="top"
-                    title="{{ _('Followers') }}">
+                    title="{{ _('Number of followers') }}">
                     <span class="{{ ficon('fa-star') }} fa-fw"></span>
                     {{ dataset.metrics.followers or 0 }}
                 </a>
diff --git a/udata/templates/organization/search-result.html b/udata/templates/organization/search-result.html
index 4f405ae0e2..749a26bcaf 100644
--- a/udata/templates/organization/search-result.html
+++ b/udata/templates/organization/search-result.html
@@ -42,20 +42,11 @@ <h4 class="result-title ellipsis">{{ organization.name }}</h4>
                 </a>
             </li>
             {% endif %}
-            {% if organization.metrics.stars %}
-            <li>
-                <a class="btn btn-xs" v-tooltip tooltip-placement="top"
-                    title="{{ _('Number of stars') }}">
-                    <span class="{{ ficon('fa-star') }} fa-fw"></span>
-                    {{ ngettext('%(num)d star', '%(num)d stars', organization.metrics.stars or 0) }}
-                </a>
-            </li>
-            {% endif %}
             {% if organization.metrics.followers %}
             <li>
                 <a class="btn btn-xs" v-tooltip tooltip-placement="top"
                     title="{{ _('Number of followers') }}">
-                    <span class="{{ ficon('fa-eye') }} fa-fw"></span>
+                    <span class="{{ ficon('fa-followers') }} fa-fw"></span>
                     {{ ngettext('%(num)d follower', '%(num)d followers', organization.metrics.followers or 0) }}
                 </a>
             </li>
diff --git a/udata/templates/reuse/search-result.html b/udata/templates/reuse/search-result.html
index 4b73b61836..4f66e687eb 100644
--- a/udata/templates/reuse/search-result.html
+++ b/udata/templates/reuse/search-result.html
@@ -29,9 +29,9 @@ <h4 class="result-title ellipsis">{{ reuse.title }}</h4>
             </li>
             <li>
                 <a class="btn btn-xs" v-tooltip tooltip-placement="top"
-                    title="{{ _('Number of stars') }}">
+                    title="{{ _('Number of followers') }}">
                     <span class="fa fa-star fa-fw"></span>
-                    {{ ngettext('%(num)d star', '%(num)d stars', reuse.metrics.followers or 0) }}
+                    {{ ngettext('%(num)d follower', '%(num)d followers', reuse.metrics.followers or 0) }}
                 </a>
             </li>
         </ul>