From a31d69715bd38f1008cda31910d6f6f8db5ecfbe Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Tue, 7 Jan 2020 13:57:16 +0300
Subject: [PATCH] fixed translate login and register page && remove dropdown
 arrow

---
 .../base-theme/resources/lang/en/button.php   |  2 +
 .../base-theme/resources/lang/en/field.php    |  9 ++-
 .../base-theme/resources/lang/tr/button.php   |  2 +
 .../base-theme/resources/lang/tr/field.php    |  5 ++
 .../addons/anomaly/users-module/login.twig    | 28 ++++++--
 .../addons/anomaly/users-module/register.twig | 67 ++++++++++++++-----
 6 files changed, 89 insertions(+), 24 deletions(-)

diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/button.php b/addons/default/visiosoft/base-theme/resources/lang/en/button.php
index e8823d7e0..7ae9963c2 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/en/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/en/button.php
@@ -4,4 +4,6 @@ return [
     'post_ad' => [
         'name' => 'Post Ad',
     ],
+    'login' => 'Login',
+    'register' => 'Register',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/field.php b/addons/default/visiosoft/base-theme/resources/lang/en/field.php
index 35a74c2d8..c95e51246 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/en/field.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/en/field.php
@@ -13,7 +13,10 @@ return [
     'logout' => [
         'name' => 'Logout',
     ],
-    'profile' => [
-        'name' => 'Profile',
-    ],
+    'profile' => 'Profile',
+    'email' => 'Email Address',
+    'password' => 'Password',
+    'display_name' => 'Display Name',
+    'username' => 'Username',
+    'remember_me' => 'Remember Me',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/tr/button.php b/addons/default/visiosoft/base-theme/resources/lang/tr/button.php
index e2db803fd..a3d4b6275 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/tr/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/tr/button.php
@@ -4,4 +4,6 @@ return [
     'post_ad' => [
         'name' => 'Ücretsiz İlan Ver',
     ],
+    'login' => 'Giriş Yap',
+    'register' => 'Üye Ol',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php
index e33537e00..e0d1c5f43 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php
@@ -7,4 +7,9 @@ return [
     'show_all' => [
         'name' => 'Tümünü Göster',
     ],
+    'email' => 'Email Adresiniz',
+    'password' => 'Şifreniz',
+    'display_name' => 'İsim Soyisim',
+    'username' => 'Kullanıcı Adı',
+    'remember_me' => 'Beni Hatırla',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig
index c9e444148..fbefed17d 100644
--- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig
@@ -11,30 +11,48 @@
                 'url':form.options.url
             })|raw }}
             <div class="col-12">
-                {{ form.fields.email|raw }}
+                <div class="form-group email-field email-field_type">
+                    <label class="control-label">
+                        {{ trans('visiosoft.theme.base::field.email') }}
+                        <span class="required">*</span>
+                    </label>
+
+                    <div class="input-wrapper">
+                        {{ form.fields.email.input|raw }}
+                    </div>
+                </div>
             </div>
             <div class="col-12">
-                {{ form.fields.password|raw }}
+                <div class="form-group password-field password-field_type">
+                    <label class="control-label">
+                        {{ trans('visiosoft.theme.base::field.password') }}
+                        <span class="required">*</span>
+                    </label>
+
+                    <div class="input-wrapper">
+                        {{ form.fields.password.input|raw }}
+                    </div>
+                </div>
             </div>
             <div class="col-12">
                 <label class="c-input c-checkbox">
                     <input value="0" type="hidden" name="remember_me">
                     <input type="checkbox" name="remember_me">
                     <span class="c-indicator"></span>
-                    {{ trans('anomaly.module.users::field.remember_me.name') }}
+                    {{ trans('visiosoft.theme.base::field.remember_me') }}
                 </label>
             </div>
             <div class="col-12 row m-0">
                 <div class="col-6 pr-0 pl-1">
                     <button class="btn btn-sm btn-primary  w-100 py-2">
                         <i class="fas fa-key"></i>
-                        {{ trans('anomaly.module.users::button.login') }}
+                        {{ trans('visiosoft.theme.base::button.login') }}
                     </button>
                 </div>
                 <div class="col-6 pr-0 pl-1">
                     <a href="{{ url('register') }}" class="btn btn-sm btn-success  w-100 py-2">
                         <i class="fas fa-user-plus"></i>
-                        {{ trans('anomaly.module.users::button.register') }}
+                        {{ trans('visiosoft.theme.base::button.register') }}
                     </a>
                 </div>
 
diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig
index 33b99da7f..0425ad878 100644
--- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig
@@ -4,38 +4,73 @@
     <div class="row justify-content-center">
         <div class="col-12 col-sm-8 col-md-6 col-lg-4 text-left bg-light p-3 m-0">
             {% set form = form('register').redirect(request_get('redirect', '/'))
-                .actions(
-                {'submit':
-                    {'type':'success',
-                        'text':'<i class="fas fa-user-plus"></i> '~trans('anomaly.module.users::button.register'),
-                        'class':'w-100 py-2'
-                    }
-                }).get() %}
+                .get() %}
             {{ form_open({
                 'class': 'row form ' ~ form.options.class ,
                 'enctype': 'multipart/form-data',
                 'url':form.options.url
             })|raw }}
             <div class="col-12">
-                {{ form.fields.display_name|raw }}
+                <div class="form-group display_name-field display_name-field_type">
+                    <label class="control-label">
+                        {{ trans('visiosoft.theme.base::field.display_name') }}
+                        <span class="required">*</span>
+                    </label>
+
+                    <div class="input-wrapper">
+                        {{ form.fields.display_name.input|raw }}
+                    </div>
+                </div>
             </div>
             <div class="col-12">
-                {{ form.fields.username|raw }}
+                <div class="form-group username-field username-field_type">
+                    <label class="control-label">
+                        {{ trans('visiosoft.theme.base::field.username') }}
+                        <span class="required">*</span>
+                    </label>
+
+                    <div class="input-wrapper">
+                        {{ form.fields.username.input|raw }}
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-12">
+                <div class="form-group email-field email-field_type">
+                    <label class="control-label">
+                        {{ trans('visiosoft.theme.base::field.email') }}
+                        <span class="required">*</span>
+                    </label>
+
+                    <div class="input-wrapper">
+                        {{ form.fields.email.input|raw }}
+                    </div>
+                </div>
             </div>
             <div class="col-12">
-                {{ form.fields.email|raw }}
-            </div>
-            <div class="col-12">
-                {{ form.fields.password|raw }}
+                <div class="form-group password-field password-field_type">
+                    <label class="control-label">
+                        {{ trans('visiosoft.theme.base::field.password') }}
+                        <span class="required">*</span>
+                    </label>
+
+                    <div class="input-wrapper">
+                        {{ form.fields.password.input|raw }}
+                    </div>
+                </div>
             </div>
             <div class="col-12 row m-0">
-                <div class="col-6 pl-0 pr-1">
-                    {{ form.actions|raw }}
+                <div class="col-6 pr-0 pl-1">
+                    <button class="btn btn-sm btn-success  w-100 py-2">
+                        <i class="fas fa-user-plus"></i>
+                        {{ trans('visiosoft.theme.base::button.register') }}
+                    </button>
+
                 </div>
                 <div class="col-6 pr-0 pl-1">
                     <a href="{{ url('login') }}" class="btn btn-sm btn-primary  w-100 py-2">
                         <i class="fas fa-key"></i>
-                        {{ trans('anomaly.module.users::button.login') }}
+                        {{ trans('visiosoft.theme.base::button.login') }}
                     </a>
                 </div>