From 7e061048b8c1529d80b5a70e358bc44789ed0b40 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Mon, 6 Sep 2021 16:33:53 +0200
Subject: [PATCH] =?UTF-8?q?Logoutbutton=20versucht=20zu=20ficxen=20sowie?=
 =?UTF-8?q?=20das=20Men=C3=BC=20erfolgreich=20gefixed=20bei=20Userinterfac?=
 =?UTF-8?q?e=20in=20Navigationsleiste?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/Customers.master            |  6 +++---
 Customers/Customers.master.vb         | 13 ++-----------
 css/Customers/MasterpageCustomers.css |  3 +++
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/Customers/Customers.master b/Customers/Customers.master
index 7e3b2ed..5cc7734 100644
--- a/Customers/Customers.master
+++ b/Customers/Customers.master
@@ -275,7 +275,7 @@
                                                             <ul style="list-style: none;"class="collapse list-unstyled" id="UserSubmenu1">
                                                                     <span class="navbar-toggler-icon"></span>                                                                
                                                                     <li><button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:16px;white-space: nowrap; height:20px"><img src="../images/Icons/main/gear_blue.png"; style="width:15px; height:15px;color:#043381;background-color:#fff;margin-right:6px;" />Profil bearbeiten</button>  </li>                                                              
-                                                                    <li><button type="button" id="LogoutButton" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:16px; margin-top:17px"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</button>   </li>                                                 
+                                                                     <li><button type="button" id="LogoutButton1" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:16px;width:200px;z-index:1032;margin-left:-16px"><img src="../images/Icons/main/Logout.svg.png"; style="font-size:14px;width:20px; height:20px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</button></li>                     
                                                             </ul>
                                                       </li>    
              </ul>                
@@ -459,9 +459,9 @@
                                               <button class="dropbtn" id="dropbtnbtnbtn" style="height:50px; width:205px;right:-194px;white-space:nowrap" 
                                                   <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff;color:#043381; width:30px;height:50px;white-space:nowrap"><img src="../images/samples/default-avatar.jpg"; width="15"; /><a data-bs-toggle="modal" data-bs-target="#exampleModal"><asp:LoginName class="pointer" ID="LoginName2" runat="server" style="margin-left:6px"/></a></button>
                                               </button>                                                
-                                              <ul class="dropdown-content" id="dropdownmenuecont" style="width:210px;right:-198px;top:52px;z-index:1032;margin-right:-2px;">                           
+                                              <ul class="dropdown-content" id="dropdownmenuecont" style="width:210px;right:-198px;top:45px;z-index:1032;margin-right:-2px;">                           
                                                            <li>  <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="text-decoration: none;background-color:#fff;color:#043381;z-index:1032;text-align:left;margin-left:-16px;border:none;font-size:16px;white-space: nowrap; width:200px"><img src="../images/Icons/main/gear_blue.png"; style="font-size:14px;width:15px; height:15px;color:#043381;background-color:#fff;margin-right:6px;" />Profil bearbeiten</button></li>                                                              
-                                                         <li>   <button type="button" id="LogoutButton" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:16px;width:200px;z-index:1032;margin-left:-16px"><img src="../images/Icons/main/Logout.svg.png"; style="font-size:14px;width:20px; height:20px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</button></li>                     
+                                                         <li>   <button type="button" id="LogoutButton1" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:16px;width:200px;z-index:1032;margin-left:-16px"><img src="../images/Icons/main/Logout.svg.png"; style="font-size:14px;width:20px; height:20px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</button></li>                     
                                                         <!-- <div class="dropdown-divider"></div>-->                                                                       
        </ul></div>  
 
diff --git a/Customers/Customers.master.vb b/Customers/Customers.master.vb
index bb9f0db..5129592 100644
--- a/Customers/Customers.master.vb
+++ b/Customers/Customers.master.vb
@@ -1,7 +1,8 @@
 
 Partial Class Customers_Customers
     Inherits System.Web.UI.MasterPage
-    Protected Sub LogoutButton_Click(sender As Object, e As EventArgs)
+    Protected Sub LogoutButton1_Click(sender As Object, e As EventArgs)
+        MsgBox("Logged out!")
         FormsAuthentication.SignOut()
 
         Session.Clear() 'clear session
@@ -10,17 +11,7 @@ Partial Class Customers_Customers
         Response.Cache.SetCacheability(HttpCacheability.NoCache)
         Response.Cache.SetNoStore()
 
-        Response.Redirect("../newpageJulius_Sidebar.aspx")
-    End Sub
 
-    Protected Sub Logout()
-        FormsAuthentication.SignOut()
-
-        Session.Clear() 'clear session
-        Session.Abandon() 'Abandon session
-        Response.Cache.SetExpires(DateTime.UtcNow.AddMinutes(-1))
-        Response.Cache.SetCacheability(HttpCacheability.NoCache)
-        Response.Cache.SetNoStore()
 
         Response.Redirect("../newpageJulius_Sidebar.aspx")
     End Sub
diff --git a/css/Customers/MasterpageCustomers.css b/css/Customers/MasterpageCustomers.css
index c806e35..6382bf2 100644
--- a/css/Customers/MasterpageCustomers.css
+++ b/css/Customers/MasterpageCustomers.css
@@ -549,4 +549,7 @@ ContentPlaceHolder1 {
 #langdropdown{
     margin-right: -39%;
    margin-top:50px;
+}
+#dropbtnbtnbtn:hover{
+    color:#fff;
 }
\ No newline at end of file