From 18de975b77a3e77e9fae286ef8f29874fae6ffd5 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Wed, 1 Sep 2021 10:04:28 +0200
Subject: [PATCH] LogoutButton

---
 Customers/CustomerIndex.aspx  |   7 +--
 Customers/Customers.master    | 105 ++++++++++++++++++++++------------
 Customers/Customers.master.vb |  14 ++++-
 3 files changed, 86 insertions(+), 40 deletions(-)

diff --git a/Customers/CustomerIndex.aspx b/Customers/CustomerIndex.aspx
index 5cd0b84..897abac 100644
--- a/Customers/CustomerIndex.aspx
+++ b/Customers/CustomerIndex.aspx
@@ -21,8 +21,7 @@
     </style>    
      <!-- Bootstrap CSS -->
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>
-    <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
-            
+    <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>            
 
      <link rel="stylesheet" type="text/css" href="../css/main.css"/>
     <link rel="stylesheet" type="text/css" href="../css/style.css"/>
@@ -65,8 +64,8 @@
                                      If True Then 'AVISO.Status <> 1 And AVISO.Status <> 2 Then 'SENDUNGSTABELLE'%>    
                                                                  <h2><%=STANDORT %></h2>                                                             
                 
-  <input class="form-control mb-4" id="tableSearch" type="text"
-    placeholder="Einen Begriff eingeben oder den Anfang davon ...">
+                                              <input class="form-control mb-4" id="tableSearch" type="text"
+                                                placeholder="Einen Begriff eingeben oder den Anfang davon ...">
                                                  <div id="conovertab">               
                                                <table class="table table-hover" id="normaltable" border="0" cellspacing="0" contenteditable="false" style="width:1250px" >        
                                                     <thead style="height:/*20px;*/ 1.56128024980484vh; /*background-color:#043381;*/ background-image: linear-gradient(to right, #003680 , #0055cc); color:#fff; font-weight:900;">
diff --git a/Customers/Customers.master b/Customers/Customers.master
index 48b355d..0f344f9 100644
--- a/Customers/Customers.master
+++ b/Customers/Customers.master
@@ -277,7 +277,7 @@
 <div class="collapse" id="collapseExample2">  
       <ul style="list-style:unset">
           <li> <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff;color:#043381"><img src="../images/samples/default-avatar.jpg"; width="80"; /></button>  </li>
-           <li><button type="button" class="btn btn-primary" id="LogoutButton" style="background-color:#fff"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px" />Logout</button></li>
+          <li><button type="button"  id="LogoutButton" style="text-decoration: none;background-color:#fff;color:#043381"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff;"/>Logout</button></li>
           </ul>
                  </div>                                                     
                        </li>
@@ -287,7 +287,25 @@
           
         <!-- Page Content  -->
         <nav id="content">             
-           <div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+           
+       
+         <div class="d-md-none">                   
+            
+                                        <nav class="navbar navbar-expand-md navbar-light bg-light justify-content-md-center flex-nowrap">    
+                                            
+                                                     <button type="button" id="sidebarCollapse" class="btn btn-info" style="background-color:#fff; color:#043381;">
+                                                        <div class="align-self: center">
+                                                          <span><img src="../images/Icons/main/menu veragblau.svg" style="width:initial;height:initial;" alt="Hamburger Menu Stripes in Verag Blue" data-toggle="tooltip" data-placement="top" title="Zeigt das Menü an."></span>
+                                                     </div>
+                                                     </button>
+                                                    <a class="navbar-brand" id="navbarhomebar" href="../newpageJulius_Sidebar.aspx"><img src="../images/Logo_small.png" style="width:90%;height:90%;" alt="VERAG Spedition AG Logo with blue word color until grey AG" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"></a>                                                                                                                                                           
+                                             <div style="margin-right:50px">       
+                                                              <ul class="nav nav-pills">  
+                                              <li class="nav-item dropdown">
+    <a class="nav-link" data-bs-toggle="dropdown"  role="button" aria-expanded="false"><img src="../images/samples/default-avatar.jpg"; width="10"; /></button><asp:LoginName ID="LoginName2" runat="server" /></a>                                                 
+                                                          <ul class="dropdown-menu">  
+                                                             <li>
+           
               <div class="modal-dialog">
                 <div class="modal-content">
                   <div class="modal-header">
@@ -316,29 +334,13 @@
                                       </div>                               
                          </div>
                         <div class="modal-footer">
-                            <button type="button" id="butclose" class="btn btn-secondary" style="background-color:#043381;color:#fff" data-bs-dismiss="modal">Close</button>                                
+                             <button type="button"  id="LogoutButton" style="text-decoration: none;background-color:#fff;color:#043381"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff;"/>Logout</button>                          
                         </div></div>
                         </div>
-                    </div>
-       
-         <div class="d-md-none">                   
-            
-                                        <nav class="navbar navbar-expand-md navbar-light bg-light justify-content-md-center flex-nowrap">    
-                                            
-                                                     <button type="button" id="sidebarCollapse" class="btn btn-info" style="background-color:#fff; color:#043381;">
-                                                        <div class="align-self: center">
-                                                          <span><img src="../images/Icons/main/menu veragblau.svg" style="width:initial;height:initial;" alt="Hamburger Menu Stripes in Verag Blue" data-toggle="tooltip" data-placement="top" title="Zeigt das Menü an."></span>
-                                                     </div>
-                                                     </button>
-                                                    <a class="navbar-brand" id="navbarhomebar" href="../newpageJulius_Sidebar.aspx"><img src="../images/Logo_small.png" style="width:90%;height:90%;" alt="VERAG Spedition AG Logo with blue word color until grey AG" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"></a>                                                                                                                                                           
-                                             <div style="margin-right:50px">       
-                                                              <ul class="nav nav-pills">  
-                                              <li class="nav-item dropdown">
-    <a class="nav-link" data-bs-toggle="dropdown"  role="button" aria-expanded="false"><button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#myModal" style="background-color:#fff"><img src="../images/samples/default-avatar.jpg"; width="10"; /></button><asp:LoginName ID="LoginName2" runat="server" /></a>                                                 
-                                                          <ul class="dropdown-menu">  
-                                                             <li><a class="dropdown-item">Profil bearbeiten</a></li>
-         <div class="dropdown-divider"></div>
-               <li><a id="LogoutButton" style="text-decoration: none;background-color:#fff;color:#043381"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff;"/>Logout</a></li>                                                                
+                   
+                                                             </li>
+         <!--<div class="dropdown-divider"></div>-->
+                                                                             
                                             </ul></li>                                               
                       </ul>       
                                              </div>
@@ -390,6 +392,50 @@
                                                 </div>
     
      <div class="d-none d-md-block">         
+          <div style="margin-top:75px; margin-right:-901px;z-index:50500">
+           <ul class="nav nav-pills">                                             
+                                                                                              <li class="nav-item dropdown">
+                                                            <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" role="button" aria-expanded="false" style="margin-left: 40px;margin-right:2px;z-index:1031" ><button type="button" class="btn btn-primary" data-bs-toggle="dropdown"  style="background-color:#fff;color:#043381;border:none"><img src="../images/samples/default-avatar.jpg"; width="25"; /></button><asp:LoginName ID="LoginName1" runat="server" /></a>
+                                                                                           <ul class="dropdown-menu">                    
+                                                                                               <li>
+           
+              <div class="modal-dialog">
+                <div class="modal-content">
+                  <div class="modal-header">
+                       	 	<h5 class="modal-title" id="exampleModalLabel">Profil: User: <%=Me.Page.User.Identity.Name %></h5>
+                        	<!--<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>-->
+                       </div>
+                       <div class="modal-body">                                                                                                                              
+                                        <div class="container-fluid">
+                                             <div class="row">
+                                                 <div class="col-md-5">
+                                                     <asp:Image ID="Image2" runat="server" ImageUrl="~/images/samples/default-avatar.jpg" Width=80px Height=80px/>
+                                                 </div>
+                                                 <div class="col-md-5" style="width:205px">
+                                                     <ul style="list-style:unset;border:2.3px ridge #043381">
+                                                         <li> Name: <%=Me.Page.User.Identity.Name %></li>
+                                                         <li> Registriert seit: 15/02/2021</li>
+                                                         <li> Die Berechtigungen im Überblick </li>
+                                                         <ul>
+                                                           <li><img src="../images/Icons/main/checkmarkcircle_veragblau.png" style="width:20px;height:20px;"/>"Zoll"</li>                                                                                                                                       
+                                                          <li> <img src="../images/Icons/main/checkmarkcircle_veragblau.png" style="width:20px;height:20px;"/>"Suben"</li>
+                                                           <li><img src="../images/Icons/main/cross_wrong_close_delete_icon.png" style="width:20px;height:20px;"/>"Waidhaus"</li>
+                                                         </ul>
+                                                      </ul>
+                                                 </div>                                                                                            
+                                            </div>
+                                      </div>                               
+                         </div>
+                        <div class="modal-footer">
+                          <!--  <button type="button" id="butclose" class="btn btn-secondary" style="background-color:#043381;color:#fff" data-bs-dismiss="modal">Close</button>     --> 
+                              <button type="button" id="LogoutButton" style="text-decoration: none;background-color:#fff;color:#043381"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff;"/>Logout</button>       
+                        </div></div>
+                        </div>                   
+                                                             </li>
+                                                        <!-- <div class="dropdown-divider"></div>-->                                                                       
+                                                                                            </ul></li>
+                                                                      </ul>
+             </div>                                                                                  
                                <nav class="navbar fixed-top navbar-expand-lg navbar-light" style="background-color:#fff">                                 
                                                       <a class="navbar-brand" href="../newpageJulius_Sidebar.aspx?lan2=DE&lan3=0"><img src="../images/Logo_small.png"  style:"width:120px" alt="Schriftzug: Verag AG Blaue Schrift: Verag Spedition Graue Schrift: AG" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"/></a>              
                                                        <div style="margin-left:25%;margin-right:-25%">
@@ -454,18 +500,7 @@
                                                                             
                                    <div style="width:120px;"></div>
                                                   
-                                                                                   <div style="margin-top:5px; margin-right:15px;">
-           <ul class="nav nav-pills">                                             
-                                                                                              <li class="nav-item dropdown">
-                                                            <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" role="button" aria-expanded="false" style="margin-left: 40px;margin-right:2px;z-index:1031" ><button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff;color:#043381;border:none"><img src="../images/samples/default-avatar.jpg"; width="25"; /></button><asp:LoginName ID="LoginName1" runat="server" /></a>
-                                                                                           <ul class="dropdown-menu">                    
-                                                                                               <li><a class="dropdown-item" href="#">Profil bearbeiten</a></li>
-                                                         <div class="dropdown-divider"></div>
-                                                                  <li><a id="LogoutButton" class="stretched-link" style="text-decoration: none;background-color:#fff;color:#043381"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff;"/>Logout</a></li>                 
-                                                                                            </ul></li>
-                                                                      </ul>
-             </div>                                                      
-                                   
+                                                                                        
 
                                     <div class="dropdown" style="background-color:#fff; color:#043381;margin-right:-24%;margin-top:-2%" >
                                               <button class="dropbtn" style="margin-right:15%;margin-top:2%"><center><img id="myImage" src="../<%=flagpath%>" style="border:1px solid #fff;width:32px; justify-items:center;" alt="Logo Schriftzug: Verag Spedition AG Blaue Schrift: Verag Spedition Graue Schrift: AG" /></center></button>
diff --git a/Customers/Customers.master.vb b/Customers/Customers.master.vb
index 54b9621..bb9f0db 100644
--- a/Customers/Customers.master.vb
+++ b/Customers/Customers.master.vb
@@ -2,7 +2,19 @@
 Partial Class Customers_Customers
     Inherits System.Web.UI.MasterPage
     Protected Sub LogoutButton_Click(sender As Object, e As EventArgs)
-        FormsAuthentication.signout()
+        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
+
+    Protected Sub Logout()
+        FormsAuthentication.SignOut()
 
         Session.Clear() 'clear session
         Session.Abandon() 'Abandon session