From 7d8c38032981bf88e6b69c8e50e0cac98eb68ed0 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Wed, 25 Aug 2021 15:27:56 +0200
Subject: [PATCH] =?UTF-8?q?Neue=20Men=C3=BCs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/Customers.master     | 54 ++++++++++++++++------------------
 Customers/Login_Edit_User.aspx |  5 ++--
 status_Julius.aspx             |  4 +--
 3 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/Customers/Customers.master b/Customers/Customers.master
index e5a4607..e761451 100644
--- a/Customers/Customers.master
+++ b/Customers/Customers.master
@@ -405,56 +405,54 @@
          <div 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;">
-                                                            <div class="align-self: center"></div>
-                                                               <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>
-                                                             </button>
-                                             <a class="navbar-brand" href="../newpageJulius_Sidebar.aspx?lan2=DE"><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>                                                                                                                                                           
-                                                   <button class="btn btn-primary" type="button" data-bs-toggle="offcanvas" data-target="#offcanvasWithBothOptions1" aria-controls="offcanvasWithBothOptions1" style="background-color:#fff; color:#043381;"><img id="myImage" src="../<%=flagpath%>" style="border:1px solid #fff;width:30px;"/></button>
+                                                     <button type="button" id="sidebarCollapse" class="btn btn-info" style="background-color:#fff; color:#043381;">
+                                                        <div class="align-self: center"></div>
+                                                          <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>
+                                                     </button>
+                                                    <a class="navbar-brand" href="../newpageJulius_Sidebar.aspx?lan2=DE"><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>                                                                                                                                                           
+                                                   <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 class="offcanvas offcanvas-end" data-bs-scroll="true" tabindex="-1" id="offcanvasWithBothOptions" aria-labelledby="offcanvasWithBothOptionsLabel2">
+                                          </div>
+                                               <div class="offcanvas offcanvas-end" data-bs-scroll="true" tabindex="-1" id="offcanvasWithBothOptions" aria-labelledby="offcanvasWithBothOptionsLabel">
                                                       <div class="offcanvas-header">
-                                                      <h5 class="offcanvas-title" id="offcanvasWithBothOptionsLabel2">Sprachauswahl:</h5>
-                                                       <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+                                                      <h5 class="offcanvas-title" id="offcanvasWithBothOptionsLabel">Sprachauswahl:</h5>
+                                                      <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
                                                    </div>
                                                         <div class="offcanvas-body">
-                                                          <%  Dim strDElang2 = "&nbsp; Deutsch"
-                                                              Dim strENlang2 = "&nbsp; Englisch"
-                                                              Dim strBIHLang2 = "&nbsp; Bosnisch"
-                                                              Dim strSRBlang2 = "&nbsp; Serbisch"
-                                                              Dim strBGlang2 = "&nbsp; Bulgarisch"
-                                                              Dim strTRlang2 = "&nbsp; Türkisch"%>                                                           
-                                                            
+                                                          <%  Dim strDElang = "&nbsp Deutsch"
+                                                              Dim strENlang = "&nbsp Englisch"
+                                                              Dim strBIHLang = "&nbsp Bosnisch"
+                                                              Dim strSRBlang = "&nbsp Serbisch"
+                                                              Dim strBGlang = "&nbsp Bulgarisch"
+                                                              Dim strTRlang = "&nbsp Türkisch"%>
                                                          <ul style="list-style: none;">
                                                              <li style="transform: rotate(0);">
                                                                  <!--<a id="ButtonDeutschLangPicker" class="btn btn-primary btn-sm"   href="<%'= navParent%>&lan=DE"><img src="<%'= imgPath%>images/flags/flagge_DE_AT.gif" <%' If laenderkuerzel = "de" Then Response.Write("style='border:1px solid #000'")%>/>DE/AT</a>-->
-                                                                 <a id="ButtonDeutschLangPicker2" href="<%= navParent%>&lan2=DE&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_DE_AT_big.gif"; width="20"; <% If laenderkuerzel = "de" Then Response.Write("style='border:1px solid #000'")%>/><%=strDElang2 %></a>
+                                                                 <a id="ButtonDeutschLangPicker2" href="<%= navParent%>&lan2=DE&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_DE_AT_big.gif"; width="20" <% If laenderkuerzel = "de" Then Response.Write("style='border:1px solid #000'")%>/><%=strDElang %></a>
                                                              </li>
                                                              <li style="transform: rotate(0);">
                                                                  <!--<a id="ButtonEnglischLangPicker" class="btn btn-primary btn-sm" href="<%'= navParent%>&lan=EN"><img src="<%'= imgPath%>images/flags/flagge_GB.gif" <%' If laenderkuerzel = "en" Then Response.Write("style='border:1px solid #000'")%>/>EN</a>-->
-                                                                 <a id="ButtonEnglischLangPicker2" href="<%= navParent%>&lan2=EN&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_GB_big.gif"; width="20"; <% If laenderkuerzel = "en" Then Response.Write("style='border:1px solid #000'")%>/><%=strENlang2 %></a>
+                                                                 <a id="ButtonEnglischLangPicker2" href="<%= navParent%>&lan2=EN&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_GB_big.gif"; width="20"; <% If laenderkuerzel = "en" Then Response.Write("style='border:1px solid #000'")%>/><%=strENlang %></a>
                                                              </li>
                                                              <li style="transform: rotate(0);">
                                                                  <!--<a id="ButtonSerbischLangPicker" class="btn btn-primary btn-sm" href="<%'= navParent%>&lan=SRB"><img src="<%'= imgPath%>images/flags/flagge_BIH.gif" <%' If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%> />BIH</a>-->
-                                                                 <a id="ButtonSerbischLangPicker2" href="<%= navParent%>&lan2=SRB&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_BIH_big.gif"; width="20"; <% If laenderkuerzel = "de" Then Response.Write("style='border:1px solid #000'")%> /><%=strBIHLang2 %></a>
+                                                                 <a id="ButtonSerbischLangPicker2" href="<%= navParent%>&lan2=SRB&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_BIH_big.gif"; width="20"; <% If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%>/><%=strBIHLang %></a>
                                                              </li>
                                                              <li style="transform: rotate(0);">
                                                                  <!--<a id="ButtonSerbischZweiLangPicker" class="btn btn-primary btn-sm" href="<%'= navParent%>&lan=SM"><img src="<'%= imgPath%>images/flags/flagge_SM.gif" <%' If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%> />SRB</a>-->
-                                                                 <a id="ButtonSerbischZweiLangPicker2" href="<%= navParent%>&lan2=SRB&lan3=1" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_SM_big.gif"; width="20"; <% If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%> /><%=strSRBlang2 %></a>
+                                                                 <a id="ButtonSerbischZweiLangPicker2" href="<%= navParent%>&lan2=SRB&lan3=1" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_SM_big.gif"; width="20"; <% If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%>/><%=strSRBlang %></a>
                                                              </li>
                                                              <li style="transform: rotate(0);">
                                                                  <!--<a id="ButtonBulgariaLangPicker" class="btn btn-primary btn-sm"  href="<%'= navParent%>&lan=BG"><img src="<%'= imgPath%>images/flags/flagge_BG.gif" <%' If laenderkuerzel = "bg" Then Response.Write("style='border:1px solid #000'")%>/>BG</a>-->
-                                                                 <a id="ButtonBulgariaLangPicker2" href="<%= navParent%>&lan2=BG&lan3=0" class="stretched-link" style="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'")%>/><%=strBGlang2 %></a>
+                                                                 <a id="ButtonBulgariaLangPicker2" href="<%= navParent%>&lan2=BG&lan3=0" class="stretched-link" style="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'")%>/><%=strBGlang %></a>
                                                              </li>
                                                              <li style="transform: rotate(0);">
                                                                  <!--<a id="ButtonTürkeiLangPicker" class="btn btn-primary btn-sm"  href="<%'= navParent%>&lan=TR"><img src="<%'= imgPath%>images/flags/flagge_TR.gif" <%' If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%>/>TR</a>-->
-                                                                 <a id="ButtonTürkeiLangPicker2" href="<%= navParent%>&lan2=TR&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_TR_big.gif"; width="20";" <% If laenderkuerzel = "en" Then Response.Write("style='border:1px solid #000'")%>/><%=strENlang2%></a>
+                                                                 <a id="ButtonTürkeiLangPicker2" href="<%= navParent%>&lan2=TR&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_TR_big.gif"; width="20";" <% If laenderkuerzel = "tr" Then Response.Write("style='border:1px solid #000'")%>/><%=strTRlang %></a>
                                                              </li>
-                                                          </ul>                                                     
+                                                          </ul>
+                                                     </div>
                                                 </div>
-                                       </div>    
-                        </div>
     
      <div class="d-none d-md-block">
                                         <nav class="navbar fixed-top navbar-expand-lg navbar-light" style="background-color:#fff">
@@ -540,11 +538,9 @@
         <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://cdn.jsdelivr.net/npm/@popperjs/core@2.9.2/dist/umd/popper.min.js" integrity="sha384-IQsoLXl5PILFhosVNubq5LC7Qb9DXgDA9i+tQ8Zj3iwWAwPtgFTxbJ8NT4GN1R8p" crossorigin="anonymous"></script>
-
         <!-- Bootstrap JS -->
        <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>
          // Filter table
          $(document).ready(function () {
diff --git a/Customers/Login_Edit_User.aspx b/Customers/Login_Edit_User.aspx
index 98fea91..73567a3 100644
--- a/Customers/Login_Edit_User.aspx
+++ b/Customers/Login_Edit_User.aspx
@@ -133,8 +133,9 @@
         <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>
+        </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">
@@ -155,6 +156,6 @@
                               																			</div>
                             																		</div>
                          																	</div>
-            </div>        
+                    
 </asp:Content>
 
diff --git a/status_Julius.aspx b/status_Julius.aspx
index c88fd08..19e7cd1 100644
--- a/status_Julius.aspx
+++ b/status_Julius.aspx
@@ -543,7 +543,7 @@
                                          <!--Smartphone-Bildschirme-->   
                                        <div class="d-md-none"> 
                                               <nav class="navbar navbar-expand-lg navbar-light bg-light justify-content-md-center flex-nowrap">                                                    
-                                                    <a class="navbar-brand" href="newpageJulius_Sidebar.aspx?lan2=DE"><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>                                                                                                                                                           
+                                                    <a class="navbar-brand" href="../newpageJulius_Sidebar.aspx?lan2=DE"><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>                                                                                                                                                           
                                                     <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>
@@ -562,7 +562,7 @@
                                                          <ul style="list-style: none;">
                                                              <li style="transform: rotate(0);">
                                                                  <!--<a id="ButtonDeutschLangPicker" class="btn btn-primary btn-sm"   href="<%'= navParent%>&lan=DE"><img src="<%'= imgPath%>images/flags/flagge_DE_AT.gif" <%' If laenderkuerzel = "de" Then Response.Write("style='border:1px solid #000'")%>/>DE/AT</a>-->
-                                                                 <a id="ButtonDeutschLangPicker2" href="<%= navParent%>&lan2=DE&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="<%= imgPath%>images/flags/flagge_DE_AT_big.gif"; width="20" <% If laenderkuerzel = "de" Then Response.Write("style='border:1px solid #000'")%>/><%=strDElang %></a>
+                                                                 <a id="ButtonDeutschLangPicker2" href="../<%= navParent%>&lan2=DE&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="<%= imgPath%>images/flags/flagge_DE_AT_big.gif"; width="20" <% If laenderkuerzel = "de" Then Response.Write("style='border:1px solid #000'")%>/><%=strDElang %></a>
                                                              </li>
                                                              <li style="transform: rotate(0);">
                                                                  <!--<a id="ButtonEnglischLangPicker" class="btn btn-primary btn-sm" href="<%'= navParent%>&lan=EN"><img src="<%'= imgPath%>images/flags/flagge_GB.gif" <%' If laenderkuerzel = "en" Then Response.Write("style='border:1px solid #000'")%>/>EN</a>-->