Web: People: added email tooltip to createUserForm, updated translations

products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextField.js

@@ -20,7 +20,8 @@ class TextField extends React.Component {
       inputIsDisabled,
       inputOnChange,
       inputAutoFocussed,
-      inputTabIndex
+      inputTabIndex,
+      tooltipContent
     } = this.props;
 
     return (
@@ -28,6 +29,7 @@ class TextField extends React.Component {
         isRequired={isRequired}
         hasError={hasError}
         labelText={labelText}
+        tooltipContent={tooltipContent}
       >
         <TextInput
           name={inputName}

products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js

@@ -1,7 +1,7 @@
 import React from 'react'
 import { withRouter } from 'react-router'
 import { connect } from 'react-redux'
-import { Avatar, Button, Textarea, toastr, AvatarEditor } from 'asc-web-components'
+import { Avatar, Button, Textarea, toastr, AvatarEditor, Text } from 'asc-web-components'
 import { withTranslation } from 'react-i18next';
 import { toEmployeeWrapper, getUserRole, getUserContactsPattern, getUserContacts, mapGroupsToGroupSelectorOptions, mapGroupSelectorOptionsToGroups, filterGroupSelectorOptions } from "../../../../../store/people/selectors";
 import { createProfile } from '../../../../../store/profile/actions';
@@ -355,6 +355,16 @@ class CreateUserForm extends React.Component {
               inputIsDisabled={isLoading}
               inputOnChange={this.onInputChange}
               inputTabIndex={3}
+
+              tooltipContent={
+                <Text.Body>
+                  {t("EmailPopupHelper_1")}
+                  <br /><br />
+                  {t("EmailPopupHelper_2")}
+                  <br /><br />
+                  {t("EmailPopupHelper_3")}
+                </Text.Body>
+              }
             />
             <PasswordField
               isRequired={true}

products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js

@@ -506,8 +506,13 @@ class UpdateUserForm extends React.Component {
               buttonOnClick={this.onEmailChange}
               buttonTabIndex={1}
 
-
-              tooltipContent={<Text.Body fontSize={13}>{t("EmailPopupHelper")}</Text.Body>}
+              tooltipContent={
+                <Text.Body>
+                  {t("EmailPopupHelper_1")}
+                  <br /><br />
+                  {t("EmailPopupHelper_3")}
+                </Text.Body>
+              }
             />
             <TextChangeField
               labelText={`${t("Password")}:`}

products/ASC.People/Client/src/components/pages/ProfileAction/locales/en/translation.json

@@ -18,7 +18,6 @@
   "SocialProfiles": "Social Profiles",
   "Search": "Search",
   "SelectAll": "Select all",
-  "EmailPopupHelper": "{0}The main e-mail is needed to restore access to the portal in case of loss of the password and send notifications.{1}You can create a new mail on the domain as the primary. In this case, you must set a one-time password so that the user can log in to the portal for the first time.{2}The main e-mail can be used as a login when logging in to the portal.{3}",
   "ProfileTypePopupHelper": "Guests have limited access to some portal features and modules",
   "ProductsAndInstruments_Products": "Modules",
   "GuestCaption": "Guest",
@@ -55,5 +54,8 @@
   "editAvatar": "Edit photo",
   "CalendarSelectDate": "Select Date:",
   "Employee": "Employee",
-  "Calendar": "Calendar"
+  "Calendar": "Calendar",
+  "EmailPopupHelper_1": "The main e-mail is needed to restore access to the portal in case of loss of the password and send notifications.",
+  "EmailPopupHelper_2": "You can create a new mail on the domain as the primary. In this case, you must set a one-time password so that the user can log in to the portal for the first time.",
+  "EmailPopupHelper_3": "The main e-mail can be used as a login when logging in to the portal."
 }

products/ASC.People/Client/src/components/pages/ProfileAction/locales/ru/translation.json

@@ -18,7 +18,6 @@
   "SocialProfiles": "Социальные профили",
   "Search": "Поиск",
   "SelectAll": "Выбрать все",
-  "EmailPopupHelper": "Основной email нужен для восстановления доступа к порталу в случае потери пароля, а также для отправки оповещений. Основной email можно использовать как логин при входе на портал.",
   "ProfileTypePopupHelper": "Гости имеют ограниченный доступ к некоторым функциям и модулям портала",
   "ProductsAndInstruments_Products": "Модули",
   "GuestCaption": "Гость",
@@ -55,5 +54,8 @@
   "editAvatar": "Изменить фотографию",
   "CalendarSelectDate": "Выберите дату:",
   "Employee": "Гость",
-  "Calendar": "Календарь"
+  "Calendar": "Календарь",
+  "EmailPopupHelper_1": "Основной email нужен для восстановления доступа к порталу в случае потери пароля, а также для отправки оповещений.",
+  "EmailPopupHelper_2": "Вы можете создать новый email на домене в качестве основного. В этом случае потребуется задать одноразовый пароль, чтобы пользователь смог войти на портал в первый раз.",
+  "EmailPopupHelper_3": "Основной email можно использовать как логин при входе на портал."
 }

products/ASC.People/Client/src/resourceConfig.json

@@ -71,7 +71,6 @@
         "UserType",
         "CancelButton",
 
-        "EmailPopupHelper",
         "ProfileTypePopupHelper",
         "ProductsAndInstruments_Products",
         "GuestCaption",