From d7c41eb9d71094f3af51306d319fe64cf5d80f8b Mon Sep 17 00:00:00 2001
From: Renato Becker
Date: Wed, 25 Apr 2018 11:30:44 -0300
Subject: [PATCH 1/2] New settings added to enable/disable the Livechat
registration form fields.
---
packages/rocketchat-i18n/i18n/en.i18n.json | 5 +-
packages/rocketchat-i18n/i18n/pt.i18n.json | 5 +-
.../.app/client/lib/_livechat.js | 14 +
.../.app/client/lib/commands.js | 2 +-
.../.app/client/views/livechatWindow.js | 10 +-
.../.app/client/views/register.html | 9 +-
.../.app/client/views/register.js | 43 ++-
.../client/views/app/livechatAppearance.html | 356 ++++++++++--------
.../client/views/app/livechatAppearance.js | 59 ++-
packages/rocketchat-livechat/config.js | 22 +-
.../server/lib/Livechat.js | 5 +-
.../server/methods/getInitialData.js | 6 +-
.../server/methods/saveAppearance.js | 5 +-
.../server/publications/livechatAppearance.js | 5 +-
14 files changed, 360 insertions(+), 186 deletions(-)
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 1be995d49489..2d9fef45d09d 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1238,6 +1238,7 @@
"Livechat_online": "Livechat online",
"Livechat_open_inquiery_show_connecting": "Show Connecting Message Instead of Input When Guest is Not Yet Connected to an Agent",
"Livechat_Queue": "Livechat Queue",
+ "Livechat_registration_form": "Registration Form",
"Livechat_room_count": "Livechat Room Count",
"Livechat_Routing_Method": "Livechat Routing Method",
"Livechat_Take_Confirm": "Do you want to take this client?",
@@ -1839,13 +1840,15 @@
"Show_all": "Show All",
"Show_Avatars": "Show Avatars",
"Show_counter": "Show counter",
- "Show_room_counter_on_sidebar": "Show room counter on sidebar",
+ "Show_email_field": "Show email field",
"Show_more": "Show more",
+ "Show_name_field": "Show name field",
"show_offline_users": "show offline users",
"Show_on_registration_page": "Show on registration page",
"Show_only_online": "Show Online Only",
"Show_preregistration_form": "Show Pre-registration Form",
"Show_queue_list_to_all_agents": "Show Queue List to All Agents",
+ "Show_room_counter_on_sidebar": "Show room counter on sidebar",
"Show_the_keyboard_shortcut_list": "Show the keyboard shortcut list",
"Showing_archived_results": "
Showing %s archived results
",
"Showing_online_users": "Showing: __total_showing__, Online: __online__, Total: __total__ users",
diff --git a/packages/rocketchat-i18n/i18n/pt.i18n.json b/packages/rocketchat-i18n/i18n/pt.i18n.json
index 3affa6dfe214..5563f472c73e 100644
--- a/packages/rocketchat-i18n/i18n/pt.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt.i18n.json
@@ -1240,6 +1240,7 @@
"Livechat_online": "Livechat on-line",
"Livechat_open_inquiery_show_connecting": "Mostrar conexão de mensagem em vez de entrada quando o visitante ainda não está conectado a um agente",
"Livechat_Queue": "Roleta Livechat",
+ "Livechat_registration_form": "Formulário de pré-registro",
"Livechat_room_count": "Contador de salas de livechat",
"Livechat_Routing_Method": "Método de roteamento Livechat",
"Livechat_Take_Confirm": "Você quer levar esse cliente?",
@@ -1841,13 +1842,15 @@
"Show_all": "Mostrar tudo",
"Show_Avatars": "Mostrar Avatares",
"Show_counter": "Show counter",
- "Show_room_counter_on_sidebar": "Mostrar contador do quarto na barra lateral",
+ "Show_email_field": "Mostrar campo e-mail",
"Show_more": "Mostrar mais",
+ "Show_name_field": "Mostrar campo nome",
"show_offline_users": "mostrar usuários offline",
"Show_on_registration_page": "Mostrar na página de registro",
"Show_only_online": "Mostrar apenas online",
"Show_preregistration_form": "Mostrar formulário de pré-registro",
"Show_queue_list_to_all_agents": "Mostrar link da roleta à todos agentes",
+ "Show_room_counter_on_sidebar": "Mostrar contador do quarto na barra lateral",
"Show_the_keyboard_shortcut_list": "Exibe a lisgta de atalhos do teclado",
"Showing_archived_results": "