Fix: Remove 'Data from Data from' examples in templates

mysociety · Nov 23, 2023 · b724241 · b724241
1 parent de31b92
commit b724241
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/hub/templates/hub/area.html b/hub/templates/hub/area.html
@@ -85,7 +85,7 @@ <h5>Support for net zero</h5>
                                     </table>
                                 </div>
                                 <div class="card-footer bg-white">
-                                    <p class="card-text fs-8"><a href="{% url 'sources' %}" class="text-decoration-none text-muted">Data from Public First, commissioned by Onward UK</a></p>
+                                    <p class="card-text fs-8"><a href="{% url 'sources' %}" class="text-decoration-none text-muted">{{ categories.opinion.first.source }}</a></p>
                                 </div>
                             </div>
                             <div class="card flex-grow-1 dataset-card">
@@ -125,7 +125,7 @@ <h5>Vote share at last election</h5>
                                     </table>
                                 </div>
                                 <div class="card-footer bg-white">
-                                    <p class="card-text fs-8"><a href="{% url 'sources' %}" class="text-decoration-none text-muted">{{ indexed_categories.opinion.last_election.data.value.date|naturalday:"jS M Y" }} election results from UK Parliament</a></p>
+                                    <p class="card-text fs-8"><a href="{% url 'sources' %}" class="text-decoration-none text-muted">Data from UK Parliament</a></p>
                                 </div>
                             </div>
                         </div>

diff --git a/hub/templates/hub/area/_mp_data.html b/hub/templates/hub/area/_mp_data.html
@@ -35,7 +35,7 @@ <h4 class="h6 mt-4 mb-1">Positions</h4>
                 </div>
             </div>
             <div class="card-footer bg-white">
-                <p class="card-text fs-8 text-muted">Data from <a href="https://www.theyworkforyou.com/{% if mp_data.twfyid %}mp/{{ mp_data.twfyid}}{% endif %}" class="text-decoration-none text-muted">TheyWorkForYou.com</a> and <a href="https://electionresults.parliament.uk/election/2019-12-12/Statistics/Majority" class="text-decoration-none text-muted">UK Parliament</a></p>
+                <p class="card-text fs-8 text-muted">Data from <a href="https://www.theyworkforyou.com/{% if mp_data.twfyid %}mp/{{ mp_data.twfyid}}{% endif %}" class="text-decoration-none text-muted">TheyWorkForYou.com</a> and <a href="https://electionresults.parliament.uk/election/2019-12-12/Statistics/Majority" class="text-decoration-none text-muted">UK Parliament</a>.</p>
             </div>
         </div>
 
@@ -61,7 +61,7 @@ <h5 class="card-title mb-3">MP profiles</h5>
                 </ul>
             </div>
             <div class="card-footer bg-white">
-                <p class="card-text fs-8"><a href="#" class="text-decoration-none text-muted">Data collated by The Climate Coalition</a></p>
+                <p class="card-text fs-8"><a href="#" class="text-decoration-none text-muted">Data collated by The Climate Coalition.</a></p>
             </div>
         </div>
       {% if mp.net_zero_target or mp.onshore_wind_energy %}
@@ -80,7 +80,7 @@ <h5>MP sector engagement</h5>
             </ul>
             </div>
             <div class="card-footer bg-white">
-                <p class="card-text fs-8"><a href="#" class="text-decoration-none text-muted">Data collated by mySociety</a></p>
+                <p class="card-text fs-8"><a href="#" class="text-decoration-none text-muted">Data collated by mySociety.</a></p>
             </div>
         </div>
         {% endif %}
@@ -125,7 +125,7 @@ <h6 class="text-muted fw-bold">APPGs</h6>
               {% endif %}
             </div>
             <div class="card-footer bg-white">
-                <p class="card-text fs-8"><a href="#" class="text-decoration-none text-muted">Data collated by The Climate Coalition</a></p>
+                <p class="card-text fs-8"><a href="#" class="text-decoration-none text-muted">Data collated by The Climate Coalition</a>.</p>
             </div>
         </div>
   <div class="card flex-grow-1 dataset-card">
@@ -157,7 +157,7 @@ <h5>Relevant votes & amendments</h5>
             </table>
             </div>
             <div class="card-footer bg-white">
-                <p class="card-text fs-8"><a href="#" class="text-decoration-none text-muted">Data from UK Parliament</a></p>
+                <p class="card-text fs-8"><a href="#" class="text-decoration-none text-muted">Data from UK Parliament</a>.</p>
             </div>
         </div>
 

diff --git a/hub/templates/hub/area/_mrp_data.html b/hub/templates/hub/area/_mrp_data.html
@@ -26,6 +26,6 @@ <h5>{{ dataset.label }}</h5>
         </table>
     </div>
     <div class="card-footer bg-white">
-        <p class="card-text fs-8 text-muted">Data from Focaldata 2023 MRP polling for HOPE not hate. <strong class="text-danger">Not to be publicly shared</strong></p>
+        <p class="card-text fs-8 text-muted">{{ dataset.source }} <strong class="text-danger">Not to be publicly shared</strong></p>
     </div>
 </div>
diff --git a/hub/templates/hub/area/_place_data.html b/hub/templates/hub/area/_place_data.html
@@ -142,9 +142,9 @@ <h5>{{ category.name }}</h5>
             </div>
             <div class="card-footer bg-white">
             {% if category.source_url %}
-                <p class="card-text fs-8"><a href="{{ category.source_url }}" class="text-decoration-none text-muted">Data from {{ category.source }}</a></p>
+                <p class="card-text fs-8"><a href="{{ category.source_url }}" class="text-decoration-none text-muted">{{ category.source }}</a></p>
             {% else %}
-                <p class="card-text fs-8 text-muted">Data from {{ category.source }}</p>
+                <p class="card-text fs-8 text-muted">{{ category.source }}</p>
             {% endif %}
             </div>
         </div>