edv/VERAG_Homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Die Zeile <meta name="viewport" content="width=device-width, initial-scale=1"> wurde in dem Header der status_Julius-aspx Datei eingefügt.

Browse Source
This commit is contained in:
ja
2021-08-11 14:13:15 +02:00
parent 8e09ba4c56
commit 01f94bed01
2 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
newpageJulius_Sidebar.aspx
View File

@@ -308,7 +308,9 @@
MEDIAQUERIES MEDIAQUERIES
----------------------------------------------------- */ ----------------------------------------------------- */
@media (max-width: 320px) and (max-height: 640px){ /*@media (max-width: 320px) and (max-height: 640px){*/
@media only screen and (min-width : 1224px) {
#sidebar { #sidebar {
margin-left: -250px; margin-left: -250px;
padding-top:0.5em; padding-top:0.5em;
@@ -352,7 +354,7 @@
display: compact; display: compact;
position: sticky; position: sticky;
} }
#navbarbrandhauptpage{ /* #navbarbrandhauptpage{
transform: translateX(-50%); transform: translateX(-50%);
left: 00%; left: 00%;
top: 20%; top: 20%;
@@ -360,10 +362,9 @@
text-align: center; text-align: center;
height: 26px; height: 26px;
width: 150px; width: 150px;
} }*/
} }
@media only screen and (min-width : 1224px) {
@media (min-width: 320px) and (min-height: 640px) {
#sidebar { #sidebar {
margin-left: -250px; margin-left: -250px;
padding-top: 0.86em; padding-top: 0.86em;
@@ -403,7 +404,7 @@
#sidebar.active { #sidebar.active {
margin-left: -0px; margin-left: -0px;
} }
} } s
#navbar.menu_class{ #navbar.menu_class{
width: 2.604166666666667vw; width: 2.604166666666667vw;
width: 1.25em; width: 1.25em;

31
status_Julius.aspx
View File

@@ -10,7 +10,7 @@ Imports System.Data.SqlClient
<html lang="en"> <html lang="en">
<!-- Required meta tags --> <!-- Required meta tags -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" http-equiv="X-UA-Compatible" content="IE=edge"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" http-equiv="X-UA-Compatible" content="IE=edge"/>
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- Bootstrap CSS --> <!-- 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 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 rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
@@ -227,7 +227,7 @@ Imports System.Data.SqlClient
MEDIAQUERIES MEDIAQUERIES
----------------------------------------------------- */ ----------------------------------------------------- */
@media (max-width: 320px) and (max-height: 640px){ @media only screen and (max-width : 320px) {
#sidebar { #sidebar {
margin-left: -250px; margin-left: -250px;
padding-top:0.5em; padding-top:0.5em;
@@ -305,7 +305,8 @@ Imports System.Data.SqlClient
background-color:#fff; background-color:#fff;
} }
} }
@media (min-width: 320px) and (min-height: 640px) { /* @media (min-width: 320px) and (min-height: 640px) {*/
@media only screen and (min-width : 1224px) {
#sidebar { #sidebar {
margin-left: -250px; margin-left: -250px;
padding-top: 0.86em; padding-top: 0.86em;
@@ -762,21 +763,18 @@ Imports System.Data.SqlClient
<br /> <br />
<div class="container-flex" style="flex-flow:nowrap;margin:inherit;/*margin-right:25px*/margin-right:1.563em;margin-right:2.6371308016877637vw;/*margin-left:-2px;*/margin-left:-0.125em;margin-left: 0.2109704641350211vw"> <div class="container-flex" style="flex-flow:nowrap;margin:inherit;/*margin-right:25px*/margin-right:1.563em;margin-right:2.6371308016877637vw;/*margin-left:-2px;*/margin-left:-0.125em;margin-left: 0.2109704641350211vw">
<table class="tableStatus table-striped" border="1" cellspacing="0" contenteditable="false" style="width:100%"> <% <table class="tableStatus table-striped" border="1" cellspacing="0" contenteditable="false" style="width:100%"> <%
Dim VERMERKE_LKW = VERAGSQL.loadDgvBySql("SELECT [VermerkID],[VermerkArt],[AvisoID],[SendungID],[Datum],VermerkeCodes.Bezeichnung,VermerkeCode FROM [Vermerke] inner join VermerkeCodes ON VermerkeCode=VermerkCodeId WHERE LKW_Vermerk=1 AND AvisoID=" & AvisoId & " AND VermerkArt='A' /*AND VermerkIDAufgehoben IS NULL*/ ORDER BY Datum", "AVISO") Dim VERMERKE_LKW = VERAGSQL.loadDgvBySql("SELECT [VermerkID],[VermerkArt],[AvisoID],[SendungID],[Datum],VermerkeCodes.Bezeichnung,VermerkeCode FROM [Vermerke] inner join VermerkeCodes ON VermerkeCode=VermerkCodeId WHERE LKW_Vermerk=1 AND AvisoID=" & AvisoId & " AND VermerkArt='A' /*AND VermerkIDAufgehoben IS NULL*/ ORDER BY Datum", "AVISO")
If VERMERKE_LKW IsNot Nothing Then If VERMERKE_LKW IsNot Nothing Then
Dim vermerkeUeberschrift = LT.getTxt(25, lan, "Probleme/Vermerke") & ":" Dim vermerkeUeberschrift = LT.getTxt(25, lan, "Probleme/Vermerke") & ":"
For Each r In VERMERKE_LKW.Rows() For Each r In VERMERKE_LKW.Rows()
%> %>
<tr class="tableStatusVermerke"><td colspan="3" class="vermerkHeader"><u><i><%Response.Write(vermerkeUeberschrift) %></i></u>&nbsp&nbsp</td> <td style="border:0px solid white" colspan="3"><i><% Response.Write(CDate(r("Datum")).ToString("dd.MM.yyyy HH:mm") & ": " & V_LST.getTxt(r("VermerkeCode"), lan)) %></i></td></tr> <tr class="tableStatusVermerke"><td colspan="3" class="vermerkHeader"><u><i><%Response.Write(vermerkeUeberschrift) %></i></u>&nbsp&nbsp</td> <td style="border:0px solid white" colspan="3"><i><% Response.Write(CDate(r("Datum")).ToString("dd.MM.yyyy HH:mm") & ": " & V_LST.getTxt(r("VermerkeCode"), lan)) %></i></td></tr>
<% vermerkeUeberschrift = "" <% vermerkeUeberschrift = ""
Next Next
If VERMERKE_LKW.Rows().Count = 0 Then %> <tr class="tableStatusVermerke"><!--<td colspan="3" class="vermerkHeader"><u><i></i></u>&nbsp&nbsp</td>--> <td style="border:0px solid white" colspan="3"><i>Keine Vermerke vorhanden</i></td></tr> If VERMERKE_LKW.Rows().Count = 0 Then %> <tr class="tableStatusVermerke"><!--<td colspan="3" class="vermerkHeader"><u><i></i></u>&nbsp&nbsp</td>--> <td style="border:0px solid white" colspan="3"><i>Keine Vermerke vorhanden</i></td></tr>
<% End If
<% End If End If
End If
%></table></div> %></table></div>
<br /> <br />
<h1><%= LT.getTxt(19, lan, "Sendungsliste!") %></h1> <h1><%= LT.getTxt(19, lan, "Sendungsliste!") %></h1>
@@ -825,8 +823,7 @@ Imports System.Data.SqlClient
End If End If
%> %>
<% <% Dim vermerkcount = 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").Rows
Dim vermerkcount = 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").Rows
If vermerkcount.Count = 0 Then %> If vermerkcount.Count = 0 Then %>
<tr <% Response.Write(trBg) %> style="color:#043381;" data-bs-toggle="tooltip" data-bs-placement="top" title="Keine zusätzlichen Infos zu Ihrem Auftrag vorhanden. Bitte wählen Sie einen anderen aus."><center><td></td><td <% Response.Write(statOK_style) %> > <% Response.Write(statOK) %> </td><td><% 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><!--</button>--></tr> <tr <% Response.Write(trBg) %> style="color:#043381;" data-bs-toggle="tooltip" data-bs-placement="top" title="Keine zusätzlichen Infos zu Ihrem Auftrag vorhanden. Bitte wählen Sie einen anderen aus."><center><td></td><td <% Response.Write(statOK_style) %> > <% Response.Write(statOK) %> </td><td><% 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><!--</button>--></tr>
@@ -856,8 +853,7 @@ Imports System.Data.SqlClient
<% <%
cnt += 1 cnt += 1
Next Next
%> %>
</div></div><table><% </div></div><table><%
End If End If
@@ -887,8 +883,7 @@ Imports System.Data.SqlClient
<h2>Bei Fehlern bitte den Panel-Button betätigen!</h2> <h2>Bei Fehlern bitte den Panel-Button betätigen!</h2>
<br /> <br />
<br/> <br/>
<br/> <br/>
<br/>
<p> <p>
<a id="ButtonPanel" class="btn btn-primary btn-lg" href="AvisoTV_Flex.aspx?&lan2=<%=lan %>" style="background-color:#fff; color:#043381;">Panel </a> <a id="ButtonPanel" class="btn btn-primary btn-lg" href="AvisoTV_Flex.aspx?&lan2=<%=lan %>" style="background-color:#fff; color:#043381;">Panel </a>
</p> </p>