Merge pull request #570 from OpenUpSA/commitee-links-jinja

moved renamed commitee links
OpenUpSA · Sep 5, 2024 · 1df82d2 · 1df82d2
2 parents 831ccc7 + 94cfd1b
commit 1df82d2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/pmg/templates/committee_detail.html b/pmg/templates/committee_detail.html
@@ -8,6 +8,20 @@ <h3 class="collapse-link cte-about-link"><span class="fa fa-fw fa-caret-right"><
     </div>
   {% endif %}
 
+  <!-- 7th parliament changed committees. Link to the old committees -->
+  <div class="renamed-committee-links my-2">
+    {% if committee.id == 95 %}
+      This committee was previously part of <strong>Agriculture, Land Reform and Rural Development</strong>.<br/>Historical meetings are available in the <strong><a href="/committee/37/">Agriculture</a></strong> committee.
+    {% endif %}
+    {% if committee.id == 23 %}
+      This committee was previously part of <strong>Higher Education, Science and Innovation</strong>.<br/>Historical meetings are available in the <strong><a href="/committee/64/">Higher Education</a></strong> committee.
+    {% endif %}
+    {% if committee.id == 40 %}
+      This committee was previously part of <strong>Justice and Correctional Services</strong>.<br/>Historical meetings are available in the <strong><a href="/committee/38/">Justice and Constitutional Development</a></strong> committee.
+    {% endif %}
+  </div>
+  <!-- end link to old committee -->
+
   {% if committee.house.sphere == 'provincial' and not committee.monitored %}
     {% include '_committee_membership.html' %}
   {% else %}

diff --git a/pmg/templates/committee_layout.html b/pmg/templates/committee_layout.html
@@ -39,20 +39,6 @@ <h4 class="light-red">{{ committee.house.name }} Committee</h4>
         {% endblock %}
       </header>
 
-      <!-- 7th parliament changed committees. Link to the old committees -->
-      <div class="renamed-committee-links">
-        {% if committee.id == 95 %}
-          This committee was previously part of <strong>Agriculture, Land Reform and Rural Development</strong>.<br/>Historical meetings are available in the <strong><a href="/committee/37/">Agriculture</a></strong> committee.
-        {% endif %}
-        {% if committee.id == 23 %}
-          This committee was previously part of <strong>Higher Education, Science and Innovation</strong>.<br/>Historical meetings are available in the <strong><a href="/committee/64/">Higher Education</a></strong> committee.
-        {% endif %}
-        {% if committee.id == 40 %}
-          This committee was previously part of <strong>Justice and Correctional Services</strong>.<br/>Historical meetings are available in the <strong><a href="/committee/38/">Justice and Constitutional Development</a></strong> committee.
-        {% endif %}
-      </div>
-      <!-- end link to old committee -->
-
       <div class="committee-page">
         {% block committee_page %}
         {% endblock %}