From 117680772e9dcf5e627a7ed7f1849f57ec33f245 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Wed, 25 Aug 2021 18:25:55 +0200
Subject: [PATCH] =?UTF-8?q?Profil=20editieren=20button=20und=20auslogbutto?=
 =?UTF-8?q?ns=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/Customers.master        |  24 ++---
 Customers/Login_Edit_User.aspx    | 161 ------------------------------
 Customers/Login_Edit_User.aspx.vb |   5 -
 3 files changed, 8 insertions(+), 182 deletions(-)
 delete mode 100644 Customers/Login_Edit_User.aspx
 delete mode 100644 Customers/Login_Edit_User.aspx.vb

diff --git a/Customers/Customers.master b/Customers/Customers.master
index 2a22317..7428c66 100644
--- a/Customers/Customers.master
+++ b/Customers/Customers.master
@@ -439,19 +439,11 @@
  
 <div class="collapse" id="collapseExample">
   
-     <ul style="list-style: none;">
-                                                                 
-                                                                    <%If Me.Page.User.Identity.Name = "test" Then %>
-         <li>
-                                                                    <a href="login_Edit_user.aspx">Profil Editieren</a>
-             </li>
-                                                                    <%ElseIf Me.Page.User.Identity.Name = "test2" Then %>
-         <li>
-                                                                    <a href="login_Edit_user.aspx">Profil Editieren</a>
-             </li>
-                                                                    <%End If %>
-                                                                
-                                                               </ul>
+     <ul style="list-style: none;">         
+             <li><button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff">Profil editieren</button></li>
+            
+             <li><button type="button" class="btn btn-primary" style="background-color:#fff"><img src="../images/Icons/main/Logout.svg"; width="80"; />Logout</button></li>
+     </ul>
   
                  </div>                                                          
                                                            
@@ -500,12 +492,12 @@
                                               <li class="nav-item dropdown">
     <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false"><asp:LoginName ID="LoginName2" runat="server" /></a>
     <ul class="dropdown-menu">             
-            <li><a class="dropdown-item" href="Login_Edit_User.aspx">Profil bearbeiten</a>         
+            <li><a class="dropdown-item" href="#">Test</a>         
              <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff"><img src="../images/samples/default-avatar.jpg"; width="80"; /></button> 
                 	
             </li>
          <div class="dropdown-divider"></div>
-                <li><a class="dropdown-item" id="btnsubmenu" href="GroupPolicies.aspx">Gruppenrichtlinien festlegen</a></li>
+               <li><button type="button" class="btn btn-primary" style="background-color:#fff"><img src="../images/Icons/main/Logout.svg"; width="80"; />Logout</button></li>
           </ul></ul>           
                                                            
                       
@@ -607,7 +599,7 @@
              <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff"><img src="../images/samples/default-avatar.jpg"; width="80"; /></button>            
             </li>
             
-                	
+               <li> <button type="button" class="btn btn-primary" style="background-color:#fff"><img src="../images/Icons/main/Logout.svg"; width="80"; />Logout</button></li>  	
           </ul></ul></div></nav></div>
         <div style="margin-left:5px;margin-right:5px">
          <div style="height:95px;"></div> 
diff --git a/Customers/Login_Edit_User.aspx b/Customers/Login_Edit_User.aspx
deleted file mode 100644
index 73567a3..0000000
--- a/Customers/Login_Edit_User.aspx
+++ /dev/null
@@ -1,161 +0,0 @@
-<%@ Page Title="" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="Login_Edit_User.aspx.vb" Inherits="Customers_Default" %>
-
-<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
-</asp:Content>
-<asp:Content ID="Content2" ContentPlaceHolderID="head" Runat="Server">
-     <!-- Bootstrap -->
-    <html lang="en"></html>
-    <!-- Required meta tags -->
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1" title="Verag Spedition AG AvisoTV Flex"/>
-   
-    <!-- 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"/>
-           <!-- Bootstrap CSS -->
-    
-     
-     <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
-    <link rel="shortcut icon" href="images/Icons/favicon/favicon.ico" />
-    <style>
-              body{
-         font-family: 'Poppins', sans-serif;
-                background: #fafafa;           
-          background-image: url(../images/road.jpg);
-          background-position:center center;
-          background-repeat: no-repeat;
-          background-attachment:fixed;
-          background-size:cover;
-         /* background-color:#043381;*/
-     }
-         .btn btn-primary{
-               color: #043381;
-               background-color: #fff;
-            }
-         #tableSearch{
-              width:1500px;              
-         }
-         .align-self-xl-start{
-             width:100%;
-         }         
-         #normaltable{
-             width:1500px;
-         }
-        @media (max-width: 558.98px) {
-           #conovertab {
-                width: 350px;                
-                overflow-x: auto;
-            } 
-           h1{
-               font-size:12px;
-           }
-           #tableSearch{
-               max-width:350px;
-           }
-           #containerseiterand{
-               margin-left:5px;
-               margin-right:5px;
-               width:350px;
-           }
-           .modal-dialog modal-dialog-scrollable{
-               width:30%;
-           }
-           .modal-content{
-              width:40%;
-              overflow-x:no-content;
-           }
-          .modal-header{
-               width:40%;
-           }
-           .modal-footer{
-                width:40%;
-           }
-           #exampleModalLabel{
-                font-size:12px;
-            }
-           .modal-body{
-           /* background-color:#043381;*/
-                background-image: linear-gradient(to right, #003680 , #0055cc);
-                color:#fff; 
-                width:40%;
-            }
-           #Image1{
-                width:40%;
-                height:40%;
-            }
-           #butclose{
-               transform:translateX(-50%);
-           }  
-        } 
-        .modal-body{
-           /* background-color:#043381;*/
-           background-image: linear-gradient(to right, #003680 , #0055cc);
-           color:#fff;            
-        }
-        .modal-header{
-           background-image: linear-gradient(to right, #003680 , #0055cc);
-           color:#fff;
-        }
-           
-         textcontent1{
-           font-size:/*18px*/0.7377049180327869vw;
-       }
-        @media (min-width: 575px) {
-            .modal-dialog modal-dialog-scrollable{
-                width:850px;                
-            }
-            .modal-content{
-                 margin-top:51px;
-                 overflow-x:auto;
-                 width:40%;
-            }
-        }  
-    </style>
-     <%@ import Namespace="MySql.Data.MySqlClient" %>
-     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" title="VERAG IndexCustomer"/>      
-   
-    <link rel="stylesheet" type="text/css" href="../css/main.css"/>
-    <link rel="stylesheet" type="text/css" href="../css/style.css"/>
-    <link rel="shortcut icon" href="../images/Icons/favicon/favicon.ico" />
-    <!--    <link rel="stylesheet" type="text/css" href="css/edit_main.css"> -->
-    <script src="js/netzwerk.js" type="text/javascript"></script>        
- 
-    <link rel="stylesheet" type="text/css" href="../stylesheets/style.css"/>
-    <link rel="stylesheet" type="text/css" href="../stylesheets/example.css"/>   
-     
-    <link rel="stylesheet" href="../css/navbarsidebar.css" type="text/css" />
-</asp:Content>
-<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
-    <div class="flex-fill">        
-         <div id="textcontent1">
-             Userverwaltung für:
-         </div>  
-        <p>
-            <asp:LoginName ID="LoginName1" runat="server" />        
-            <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff"><img src="../images/samples/default-avatar.jpg"; width="80"; /></button> 
-        </p></div>
-        <!-- Mdoal -->
-    
-                        																	<div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel">
-                            																		<div class="modal-dialog modal-dialog-scrollable" style="min-width: 850px; min-height: 800px;  overflow: hidden; place-self:center">
-                              																				<div class="modal-content">
-                               																		 	<div class="modal-header">
-                                 																		 	<h5 class="modal-title" id="exampleModalLabel">Profilbild: 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" >
-                                                                                                                   <center>
-                                  																				        <p><asp:Image ID="Image1" runat="server" ImageUrl="~/images/samples/default-avatar.jpg"/> </p>
-                                                                                                                   </center>
-                                        																	</div>
-                                																		</div>
-                                																			<div class="modal-footer">
-                                  																			<button type="button" id="butclose" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>                                
-                                																			</div>
-                              																			</div>
-                            																		</div>
-                         																	</div>
-                    
-</asp:Content>
-
diff --git a/Customers/Login_Edit_User.aspx.vb b/Customers/Login_Edit_User.aspx.vb
deleted file mode 100644
index 61c8063..0000000
--- a/Customers/Login_Edit_User.aspx.vb
+++ /dev/null
@@ -1,5 +0,0 @@
-
-Partial Class Customers_Default
-    Inherits System.Web.UI.Page
-
-End Class