From 863c313037ff1de7ea8359a8f876bdd0bb71e006 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Thu, 26 Aug 2021 12:04:04 +0200
Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20Sprachauswahlverfahren=20zu?=
 =?UTF-8?q?=20ursprung=20und=20Implementierung=20des=20Sprachdropdown-Men?=
 =?UTF-8?q?=C3=BCs=20in=20Desktopversion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/Customers.master | 63 +++++++++++++++++++++++---------------
 Customers/Welcome.aspx     | 13 +++-----
 2 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/Customers/Customers.master b/Customers/Customers.master
index 238a461..f5429e8 100644
--- a/Customers/Customers.master
+++ b/Customers/Customers.master
@@ -341,20 +341,8 @@
                         <!-- </div> -->       
                                                                     
                                                                               <%
-                                                                                  Dim navParent = ""
-                                                                                  If Request.QueryString("Par1") = "1" Then
-                                                                                      navParent = "/Customers/Welcome.aspx?"
-                                                                                  ElseIf Request.QueryString("Par1") = "2" Then
-                                                                                      navParent = "/Customers/CustomerIndex.aspx?"
-                                                                                  ElseIf Request.QueryString("Par1") = "3" Then
-                                                                                      navParent = "/Customers/Invoices.aspx?"
-                                                                                  ElseIf Request.QueryString("Par1") = "4" Then
-                                                                                      navParent = "/Customers/LKWs.aspx?"
-                                                                                  ElseIf Request.QueryString("Par1") = "5" Then
-                                                                                      navParent = "/Customers/Card_Boxes.aspx?"
-                                                                                  Else
-                                                                                      navParent = "Customers.master?"
-                                                                                  End If
+                                                                                  Dim navParent = "Customer/CustomerIndex.aspx"
+                                                                                  Dim var = ""
 
                                                                                   Dim laenderkuerzel As String = "de"
 
@@ -417,8 +405,11 @@
                                                            <!-- <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>-->
-                                                                <li>
+                                                                <li><%If Me.Page.User.Identity.Name = "test" Then %>
                                                                     <a href="Welcome.aspx">Startseite</a>
+                                                                    <%ElseIf Me.Page.User.Identity.Name = "test2" Then %>
+                                                                    <a href="Welcome.aspx?Par1=1">Startseite</a>
+                                                                    <%End If %>                                                                    
                                                                 </li>
                                                           <!--  </ul>-->
                        </li>
@@ -463,7 +454,7 @@
                                                                 </li>
                                                              <!--  </ul>-->
                        </li>
-                 <li>
+                
                        <a class="btn btn-primary" data-bs-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample"> Menü:
    <asp:LoginName ID="LoginName4" runat="server" />
   </a>
@@ -474,7 +465,8 @@
                        </li>
              </ul>                
                 </div></nav>   
-       <div class="container-xxl" style="align-content:center">                                                                                                                                                
+       <div class="container-xxl" style="align-content:center">   
+           
         <!-- Page Content  -->
         <nav id="content">             
            <div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel">
@@ -526,7 +518,7 @@
             </li>
          <div class="dropdown-divider"></div>
                <li><button type="button" class="btn btn-primary" style="background-color:#fff"><img src="../images/Icons/main/Logout.svg"; style="width:20px; height:20px" />Logout</button></li>                                                                
-                                            </ul>                                                  
+                                            </ul>   </li>                                               
                       </ul>
                                         </nav>
                                           </div>
@@ -546,27 +538,27 @@
                                                              
                                                              <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>-->
-                                                                 <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>
+                                                                 <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'")%>/><%=strBIHLang %></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'")%>/><%=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'")%>/><%=strSRBlang %></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'")%>/><%=strBIHLang %></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'")%>/><%=strBIHLang %></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'")%>/><%=strENlang %></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'")%>/><%=strENlang %></a>
                                                              </li>
                                                           </ul>
                                                      </div>
@@ -632,7 +624,28 @@
                                             </ul>
                       </ul>
 
-                                                  </div></nav></div>
+                                                  </div>
+                                            <div class="me-auto">
+                                <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">     
+                                                  <%  Dim stringDE = "&nbsp  DE"
+                                                      Dim stringEN = "&nbsp  EN"
+                                                      Dim stringBIH = "&nbsp BIH"
+                                                      Dim stringSRB = "&nbsp SRB"
+                                                      Dim stringBG = "&nbsp  BG"
+                                                      Dim stringTR = "&nbsp  TR"%>
+                                              <!--<a id="ButtonOesterreichLangPicker" class="btn btn-primary btn-sm" onclick="changeflag(A)" href="<%'= navParent%>?menuID=<%'= curentMenuId %>&lan=de"><img src="<%'= imgPath%>images/flags/flagge_A.gif" <%' If laenderkuerzel = "de" Then Response.Write("style='border:1px solid #000'")%> /> DE</a>-->
+                                                  <a id="ButtonDeutschLangPicker" class="btn btn-primary btn-sm"   href="<%= navParent%>&lan2=DE&lan3=0" style="background-color:#fff;color:#043381;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'")%>/><%=stringDE%></a>
+                                                  <a id="ButtonTürkeiLangPicker" class="btn btn-primary btn-sm"  href="<%= navParent%>&lan2=TR&lan3=0" style="background-color:#fff;color:#043381;text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_TR_big.gif"; width="20"; <% If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%>/><%=stringTR%></a>
+                                                  <a id="ButtonEnglischLangPicker" class="btn btn-primary btn-sm" href="<%= navParent%>&lan2=EN&lan3=0" style="background-color:#fff;color:#043381;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'")%>/><%=stringEN%></a>
+                                                  <a id="ButtonSerbischLangPicker" class="btn btn-primary btn-sm" href="<%= navParent%>&lan2=SRB&lan3=0" style="background-color:#fff;color:#043381;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'")%> /><%=stringBIH%></a> 
+                                                  <a id="ButtonSerbischZweiLangPicker" class="btn btn-primary btn-sm" href="<%= navParent%>&lan2=SRB&lan3=1" style="background-color:#fff;color:#043381;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'")%> /><%=stringSRB%></a> 
+                                                  <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>                  
+                                        </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/Customers/Welcome.aspx b/Customers/Welcome.aspx
index 439c07f..7d5d337 100644
--- a/Customers/Welcome.aspx
+++ b/Customers/Welcome.aspx
@@ -80,9 +80,6 @@
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
     
-            
-      
-            
         <h1>Hauptseite Kunden:</h1>
         <asp:Label ID="Label3" runat="server" Text="Kundennr.: 045112"></asp:Label>
         <asp:Label ID="Label2" runat="server" Text="Bereich: "></asp:Label>
@@ -105,16 +102,16 @@
                                                       </div>
                                                       <div class="carousel-inner">
                                                         <div class="carousel-item active">
-                                                      <a href="Invoices.aspx?Par1=3> <img src="../images/pics/pexels-kampus-production-7477713.jpg" id="imgcar" style="width:100%;height:auto" alt="First slide"></a>
+                                                      <a href="Invoices.aspx?Par1=3"> <img src="../images/pics/pexels-kampus-production-7477713.jpg" id="imgcar" style="width:100%;height:auto" alt="First slide"></a>
                                                             <div class="carousel-caption d-none d-md-block" style="background:linear-gradient(to right, #003680 , #0055cc);opacity:80%">
-                                                       <a href="Invoices.aspx?Par1=3><h5 style="opacity:100%">Rechnungen</h5></a>
-                                                       <a href="Invoices.aspx?Par1=3> <p style="color:#fff;opacity:100%">Hier erfahren sie alles über Ihre Rechnungen.</p></a>
+                                                       <a href="Invoices.aspx?Par1=3"><h5 style="opacity:100%">Rechnungen</h5></a>
+                                                       <a href="Invoices.aspx?Par1=3"> <p style="color:#fff;opacity:100%">Hier erfahren sie alles über Ihre Rechnungen.</p></a>
                                                       </div>
                                                         </div>
                                                         <div class="carousel-item">
-                                                        <a href="CustomerIndex.aspx?Par1=2><img class="d-block w-100" src="../images/pics/pexels-photoscom-93398.jpg" id="imgcar" style="width:100%;height:auto" alt="Second slide"></a>
+                                                        <a href="CustomerIndex.aspx?Par1=2"><img class="d-block w-100" src="../images/pics/pexels-photoscom-93398.jpg" id="imgcar" style="width:100%;height:auto" alt="Second slide"></a>
                                                             <div class="carousel-caption d-none d-md-block" style="background:linear-gradient(to right, #003680 , #0055cc);opacity:80%">
-                                                     <a href="CustomerIndex.aspx?Par1=2> <h5 style="opacity:100%">Kundenseite</h5></a>
+                                                     <a href="CustomerIndex.aspx?Par1=2"> <h5 style="opacity:100%">Kundenseite</h5></a>
                                                       <a href="CustomerIndex.aspx?Par1=2"><p style="color:#fff;opacity:100%">Hier beginnt alles mit Ihren Aufträgen.</p></a>
                                                       </div>
                                                         </div>