From 105262642691ff46143180c759f5a333169f6635 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Tue, 24 Aug 2021 14:42:07 +0200
Subject: [PATCH] =?UTF-8?q?Container=C3=A4nderungen=20und=20Men=C3=BCanpas?=
 =?UTF-8?q?sungen=20des=20Seitenmen=C3=BCs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/Cards_Boxes.aspx                    |   7 +-
 Customers/CustomerIndex.aspx                  |   2 +-
 Customers/Customers.master                    | 119 ++++++++++--------
 Customers/Customers.master.vb                 |  11 ++
 Customers/GroupPolicies.aspx                  |  10 ++
 ...rwaltung.aspx.vb => GroupPolicies.aspx.vb} |   2 +-
 Customers/Invoices.aspx                       |  41 +++---
 Customers/LKWs.aspx                           |  95 ++++++++++++++
 Customers/LoggedinUserPanel.aspx              |  76 -----------
 Customers/LoggedinUserPanel.aspx.vb           |   5 -
 Customers/Login_Edit_User.aspx                |  27 +++-
 Customers/Userwerwaltung.aspx                 |  15 ---
 Customers/Welcome.aspx                        |  34 +++--
 css/navbarsidebar2.css                        |  91 ++++++--------
 newpageJulius_Sidebar.aspx                    |   6 +-
 15 files changed, 300 insertions(+), 241 deletions(-)
 create mode 100644 Customers/GroupPolicies.aspx
 rename Customers/{Userwerwaltung.aspx.vb => GroupPolicies.aspx.vb} (54%)
 delete mode 100644 Customers/LoggedinUserPanel.aspx
 delete mode 100644 Customers/LoggedinUserPanel.aspx.vb
 delete mode 100644 Customers/Userwerwaltung.aspx

diff --git a/Customers/Cards_Boxes.aspx b/Customers/Cards_Boxes.aspx
index 9d7688f..dbe5f8c 100644
--- a/Customers/Cards_Boxes.aspx
+++ b/Customers/Cards_Boxes.aspx
@@ -13,8 +13,7 @@
 
         .align-self-center{
             margin-left: 0.1530221882172915vw /*2px*/;
-            margin-right:  0.1530221882172915vw /*2px*/;
-            
+            margin-right:  0.1530221882172915vw /*2px*/;            
         }
            
         @media (max-width: 558.98px) {
@@ -58,7 +57,7 @@
                   font-size: 1em;
                   display: flex;
                   align-items: center;
-                  justify-content: center
+                  justify-content:center
              }
          .btn-primary {
             color: #fff;
@@ -79,7 +78,7 @@
              overflow-x:auto;             
          }
     </style>
-     <link rel="stylesheet" type="text/css" href="../css/navbarsidebar2.css"/>  
+     
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
     <div style="height:/*90px*/9.68783638320775vh;"></div> 
diff --git a/Customers/CustomerIndex.aspx b/Customers/CustomerIndex.aspx
index a548918..0daa4ce 100644
--- a/Customers/CustomerIndex.aspx
+++ b/Customers/CustomerIndex.aspx
@@ -27,7 +27,7 @@
 
 <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
     <!-- Webiste-Content-->
-    <div class="align-self-xl-start" style="/*margin-top:5px;*/margin-left:30px; margin-top:0.6510416666666667vw; margin-right:30px; place-content:center;">
+    <div class="align-self-xl-center" style="/*margin-top:5px;*/margin-left:30px; margin-top:0.6510416666666667vw; margin-right:30px; place-content:center;">
             <div id="containerseiterand"> 
                                     <div style="height:/*90px*/9.68783638320775vh;"></div> 
                                           <h1>Kundencenter</h1>
diff --git a/Customers/Customers.master b/Customers/Customers.master
index c7b9f33..96c6128 100644
--- a/Customers/Customers.master
+++ b/Customers/Customers.master
@@ -76,7 +76,7 @@
     </script>
 
     <link rel="stylesheet" type="text/css" href="../css/StyleSheetWebsiteNew.css"/>
-     <link rel="stylesheet" type="text/css" href="/css/navbarsidebar.css"/>   
+     <link rel="stylesheet" type="text/css" href="/css/navbarsidebar2.css"/>   
     <script type="text/javascript" src="../js/languageupdatescript.js"></script>
      
     <!--Hover Info --> 
@@ -160,9 +160,10 @@
         }
         #contentcontainer{
             width:2048px;
+            align-self:center;
         }
         ContentPlaceHolder1{
-            width:1725px;
+            width:2048px;
         }
         
        @media (max-width: 575px){
@@ -240,7 +241,13 @@
     right: 20px;
     transform: translateY(-50%);
 }
-        }        
+        }    
+        #ContentPlaceHolder1{
+            align-self:center;
+        }
+        #form1{
+            align-content:center
+        }
     </style>
     </asp:ContentPlaceHolder>
     <asp:ContentPlaceHolder id="head" runat="server">
@@ -301,21 +308,19 @@
                                                                                   ElseIf laenderkuerzel = "TR" And lan3 = "0" Then
                                                                                       flagpath = "images/flags/flagge_TR.gif"
                                                                                   End If
-
-
                                                                                   %>          
-     <li class="wrapper">
+   <li class="wrapper">
         <!-- Sidebar  -->
         <nav id="sidebar">
-            <div class="container-fluid">              
+            <div class="container">              
                 <div class="sidebar-header">
                     <a class="navbar-brand" 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>
 
-             <ul class="list-unstyled components">
-                                        <p style="font-size:medium;font-weight:600;" data-toggle="tooltip" data-placement="right" title="Durchklicken und mehr über uns erfahren!">VERAG Hauptmenü:</p>
-                                        <li class="active">
-                                         <li>
+                <ul class="list-unstyled components">
+                            <p style="font-size:medium;font-weight:600;" data-toggle="tooltip" data-placement="right" title="Durchklicken und mehr über uns erfahren!">VERAG Hauptmenü:</p>
+                            <li class="active">                                        
+                                 <li>
                                                            <!-- <a href="#WelcomeSubmenu1" data-toggle="collapse" aria-expanded="false" class="dropdown-toggle">Startseite</a>                        
                                                             <ul style="list-style: none;"class="collapse list-unstyled" id="WelcomeSubmenu1">
                                                                  <span class="navbar-toggler-icon"></span>-->
@@ -325,7 +330,7 @@
                                                           <!--  </ul>-->
                        </li>
                  <li>
-                                         <li>
+                                <li>
                                                         <!--    <a href="#RechnungenSubmenu1" data-toggle="collapse" aria-expanded="false" class="dropdown-toggle">Rechnungen</a>                        
                                                             <ul style="list-style: none;"class="collapse list-unstyled" id="RechnungenSubmenu1">
                                                                  <span class="navbar-toggler-icon"></span>-->
@@ -358,16 +363,31 @@
                                                                  <span class="navbar-toggler-icon"></span>-->
                                                                 <li>
                                                                     <%If Me.Page.User.Identity.Name = "test" Then %>
-                                                                    <a href="#">Coming soon</a>
+                                                                    <a href="#" aria-disabled="true">Coming soon</a>
                                                                     <%ElseIf Me.Page.User.Identity.Name = "test2" Then %>
                                                                     <a href="Invoices.aspx">Rechnungen</a>
                                                                     <%End If %>
                                                                 </li>
                                                              <!--  </ul>-->
-                       </li>
-             </ul>                
-                </div></nav>   
-         <div id="content">
+                                        <li>
+                                            <li>
+                                             <button class="btn btn-primary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample">
+    <asp:LoginName ID="LoginName2" runat="server" />
+  </button>
+
+<div class="collapse" id="collapseExample" style="width:250px;margin-left:-40px;">
+     <ul> 
+  
+                                                   <li><a class="dropdown-item" href="Login_Edit_User.aspx">Accountverwaltung</a></li>
+                                                   <li><a class="dropdown-item" href="GroupPolicies.aspx">Gruppenrichtlinien</a></li>
+     </ul>
+  </div>
+                                            </li>
+                                                                                   
+                    </ul></div>
+        </nav>
+           <div class="align-self-center" id="content">
+                          
          <div class="d-md-none">      
                                         <nav class="navbar navbar-expand-lg 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;">
@@ -451,8 +471,7 @@
                                                             <div class="dropdown-divider"></div>
                                                             <a class="dropdown-item" href="#">Separated link</a>
                                                           </div>-->
-                                                        </div>
-              
+                                                        </div>              
 
                                                           <div class="btn-group">
                                                           <a type="button" class="btn btn-primary" href="CustomerIndex.aspx" style="background-color:#fff; color:#043381;border:hidden;">Kundenseite</a>
@@ -466,33 +485,31 @@
                                                             <div class="dropdown-divider"></div>
                                                             <a class="dropdown-item" href="#">Separated link</a>
                                                           </div>-->
-                                                        </div>  
+                                                        </div>                 
                                                             </div>
-                                            <div style="padding-right:240px;">
-                                          <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>
+                                            <div style="padding-right:240px;">                                              
+  <li class="nav-item dropdown">
+    <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false"><img src="../images/samples/default-avatar.jpg" style="width:20px;height:20px" /> 
+        <asp:LoginName ID="LoginName1" runat="server" /></a>
     <ul class="dropdown-menu">
-        <div class="col-2">
-      <li> <iframe id="frame1" src="LoggedinUserPanel.aspx" runat="server" seamless="seamless" style="width:266px;height:219px;overflow:no-content;background-image:none;" scrolling="no"/>Accountverwaltung</li>
-        
-      <li><a class="dropdown-item" href="#">Another action</a></li>
-                                           </div>
-         <div class="col-2">
-         <img src="../images/samples/default-avatar.jpg" style="width:40px;height:40px;" alt="Avatar Picture sample" data-toggle="tooltip" data-placement="top" title="Upload Photo.">
-         </div>
+      <li><a class="dropdown-item" href="Login_Edit_User.aspx">Accountverwaltung</a></li>
+      <li><a class="dropdown-item" href="GroupPolicies.aspx">Gruppenrichtlinien</a></li>
+      
+        <%  If Me.Page.User.Identity.IsAuthenticated = True Then %>
+      <li><button type="button" id="Logout" class="btn btn-primary">Logout</button></li>
+        <%Else %>
+        <li><button type="button" id="Login" href="../login/Login_FLEX.aspx" class="btn btn-primary">Logout</button></li>
+        <%End If %>
     </ul>
-    
-                                        </li> </ul></div>
-                             </asp:LoginView>
+  </li>
+ 
+                                          </div>
+                             
                                                      </nav>
                                          </div>
-    <form id="form1" runat="server">
+    <form id="form1" runat="server" style="place-self:center">
 
-    <div>
+    <div class="align-content-center" style="place-content:center;background-color:#fff">
         <asp:ContentPlaceHolder id="ContentPlaceHolder1" runat="server">
         
         </asp:ContentPlaceHolder>
@@ -502,9 +519,7 @@
   
      <script type="text/javascript" src="../js/toptions/top_up-min.js"></script>   
          <script type="text/javascript" src="../js/scrollscript.js"></script>   
-         <!-- JQUERY Script fuer Modal-->
-         <script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
-
+        
          <!-- jQuery CDN - Slim version (=without AJAX) -->
         <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
         <!-- Popper.JS -->
@@ -514,7 +529,8 @@
        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.min.js" integrity="sha384-cVKIPhGWiC2Al4u+LWgxfKTRIcfu0JTxR+EQDz/bgldoEyl4H0zUF0QKbrJ0EcQF" crossorigin="anonymous"></script>     
         <!-- jQuery Custom Scroller CDN -->
         <script src="https://cdnjs.cloudflare.com/ajax/libs/malihu-custom-scrollbar-plugin/3.1.5/jquery.mCustomScrollbar.concat.min.js"></script>
-     <script>
+       
+    <script>
          // Filter table
          $(document).ready(function () {
              $("#tableSearch").on("keyup", function () {
@@ -525,12 +541,13 @@
              });
          });
      </script>
-    <script type="text/javascript">
-        $(document).ready(function () {
-            $('#sidebarCollapse').on('click', function () {
-                $('#sidebar').toggleClass('active');
-            });
-        });
-    </script>      
+       
+     <script type="text/javascript">
+         $(document).ready(function () {
+             $('#sidebarCollapse').on('click', function () {
+                 $('#sidebar').toggleClass('active');
+             });
+         });
+     </script> 
 </body>
 </html>
diff --git a/Customers/Customers.master.vb b/Customers/Customers.master.vb
index 57a57a3..8878eab 100644
--- a/Customers/Customers.master.vb
+++ b/Customers/Customers.master.vb
@@ -1,5 +1,16 @@
 
 Partial Class Customers_Customers
     Inherits System.Web.UI.MasterPage
+
+    Protected Sub LogoutButton_Click(sender As Object, e As EventArgs)
+        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("Logout.aspx")
+    End Sub
 End Class
 
diff --git a/Customers/GroupPolicies.aspx b/Customers/GroupPolicies.aspx
new file mode 100644
index 0000000..9714de0
--- /dev/null
+++ b/Customers/GroupPolicies.aspx
@@ -0,0 +1,10 @@
+<%@ Page Title="" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="GroupPolicies.aspx.vb" Inherits="Customers_Default" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+</asp:Content>
+<asp:Content ID="Content2" ContentPlaceHolderID="head" Runat="Server">
+</asp:Content>
+<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+    Gruppenrichtlinen
+</asp:Content>
+
diff --git a/Customers/Userwerwaltung.aspx.vb b/Customers/GroupPolicies.aspx.vb
similarity index 54%
rename from Customers/Userwerwaltung.aspx.vb
rename to Customers/GroupPolicies.aspx.vb
index 92dbe91..61c8063 100644
--- a/Customers/Userwerwaltung.aspx.vb
+++ b/Customers/GroupPolicies.aspx.vb
@@ -1,5 +1,5 @@
 
-Partial Class Customers_Userwerwaltung
+Partial Class Customers_Default
     Inherits System.Web.UI.Page
 
 End Class
diff --git a/Customers/Invoices.aspx b/Customers/Invoices.aspx
index a4ff585..78b2733 100644
--- a/Customers/Invoices.aspx
+++ b/Customers/Invoices.aspx
@@ -20,8 +20,7 @@
     <style>
         /* ---------------------------------------------------
                 CONTENT STYLE
-            ----------------------------------------------------- */
-
+            ----------------------------------------------------- */       
         .btn btn-primary{
                color: #043381;
                background-color: #fff;
@@ -29,8 +28,11 @@
 
         .align-self-center{
             margin-left: 0.1530221882172915vw /*2px*/;
-            margin-right:  0.1530221882172915vw /*2px*/;
-            
+            margin-right:  0.1530221882172915vw /*2px*/;            
+        }
+        #content {
+        align-content:center;
+          justify-content:center;
         }
 
         @media (max-width: 558.98px) {
@@ -45,11 +47,20 @@
              width: 100%;
          }     
         #containerseiterand{
-             width:90%;
-             justify-content:start;
+             width:110%;
+             justify-content:center;
          }
-        #input-group{
-            max-width:90%;
+        #myInput1{
+            width:70%;
+            height:50%;
+        }
+        #myInput2{
+             width:70%;
+             height:50%;
+        }
+        #myInput3{
+            width:85%;
+            height:50%;
         }
         }
         /* @media (min-width: 320px) and (min-height: 640px) {*/
@@ -57,8 +68,7 @@
             #content_all {
                 font-size: 1rem;
                 font-size: 3.303964757709251vw;
-                min-width: /*445px;*/ 98.01762114537445vw;
-                float: left;
+                min-width: /*445px;*/ 98.01762114537445vw;               
                 overflow-x: hidden;
                 margin-left: 0px;
                 padding-right: /*-20px*/ -4.405286343612334vw;
@@ -68,6 +78,7 @@
              width:1400px;           
              overflow-x:auto;             
          }
+           
         }
         #innerhtmltable{
                 margin-left: /*5px*/0.19615535504119264vw;
@@ -76,7 +87,7 @@
                   font-size: 1em;
                   display: flex;
                   align-items: center;
-                  justify-content: center
+                  justify-content: center;
              }
          .btn-primary {
             color: #fff;
@@ -93,7 +104,7 @@
       #conovertab{
              /* max-width:width:150px 11.25em;*/
              margin-left:/*14px*/ 3.0837004405286343vw;
-              max-width:/*390px;*/ 85.90308370044053vw;           
+              max-width:/*390px;*/ 35.90308370044053vw;           
              overflow-x:auto;             
          }
     </style>
@@ -104,14 +115,14 @@
 
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
     
-   <div class="align-self-flex-start" style="/*margin-top:5px;*/margin-left:25px; margin-top:0.6510416666666667vw; margin-right:25px;">
+   <div class="align-self-flex-center" style="/*margin-top:5px;*/margin-left:25px; margin-top:0.6510416666666667vw; margin-right:25px;">
             <div id="containerseiterand"> 
   <div style="height:/*90px*/9.68783638320775vh;"></div> 
     
-     <div class="d-flex flex-col-4" style="align-content:start">
+     <div class="d-flex flex-col-4" style="align-content:center">
      <h5>Rechnungen</h5>
 </div>
-       <div style="place-content:center;">
+       <div>
                      <div class="row justify-content-md-start" >
                          <div class="d-flex flex-col-4">
                              <asp:Label ID="Label1" runat="server" Text="Datum"></asp:Label>        
diff --git a/Customers/LKWs.aspx b/Customers/LKWs.aspx
index 3358691..5a6d087 100644
--- a/Customers/LKWs.aspx
+++ b/Customers/LKWs.aspx
@@ -2,6 +2,101 @@
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
 </asp:Content>
+
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+
+    <div class="align-self-flex-center" style="/*margin-top:5px;*/margin-left:25px; margin-top:0.6510416666666667vw; margin-right:25px;">
+            <div id="containerseiterand"> 
+  <div style="height:/*90px*/9.68783638320775vh;"></div> 
+    
+     <div class="d-flex flex-col-4" style="align-content:center">
+     <h5>Hier befindet sich eine Übersicht über alle LKWS</h5>
+</div>
+       <div>
+                     <div class="row justify-content-md-start" >
+                         <div class="d-flex flex-col-4">
+                             <asp:Label ID="Label1" runat="server" Text="Datum"></asp:Label>        
+                          <div class="input-group">
+                              <input type="text" id="myInput1" onkeyup="filterdatvonbis()" placeholder="Von"/>                       
+                             <input type="text" id="myInput2" onkeyup="filterdatvonbis()" placeholder="Bis"/>        
+                        </div>
+                    </div>
+                    <div class="d-flex flex-col-2">    
+                        <div class="input-group">
+                            <!-- <asp:Label ID="Label3" runat="server" Text="ReNr:"></asp:Label>-->
+                           <input type="text" id="myInput3" onkeyup="filterRENr()" placeholder="Rechnungsnummer"/>
+                        </div>
+                    </div>
+                 </div>
+           
+               <div style="height:/*20px*/2.1621621621621623vh;"></div> 
+                 
+              <div id="conovertab">                                       
+         
+            <table class="table table-hover table-responsive table-primary" id="tablerechnungen" contenteditable="false">
+                <thead style="width:fit-content;font-size:14px;"><tr><th>Rechnungsnr</th><th>Rechnungsdatum</th><th>LKW</th><th>Grenzsztelle</th><th>Rechnungsbetrag</th><th>Abfertigungsdatum</th><th>Filiale</th><th>Abfertigungsnr.</th><th style="width:/*20px*/ 0.7927070947284979vw;"></th></tr></thead>
+                <tbody id="bodyoftable">
+                    <tr><td>045100110</td><td>18.08.2021</td><td>14334234</td><td>SUBEN</td><td>509,21€</td><td>18.08.2021</td><td>SUBEN</td><td>512</td><td><center><button type="button" class="btn btn-primary"  data-toggle="tooltip" data-placement="top" title="Hier klicken zum Downlaod der Rechnungen."><img src="../images/pdficon.gif" width="15" height="15"/></button></center></td></tr>
+                     <tr><td>0487110</td><td>17.05.2021</td><td>14334234</td><td>NEUHAUS A INN</td><td>509,21€</td><td>17.05.2021</td><td>NICKELSDORF</td><td>512</td><td><center><button type="button" class="btn btn-primary"  data-toggle="tooltip" data-placement="top" title="Hier klicken zum Downlaod der Rechnungen."><img src="../images/pdficon.gif" width="15" height="15"/></button></center></td></tr>
+                     <tr><td>88800110</td><td>19.10.2017</td><td>14334234</td><td>SUBEN</td><td>509,21€</td><td>19.10.2017</td><td>WAIDHAUS</td><td>512</td><td><center><button type="button" class="btn btn-primary"  data-toggle="tooltip" data-placement="top" title="Hier klicken zum Downlaod der Rechnungen."><img src="../images/pdficon.gif" width="15" height="15"/></button></center></td></tr>
+                     <tr><td>25100110</td><td>29.02.2021</td><td>14334234</td><td>SUBEN</td><td>509,21€</td><td>18.08.2021</td><td>SUBEN</td><td>512</td><td><center><button type="button" class="btn btn-primary"  data-toggle="tooltip" data-placement="top" title="Hier klicken zum Downlaod der Rechnungen."><img src="../images/pdficon.gif" width="15" height="15"/></button></center></td></tr>
+                     <tr><td>542110</td><td>29.02.2021</td><td>14334234</td><td>SUBEN</td><td>509,21€</td><td>18.08.2021</td><td>SUBEN</td><td>512</td><td><center><button type="button" class="btn btn-primary"  data-toggle="tooltip" data-placement="top" title="Hier klicken zum Downlaod der Rechnungen."><img src="../images/pdficon.gif" width="15" height="15"/></button></center></td></tr>
+                </tbody>
+            </table></div> 
+              </div></div></div>
+        
+    
+     <!-- jQuery CDN - Slim version (=without AJAX) -->
+        <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+     <!-- Popper.JS -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" integrity="sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ" crossorigin="anonymous"></script>   
+    
+
+     <script>
+         function filterRENr() {
+             // Declare variables
+             var input, filter, table, tr, td, i, txtValue;
+             input = document.getElementById("myInput3");
+             filter = input.value.toUpperCase();
+             table = document.getElementById("bodyoftable");
+             tr = table.getElementsByTagName("tr");
+
+             // Loop through all table rows, and hide those who don't match the search query
+             for (i = 0; i < tr.length; i++) {
+                 td = tr[i].getElementsByTagName("td")[0];
+                 if (td) {
+                     txtValue = td.textContent || td.innerText;
+                     if (txtValue.toUpperCase().indexOf(filter) > -1) {
+                         tr[i].style.display = "";
+                     } else {
+                         tr[i].style.display = "none";
+                     }
+                 }
+             }
+         }
+         function filterdatvonbis() {
+             // Declare variables
+             var input, filter, table, tr, td, i, txtValue;
+             input = document.getElementById("myInput1");
+             input2 = document.getElementById("myInput2");
+             filter = input.value.toUpperCase();
+             filter = input2.value.toUpperCase();
+             table = document.getElementById("bodyoftable");
+             tr = table.getElementsByTagName("tr");
+
+             // Loop through all table rows, and hide those who don't match the search query
+             for (i = 0; i < tr.length; i++) {
+                 td = tr[i].getElementsByTagName("td")[1];
+                 if (td) {
+                     txtValue = td.textContent || td.innerText;
+                     if (txtValue.toUpperCase().indexOf(filter) > -1) {
+                         tr[i].style.display = "";
+                     } else {
+                         tr[i].style.display = "none";
+                     }
+                 }
+             }
+         }
+     </script> 
 </asp:Content>
 
diff --git a/Customers/LoggedinUserPanel.aspx b/Customers/LoggedinUserPanel.aspx
deleted file mode 100644
index 3cd8f93..0000000
--- a/Customers/LoggedinUserPanel.aspx
+++ /dev/null
@@ -1,76 +0,0 @@
-<%@ Page Language="VB" AutoEventWireup="false" CodeFile="LoggedinUserPanel.aspx.vb" Inherits="Customers_LoggedinUserPanel" %>
-
-<!DOCTYPE html>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title>VERAG LoggedinUserStatus</title>
-      <!-- Bootstrap -->
-   <html lang="en">
-    <!-- Required meta tags -->
-    <meta charset="utf-8"/>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <!-- 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 href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">-->
-      
-    <link href="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"/>
-
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" title="VERAG Spedition AG"/>      
-    <link rel="stylesheet" type="text/css" href="/css/navbarsidebar.css"/>   
-    <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"/> 
-</head>
-<body>
-    <form id="form1" runat="server">
-        <div class="flex-fill">
-        <asp:Panel ID="Panel1" runat="server" style="width:60px;height:fit-content">
-            Herzlich Willkommen: 
-                 <a href="#LeistungenSubmenu" data-toggle="collapse" aria-expanded="false" class="dropdown-toggle">
-                     <asp:LoginName ID="LoginName1" runat="server" />
-                 </a>                                          
-                                     <a href="#AccverwSubmenu" data-toggle="collapse" aria-expanded="false" class="dropdown-toggle">Account verwalten:</a>
-                                                <ul class="collapse list-unstyled" id="AccverwSubmenu">
-                                                     <li class="nav-item dropdown">
-                                                       <a class="dropdown-item" onclick="bust1()"><img src="../images/Icons/main/edit.gif" width="35" height="35" alt="Edit symbol" data-toggle="tooltip" data-placement="top" title="Editiere deinen Account."/> Account editieren</a>   
-                                                    </li>
-                                                    <li>
-                                                       <a class="dropdown-item" href="Userverwaltung.aspx"><img src="../images/Icons/main/edit.gif" width="35" height="35" alt="Edit symbol" data-toggle="tooltip" data-placement="top" title="Editiere deinen Account."/> Account editieren</a>   
-                                                    </li>
-                                                    </ul>
-                                   
-        </asp:Panel></div>
-        <div>
-        </div>
-    </form>
-     <script type="text/javascript" src="js/toptions/top_up-min.js"></script>
-                <!-- jQuery CDN - Slim version (=without AJAX) -->
-            <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-            <!-- Popper.JS -->
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" integrity="sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ" crossorigin="anonymous"></script>
-            <!-- Bootstrap JS -->
-            <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js" integrity="sha384-uefMccjFJAIv6A+rW+L4AHf99KvxDjWSu1z9VI8SKNVmz4sk7buKt/6v9KI65qnm" crossorigin="anonymous"></script>       
-            <!-- jQuery Custom Scroller CDN -->
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/malihu-custom-scrollbar-plugin/3.1.5/jquery.mCustomScrollbar.concat.min.js"></script>
-             <script src="bootstrap-5.0.2-dist/js/bootstrap.min.js"></script>
-            <script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
-    <script>
-        function bust1() {
-            if (top != self)
-                top.location.replace('Login_Edit_User.aspx');
-        }
-    </script>
-</body>
-</html>
diff --git a/Customers/LoggedinUserPanel.aspx.vb b/Customers/LoggedinUserPanel.aspx.vb
deleted file mode 100644
index 1f5cfd2..0000000
--- a/Customers/LoggedinUserPanel.aspx.vb
+++ /dev/null
@@ -1,5 +0,0 @@
-
-Partial Class Customers_LoggedinUserPanel
-    Inherits System.Web.UI.Page
-
-End Class
diff --git a/Customers/Login_Edit_User.aspx b/Customers/Login_Edit_User.aspx
index be7cd21..6c4d8a4 100644
--- a/Customers/Login_Edit_User.aspx
+++ b/Customers/Login_Edit_User.aspx
@@ -3,10 +3,35 @@
 <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"/>
+    
+    <%@ import Namespace="MySql.Data.MySqlClient" %>
+
+    <style>
+        #ImageButton1{
+            width:50px;
+            height:50px;
+        }
+    </style>
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
     <div class="flex-fill">
-            <asp:Label ID="Label1" runat="server" Text="Userwerwaltung"></asp:Label>
+        
+           Userwerwaltung für: <asp:LoginName ID="LoginName1" runat="server" />
+        
+        <asp:ImageButton ID="ImageButton1" runat="server" ImageUrl="~/images/samples/default-avatar.jpg"/>
         </div>
 </asp:Content>
 
diff --git a/Customers/Userwerwaltung.aspx b/Customers/Userwerwaltung.aspx
deleted file mode 100644
index b07f93b..0000000
--- a/Customers/Userwerwaltung.aspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<%@ Page Language="VB" AutoEventWireup="false" CodeFile="Userwerwaltung.aspx.vb" Inherits="Customers_Userwerwaltung" %>
-
-<!DOCTYPE html>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title>VERAG Userwerwaltung</title>
-</head>
-<body>
-    <form id="form1" runat="server">
-        
-    </form>
-</body>
-</html>
diff --git a/Customers/Welcome.aspx b/Customers/Welcome.aspx
index bfbba34..860a00c 100644
--- a/Customers/Welcome.aspx
+++ b/Customers/Welcome.aspx
@@ -8,31 +8,29 @@
         font-size: 1em;         
       }
        @media (max-width: 558.98px) {
-           .container {
+           
+
+           #imgcar {
                width: 112px;
                height: 70px;
            }
-           #imgcar{
-               width:112px;
-               height:70px;
-           }
-           @media (min-width: 558.98px) {
-           .container{
-               width:1296px;
-               height:813px;
-           }
-           #imgcar{
-              width:1296px;
-              height:813px;
-           }
        }
+           @media (min-width: 558.98px) {
+              
+
+               #imgcar {
+                   width: 1296px;
+                   height: 813px;
+               }
+           }
        </style>
-    <link rel="shortcut icon" href="images/Icons/favicon/favicon.ico" />
-     <link rel="stylesheet" type="text/css" href="../css/Welcome.css"/>}
+    <link rel="shortcut icon" href="../images/Icons/favicon/favicon.ico" />
+     <link rel="stylesheet" type="text/css" href="../css/Welcome.css"/>
+    <link rel="stylesheet" type="text/css" href="../css/navbarsidebar2.css" />
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
-    <div class="align-self-xl-start" style="/*margin-top:5px;*/margin-left:30px; margin-top:0.6510416666666667vw; margin-right:30px; place-content:center; width:1725px;">
-            <div id="containerseiterand" style="width:1625px"> 
+    <div class="container-xl" style="/*margin-top:5px;*/margin-left:30px; margin-top:0.6510416666666667vw; margin-right:30px; place-content:center; width:1725px;">
+            <div id="containerseiterand" style="width:1625px;"> 
          <div style="height:/*90px*/9.68783638320775vh;"></div> 
         <div>
             
diff --git a/css/navbarsidebar2.css b/css/navbarsidebar2.css
index 8b8ec29..7d773db 100644
--- a/css/navbarsidebar2.css
+++ b/css/navbarsidebar2.css
@@ -1,6 +1,7 @@
 
 /*Sidenav */
 @import "https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700";
+
 body {
     font-family: 'Poppins', sans-serif;
     background: #fafafa;
@@ -85,12 +86,12 @@ a:focus {
 #sidebarCollapse {
     background-color: #043381;
     color: #fff;
-    margin-right: -43px;
-    margin-right: -2.5rem;
+    margin-left: -250px;
+    
 }
 
     #sidebarCollapse:hover {
-        background-color: #043381;        
+        background-color: #043381;
         color: #fff;
         border-radius: 5px;
         border-radius: 0.313em;
@@ -109,15 +110,15 @@ a:focus {
 #sidebar {
     min-width: 250px;
     max-width: 250px;
-    background-color:#fff;
-    color:#043381;
+    background-color: #fff;
+    color: #043381;
 }
 
     #sidebar.active {
         margin-left: -250px;
-    }      
+    }
 
-    #sidebar .sidebar-header {        
+    #sidebar .sidebar-header {
         background: #fff;
     }
 
@@ -153,40 +154,26 @@ a:focus {
         background-color: #043381;
     }
 
-    a[data-toggle="collapse"] {
-        position: relative;
-    }
+a[data-toggle="collapse"] {
+    position: relative;   
+}
 
-    .dropdown-toggle::after {
-        display: block;
-        position: absolute;
-        top: 50%;
-        right: 20px;
-        transform: translateY(-50%);
-    }
+.dropdown-toggle::after {
+    display: block;
+    position: absolute;
+    top: 50%;
+    right: 20px;
+    transform: translateY(-50%);
+}
 
-    ul ul a {
-        font-size: 0.875em !important;
-        padding-left: 30px !important;
-        background-color: #fff;
-    }
+ul ul a {
+    font-size: 0.875em !important;
+    padding-left: 30px !important;
+    background-color: #fff;
+}
 
-    ul.CTAs {
-        padding: 20px;
-    }
 
-    ul.CTAs a {
-        text-align: center;
-        font-size: 14px !important;
-        font-size: 1.8229166666666667vw !important;
-        font-size: 0.875rem !important;
-        display: block;
-        border-radius: 5px;
-        border-radius: 0.313rem;
-        margin-bottom: 5px;
-        margin-bottom: 0.313rem;
-    }
-            /* a.download {
+/* a.download {
                 background: #fff;
                 color: #043381;
             }
@@ -202,32 +189,34 @@ a:focus {
             ----------------------------------------------------- */
 
 #content {
-    max-width: /*2048px;*/ 451.10132158590307vw;
+    max-width: /*575px;*/ 126.65198237885463vw;
     padding: 20px;
     padding: 1.25em;
     min-height: 100vh;
     transition: all 0.5s;
     background-color: #fff;
 }
-            #container-xxl {
-                background-color: #fff;
-            }
+
+#container-xxl {
+    background-color: #fff;
+}
 /* ---------------------------------------------------
                     MEDIAQUERIES
                 ----------------------------------------------------- */
 /* @media (max-width: 320px) and (max-height: 640px){*/
 @media (max-width: 575.98px) {
     #sidebar {
-            padding: /*2px*/ 0.44052863436123346vw;
-            font-size: 1em;
-            margin-left: -250px;
-            background-color: #fff;
-            color: #043381;
-        }
-    #sidebar.active {
-        margin-left: 0;
+        padding: /*2px*/ 0.44052863436123346vw;
+        font-size: 1em;
+        margin-left: -250px;
+        background-color: #fff;
+        color: #043381;
     }
 
+        #sidebar.active {
+            margin-left: -250px;
+        }
+
     #content {
         font-size: 1.57em;
         font-size: 3.270833333333333vw;
@@ -307,12 +296,13 @@ a:focus {
         #sidebar.active {
             margin-left: -250px;
         }
+
     #content_all {
         font-size: 1rem;
         font-size: 1.2333000033333vw;
         min-width: 110%;
         float: left;
-        background-color:#fff;
+        background-color: #fff;
     }
 
     #footer_content b {
@@ -8689,4 +8679,3 @@ li {
     background-color: #fff;
     color: #043381;
 }
-
diff --git a/newpageJulius_Sidebar.aspx b/newpageJulius_Sidebar.aspx
index 0646a08..486cd7b 100644
--- a/newpageJulius_Sidebar.aspx
+++ b/newpageJulius_Sidebar.aspx
@@ -351,7 +351,7 @@
               </div>
         </div>
 
-      <div class="container-xxl">                                                                                                                                                
+      <div class="container-xxl" style="align-content:center">                                                                                                                                                
         <!-- Page Content  -->
         <div id="content">             
             <div class="d-none d-md-block">
@@ -393,7 +393,7 @@
                                                                           End If%>
 
                                                                           <% For Each nav As cNavigation In navigation %>
-                <div style="display:flex;">
+                
                        <li class="nav-item dropdown" style="background-color:#fff; color:#043381;list-style:none;">
                         <a class="nav-link dropdown-toggle" href="<%= navParent%>?menuID=<%= nav.id %>&lan=<%= laenderKuerzel %>" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="background-color:#fff; color:#043381;">                              
                             <%= IIf(nav.bezeichnung <> "", nav.bezeichnung, "XXX") %>
@@ -442,7 +442,7 @@
                                                                                  End If%>                                                                                        
                                                                               </tr>
                                                                  </table>                                        
-                                                        </li></div>
+                                                        </li>
                                                 <%
                                                     Next
                                                 %>