From 9279322b1346eabb8fcbf3719bd521792e31430a Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Mon, 12 Apr 2021 14:58:37 +0300
Subject: [PATCH] oc-theme edited profile page (profile, detail, password)

---
 .../resources/lang/en/field.php               |  2 +
 .../views/profile/partials/navigation.twig    | 68 ++++++++++---------
 2 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/addons/default/visiosoft/profile-module/resources/lang/en/field.php b/addons/default/visiosoft/profile-module/resources/lang/en/field.php
index 8bf5e6803..62a8abf0d 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/en/field.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/en/field.php
@@ -469,6 +469,8 @@ return [
     'change_password' => 'Change Password',
     'choose_an_option' => 'Choose an option...',
     'change_status' => 'Change Status',
+	'profile_settings' => 'Profile Settings',
+	'profile_detail' => 'Profile Detail',
 
     // Register page
     'accept_terms_label' => 'I accept the terms.',
diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig b/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig
index 0ca96c345..091a774ac 100644
--- a/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig
+++ b/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig
@@ -11,42 +11,44 @@
         </p>
     </span>
     <hr class="mt-2">
-    <a href="{{ url_route('profile::profile') }}"
-       class="px-3 link-unstyled{{ app.request.pathinfo == '/profile' ? ' active' : '' }}">
-        {{ img('visiosoft.module.profile::images/social-media.svg').data|raw }}
-        <p>{{ trans('visiosoft.module.profile::addon.title') }}</p>
-    </a>
-    <a href="{{ url_route('profile::detail') }}"
-       class="px-3 link-unstyled{{ app.request.pathinfo == '/profile/detail' ? ' active' : '' }}">
-        {{ img('visiosoft.module.profile::images/detail2.svg').data|raw }}
-        <p>{{ trans('visiosoft.module.profile::field.details.name') }}</p>
-    </a>
-    {% set marketPlace = setting_value('visiosoft.module.advs::market_place') %}
-    {% if marketPlace %}
-        <a href="{{ url_route('profile::ads') }}"
-           class="px-3 link-unstyled{{ app.request.pathinfo == '/profile/ads' ? ' active' : '' }}">
-            {{ img('visiosoft.module.profile::images/website.svg').data|raw }}
-            <p>{{ trans('visiosoft.module.advs::addon.title') }}</p>
+    <div class="profile-navigation-item">
+        <a href="{{ url_route('profile::profile') }}"
+           class="px-3 link-unstyled{{ app.request.pathinfo == '/profile' ? ' active' : '' }}">
+            {{ img('visiosoft.module.profile::images/social-media.svg').data|raw }}
+            <p>{{ trans('visiosoft.module.profile::addon.title') }}</p>
+        </a>
+        <a href="{{ url_route('profile::detail') }}"
+           class="px-3 link-unstyled{{ app.request.pathinfo == '/profile/detail' ? ' active' : '' }}">
+            {{ img('visiosoft.module.profile::images/detail2.svg').data|raw }}
+            <p>{{ trans('visiosoft.module.profile::field.details.name') }}</p>
+        </a>
+        {% set marketPlace = setting_value('visiosoft.module.advs::market_place') %}
+        {% if marketPlace %}
+            <a href="{{ url_route('profile::ads') }}"
+               class="px-3 link-unstyled{{ app.request.pathinfo == '/profile/ads' ? ' active' : '' }}">
+                {{ img('visiosoft.module.profile::images/website.svg').data|raw }}
+                <p>{{ trans('visiosoft.module.advs::addon.title') }}</p>
+            </a>
+        {% endif %}
+        <a href="{{ url_route('profile::address') }}"
+           class="px-3 link-unstyled{{ app.request.pathinfo == '/profile/address' ? ' active' : '' }}">
+            {{ img('visiosoft.module.profile::images/location.svg').data|raw }}
+            <p>{{ trans('visiosoft.module.profile::stream.adress.name') }}</p>
         </a>
-    {% endif %}
-    <a href="{{ url_route('profile::address') }}"
-       class="px-3 link-unstyled{{ app.request.pathinfo == '/profile/address' ? ' active' : '' }}">
-        {{ img('visiosoft.module.profile::images/location.svg').data|raw }}
-        <p>{{ trans('visiosoft.module.profile::stream.adress.name') }}</p>
-    </a>
 
-    {{ addBlock('profile/navigation',{'marketPlace':marketPlace})|raw }}
+        {{ addBlock('profile/navigation',{'marketPlace':marketPlace})|raw }}
 
-    <a href="{{ url_route('profile::password') }}"
-       class="px-3 link-unstyled{{ app.request.pathinfo == '/profile/password' ? ' active' : '' }}">
-        {{ img('visiosoft.module.profile::images/password2.svg').data|raw }}
-        <p>{{ trans('visiosoft.module.profile::field.password.name') }}</p>
-    </a>
-    <a href="{{ url('logout') }}"
-       class="px-3 link-unstyled d-flex d-md-none">
-        {{ img('visiosoft.module.profile::images/logout.svg').data|raw }}
-        <p>{{ trans('visiosoft.theme.base::field.logout.name') }}</p>
-    </a>
+        <a href="{{ url_route('profile::password') }}"
+           class="px-3 link-unstyled{{ app.request.pathinfo == '/profile/password' ? ' active' : '' }}">
+            {{ img('visiosoft.module.profile::images/password2.svg').data|raw }}
+            <p>{{ trans('visiosoft.module.profile::field.password.name') }}</p>
+        </a>
+        <a href="{{ url('logout') }}"
+           class="px-3 link-unstyled d-flex d-md-none">
+            {{ img('visiosoft.module.profile::images/logout.svg').data|raw }}
+            <p>{{ trans('visiosoft.theme.base::field.logout.name') }}</p>
+        </a>
+    </div>
 </div>
 
 <div class="overlay"></div>