From ec8e82aaca8b5a9d1aca36a85680d46f7745a48e Mon Sep 17 00:00:00 2001 From: Stefan Auditor Date: Mon, 23 Apr 2018 18:55:13 +0200 Subject: [PATCH 1/4] Remove services status template --- core/admin/mailu/ui/templates/services.html | 28 --------------------- 1 file changed, 28 deletions(-) delete mode 100644 core/admin/mailu/ui/templates/services.html diff --git a/core/admin/mailu/ui/templates/services.html b/core/admin/mailu/ui/templates/services.html deleted file mode 100644 index 4e415144..00000000 --- a/core/admin/mailu/ui/templates/services.html +++ /dev/null @@ -1,28 +0,0 @@ -{% extends "base.html" %} - -{% block title %} -{% trans %}Services status{% endtrans %} -{% endblock %} - -{% block content %} -{% call macros.table() %} - - {% trans %}Service{% endtrans %} - {% trans %}Status{% endtrans %} - {% trans %}PID{% endtrans %} - {% trans %}Image{% endtrans %} - {% trans %}Started{% endtrans %} - {% trans %}Last update{% endtrans %} - -{% for name, container in containers.items() %} - - {{ name }} - {{ container['State']['Status'] }} - {{ container['State']['Pid'] }} - {{ container['Config']['Image'] }} - {{ container['State']['StartedAt'] }} - {{ container['Image']['Created'] }} - -{% endfor %} -{% endcall %} -{% endblock %} From e89b32a3f4d1fcb307b6f2df95b6f164706ec481 Mon Sep 17 00:00:00 2001 From: Stefan Auditor Date: Mon, 23 Apr 2018 18:55:37 +0200 Subject: [PATCH 2/4] Remove services route --- core/admin/mailu/ui/views/base.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/core/admin/mailu/ui/views/base.py b/core/admin/mailu/ui/views/base.py index 6d4ea022..1ea87401 100644 --- 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(): From b541d4c25713ac1ff09c57346ddff26f84db691c Mon Sep 17 00:00:00 2001 From: Stefan Auditor Date: Mon, 23 Apr 2018 18:56:48 +0200 Subject: [PATCH 3/4] Remove services status sidebar link --- core/admin/mailu/ui/templates/sidebar.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/core/admin/mailu/ui/templates/sidebar.html b/core/admin/mailu/ui/templates/sidebar.html index 2520fa33..7ba86e1f 100644 --- a/core/admin/mailu/ui/templates/sidebar.html +++ b/core/admin/mailu/ui/templates/sidebar.html @@ -34,11 +34,6 @@
  • {% trans %}Administration{% endtrans %}
    • {% if current_user.global_admin %} -
  • - - {% trans %}Services status{% endtrans %} - -
  • {% trans %}Announcement{% endtrans %} From 6177571e4d47c3b5a7d333ca0633a9cba1422e51 Mon Sep 17 00:00:00 2001 From: Stefan Auditor Date: Mon, 23 Apr 2018 18:59:46 +0200 Subject: [PATCH 4/4] Remove services status localization --- .../translations/de/LC_MESSAGES/messages.po | 28 ---------------- .../translations/en/LC_MESSAGES/messages.po | 28 ---------------- .../translations/es/LC_MESSAGES/messages.po | 28 ---------------- .../translations/fr/LC_MESSAGES/messages.po | 28 ---------------- .../translations/it/LC_MESSAGES/messages.po | 28 ---------------- .../translations/nl/LC_MESSAGES/messages.po | 28 ---------------- .../translations/pl/LC_MESSAGES/messages.po | 28 ---------------- .../translations/pt/LC_MESSAGES/messages.po | 28 ---------------- .../translations/ru/LC_MESSAGES/messages.po | 28 ---------------- .../translations/sv/LC_MESSAGES/messages.po | 28 ---------------- .../zh_CN/LC_MESSAGES/messages.po | 28 ---------------- core/admin/messages.pot | 32 ------------------- 12 files changed, 340 deletions(-) diff --git a/core/admin/mailu/translations/de/LC_MESSAGES/messages.po b/core/admin/mailu/translations/de/LC_MESSAGES/messages.po index 5b56467c..c733b45d 100644 --- 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" diff --git a/core/admin/mailu/translations/en/LC_MESSAGES/messages.po b/core/admin/mailu/translations/en/LC_MESSAGES/messages.po index e31d0359..87f411e0 100644 --- 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 "" diff --git a/core/admin/mailu/translations/es/LC_MESSAGES/messages.po b/core/admin/mailu/translations/es/LC_MESSAGES/messages.po index 74d57795..e3fd6c1d 100644 --- 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" diff --git a/core/admin/mailu/translations/fr/LC_MESSAGES/messages.po b/core/admin/mailu/translations/fr/LC_MESSAGES/messages.po index 8939605c..0d8077a0 100644 --- 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" diff --git a/core/admin/mailu/translations/it/LC_MESSAGES/messages.po b/core/admin/mailu/translations/it/LC_MESSAGES/messages.po index a7649e2a..e53cd4df 100644 --- 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" diff --git a/core/admin/mailu/translations/nl/LC_MESSAGES/messages.po b/core/admin/mailu/translations/nl/LC_MESSAGES/messages.po index 673ca205..2e6e2c7e 100644 --- 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" diff --git a/core/admin/mailu/translations/pl/LC_MESSAGES/messages.po b/core/admin/mailu/translations/pl/LC_MESSAGES/messages.po index 56555232..43f7b72b 100644 --- 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" diff --git a/core/admin/mailu/translations/pt/LC_MESSAGES/messages.po b/core/admin/mailu/translations/pt/LC_MESSAGES/messages.po index af72d033..6cef189f 100644 --- 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" diff --git a/core/admin/mailu/translations/ru/LC_MESSAGES/messages.po b/core/admin/mailu/translations/ru/LC_MESSAGES/messages.po index 8fdc026e..3456cd6b 100644 --- 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 "Моя учетная запись" diff --git a/core/admin/mailu/translations/sv/LC_MESSAGES/messages.po b/core/admin/mailu/translations/sv/LC_MESSAGES/messages.po index 3d0c6fd5..61e3458b 100644 --- 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" diff --git a/core/admin/mailu/translations/zh_CN/LC_MESSAGES/messages.po b/core/admin/mailu/translations/zh_CN/LC_MESSAGES/messages.po index cb049318..3b0a2332 100644 --- 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 "我的帐户" diff --git a/core/admin/messages.pot b/core/admin/messages.pot index 3b3bd545..12687e5d 100644 --- 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 ""