contact.html.erb in flapjack-0.7.35

- old
+ new

@@ -104,36 +104,10 @@
               <% end %>
             <% end %>
           </table>
         <% end %>
 
-        <h3>All Entities and Checks</h3>
-        <% if !@entities_and_checks || @entities_and_checks.empty? %>
-          <p>No entities</p>
-        <% else %>
-          <table class="table table-bordered table-hover table-condensed">
-            <tr>
-              <th>Entity</th>
-              <th>Checks</th>
-            </tr>
-            <% @entities_and_checks.each do |ec| %>
-              <%
-                entity = ec[:entity]
-                checks = ec[:checks]
-               %>
-              <tr>
-                <td><a href="/entity/<%= u(entity.name) %>" title="entity status"><%= h entity.name %></a></td>
-                <td>
-                  <% checks.each do |check| %>
-                  <%=   "<a href=\"/check?entity=#{u(entity.name)}&amp;check=#{u(check)}\" title=\"check status\">#{ h check }</a>" %>
-                  <% end %>
-                </td>
-              </tr>
-            <% end %>
-          </table>
-        <% end %>
-
         <h3>Notification Rules</h3>
         <% rules = @contact.notification_rules %>
         <% if !rules || rules.empty? %>
           <p>No notification rules</p>
         <% else %>
@@ -159,10 +133,36 @@
                 <% blackholes << 'Warning' if rule.warning_blackhole %>
                 <% blackholes << 'Critical' if rule.critical_blackhole %>
                 <td><%= h(blackholes.join(', ')) %></td>
               </tr>
             <% end %>
-            </table>
+          </table>
+        <% end %>
+
+        <h3>All Entities and Checks</h3>
+        <% if !@entities_and_checks || @entities_and_checks.empty? %>
+          <p>No entities</p>
+        <% else %>
+          <table class="table table-bordered table-hover table-condensed">
+            <tr>
+              <th>Entity</th>
+              <th>Checks</th>
+            </tr>
+            <% @entities_and_checks.each do |ec| %>
+              <%
+                entity = ec[:entity]
+                checks = ec[:checks]
+               %>
+              <tr>
+                <td><a href="/entity/<%= u(entity.name) %>" title="entity status"><%= h entity.name %></a></td>
+                <td>
+                  <% checks.each do |check| %>
+                  <%=   "<a href=\"/check?entity=#{u(entity.name)}&amp;check=#{u(check)}\" title=\"check status\">#{ h check }</a>" %>
+                  <% end %>
+                </td>
+              </tr>
+            <% end %>
+          </table>
         <% end %>
 
       </div>
       <div id="push"></div>
     </div>