Merge remote-tracking branch 'default-theme/main'

informed-governance-project · Oct 10, 2024 · e603849 · e603849
2 parents 8a2cd2f + ac6e5a1
commit e603849
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/templates/incidents_base.html b/templates/incidents_base.html
@@ -24,8 +24,8 @@
 <h3>{% translate "Reported incidents" %}</h3>
 {% endblock %}
 {% settings_value "TIME_ZONE" as time_zone %}
-<div class="d-flex {% if is_regulator or is_observer %}justify-content-end{% else %}justify-content-between{% endif %}">
-    {% if not is_regulator and not is_observer %}
+<div class="d-flex {% if is_regulator and not is_regulator_incidents or is_observer %}justify-content-end{% else %}justify-content-between{% endif %}">
+    {% if not is_regulator and not is_observer or is_regulator_incidents %}
     <div>
         <a role="button" class="btn btn-primary btn-sm" href="{% url 'declaration' %}">
             {% translate "Report an incident" %}
@@ -75,42 +75,42 @@ <h3>{% translate "Reported incidents" %}</h3>
 <table id="incidents-table" class="table align-middle table-sm small">
     <thead>
         <tr>
-            <th scope="col">{% translate "Incident notification date" %}</th>
-            <th scope="col">{% translate "Reference" %}</th>
-            <th scope="col">
+            <th class="text-start">{% translate "Incident notification date" %}</th>
+            <th>{% translate "Reference" %}</th>
+            <th>
                 {% if is_observer %}
                 {% translate "Regulator" %}
                 {% else %}
                 {% translate "Regulation" %}
                 {% endif %}
             </th>
-            <th scope="col">
+            <th>
                 {% if is_regulator and not is_regulator_incidents or is_observer %}
                 {% translate "Operator" %}
                 {% else %}
                 {% translate "Regulator" %}
                 {% endif %}
             </th>
-            <th scope="col">{% translate "Sectors" %}</th>
-            <th scope="col">{% translate "Subsectors" %}</th>
-            <th scope="col">
+            <th>{% translate "Sectors" %}</th>
+            <th>{% translate "Subsectors" %}</th>
+            <th>
                 <table class="table table-borderless table-sm m-0">
                     <tr>
                         <td>{% translate "Report" %}</td>
                         <td>{% translate "Status" %}</td>
                     </tr>
                 </table>
             </th>
-            <th scope="col">{% translate "Incident status" %}</th>
-            <th scope="col">{% translate "Significant impact" %}</th>
-            <th scope="col">{% translate "Actions" %}</th>
+            <th>{% translate "Incident status" %}</th>
+            <th>{% translate "Significant impact" %}</th>
+            <th>{% translate "Actions" %}</thss=>
         </tr>
     </thead>
     <tbody>
         {% for incident in incidents %}
         {% timezone time_zone %}
         <tr>
-            <td class="table-group-divider"> <!-- NoIncident notification date -->
+            <td class="table-group-divider text-start"> <!-- NoIncident notification date -->
                 {{incident.incident_notification_date|date:"d M Y, H:i" }}
             </td>
             <td class="table-group-divider"> <!-- Reference -->

diff --git a/templates/regulator/menu.html b/templates/regulator/menu.html
@@ -16,7 +16,6 @@
     <ul class="dropdown-menu" aria-labelledby="navbarDropdown">
         <li><a class="dropdown-item" href="{% url 'incidents' %}">{% translate "Dashboard" %}</a></li>
         <li><hr class="dropdown-divider"></li>  
-        <li><a class="dropdown-item" href="{% url 'declaration' %}">{% translate "Report an incident" %}</a></li>
         <li><a class="dropdown-item" href="{% url 'regulator_incidents' %}">{% translate "My incidents" %}</a></li>
     </ul>
   </li>