From 0763a1492a80c625f7f033dc092ad8f0806885be Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Mon, 30 Aug 2021 16:59:57 +0200
Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20start=20Navbar=20und=20kunden?=
 =?UTF-8?q?beriech=20oben=20von=20navbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Customers/Cards_Boxes.aspx b/Customers/Cards_Boxes.aspx
index 6244d74..f9ead20 100644
--- a/Customers/Cards_Boxes.aspx
+++ b/Customers/Cards_Boxes.aspx
@@ -1,4 +1,4 @@
-<%@ Page Title="" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="Cards_Boxes.aspx.vb" Inherits="Customers_Default" %>
+<%@ Page Title="VERAG IndexCustomer" 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" title="VERAG IndexCustomer"/>      
+     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />      
    
   
     <link rel="shortcut icon" href="../images/Icons/favicon/favicon.ico" />
@@ -22,7 +22,6 @@
    <!-- 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 98a8e71..1bdba4c 100644
--- a/Customers/CustomerIndex.aspx
+++ b/Customers/CustomerIndex.aspx
@@ -39,8 +39,7 @@
 <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 5f1affe..781feb5 100644
--- a/Customers/Customers.master
+++ b/Customers/Customers.master
@@ -287,11 +287,11 @@
           
         <!-- Page Content  -->
         <nav id="content">             
-           <div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+           <div class="modal fade" id="myModal" 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="exampleModalLabel">Profil: User: <%=Me.Page.User.Identity.Name %></h5>
+                       	 	<h5 class="modal-title" id="myModalLabel">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">                                                                                                                              
@@ -336,14 +336,15 @@
     <a class="nav-link" data-bs-toggle="dropdown"  role="button" aria-expanded="false"><asp:LoginName ID="LoginName2" runat="server" /></a>                                                 
                                                           <ul class="dropdown-menu">  
                                                              <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>                 	
+             <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="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,9 +392,23 @@
                                                 </div>
     
      <div class="d-none d-md-block">
-                                        <nav class="navbar fixed-top navbar-expand-lg navbar-light" style="background-color:#fff">
+         
+             <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>
+                                           <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>
+                      </ul>                                                     
+                                   </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">
+                                                       <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>
@@ -447,21 +462,10 @@
                                                             <a class="dropdown-item" href="#">Separated link</a>
                                                           </div>-->
                                                         </div>                 
-                                               </div>             
-                                            
-                                          <ul class="nav nav-pills">                                             
-                                              <li class="nav-item dropdown">
-    <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false"><asp:LoginName ID="LoginName1" runat="server" /></a>
-                                           <ul class="dropdown-menu">                    
-                                               <li><a class="dropdown-item" href="#">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" 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 id="divueberdropdown">
+<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>
                                               <div class="dropdown-content">     
@@ -481,6 +485,8 @@
                                               </div>
                                 </div>  
                             </div>                  
+                          </div>
+                           
                                         </nav></div>
         <div style="margin-left:5px;margin-right:5px">
          <div style="height:95px;"></div> 
diff --git a/css/Customers/MasterpageCustomers.css b/css/Customers/MasterpageCustomers.css
index b183736..cc3d2d4 100644
--- a/css/Customers/MasterpageCustomers.css
+++ b/css/Customers/MasterpageCustomers.css
@@ -101,7 +101,17 @@ 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%;
     }
@@ -228,7 +238,13 @@ ContentPlaceHolder1 {
         right: 20px;
       
     }
-
+    .nav {
+       
+        flex-wrap: wrap;
+        padding-left: 0;
+        margin-bottom: 0;
+        list-style: none
+    }
     .modal-body {
         /* background-color:#043381;*/
         background-color: #fff;