From 3ebb28ea275e43110dc2ca273cb1972b5428424a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Wed, 20 Feb 2019 13:54:52 +0100
Subject: [PATCH] misc: adjust availability check parameters dialog (#30786)

---
 passerelle/static/css/style.css                  |  9 +++++++++
 .../manage/manage_availability_form.html         | 16 +++++++++++++++-
 .../passerelle/manage/service_view.html          |  2 +-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/passerelle/static/css/style.css b/passerelle/static/css/style.css
index cde9dc2c..dfd2d765 100644
--- a/passerelle/static/css/style.css
+++ b/passerelle/static/css/style.css
@@ -13,6 +13,15 @@ span.down {
 	cursor: help;
 }
 
+span.availability-status-message {
+	display: block;
+	word-wrap: anywhere;
+	max-width: 30rem;
+	overflow: hidden;
+	font-size: 90%;
+	color: #666;
+}
+
 div#queries ul {
 	padding-left: 0;
 }
diff --git a/passerelle/templates/passerelle/manage/manage_availability_form.html b/passerelle/templates/passerelle/manage/manage_availability_form.html
index ae805075..f0896413 100644
--- a/passerelle/templates/passerelle/manage/manage_availability_form.html
+++ b/passerelle/templates/passerelle/manage/manage_availability_form.html
@@ -2,12 +2,26 @@
 {% load i18n %}
 
 {% block appbar %}
-<h2>{% trans 'Connector Status' %} : {{availability_status.status}}</h2>
+<h2>{% trans "Availability check parameters" %}</h2>
 {% endblock %}
 
 {% block content %}
 <form method="post">
   {% csrf_token %}
+
+  {% if availability_status %}
+  <div class="{% if availability_status.down %}errornotice{% else %}successnotice{% endif %}">
+    {% trans 'Connector Status:' %}
+    {% if availability_status.down %}
+      {% trans 'Down' %}
+      ({% trans 'since:' %} {{availability_status.start_timestamp|date:"SHORT_DATETIME_FORMAT"}})
+      <span class="availability-status-message">{{availability_status.message}}</span>
+    {% else %}
+      {% trans 'Up' %}
+    {% endif %}
+  </div>
+  {% endif %}
+
   {{ form.as_p }}
   <div class="buttons">
     <button class="submit-button">{% trans 'Save' %}</button>
diff --git a/passerelle/templates/passerelle/manage/service_view.html b/passerelle/templates/passerelle/manage/service_view.html
index 4270cb5f..44c7774d 100644
--- a/passerelle/templates/passerelle/manage/service_view.html
+++ b/passerelle/templates/passerelle/manage/service_view.html
@@ -16,7 +16,7 @@
 </h2>
 <span class="actions">
 {% if object|can_edit:request.user and has_check_status %}
-<a rel="popup" href="{% url 'manage-availability' resource_type=object|resource_type resource_pk=object.id %}">{% trans 'availability check' %}</a>
+<a rel="popup" href="{% url 'manage-availability' resource_type=object|resource_type resource_pk=object.id %}">{% trans 'availability check parameters' %}</a>
 {% endif %}
 {% if object|can_edit:request.user %}
 <a rel="popup" href="{% url 'logging-parameters' resource_type=object|resource_type resource_pk=object.id %}">{% trans 'logging parameters' %}</a>