Änderungen lan variable in link in lang piucker und sidemenü

This commit is contained in:
ja
2021-08-12 09:38:58 +02:00
parent f53ad3c258
commit 7499dd08bb
2 changed files with 40 additions and 43 deletions

View File

@@ -880,7 +880,7 @@
</li> </li>
<li style="transform: rotate(0);"> <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ü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%>&lan=TR&lan3=0" class="stretched-link"><img src="<%= imgPath%>images/flags/flagge_TR_big.gif"; width="20";" <% If laenderkuerzel = "tr" Then Response.Write("style='border:1px solid #000'")%>/><%=strTRlang %></a> <a id="ButtonTürkeiLangPicker2" href="<%= navParent%>&lan2=TR&lan3=0" class="stretched-link"><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> </li>
</ul> </ul>
</div> </div>

View File

@@ -455,60 +455,59 @@ Imports System.Data.SqlClient
<div id="bodycontent"> <div id="bodycontent">
<span class="content_all" style="background-color:#fff;align-content:center"> <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 LT As New VERAG_PROG_ALLGEMEIN.cLanguageText_LIST("HOMEPAGE", "LOGIN", "STATUS", "")
Dim V_LST As New VERAG_PROG_ALLGEMEIN.cVermerkeCodes_LIST 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 If (Request.QueryString.Count > 0) AndAlso Request.QueryString("lan2") IsNot Nothing Then
lan = Request.QueryString("lan2") lan = Request.QueryString("lan2")
End If End If
If (Request.QueryString.Count > 0) AndAlso Request.QueryString("lan") IsNot Nothing Then If (Request.QueryString.Count > 0) AndAlso Request.QueryString("lan") IsNot Nothing Then
lan = Request.QueryString("lan") lan = Request.QueryString("lan")
ElseIf (Request.QueryString.Count > 0) AndAlso (Request.QueryString("AvisoId") IsNot Nothing Or Request.QueryString("test") IsNot Nothing) Then 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 flagpath = "images/flags/flagge_DE_AT.gif"
Dim laenderkuerzel As String = "DE" Dim laenderkuerzel As String = "DE"
Dim imgPath As String = "" Dim imgPath As String = ""
If HttpContext.Current.Request.Url.AbsoluteUri.ToString.Contains("admin.aspx") Then If HttpContext.Current.Request.Url.AbsoluteUri.ToString.Contains("admin.aspx") Then
navParent = "admin.aspx" navParent = "admin.aspx"
imgPath = "../" imgPath = "../"
End If End If
Dim lan3 As String = Request.QueryString("lan3") Dim lan3 As String = Request.QueryString("lan3")
If lan = "DE" And lan3 = "0" Then If lan = "DE" And lan3 = "0" Then
flagpath = "images/flags/flagge_DE_AT.gif" flagpath = "images/flags/flagge_DE_AT.gif"
ElseIf lan = "EN" And lan3 = "0" Then ElseIf lan = "EN" And lan3 = "0" Then
flagpath = "images/flags/flagge_GB.gif" flagpath = "images/flags/flagge_GB.gif"
ElseIf lan = "SRB" And lan3 = "0" Then ElseIf lan = "SRB" And lan3 = "0" Then
flagpath = "images/flags/flagge_BIH.gif" flagpath = "images/flags/flagge_BIH.gif"
ElseIf lan = "SRB" And lan3 = "1" Then ElseIf lan = "SRB" And lan3 = "1" Then
flagpath = "images/flags/flagge_SM.gif" flagpath = "images/flags/flagge_SM.gif"
ElseIf lan = "BG" And lan3 = "0" Then ElseIf lan = "BG" And lan3 = "0" Then
flagpath = "images/flags/flagge_BG.gif" flagpath = "images/flags/flagge_BG.gif"
ElseIf lan = "TR" And lan3 = "0" Then ElseIf lan = "TR" And lan3 = "0" Then
flagpath = "images/flags/flagge_TR.gif" flagpath = "images/flags/flagge_TR.gif"
End If End If
%> %>
<!-- Page Content --> <!-- Page Content -->
<div class="container" style="/*margin-top:5px;*/margin-top:0.313rem; margin-top:0.6510416666666667vw; place-content:center; margin-left:10px;margin-right:4px"> <div class="container" style="/*margin-top:5px;*/margin-top:0.313rem; margin-top:0.6510416666666667vw; place-content:center; margin-left:10px;margin-right:4px">
<div class="d-none d-md-block"> <div class="d-none d-md-block">
<nav class="navbar navbar-expand-lg navbar-light bg-light"> <nav class="navbar navbar-expand-lg navbar-light bg-light">
<a class="navbar-brand" id="navbarbrandhauptpage" href="newpageJulius_Sidebar.aspx?lan2=DE&lan3=0"><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> <a class="navbar-brand" id="navbarbrandhauptpage" href="newpageJulius_Sidebar.aspx?lan2=DE&lan3=0"><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" Dim curentMenuId As String = "1"
If Not Request.QueryString("menuID") Is Nothing Then If Not Request.QueryString("menuID") Is Nothing Then
curentMenuId = Request.QueryString("menuID") curentMenuId = Request.QueryString("menuID")
End If End If%>
%>
<div style="/*width:62%;*/width: 97.25490196078431vw;"></div> <div style="/*width:62%;*/width: 97.25490196078431vw;"></div>
<div class="me-auto"> <div class="me-auto">
<div class="dropdown" style="background-color:#fff; color:#043381; margin-right:9.813rem;"> <div class="dropdown" style="background-color:#fff; color:#043381; margin-right:9.813rem;">
@@ -575,7 +574,7 @@ Imports System.Data.SqlClient
</li> </li>
<li style="transform: rotate(0);"> <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ü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%>&lan=TR&lan3=0" class="stretched-link"><img src="<%= imgPath%>images/flags/flagge_TR_big.gif"; width="20";" <% If laenderkuerzel = "tr" Then Response.Write("style='border:1px solid #000'")%>/><%=strTRlang %></a> <a id="ButtonTürkeiLangPicker2" href="<%= navParent%>&lan2=TR&lan3=0" class="stretched-link"><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> </li>
</ul> </ul>
</div> </div>
@@ -593,10 +592,8 @@ Imports System.Data.SqlClient
</div> --> </div> -->
<% <%
End If End If
'Response.Write(DB2.qry_contentNew(menuID, lan)) %> 'Response.Write(DB2.qry_contentNew(menuID, lan)) %>
<br /><br /> <br /><br />
<h1><%= LT.getTxt(1, lan, "Herzlich Willkommen bei VERAG Spedition AG!")%></h1> <h1><%= LT.getTxt(1, lan, "Herzlich Willkommen bei VERAG Spedition AG!")%></h1>
<div id="line"></div> <div id="line"></div>
<br /><br /> <br /><br />