Fix home

ISI-MIP · Aug 16, 2023 · 3992fbd · 3992fbd
1 parent 5cbeac6
commit 3992fbd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/isimip_data/home/templates/home/home.html b/isimip_data/home/templates/home/home.html
@@ -118,7 +118,7 @@ <h3>Output data</h3>
                     </div>
                     <h5>Agriculture sector</h5>
                     <p>
-                        Output data from the {% home_inline_list 'OutputData' 'agriculture' %} simulation rounds.
+                        Output data from {% home_inline_list 'OutputData' 'agriculture' %}.
                     </p>
                 </div>
                 <div class="col-md-3 mb-4">
@@ -136,7 +136,7 @@ <h5>Agriculture sector</h5>
                     </div>
                     <h5>Terrestrial biodiversity sector</h5>
                     <p>
-                        Output data from the {% home_inline_list 'OutputData' 'biodiversity' %} simulation rounds.
+                        Output data from {% home_inline_list 'OutputData' 'biodiversity' %}.
                     </p>
                 </div>
                 <div class="col-md-3 mb-4">
@@ -154,7 +154,7 @@ <h5>Terrestrial biodiversity sector</h5>
                     </div>
                     <h5>Biomes sector</h5>
                     <p>
-                        Output data from the {% home_inline_list 'OutputData' 'biomes' %} simulation rounds.
+                        Output data from {% home_inline_list 'OutputData' 'biomes' %}.
                     </p>
                 </div>
                 <div class="col-md-3 mb-4">
@@ -172,7 +172,7 @@ <h5>Biomes sector</h5>
                     </div>
                     <h5>Fire sector</h5>
                     <p>
-                        Output data from the {% home_inline_list 'OutputData' 'fire' %} simulation round.
+                        Output data from {% home_inline_list 'OutputData' 'fire' %}.
                     </p>
                 </div>
                 <div class="col-md-3 mb-4">
@@ -190,7 +190,7 @@ <h5>Fire sector</h5>
                     </div>
                     <h5>Regional forests sector</h5>
                     <p>
-                        Output data from the {% home_inline_list 'OutputData' 'forestry' %} simulation round.
+                        Output data from {% home_inline_list 'OutputData' 'forestry' %}.
                     </p>
                 </div>
                 <div class="col-md-3 mb-4">
@@ -208,7 +208,7 @@ <h5>Regional forests sector</h5>
                     </div>
                     <h5>Temperature-related mortality sector</h5>
                     <p>
-                        Output data from the {% home_inline_list 'OutputData' 'health' %} simulation round.
+                        Output data from {% home_inline_list 'OutputData' 'health' %}.
                     </p>
                 </div>
                 <div class="col-md-3 mb-4">
@@ -226,7 +226,7 @@ <h5>Temperature-related mortality sector</h5>
                     </div>
                     <h5>Lakes (global) sector</h5>
                     <p>
-                        Output data from the {% home_inline_list 'OutputData' 'lakes_global' %} simulation rounds.
+                        Output data from {% home_inline_list 'OutputData' 'lakes_global' %}.
                     </p>
                 </div>
                 <div class="col-md-3 mb-4">
@@ -244,7 +244,7 @@ <h5>Lakes (global) sector</h5>
                     </div>
                     <h5>Lakes (local) sector</h5>
                     <p>
-                        Output data from the {% home_inline_list 'OutputData' 'lakes_local' %} simulation rounds.
+                        Output data from {% home_inline_list 'OutputData' 'lakes_local' %}.
                     </p>
                 </div>
                 <div class="col-md-3 mb-4">
@@ -262,7 +262,7 @@ <h5>Lakes (local) sector</h5>
                     </div>
                     <h5>Fisheries & Marine Ecosystems (global) sector</h5>
                     <p>
-                        Output data from the {% home_inline_list 'OutputData' 'marine-fishery_global' %} simulation round.
+                        Output data from {% home_inline_list 'OutputData' 'marine-fishery_global' %}.
                     </p>
                 </div>
                 <div class="col-md-3 mb-4">
@@ -280,7 +280,7 @@ <h5>Fisheries & Marine Ecosystems (global) sector</h5>
                     </div>
                     <h5>Fisheries & Marine Ecosystems (regional) sector</h5>
                     <p>
-                        Output data from the {% home_inline_list 'OutputData' 'marine-fishery_regional' %} simulation round.
+                        Output data from {% home_inline_list 'OutputData' 'marine-fishery_regional' %}.
                     </p>
                 </div>
                 <div class="col-md-3 mb-4">
@@ -298,7 +298,7 @@ <h5>Fisheries & Marine Ecosystems (regional) sector</h5>
                     </div>
                     <h5 class="card-title">Permafrost sector</h5>
                     <p>
-                        Output data from the {% home_inline_list 'OutputData' 'permafrost' %} simulation rounds.
+                        Output data from {% home_inline_list 'OutputData' 'permafrost' %}.
                     </p>
                 </div>
                 <div class="col-md-3 mb-4">
@@ -316,7 +316,7 @@ <h5 class="card-title">Permafrost sector</h5>
                     </div>
                     <h5>Water (global) sector</h5>
                     <p>
-                        Output data from the {% home_inline_list 'OutputData' 'water_global' %} simulation rounds.
+                        Output data from {% home_inline_list 'OutputData' 'water_global' %}.
                     </p>
                 </div>
                 <div class="col-md-3 mb-4">
@@ -334,7 +334,7 @@ <h5>Water (global) sector</h5>
                     </div>
                     <h5>Water (regional) sector</h5>
                     <p>
-                        Output data from the {% home_inline_list 'OutputData' 'water_regional' %} simulation rounds.
+                        Output data from {% home_inline_list 'OutputData' 'water_regional' %}.
                     </p>
                 </div>
             </div>

diff --git a/isimip_data/home/templates/home/tags/home_inline_list.html b/isimip_data/home/templates/home/tags/home_inline_list.html
@@ -1,3 +1 @@
-{% for text, href in links %}
-<a class="badge badge-light" href="{{ href }}">{{ text }}</a>{% if forloop.revcounter0 == 1 %}, and{% elif forloop.revcounter > 1 %}, {% endif %}
-{% endfor %}
+{% for text, href in links %}<a class="badge badge-light" href="{{ href }}">{{ text }}</a>{% if forloop.revcounter0 == 1 %}{% if forloop.counter0 > 1 %},{% endif %} and{% elif forloop.revcounter > 1 %}, {% endif %}{% endfor %}