From 77e7b309cdf8892bdfe2258f75862f08bd37df43 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Wed, 11 Aug 2021 16:54:30 +0200
Subject: [PATCH] =?UTF-8?q?Icon=20hinzugef=C3=BCgt=20hamburger=20sidemenue?=
 =?UTF-8?q?=20sowie=20Displayweiten=20wurden=20angepasst,=20sowie=20die=20?=
 =?UTF-8?q?Weiten=20der=20Elemente=20dynamischer=20gestaltet=20(Navbar,=20?=
 =?UTF-8?q?etc).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 images/Icons/main/menu vergablau.png | Bin 0 -> 145 bytes
 images/Icons/main/menu vergablau.svg |   1 +
 newpageJulius_Sidebar.aspx           |   8 +--
 status_Julius.aspx                   |  95 ++++++++++++++-------------
 4 files changed, 53 insertions(+), 51 deletions(-)
 create mode 100644 images/Icons/main/menu vergablau.png
 create mode 100644 images/Icons/main/menu vergablau.svg

diff --git a/images/Icons/main/menu vergablau.png b/images/Icons/main/menu vergablau.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d7d17fa44e37d171c7ce38e35b814dfc9686e56
GIT binary patch
literal 145
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCilAJzX3_JiL=7SP#n^IAyYlEpA)N)6)|epqKjK|NqqbbEYoMGkg*n0}a+3
p%+Qizozi?U#Dt5@HX(t5;r%gDE{oTz{{oF+@O1TaS?83{1OQy)D$D=?

literal 0
HcmV?d00001

diff --git a/images/Icons/main/menu vergablau.svg b/images/Icons/main/menu vergablau.svg
new file mode 100644
index 0000000..078735a
--- /dev/null
+++ b/images/Icons/main/menu vergablau.svg	
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#043381" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-menu"><line x1="3" y1="12" x2="21" y2="12"></line><line x1="3" y1="6" x2="21" y2="6"></line><line x1="3" y1="18" x2="21" y2="18"></line></svg>
\ No newline at end of file
diff --git a/newpageJulius_Sidebar.aspx b/newpageJulius_Sidebar.aspx
index 170cf53..6bd7669 100644
--- a/newpageJulius_Sidebar.aspx
+++ b/newpageJulius_Sidebar.aspx
@@ -833,12 +833,12 @@
                       </li>
                </nav> 
      </div>
-        
-                                           <div class="d-md-none">
-                                               <nav class="navbar navbar-expand-lg navbar-light bg-light justify-content-between flex-nowrap">            
+   
+                                           <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>Menue</span>
+                                                          <span><img src="images/Icons/main/menu vergablau.svg" style="width:initial;height:initial;" alt="Hamburger Menu Stripes in Verag Blue" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"></span>
                                                      </button>
                                                     <a class="navbar-brand" href="newpageJulius_Sidebar.aspx?lan2=DE"><img src="images/Logo_small.png" style="width:initial;height:initial;" 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>
diff --git a/status_Julius.aspx b/status_Julius.aspx
index 0b9bac4..59e9f6e 100644
--- a/status_Julius.aspx
+++ b/status_Julius.aspx
@@ -461,45 +461,45 @@ Imports System.Data.SqlClient
                  <span class="content_all" style="background-color:#fff;align-content:center">       
       
                       <% 
-                          VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
+                VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
 
-                          Dim LT As New VERAG_PROG_ALLGEMEIN.cLanguageText_LIST("HOMEPAGE", "LOGIN", "STATUS", "")
-                          Dim V_LST As New VERAG_PROG_ALLGEMEIN.cVermerkeCodes_LIST
+                Dim LT As New VERAG_PROG_ALLGEMEIN.cLanguageText_LIST("HOMEPAGE", "LOGIN", "STATUS", "")
+                Dim V_LST As New VERAG_PROG_ALLGEMEIN.cVermerkeCodes_LIST
 
-                          Dim lan = "DE"
+                Dim lan = "DE"
 
-                          If (Request.QueryString.Count > 0) AndAlso Request.QueryString("lan2") IsNot Nothing Then
-                              lan = Request.QueryString("lan2")
-                          End If
-                          If (Request.QueryString.Count > 0) AndAlso Request.QueryString("lan") IsNot Nothing Then
-                              lan = Request.QueryString("lan")
-                          ElseIf (Request.QueryString.Count > 0) AndAlso (Request.QueryString("AvisoId") IsNot Nothing Or Request.QueryString("test") IsNot Nothing) Then
+                If (Request.QueryString.Count > 0) AndAlso Request.QueryString("lan2") IsNot Nothing Then
+                    lan = Request.QueryString("lan2")
+                End If
+                If (Request.QueryString.Count > 0) AndAlso Request.QueryString("lan") IsNot Nothing Then
+                    lan = Request.QueryString("lan")
+                ElseIf (Request.QueryString.Count > 0) AndAlso (Request.QueryString("AvisoId") IsNot Nothing Or Request.QueryString("test") IsNot Nothing) Then
 
-                              Dim navParent = "status_Julius.aspx?AvisoId=" & Request.QueryString("AvisoId")
+                    Dim navParent = "status_Julius.aspx?AvisoId=" & Request.QueryString("AvisoId")
 
-                              Dim flagpath = "images/flags/flagge_DE_AT.gif"
-                              Dim laenderkuerzel As String = "DE"
+                    Dim flagpath = "images/flags/flagge_DE_AT.gif"
+                    Dim laenderkuerzel As String = "DE"
 
-                              Dim imgPath As String = ""
-                              If HttpContext.Current.Request.Url.AbsoluteUri.ToString.Contains("admin.aspx") Then
-                                  navParent = "admin.aspx"
-                                  imgPath = "../"
-                              End If
+                    Dim imgPath As String = ""
+                    If HttpContext.Current.Request.Url.AbsoluteUri.ToString.Contains("admin.aspx") Then
+                        navParent = "admin.aspx"
+                        imgPath = "../"
+                    End If
 
-                              Dim lan3 As String = Request.QueryString("lan3")
-                              If lan = "DE" And lan3 = "0" Then
-                                  flagpath = "images/flags/flagge_DE_AT.gif"
-                              ElseIf lan = "EN" And lan3 = "0" Then
-                                  flagpath = "images/flags/flagge_GB.gif"
-                              ElseIf lan = "SRB" And lan3 = "0" Then
-                                  flagpath = "images/flags/flagge_BIH.gif"
-                              ElseIf lan = "SRB" And lan3 = "1" Then
-                                  flagpath = "images/flags/flagge_SM.gif"
-                              ElseIf lan = "BG" And lan3 = "0" Then
-                                  flagpath = "images/flags/flagge_BG.gif"
-                              ElseIf lan = "TR" And lan3 = "0" Then
-                                  flagpath = "images/flags/flagge_TR.gif"
-                              End If
+                    Dim lan3 As String = Request.QueryString("lan3")
+                    If lan = "DE" And lan3 = "0" Then
+                        flagpath = "images/flags/flagge_DE_AT.gif"
+                    ElseIf lan = "EN" And lan3 = "0" Then
+                        flagpath = "images/flags/flagge_GB.gif"
+                    ElseIf lan = "SRB" And lan3 = "0" Then
+                        flagpath = "images/flags/flagge_BIH.gif"
+                    ElseIf lan = "SRB" And lan3 = "1" Then
+                        flagpath = "images/flags/flagge_SM.gif"
+                    ElseIf lan = "BG" And lan3 = "0" Then
+                        flagpath = "images/flags/flagge_BG.gif"
+                    ElseIf lan = "TR" And lan3 = "0" Then
+                        flagpath = "images/flags/flagge_TR.gif"
+                    End If
                     %>          
                                                                                                                                                                             
         <!-- Page Content  -->
@@ -510,10 +510,10 @@ Imports System.Data.SqlClient
             <nav class="navbar navbar-expand-lg navbar-light bg-light">            
                 <a class="navbar-brand" id="navbarbrandhauptpage" href="newpageJulius_Sidebar.aspx?lan2=DE"><img src="images/Logo_small.png" alt="Logo Verag Spedition (Blaue Schrift) AG (Graue Schrift)" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"/></a>
                     <%
-                                                       Dim curentMenuId As String = "1"
-                                                       If Not Request.QueryString("menuID") Is Nothing Then
-                                                           curentMenuId = Request.QueryString("menuID")
-                                                       End If
+                Dim curentMenuId As String = "1"
+                If Not Request.QueryString("menuID") Is Nothing Then
+                    curentMenuId = Request.QueryString("menuID")
+                End If
                                                                             %>                    
                       <div style="width:62%;"></div>                         
                         <div class="me-auto">
@@ -521,11 +521,11 @@ Imports System.Data.SqlClient
                                           <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"%>
+                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;"><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;"><img src="<%= imgPath%>images/flags/flagge_TR_big.gif"; width="20"; <% If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%>/><%=stringTR%></a>
@@ -541,7 +541,7 @@ Imports System.Data.SqlClient
                        </div>
                        
                                           <div class="d-md-none">
-                                               <nav class="navbar navbar-expand-lg navbar-light bg-light justify-content-between flex-nowrap">                                                                
+                                               <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:initial;height:initial;" 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>
@@ -553,11 +553,11 @@ Imports System.Data.SqlClient
                                                    </div>
                                                       <div class="offcanvas-body">
                                                           <%  Dim strDElang = "&nbsp Deutsch"
-                                                              Dim strENlang = "&nbsp Englisch"
-                                                              Dim strBIHLang = "&nbsp Bosnien und Herzegowina"
-                                                              Dim strSRBlang = "&nbsp Serbien"
-                                                              Dim strBGlang = "&nbsp Bulgarien"
-                                                              Dim strTRlang = "&nbsp Türkei"%>
+                Dim strENlang = "&nbsp Englisch"
+                Dim strBIHLang = "&nbsp Bosnien und Herzegowina"
+                Dim strSRBlang = "&nbsp Serbien"
+                Dim strBGlang = "&nbsp Bulgarien"
+                Dim strTRlang = "&nbsp Türkei"%>
                                                          <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>-->
@@ -599,6 +599,7 @@ Imports System.Data.SqlClient
                             </div>   -->                                      
             <%
                 End If
+
                 'Response.Write(DB2.qry_contentNew(menuID, lan)) %>
               <br /><br />