diff --git a/apps/common/const/choices.py b/apps/common/const/choices.py index 6db9254b3..ee8519c34 100644 --- a/apps/common/const/choices.py +++ b/apps/common/const/choices.py @@ -19,3 +19,17 @@ class Status(models.TextChoices): failed = 'failed', _("Failed") error = 'error', _("Error") canceled = 'canceled', _("Canceled") + + +COUNTRY_CALLING_CODES = [ + {'name': 'China(中国)', 'value': '+86'}, + {'name': 'HongKong(中国香港)', 'value': '+852'}, + {'name': 'Macao(中国澳门)', 'value': '+853'}, + {'name': 'Taiwan(中国台湾)', 'value': '+886'}, + {'name': 'America(America)', 'value': '+1'}, {'name': 'Russia(Россия)', 'value': '+7'}, + {'name': 'France(français)', 'value': '+33'}, + {'name': 'Britain(Britain)', 'value': '+44'}, + {'name': 'Germany(Deutschland)', 'value': '+49'}, + {'name': 'Japan(日本)', 'value': '+81'}, {'name': 'Korea(한국)', 'value': '+82'}, + {'name': 'India(भारत)', 'value': '+91'} +] diff --git a/apps/settings/api/public.py b/apps/settings/api/public.py index 81abfeb99..9808ea1c6 100644 --- a/apps/settings/api/public.py +++ b/apps/settings/api/public.py @@ -3,6 +3,7 @@ from rest_framework import generics from rest_framework.permissions import AllowAny from authentication.permissions import IsValidUserOrConnectionToken +from common.const.choices import COUNTRY_CALLING_CODES from common.utils import get_logger, lazyproperty from common.utils.timezone import local_now from .. import serializers @@ -24,7 +25,8 @@ class OpenPublicSettingApi(generics.RetrieveAPIView): def get_object(self): return { "XPACK_ENABLED": settings.XPACK_ENABLED, - "INTERFACE": self.interface_setting + "INTERFACE": self.interface_setting, + "COUNTRY_CALLING_CODES": COUNTRY_CALLING_CODES } diff --git a/apps/settings/serializers/public.py b/apps/settings/serializers/public.py index 6e5a74c8e..278764c65 100644 --- a/apps/settings/serializers/public.py +++ b/apps/settings/serializers/public.py @@ -11,6 +11,7 @@ __all__ = [ class PublicSettingSerializer(serializers.Serializer): XPACK_ENABLED = serializers.BooleanField() INTERFACE = serializers.DictField() + COUNTRY_CALLING_CODES = serializers.ListField() class PrivateSettingSerializer(PublicSettingSerializer): diff --git a/apps/users/templates/users/forgot_password.html b/apps/users/templates/users/forgot_password.html index 64137ea8a..cdb32dca2 100644 --- a/apps/users/templates/users/forgot_password.html +++ b/apps/users/templates/users/forgot_password.html @@ -7,6 +7,7 @@ .margin-bottom { margin-bottom: 15px; } + .input-style { width: 100%; display: inline-block; @@ -22,6 +23,19 @@ height: 100%; vertical-align: top; } + + .scrollable-menu { + height: auto; + max-height: 18rem; + overflow-x: hidden; + } + + .input-group { + .input-group-btn .btn-secondary { + color: #464a4c; + background-color: #eceeef; + } + } {% endblock %} {% block html_title %}{% trans 'Forgot password' %}{% endblock %} @@ -57,9 +71,26 @@ placeholder="{% trans 'Email account' %}" value="{{ email }}">