From c3fcce1b485d587df12446f50633492210fbccd2 Mon Sep 17 00:00:00 2001 From: TimZ99 Date: Wed, 12 Aug 2020 19:13:49 +0200 Subject: [PATCH] Moved webhook below Jabber --- src/lang/en_US.lang.php | 13 ++--- .../default/module/config/config.tpl.html | 48 +++++++++---------- .../module/server/server/update.tpl.html | 6 +-- .../module/server/server/view.tpl.html | 28 +++++------ 4 files changed, 48 insertions(+), 47 deletions(-) diff --git a/src/lang/en_US.lang.php b/src/lang/en_US.lang.php index cc89842c..acec4425 100644 --- a/src/lang/en_US.lang.php +++ b/src/lang/en_US.lang.php @@ -113,12 +113,6 @@ $sm_lang = array( servers that have been assigned to them.', 'mobile' => 'Mobile', 'email' => 'Email', - 'webhook' => 'Webhook', - 'webhook_description' => 'Send a json webhook to a certain endpoint.
URL should start with https://.
The json can be customized, e.g. {"text":"servermon: #message"} (Using #message as variable.) ', - 'webhook_url' => 'Webhook Url', - 'webhook_url_description' => 'Webhook public endpoint url', - 'webhook_json' => 'Webhook JSON', - 'webhook_json_description' => 'Define a custom json, use #message as message variable.', 'pushover' => 'Pushover', 'pushover_description' => 'Pushover is a service that makes it easy to get real-time notifications. See their website for more info.', @@ -144,6 +138,13 @@ $sm_lang = array( 'jabber' => 'Jabber', 'jabber_label' => 'Jabber', 'jabber_description' => 'You Jabber account', + 'webhook' => 'Webhook', + 'webhook_description' => 'Send a json webhook to a certain endpoint.
The json can be customized, e.g. { +"text":"servermon: #message"}', + 'webhook_url' => 'Webhook Url', + 'webhook_url_description' => 'Webhook public endpoint url, should start with https://.', + 'webhook_json' => 'Webhook JSON', + 'webhook_json_description' => 'Define a custom json, use #message as message variable.', 'delete_title' => 'Delete User', 'delete_message' => 'Are you sure you want to delete user \'%1\'?', 'deleted' => 'User deleted.', diff --git a/src/templates/default/module/config/config.tpl.html b/src/templates/default/module/config/config.tpl.html index bfbf4703..a9c4f6c0 100644 --- a/src/templates/default/module/config/config.tpl.html +++ b/src/templates/default/module/config/config.tpl.html @@ -22,11 +22,6 @@ role="tab" aria-controls="config-pushover" aria-selected="{% if pushover_active %}true{% else %}false{% endif %}">{{ label_tab_pushover }} -
  • - {{ - label_tab_webhook }} -
  • {{ @@ -35,7 +30,12 @@
  • {{ - label_tab_jabber }} + label_tab_jabber }} +
    • +
  • + {{ + label_tab_webhook }}
    • @@ -140,24 +140,6 @@ {{ macro.button_save("sms_submit", label_save) }} -
    -
    - {{ label_settings_webhook }} -

    {{ label_webhook_description|raw }}

    - - {{ macro.input_checkbox("webhook_status", "webhook_status", label_webhook_status, webhook_status_checked) }} - - {{ macro.input_checkbox("log_webhook", "log_webhook", label_log_webhook, log_webhook_checked) }} - - - - - - {{ macro.button_test("testWebhook", label_test) }} - {{ macro.input_hidden("test_webhook", "0") }} - {{ macro.button_save("webhook_submit", label_save) }} -
    -
    {{ label_settings_pushover }} @@ -206,6 +188,24 @@ {{ macro.button_save("jabber_submit", label_save) }}
    +
    +
    + {{ label_settings_webhook }} +

    {{ label_webhook_description|raw }}

    + + {{ macro.input_checkbox("webhook_status", "webhook_status", label_webhook_status, webhook_status_checked) }} + + {{ macro.input_checkbox("log_webhook", "log_webhook", label_log_webhook, log_webhook_checked) }} + + + + + + {{ macro.button_test("testWebhook", label_test) }} + {{ macro.input_hidden("test_webhook", "0") }} + {{ macro.button_save("webhook_submit", label_save) }} +
    +
    {{ macro.input_csrf() }} diff --git a/src/templates/default/module/server/server/update.tpl.html b/src/templates/default/module/server/server/update.tpl.html index 67b82d0d..0cefdd98 100644 --- a/src/templates/default/module/server/server/update.tpl.html +++ b/src/templates/default/module/server/server/update.tpl.html @@ -140,12 +140,12 @@ {{ macro.input_select_monitoring("sms", "sms", label_send_sms, edit_sms_selected, label_yes, label_no, warning_sms, label_warning_sms) }} {{ macro.input_select_monitoring("pushover", "pushover", label_send_pushover, edit_pushover_selected, label_yes, label_no, warning_pushover, label_warning_pushover) }} - - {{ macro.input_select_monitoring("webhook", "webhook", label_send_webhook, edit_webhook_selected, label_yes, label_no, warning_webhook, label_warning_webhook) }} {{ macro.input_select_monitoring("telegram", "telegram", label_send_telegram, edit_telegram_selected, label_yes, label_no, warning_telegram, label_warning_telegram) }} - {{ macro.input_select_monitoring("jabber", "jabber", label_send_jabber, edit_jabber_selected, label_yes, label_no, warning_jabber, label_warning_jabber) }} + {{ macro.input_select_monitoring("jabber", "jabber", label_send_jabber, edit_jabber_selected, label_yes, label_no, warning_jabber, label_warning_jabber) }} + + {{ macro.input_select_monitoring("webhook", "webhook", label_send_webhook, edit_webhook_selected, label_yes, label_no, warning_webhook, label_warning_webhook) }}
    diff --git a/src/templates/default/module/server/server/view.tpl.html b/src/templates/default/module/server/server/view.tpl.html index efbff458..154ea26c 100644 --- a/src/templates/default/module/server/server/view.tpl.html +++ b/src/templates/default/module/server/server/view.tpl.html @@ -322,19 +322,6 @@ {% endif %} -
  • - {{ label_webhook }}: - {% if webhook|lower == 'yes' %} - - - {% elseif webhook|lower == 'no' %} - - - {% else %} - - - {% endif %} -
  • {{ label_telegram }}: {% if telegram|lower == 'yes' %} @@ -360,7 +347,20 @@ {% endif %} -
    • + +
  • + {{ label_webhook }}: + {% if webhook|lower == 'yes' %} + + + {% elseif webhook|lower == 'no' %} + + + {% else %} + + + {% endif %} +