Master update

templates/status/status-members.html

@@ -7,28 +7,32 @@
     {% set alert_text = 'status OK' %}
     {% set error_message = '' %}
     {% set problem_class = ' feed-ok' %}
-    {% if federation.fed.feed_problem %}
-        {% set alert_icon = 'orange_dot.png' %}
-        {% set alert_text = 'metadata update problem' %}
-        {% if federation.fed.status == 6 %}
+    {% if federation.fed.status == 6 %}
+        {% if federation.fed.feed_problem %}
+            {% set alert_icon = 'orange_dot.png' %}
+            {% set alert_text = 'metadata update problem' %}    
             {% set problem_class = ' feed-problem' %}
         {% endif %}
-    {% endif %}
+        {% if federation.fed.valid_sec <= 0 %}
+            {% set alert_icon = 'red_dot.png' %}
+            {% set alert_text = 'metadata dropped' %}
+            {% set problem_class = ' feed-problem' %}
+        {% elseif federation.fed.valid_sec <= constant('VALIDITY_ALERT_THRESHOLD') %}
+            {% set alert_icon = 'orange_dot.png' %}
+            {% set alert_text = 'validUnitl under ' ~ constant('VALIDITY_ALERT_THRESHOLD')/3600 ~ ' hours' %}
+        {% elseif federation.fed.valid_sec < constant('VALIDITY_WARNING_THRESHOLD') %}
+            {% set alert_icon = 'blue_dot.png' %}
+            {% set problem_class = ' feed-problem' %}
+            {% set alert_text = 'validUnitl between ' ~ constant('VALIDITY_ALERT_THRESHOLD')/3600 ~ ' and ' ~ constant('VALIDITY_WARNING_THRESHOLD')/3600 ~ ' hours' %}
+        {% endif %}        
+    {% endif %}    
     {% if federation.information_missing %}
         {% set error_message = error_message ~ ' information missing' %}
     {% endif %}
-    {% if federation.fed.valid_sec <= 0 %}
+    {% if federation.fed.status == 5 %}
         {% set alert_icon = 'red_dot.png' %}
-        {% set alert_text = 'metadata dropped' %}
-        {% set problem_class = ' feed-problem' %}
-    {% elseif federation.fed.valid_sec <= constant('VALIDITY_ALERT_THRESHOLD') %}
-        {% set alert_icon = 'orange_dot.png' %}
-        {% set alert_text = 'validUnitl under ' ~ constant('VALIDITY_ALERT_THRESHOLD')/3600 ~ ' hours' %}
-    {% elseif federation.fed.valid_sec < constant('VALIDITY_WARNING_THRESHOLD') %}
-        {% set alert_icon = 'blue_dot.png' %}
-        {% set problem_class = ' feed-problem' %}
-        {% set alert_text = 'validUnitl between ' ~ constant('VALIDITY_ALERT_THRESHOLD')/3600 ~ ' and ' ~ constant('VALIDITY_WARNING_THRESHOLD')/3600 ~ ' hours' %}
-    {% endif %}
+    {% endif %}    
+    
 <div id="{{ federation.fed.code }}_option_div" class="member-div{{ problem_class }}" style="padding-left: 1em;{%
 if federation.information_missing
 %}color: red;{%