From f471c49217ad06a4d74f38f4be1e978aba014502 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Tue, 31 Aug 2021 13:27:16 +0200
Subject: [PATCH] Wiederherstellung

---
 Customers/Cards_Boxes.aspx            |  5 +--
 Customers/CustomerIndex.aspx          |  3 +-
 Customers/Customers.master            | 48 ++++++++++++---------------
 css/Customers/MasterpageCustomers.css | 20 ++---------
 4 files changed, 28 insertions(+), 48 deletions(-)

diff --git a/Customers/Cards_Boxes.aspx b/Customers/Cards_Boxes.aspx
index f9ead20..6244d74 100644
--- a/Customers/Cards_Boxes.aspx
+++ b/Customers/Cards_Boxes.aspx
@@ -1,4 +1,4 @@
-<%@ Page Title="VERAG IndexCustomer" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="Cards_Boxes.aspx.vb" Inherits="Customers_Default" %>
+<%@ Page Title="" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="Cards_Boxes.aspx.vb" Inherits="Customers_Default" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">   
 </asp:Content>
@@ -12,7 +12,7 @@
   
     <link rel="shortcut icon" href="images/Icons/favicon/favicon.ico" />
      
-     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />      
+     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" title="VERAG IndexCustomer"/>      
    
   
     <link rel="shortcut icon" href="../images/Icons/favicon/favicon.ico" />
@@ -22,6 +22,7 @@
    <!-- 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" type="text/css" href="../css/main.css"/>
     <link rel="stylesheet" type="text/css" href="../css/style.css"/>
 
diff --git a/Customers/CustomerIndex.aspx b/Customers/CustomerIndex.aspx
index 1bdba4c..98a8e71 100644
--- a/Customers/CustomerIndex.aspx
+++ b/Customers/CustomerIndex.aspx
@@ -39,7 +39,8 @@
 <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
     <!-- Webiste-Content-->
   
-            <div id="containerseiterand">                                
+            <div id="containerseiterand"> 
+                                    
                                           <h1>Kundencenter</h1>
                                             <div id="line" style="width: 92%;"></div>
                                             <br/>                      
diff --git a/Customers/Customers.master b/Customers/Customers.master
index 80c2970..e9f1343 100644
--- a/Customers/Customers.master
+++ b/Customers/Customers.master
@@ -287,11 +287,11 @@
           
         <!-- Page Content  -->
         <nav id="content">             
-           <div class="modal fade" id="myModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+           <div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
               <div class="modal-dialog">
                 <div class="modal-content">
                   <div class="modal-header">
-                       	 	<h5 class="modal-title" id="myModalLabel">Profil: User: <%=Me.Page.User.Identity.Name %></h5>
+                       	 	<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">                                                                                                                              
@@ -335,14 +335,15 @@
                                               <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>
+                                                             <li><a class="dropdown-item">Profil bearbeiten</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 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>                                                                
                                             </ul></li>                                               
                       </ul>       
-<button class="btn btn-primary" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasWithBothOptions" aria-controls="offcanvasWithBothOptions" style="background-color:#fff; color:#043381;"><img id="myImage" src="../<%=flagpath%>" style="border:1px solid #fff;width:30px;"/></button>                 
                                              </div>
-                                            
+                                            <button class="btn btn-primary" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasWithBothOptions" aria-controls="offcanvasWithBothOptions" style="background-color:#fff; color:#043381;"><img id="myImage" src="../<%=flagpath%>" style="border:1px solid #fff;width:30px;"/></button>                 
                                                
                                         </nav>
                                           </div>
@@ -391,14 +392,7 @@
     
      <div class="d-none d-md-block">
          
-           
-             
-                                        <nav class="navbar fixed-top navbar-expand-lg navbar-light" style="background-color:#fff">                                              
-                                          <div class="container" style="width:100%;margin-left:-5%">
-                                               <a class="navbar-brand" id="navbarhomebar" href="../newpageJulius_Sidebar.aspx"><img src="../images/Logo_small.png" width="175" height="35" alt="Logo VERAG Spedition AG" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"/></a>   
-                                               
-                                                   <div class="navbar-nav mb-lg-0">
-                                                  <div style="width:100%;margin-right:150px;height:20px;">
+             <div style="width:100%;margin-right:150px;height:20px;">
                                <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"> <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="LoginName1" runat="server" /></a>
@@ -408,12 +402,12 @@
                   <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>
                       </ul>                                                     
-                                   </div></div>
-                                              
-                                           <div class="align-self: center" style="margin-left:auto;margin-right:auto"> 
-                                           <ul class="navbar-nav mt-0">
-                                                     <li>
-                                                       
+                                   </div>
+             
+                                        <nav class="navbar  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 class="align-self: center" style="margin-left:auto;margin-right:auto">
                                                         <div class="btn-group">
                                                              <%If Me.Page.User.Identity.Name = "test" Then %>
                                                                 <a type="button" class="btn btn-primary" href="Welcome.aspx" style="background-color:#fff; color:#043381;border:hidden;">Startseite</a>
@@ -466,10 +460,10 @@
                                                             <div class="dropdown-divider"></div>
                                                             <a class="dropdown-item" href="#">Separated link</a>
                                                           </div>-->
-                                                        </div>      
-        </li>
-                                               </ul> </div>                  
-
+                                                        </div>                 
+                                               </div>                   
+                          
+<div style="margin-right:-8px;">
                                 <div id="divueberdropdown">
                                 <div class="dropdown" style="background-color:#fff; color:#043381; margin-right:9.813rem;position:sticky;">
                                               <button class="dropbtn"> <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>
@@ -489,10 +483,10 @@
                                                   <a id="ButtonBulgariaLangPicker" class="btn btn-primary btn-sm"  href="<%= navParent%>&lan2=BG&lan3=0" style="background-color:#fff;color:#043381;text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_BG_big.gif"; width="20"; <% If laenderkuerzel = "bg" Then Response.Write("style='border:1px solid #000'")%>/><%=stringBG%></a>                                             
                                               </div>
                                 </div>  
-                            </div>    </div> </nav>        
-                       </div>
-                         
-                                        
+                            </div>                  
+                          </div>
+                           
+                                        </nav></div>
         <div style="margin-left:5px;margin-right:5px">
          <div style="height:95px;"></div> 
             <form id="leftLinks" runat="server" style="float:initial">
diff --git a/css/Customers/MasterpageCustomers.css b/css/Customers/MasterpageCustomers.css
index 9a29e70..4091ec8 100644
--- a/css/Customers/MasterpageCustomers.css
+++ b/css/Customers/MasterpageCustomers.css
@@ -108,17 +108,7 @@ ContentPlaceHolder1 {
         background-color: #fff;
         color: #043381;
     }
-    #navbarhomebar {
-        /*transform: translateX(-50%);*/
-        left: 15%;
-        top: 20%;
-        position: absolute;
-        text-align: center;
-        height: 26px;
-        height: 2.0233463035019454vh;
-        width: 150px;
-        width: 19.97336884154461vw;
-    }
+
     .modal-dialog modal-dialog-scrollable {
         width: 30%;
     }
@@ -245,13 +235,7 @@ ContentPlaceHolder1 {
         right: 20px;
       
     }
-    .nav {
-       
-        flex-wrap: wrap;
-        padding-left: 0;
-        margin-bottom: 0;
-        list-style: none
-    }
+
     .modal-body {
         /* background-color:#043381;*/
         background-color: #fff;