From e0c961541db1337e42e7458766efcec9f2cab90f Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Mon, 9 Aug 2021 13:08:11 +0200
Subject: [PATCH] =?UTF-8?q?Lang=20Pick=20Button=20=C3=84nderungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AvisoTV_FLEX.aspx  |  4 ++--
 status_Julius.aspx | 21 ++++++++++-----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/AvisoTV_FLEX.aspx b/AvisoTV_FLEX.aspx
index 0613514..5abe476 100644
--- a/AvisoTV_FLEX.aspx
+++ b/AvisoTV_FLEX.aspx
@@ -443,7 +443,7 @@
                                                                                                                                               End Try
                                                                                                                                               'Dim link As String = "Par1=" + AVISO_ROW("LKW_Nr") + "Par2=" + AVISO_ROW("Frächter") + "Par3=" + AVISO_ROW("Auftraggeber") + "Par4=" + AVISO_ROW("Ankunft") + "Par5=" + AVISO_ROW("LKW_Fertig") + "Par6=" + STANDORT + "Par7=" + lan
                                                                                                                                              %>      
-                                                                                                 
+                                                                                                                                                
                                                                                                                                              <tbody class="table-light table-responsive-xxl table-striped" contenteditable="false"> 
                                                                                                                                                   <tr style="transform: rotate(0);">
                                                                                                                                                      <th scope="row"><a href="status_Julius.aspx?AvisoId=<%=AvisoId%>&lan2=<%=laenderkuerzel%>" rel="nofollow" target="_blank" class="stretched-link"><%Response.Write(cnt + 1)%></a></th>
@@ -472,7 +472,7 @@
 
                                                                                   %>
                                                                                               <div></div>                                                                    
-                                                                                </div>                                                                
+                                                                                </div>                                                          
      
                                                                                     <%--  <div class="footer_menu">
                                                                                         <div class="footer_menu_content">      
diff --git a/status_Julius.aspx b/status_Julius.aspx
index 56d8cd4..60196ca 100644
--- a/status_Julius.aspx
+++ b/status_Julius.aspx
@@ -10,8 +10,8 @@
      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" http-equiv="X-UA-Compatible" content="IE=edge"/>
 
     <!-- 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">
+    <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"/>
     
         <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
   <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js"></script>
@@ -340,7 +340,7 @@
             border-color: #043381;
       }   
       table {         
-          font-size: 1em;
+          font-size: 16px;
           font-size:1.150066666666665vw;
       }
       alert alert-success align-items-center{         
@@ -486,7 +486,7 @@
                        
                                            <div class="d-md-none">   
                                                <nav class="navbar navbar-expand-lg navbar-light bg-light" style="background-color:#fff;">   
-                                               <a href="newpageJulius_Sidebar.aspx?lan2=DE"><img src="images/Logo_small.png" alt="Schriftzug: Verag AG Blaue Schrift: Verag Spedition Graue Schrift: AG" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"></a>
+                                               <a href="newpageJulius_Sidebar.aspx?lan2=DE"><img src="images/Logo_small.png" alt="Schriftzug: Verag AG Blaue Schrift: Verag Spedition Graue Schrift: 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>
@@ -497,15 +497,15 @@
                                                        <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
                                                    </div>
                                                       <div class="offcanvas-body">
-                                                         <ul style="list-style: none;">
-                                                             <li>
+                                                         <ul style="list-style: none;">                                                            
                                                                  <%  Dim strDElang = "&nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp Deutsch"
                                                                      Dim strENlang = "&nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp Englisch"
                                                                      Dim strBIHLang = "&nbsp &nbsp &nbsp Bosnien und Herzegowina"
                                                                      Dim strSRBlang = "&nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp Serbien"
                                                                      Dim strBGlang = "&nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp Bulgarien"
                                                                      Dim strTRlang = "&nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp Türkei"%>
-                                                                <li style="transform: rotate(0);">
+                                                                
+                                                                 <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" class="stretched-link"><img src="<%= imgPath%>images/flags/flagge_DE_AT.gif" <% If laenderkuerzel = "de" Then Response.Write("style='border:1px solid #000'")%>/><%=strDElang %></a>
                                                              </li>
@@ -761,9 +761,8 @@
                                                                <% 
                                                                    Else
                                                                %>       
-                                                               <tr <% Response.Write(trBg) %> style="color:#043381;" <a href="#collapseExample" data-toggle="collapse" data-target="#demo<%=cnt %>" role="button" aria-expanded="false" aria-controls="collapseExample" data-bs-toggle="tooltip" data-bs-placement="top" title="Für zusätzliche Infos auf die Zeile oder das Info-Symbol tippen."><td><center> <% Response.Write(cnt) %></center></td><td> <% Response.Write(txtCluster)%> </td><td> <% Response.Write(sndDat) %> </td><td> <% Response.Write(If(s.tblSnd_Absender, "")) %> </td><td> <% Response.Write(If(s.tblSnd_Empfaenger, "")) %> </td><td  <% Response.Write(statOK_style) %> > <% Response.Write(statOK) %> </td><td><center><button type="button" class="btn btn-primary" data-toggle="collapse" data-target="#demo<%=cnt %>" id="togglecollapse"><img src="images/Icons/service/hilfe.png" width="15px" height="15px" /></button></center></td></a><!--</button>--></tr>
-                                                               <%   End If %>              
-                                                                            <%
+                                                               <tr <% Response.Write(trBg) %> style="color:#043381;" <a href="#collapseExample" data-toggle="collapse" data-target="#demo<%=cnt %>" role="button" aria-expanded="false" aria-controls="collapseExample" data-bs-toggle="tooltip" data-bs-placement="top" title="Für zusätzliche Infos auf die Zeile oder das Info-Symbol tippen."><td><center> <% Response.Write(cnt) %></center></td><td> <% Response.Write(txtCluster)%> </td><td> <% Response.Write(sndDat) %> </td><td> <% Response.Write(If(s.tblSnd_Absender, "")) %> </td><td> <% Response.Write(If(s.tblSnd_Empfaenger, "")) %> </td><td  <% Response.Write(statOK_style) %> > <% Response.Write(statOK) %> </td><td><center><button type="button" class="btn btn-primary" data-toggle="collapse" data-target="#demo<%=cnt %>" id="togglecollapse"><img src="images/Icons/service/hilfe.png" width="15" height="15" /></button></center></td></a><!--</button>--></tr>
+                                                               <%   End If 
                                                                                 Dim VERMERKE = VERAGSQL.loadDgvBySql("SELECT [VermerkID],[VermerkArt],[AvisoID],[SendungID],[Datum],VermerkeCodes.Bezeichnung,VermerkeCode  FROM [Vermerke] inner join VermerkeCodes ON VermerkeCode=VermerkCodeId WHERE LKW_Vermerk=1 AND SendungID=" & s.tblSnd_SendungID & "  /*AND VermerkIDAufgehoben IS NULL*/  ORDER BY Datum", "AVISO")
                                                                                 If VERMERKE IsNot Nothing Then
                                                                                   %>     
@@ -778,7 +777,7 @@
                                                                                                                                <i><%  Response.Write(CDate(r("Datum")).ToString("dd.MM.yyyy HH:mm") & ":   " & V_LST.getTxt(r("VermerkeCode"), lan)) %></i>                                                                                                                            
                                                                                                                             </td>                                                                                                                                                                                                                                                                                                                                                         
                                                                                                                           </tr> <% vermerkeUeberschrift = ""
-                                                                                                                             Next  %>                                                                                                                                                                                       
+                                                                                                                             Next  %>                                                                                                                                                                                      
                                                                                       <%
                                                                                           End If %> 
                                                                                                                    </table></td></tr>