Merge pull request #465 from sanduhrs/feature/463

Remove services status page
7 years ago · 91e51a24c8
parent ebdfcbd18e 6177571e4d
commit 91e51a24c8
15 changed files with 0 additions and 383 deletions
--- a/core/admin/mailu/translations/de/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/de/LC_MESSAGES/messages.po
@ -193,34 +193,6 @@ msgstr "Konto"
 msgid "to access the administration tools"
 msgstr "für administrativen Zugriff"

-#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
-msgid "Services status"
-msgstr "Dienst-Status"
-
-#: mailu/ui/templates/services.html:10
-msgid "Service"
-msgstr "Dienst"
-
-#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
-msgid "Status"
-msgstr "Status"
-
-#: mailu/ui/templates/services.html:12
-msgid "PID"
-msgstr "PID"
-
-#: mailu/ui/templates/services.html:13
-msgid "Image"
-msgstr "Image"
-
-#: mailu/ui/templates/services.html:14
-msgid "Started"
-msgstr "Gestartet"
-
-#: mailu/ui/templates/services.html:15
-msgid "Last update"
-msgstr "Letztes Update"
-
 #: mailu/ui/templates/sidebar.html:8
 msgid "My account"
 msgstr "Mein Konto"
--- a/core/admin/mailu/translations/en/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/en/LC_MESSAGES/messages.po
@ -291,34 +291,6 @@ msgstr ""
 msgid "to access the administration tools"
 msgstr ""

-#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
-msgid "Services status"
-msgstr ""
-
-#: mailu/ui/templates/services.html:10
-msgid "Service"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
-msgid "Status"
-msgstr ""
-
-#: mailu/ui/templates/services.html:12
-msgid "PID"
-msgstr ""
-
-#: mailu/ui/templates/services.html:13
-msgid "Image"
-msgstr ""
-
-#: mailu/ui/templates/services.html:14
-msgid "Started"
-msgstr ""
-
-#: mailu/ui/templates/services.html:15
-msgid "Last update"
-msgstr ""
-
 #: mailu/ui/templates/sidebar.html:8
 msgid "My account"
 msgstr ""
--- a/core/admin/mailu/translations/es/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/es/LC_MESSAGES/messages.po
@ -193,34 +193,6 @@ msgstr ""
 msgid "to access the administration tools"
 msgstr "para acceder a las herramientas de administración"

-#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
-msgid "Services status"
-msgstr "Estado de servicios"
-
-#: mailu/ui/templates/services.html:10
-msgid "Service"
-msgstr "Servicio"
-
-#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
-msgid "Status"
-msgstr "Estado"
-
-#: mailu/ui/templates/services.html:12
-msgid "PID"
-msgstr "PID"
-
-#: mailu/ui/templates/services.html:13
-msgid "Image"
-msgstr "Imagen"
-
-#: mailu/ui/templates/services.html:14
-msgid "Started"
-msgstr "Iniciado"
-
-#: mailu/ui/templates/services.html:15
-msgid "Last update"
-msgstr "Última actualización"
-
 #: mailu/ui/templates/sidebar.html:8
 msgid "My account"
 msgstr "Mi cuenta"
--- a/core/admin/mailu/translations/fr/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/fr/LC_MESSAGES/messages.po
@ -193,34 +193,6 @@ msgstr "Votre compte"
 msgid "to access the administration tools"
 msgstr "pour accéder aux outils d'administration"

-#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
-msgid "Services status"
-msgstr "Etat des services"
-
-#: mailu/ui/templates/services.html:10
-msgid "Service"
-msgstr "Service"
-
-#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
-msgid "Status"
-msgstr "Etat"
-
-#: mailu/ui/templates/services.html:12
-msgid "PID"
-msgstr "PID"
-
-#: mailu/ui/templates/services.html:13
-msgid "Image"
-msgstr "Image"
-
-#: mailu/ui/templates/services.html:14
-msgid "Started"
-msgstr "Démarré depuis"
-
-#: mailu/ui/templates/services.html:15
-msgid "Last update"
-msgstr "Dernière mise à jour"
-
 #: mailu/ui/templates/sidebar.html:8
 msgid "My account"
 msgstr "Mon compte"
--- a/core/admin/mailu/translations/it/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/it/LC_MESSAGES/messages.po
@ -194,34 +194,6 @@ msgstr "Il tuo account"
 msgid "to access the administration tools"
 msgstr ""

-#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
-msgid "Services status"
-msgstr ""
-
-#: mailu/ui/templates/services.html:10
-msgid "Service"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
-msgid "Status"
-msgstr "Stato"
-
-#: mailu/ui/templates/services.html:12
-msgid "PID"
-msgstr "PID"
-
-#: mailu/ui/templates/services.html:13
-msgid "Image"
-msgstr "Immagine"
-
-#: mailu/ui/templates/services.html:14
-msgid "Started"
-msgstr "Avviato"
-
-#: mailu/ui/templates/services.html:15
-msgid "Last update"
-msgstr "Ultimo aggiornamento"
-
 #: mailu/ui/templates/sidebar.html:8
 msgid "My account"
 msgstr "Il mio account"
--- a/core/admin/mailu/translations/nl/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/nl/LC_MESSAGES/messages.po
@ -193,34 +193,6 @@ msgstr "Uw account"
 msgid "to access the administration tools"
 msgstr "om toegang te krijgen tot systeembeheer"

-#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
-msgid "Services status"
-msgstr "Status diensten"
-
-#: mailu/ui/templates/services.html:10
-msgid "Service"
-msgstr "Dienst"
-
-#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
-msgid "Status"
-msgstr "Status"
-
-#: mailu/ui/templates/services.html:12
-msgid "PID"
-msgstr "PID"
-
-#: mailu/ui/templates/services.html:13
-msgid "Image"
-msgstr "Image"
-
-#: mailu/ui/templates/services.html:14
-msgid "Started"
-msgstr "Gestart"
-
-#: mailu/ui/templates/services.html:15
-msgid "Last update"
-msgstr "Laatste aanpassing"
-
 #: mailu/ui/templates/sidebar.html:8
 msgid "My account"
 msgstr "Mijn account"
--- a/core/admin/mailu/translations/pl/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/pl/LC_MESSAGES/messages.po
@ -194,34 +194,6 @@ msgstr "Twoje konto"
 msgid "to access the administration tools"
 msgstr ""

-#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
-msgid "Services status"
-msgstr "Status usług"
-
-#: mailu/ui/templates/services.html:10
-msgid "Service"
-msgstr "Usługa"
-
-#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
-msgid "Status"
-msgstr "Status"
-
-#: mailu/ui/templates/services.html:12
-msgid "PID"
-msgstr ""
-
-#: mailu/ui/templates/services.html:13
-msgid "Image"
-msgstr ""
-
-#: mailu/ui/templates/services.html:14
-msgid "Started"
-msgstr ""
-
-#: mailu/ui/templates/services.html:15
-msgid "Last update"
-msgstr "Ostatnia aktualizacja"
-
 #: mailu/ui/templates/sidebar.html:8
 msgid "My account"
 msgstr "Moje konto"
--- a/core/admin/mailu/translations/pt/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/pt/LC_MESSAGES/messages.po
@ -193,34 +193,6 @@ msgstr "Sua conta"
 msgid "to access the administration tools"
 msgstr "para acessar as ferramentas administrativas"

-#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
-msgid "Services status"
-msgstr "Status do serviço"
-
-#: mailu/ui/templates/services.html:10
-msgid "Service"
-msgstr "Serviço"
-
-#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
-msgid "Status"
-msgstr "Status"
-
-#: mailu/ui/templates/services.html:12
-msgid "PID"
-msgstr "PID"
-
-#: mailu/ui/templates/services.html:13
-msgid "Image"
-msgstr "Imagem"
-
-#: mailu/ui/templates/services.html:14
-msgid "Started"
-msgstr "Iniciado"
-
-#: mailu/ui/templates/services.html:15
-msgid "Last update"
-msgstr "Última atualização"
-
 #: mailu/ui/templates/sidebar.html:8
 msgid "My account"
 msgstr "Minha conta"
--- a/core/admin/mailu/translations/ru/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/ru/LC_MESSAGES/messages.po
@ -193,34 +193,6 @@ msgstr "Ваша учетная запись"
 msgid "to access the administration tools"
 msgstr "для доступа к утилитам администрирования"

-#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
-msgid "Services status"
-msgstr "Статусы сервисов"
-
-#: mailu/ui/templates/services.html:10
-msgid "Service"
-msgstr "Сервис"
-
-#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
-msgid "Status"
-msgstr "Статус"
-
-#: mailu/ui/templates/services.html:12
-msgid "PID"
-msgstr "PID"
-
-#: mailu/ui/templates/services.html:13
-msgid "Image"
-msgstr "Изображение"
-
-#: mailu/ui/templates/services.html:14
-msgid "Started"
-msgstr "Начато"
-
-#: mailu/ui/templates/services.html:15
-msgid "Last update"
-msgstr "Последнее обновление"
-
 #: mailu/ui/templates/sidebar.html:8
 msgid "My account"
 msgstr "Моя учетная запись"
--- a/core/admin/mailu/translations/sv/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/sv/LC_MESSAGES/messages.po
@ -193,34 +193,6 @@ msgstr "Ditt konto"
 msgid "to access the administration tools"
 msgstr "att komma åt administrationsverktygen"

-#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
-msgid "Services status"
-msgstr "Tjänster status"
-
-#: mailu/ui/templates/services.html:10
-msgid "Service"
-msgstr "Tjänst"
-
-#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
-msgid "Status"
-msgstr "Status"
-
-#: mailu/ui/templates/services.html:12
-msgid "PID"
-msgstr "PID"
-
-#: mailu/ui/templates/services.html:13
-msgid "Image"
-msgstr "Bild"
-
-#: mailu/ui/templates/services.html:14
-msgid "Started"
-msgstr "Startad"
-
-#: mailu/ui/templates/services.html:15
-msgid "Last update"
-msgstr "Senast uppdaterad"
-
 #: mailu/ui/templates/sidebar.html:8
 msgid "My account"
 msgstr "Mitt konto"
--- a/core/admin/mailu/translations/zh_CN/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/zh_CN/LC_MESSAGES/messages.po
@ -193,34 +193,6 @@ msgstr "你的帐户"
 msgid "to access the administration tools"
 msgstr "访问管理员工具"

-#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
-msgid "Services status"
-msgstr "服务状态"
-
-#: mailu/ui/templates/services.html:10
-msgid "Service"
-msgstr "服务"
-
-#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
-msgid "Status"
-msgstr "状态"
-
-#: mailu/ui/templates/services.html:12
-msgid "PID"
-msgstr "进程ID"
-
-#: mailu/ui/templates/services.html:13
-msgid "Image"
-msgstr "镜像"
-
-#: mailu/ui/templates/services.html:14
-msgid "Started"
-msgstr "已开始"
-
-#: mailu/ui/templates/services.html:15
-msgid "Last update"
-msgstr "最后更新"
-
 #: mailu/ui/templates/sidebar.html:8
 msgid "My account"
 msgstr "我的帐户"
--- a/core/admin/mailu/ui/templates/services.html
+++ b/core/admin/mailu/ui/templates/services.html
@ -1,28 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}
-{% trans %}Services status{% endtrans %}
-{% endblock %}
-
-{% block content %}
-{% call macros.table() %}
-<tr>
-  <th>{% trans %}Service{% endtrans %}</th>
-  <th>{% trans %}Status{% endtrans %}</th>
-  <th>{% trans %}PID{% endtrans %}</th>
-  <th>{% trans %}Image{% endtrans %}</th>
-  <th>{% trans %}Started{% endtrans %}</th>
-  <th>{% trans %}Last update{% endtrans %}</th>
-</tr>
-{% for name, container in containers.items() %}
-<tr>
-  <td>{{ name }}</td>
-  <td><span class="label label-{{ "success" if container['State']['Running'] else "danger" }}">{{ container['State']['Status'] }}</span></td>
-  <td>{{ container['State']['Pid'] }}</td>
-  <td>{{ container['Config']['Image'] }}</td>
-  <td>{{ container['State']['StartedAt'] }}</td>
-  <td>{{ container['Image']['Created'] }}
-</tr>
-{% endfor %}
-{% endcall %}
-{% endblock %}
--- a/core/admin/mailu/ui/templates/sidebar.html
+++ b/core/admin/mailu/ui/templates/sidebar.html
@ -34,11 +34,6 @@

    <li class="header">{% trans %}Administration{% endtrans %}</li>
    {% if current_user.global_admin %}
-    <li>
-      <a href="{{ url_for('.services') }}">
-        <i class="fa fa-dashboard"></i> <span>{% trans %}Services status{% endtrans %}</span>
-      </a>
-    </li>
    <li>
      <a href="{{ url_for('.announcement') }}">
        <i class="fa fa-bullhorn"></i> <span>{% trans %}Announcement{% endtrans %}</span>
--- a/core/admin/mailu/ui/views/base.py
+++ b/core/admin/mailu/ui/views/base.py
@ -35,16 +35,6 @@ def logout():
    return flask.redirect(flask.url_for('.index'))


-@ui.route('/services', methods=['GET'])
-@access.global_admin
-def services():
-    try:
-        containers = dockercli.get()
-    except Exception as error:
-        return flask.render_template('docker-error.html', error=error)
-    return flask.render_template('services.html', containers=containers)
-
-
@ui.route('/announcement', methods=['GET', 'POST'])
@access.global_admin
 def announcement():
--- a/core/admin/messages.pot
+++ b/core/admin/messages.pot
@ -290,38 +290,6 @@ msgstr ""
 msgid "to access the administration tools"
 msgstr ""

-#: mailu/ui/templates/services.html:4 mailu/ui/templates/sidebar.html:39
-msgid "Services status"
-msgstr ""
-
-#: mailu/ui/templates/services.html:10
-msgid "Service"
-msgstr ""
-
-#: mailu/ui/templates/fetch/list.html:23 mailu/ui/templates/services.html:11
-msgid "Status"
-msgstr ""
-
-#: mailu/ui/templates/services.html:12
-msgid "PID"
-msgstr ""
-
-#: mailu/ui/templates/services.html:13
-msgid "Image"
-msgstr ""
-
-#: mailu/ui/templates/services.html:14
-msgid "Started"
-msgstr ""
-
-#: mailu/ui/templates/services.html:15
-msgid "Last update"
-msgstr ""
-
-#: mailu/ui/templates/sidebar.html:8
-msgid "My account"
-msgstr ""
-
 #: mailu/ui/templates/sidebar.html:11 mailu/ui/templates/user/list.html:34
 msgid "Settings"
 msgstr ""