Tabellenanpassungen und weitere Änderungen
This commit is contained in:
ja
@@ -90,7 +90,6 @@
|
||||
body{
|
||||
font-family: 'Poppins', sans-serif;
|
||||
background: #fafafa;
|
||||
|
||||
background-image: url(images/road.jpg);
|
||||
background-position:center center;
|
||||
background-repeat: no-repeat;
|
||||
@@ -209,8 +208,7 @@
|
||||
background-color:#fff;
|
||||
}
|
||||
main-page{
|
||||
margin-left:-1rem;
|
||||
margin-right:-1rem;
|
||||
|
||||
}
|
||||
|
||||
/* ---------------------------------------------------
|
||||
@@ -219,17 +217,22 @@
|
||||
|
||||
#content {
|
||||
width: 100%;
|
||||
padding: 20px;
|
||||
padding: 1.25em;
|
||||
/* padding: 20px;
|
||||
padding: 1.25em;*/
|
||||
min-height: 100vh;
|
||||
transition: all 0.5s;
|
||||
}
|
||||
|
||||
/* ---------------------------------------------------
|
||||
MEDIAQUERIES
|
||||
----------------------------------------------------- */
|
||||
|
||||
/* @media (max-width: 320px) and (max-height: 640px){*/
|
||||
@media (max-width: 575.98px) {
|
||||
@media (max-width: 558.98px) {
|
||||
#body{
|
||||
max-width:123.12334801762114vw;
|
||||
overflow-x:no-display;
|
||||
}
|
||||
#sidebar {
|
||||
margin-left: -250px;
|
||||
padding-top:0.5em;
|
||||
@@ -237,13 +240,13 @@
|
||||
font-size:16px;
|
||||
}
|
||||
#content{
|
||||
font-size: 1.57em;
|
||||
font-size: 3.270833333333333vw;
|
||||
max-width:/*380px;*/ 83.70044052863436vw;
|
||||
font-size: 1.063em;
|
||||
font-size: 3.7444933920704844vw;
|
||||
width:/*456px;*/ 100.44052863436123vw;
|
||||
}
|
||||
#footer_content b{
|
||||
font-size: 1em;
|
||||
font-size: 2.083333333333333vw;
|
||||
font-size: 1.5418502202643172vw;
|
||||
padding-inline: 0.163rem;
|
||||
}
|
||||
.nav-link dropdown-toggle
|
||||
@@ -279,15 +282,15 @@
|
||||
top: 20%;
|
||||
position: absolute;
|
||||
text-align: center;
|
||||
height: 26px;
|
||||
width: 150px;
|
||||
height: 23px;
|
||||
width: 130px;
|
||||
}
|
||||
table th td {
|
||||
font-size: 1em;
|
||||
font-size: 3.303964757709251vw;
|
||||
display:block;
|
||||
}
|
||||
tbody{
|
||||
font-size:2.0134228187919465vw;
|
||||
font-size: 3.303964757709251vw;
|
||||
height: auto;
|
||||
flex-wrap:wrap;
|
||||
}
|
||||
@@ -298,32 +301,41 @@
|
||||
overflow-x:auto;
|
||||
}
|
||||
#rowTable{
|
||||
width:70%;
|
||||
width:/*450px;*/ 99.11894273127753vw;
|
||||
}
|
||||
#navbar navbar-expand-md navbar-light bg-light{
|
||||
background-color:#fff;
|
||||
background-color:#fff; margin-right:-30px;
|
||||
}
|
||||
.alert {
|
||||
max-width:/*380px;*/ 83.70044052863436vw;
|
||||
width:/*450px;*/ 99.11894273127753vw;
|
||||
/* width:1328px;*/
|
||||
}
|
||||
#line{
|
||||
max-width:/*380px;*/ 83.70044052863436vw;
|
||||
width:/*32058.98px;*/ 70.48458149779735vw;
|
||||
}
|
||||
.content_all{
|
||||
max-width:/*575px;*/ 126.65198237885463vw;
|
||||
width:fit-content;
|
||||
}
|
||||
.align-self-center{
|
||||
max-width:/*575px;*/ 126.65198237885463vw;
|
||||
width:100%;
|
||||
}
|
||||
|
||||
#bodycontent{
|
||||
max-width:/*575px;*/ 126.65198237885463vw;
|
||||
width: 100%;
|
||||
|
||||
}
|
||||
#container{
|
||||
width: 100%;
|
||||
}
|
||||
#offcanvbut{
|
||||
margin-right:/*40px*/ 8.810572687224669vw;
|
||||
}
|
||||
#innerhtmltable{
|
||||
margin-left:1.1013215859030836vw;
|
||||
}
|
||||
}
|
||||
|
||||
/* @media (min-width: 320px) and (min-height: 640px) {*/
|
||||
@media (min-width: 575.98px) {
|
||||
@media (min-width: 558.98px) {
|
||||
#sidebar {
|
||||
margin-left: -250px;
|
||||
padding-top: 0.86em;
|
||||
@@ -332,10 +344,12 @@
|
||||
}
|
||||
#content_all{
|
||||
font-size: 1rem;
|
||||
font-size: 1.2333000033333vw;
|
||||
min-width: 110%;
|
||||
font-size: 3.303964757709251vw;
|
||||
min-width:/*445px;*/ 98.01762114537445vw;
|
||||
float: left;
|
||||
overflow-x:hidden;
|
||||
margin-left: 0px;
|
||||
padding-right:/*-20px*/-4.405286343612334vw;
|
||||
}
|
||||
#footer_content b{
|
||||
font-size: 1rem;
|
||||
@@ -363,6 +377,9 @@
|
||||
#sidebar.active {
|
||||
margin-left: -0px;
|
||||
}
|
||||
#innerhtmltable{
|
||||
margin-left: /*5px*/0.19615535504119264vw;
|
||||
}
|
||||
}
|
||||
#navbar.menu_class{
|
||||
width: 2.604166666666667vw;
|
||||
@@ -389,7 +406,7 @@
|
||||
max-height: 3.75em;
|
||||
z-index: 2;
|
||||
}
|
||||
}
|
||||
|
||||
#navbar.menu_class{
|
||||
width: 1.25em;
|
||||
width: 2.604166666666667vw;
|
||||
@@ -409,7 +426,7 @@
|
||||
border-color: #043381;
|
||||
}
|
||||
table {
|
||||
font-size: 1.103230890464933vh;
|
||||
font-size: 16px;
|
||||
}
|
||||
alert alert-success align-items-center{
|
||||
width: 7.813em;
|
||||
@@ -463,6 +480,8 @@
|
||||
background-color: #fff;
|
||||
color: #043381;
|
||||
}
|
||||
|
||||
|
||||
</style>
|
||||
</html>
|
||||
</head>
|
||||
@@ -471,7 +490,7 @@
|
||||
<div class="align-self-center">
|
||||
<form id="leftLinks" runat="server">
|
||||
<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;width:100%">
|
||||
<%
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
||||
|
||||
@@ -515,10 +534,10 @@
|
||||
%>
|
||||
|
||||
<!-- 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; width:100%">
|
||||
<!-- Große Bildschirme-->
|
||||
<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" style="width:100%">
|
||||
<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"
|
||||
@@ -550,13 +569,12 @@
|
||||
</div>
|
||||
<!--Smartphone-Bildschirme-->
|
||||
<div class="d-md-none">
|
||||
<div class="me-auto">
|
||||
<nav class="navbar navbar-expand navbar-light bg-light justify-content-md-center flex-nowrap" style="max-width:/*380px;*/ 83.70044052863436vw;">
|
||||
<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 class="navbar navbar-expand-lg navbar-light bg-light justify-content-md-center flex-nowrap" style:"width:/*300px;*/ 66.07929515418502vw;">
|
||||
|
||||
<a class="navbar-brand" href="newpageJulius_Sidebar.aspx?lan2=DE"><img src="images/Logo_small.png" style="width:70%;height:70%;" 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" id="offcanvbut" 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>
|
||||
</div>
|
||||
<div class="offcanvas offcanvas-end" data-bs-scroll="true" tabindex="-1" id="offcanvasWithBothOptions" aria-labelledby="offcanvasWithBothOptionsLabel">
|
||||
<div class="offcanvas-header">
|
||||
<h5 class="offcanvas-title" id="offcanvasWithBothOptionsLabel">Sprachauswahl:</h5>
|
||||
@@ -652,11 +670,11 @@
|
||||
|
||||
<div class="d-md-none">
|
||||
<table><tr> <td>
|
||||
<tr><td style="/*width:150px*/ width:11.25em;width:24.161073825503355vw"></td><td></td></tr>
|
||||
<tr><td><b><%= LT.getTxt(3, lan, "LKW-Kennzeichen") %></b></td><td><span style="font-size:/*15px*/ 3.5242290748898677vw;"><%= AVISO.LKW_Nr %></span></td></tr>
|
||||
<tr><td><b><%= LT.getTxt(14, lan, "LKW-ID") %>:</b></td><td><%= AVISO.AvisoID %></td></tr>
|
||||
<tr><td style="/*width:150px*/ width:11.25em;width:24.161073825503355vw;"></td><td id="innerhtmltable"></td></tr>
|
||||
<tr><td><b><%= LT.getTxt(3, lan, "LKW-Kennzeichen") %>:</b></td><td><span style="font-size:/*15px*/ 3.5242290748898677vw;"><%= AVISO.LKW_Nr %></span></td></tr>
|
||||
<tr><td><b><%= LT.getTxt(14, lan, "LKW-ID") %>:</b></td><td style=" margin-left:12px;"><%= AVISO.AvisoID %></td></tr>
|
||||
<tr style="height:10px"></tr>
|
||||
<tr><td><b><%= LT.getTxt(4, lan, "Avisierer") %></b></td><td><%= AVISO.Auftraggeber %></td></tr>
|
||||
<tr><td><b><%= LT.getTxt(4, lan, "Avisierer") %>:</b></td><td><%= AVISO.Auftraggeber %></td></tr>
|
||||
<tr><td><b><%= LT.getTxt(8, lan, "Frachtführer") %>:</b></td><td><%= AVISO.Frächter %></td></tr>
|
||||
|
||||
<tr style="/*height:10px*/height:0.7818608287724785vh;font-size:/*15px*/ 3.303964757709251vw;"></tr>
|
||||
@@ -684,7 +702,7 @@
|
||||
</div>
|
||||
|
||||
<div class="d-none d-md-block">
|
||||
<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;width:100%;/*margin-right:25px*//*margin-left:-2px;*/margin-left:-0.125em;margin-left: 0.2109704641350211vw">
|
||||
<table style="width:100%" class="table-responsive" contenteditable="false"><tr> <td>
|
||||
<table>
|
||||
<!-- <tr><td style="/*width:150px;*/width:9.375em;width: 10.615711252653927vw"></td><td></td></tr>-->
|
||||
@@ -764,14 +782,14 @@
|
||||
</div>
|
||||
</div> -->
|
||||
<!-- <div style="height:20px"></div>-->
|
||||
<span style="font-size:1em;font-size:16px;font-size:1em"><%= LT.getTxt(18, lan, "Bitte haben Sie noch Geduld bis ihr Auftrag fertig ist. Sie können den aktuellen Status Ihres LKWs am Bildschirm verfolgen.<br />Bei Status ""OK"" können Sie an den Schalter kommen.") %></span>
|
||||
<span style="display:inline-block; font-size:1em;font-size:16px;font-size:1em; width:/*375px;*/ 82.59911894273128vw;"><%= LT.getTxt(18, lan, "Bitte haben Sie noch Geduld bis ihr Auftrag fertig ist. Sie können den aktuellen Status Ihres LKWs am Bildschirm verfolgen.<br />Bei Status ""OK"" können Sie an den Schalter kommen.") %></span>
|
||||
<% End If %>
|
||||
<div id="abstand"></div>
|
||||
|
||||
<h2>Allgemeine Vermerke</h2>
|
||||
<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">
|
||||
<table class="tableStatus table-striped" border="1" cellspacing="0" contenteditable="false" style="width:40%"> <%
|
||||
<table class="tableStatus table-striped" border="1" cellspacing="0" contenteditable="false" style=" max-width:/*380px;*/ 83.70044052863436vw;"> <%
|
||||
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
|
||||
Dim vermerkeUeberschrift = LT.getTxt(25, lan, "Probleme/Vermerke") & ":"
|
||||
@@ -785,8 +803,8 @@
|
||||
<% End If
|
||||
End If
|
||||
%></table></div>
|
||||
<br />
|
||||
<h2><%= LT.getTxt(19, lan, "Sendungsliste!") %></h2>
|
||||
|
||||
<h2><%= LT.getTxt(19, lan, "Sendungsliste!") %></h2> <br />
|
||||
</div>
|
||||
|
||||
<div id="conovertab">
|
||||
@@ -835,7 +853,7 @@
|
||||
<% 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 %>
|
||||
<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><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><!--</button>--></tr>
|
||||
<%
|
||||
Else
|
||||
%>
|
||||
@@ -849,8 +867,8 @@
|
||||
Dim vermerkeUeberschrift = LT.getTxt(25, lan, "Probleme/Vermerke") & ":"
|
||||
For Each r In VERMERKE.Rows()%>
|
||||
<tr class="tableStatusVermerke" style="border:0px solid white; width:fit-content; align-items:start">
|
||||
<td class="vermerkHeader" style="border:0px solid white;text-align:left;width:20%;">
|
||||
<u><i><% Response.Write(vermerkeUeberschrift) %></i></u>  </td>
|
||||
<!-- <td class="vermerkHeader" style="border:0px solid white;text-align:left;width:20%;">
|
||||
<u><i><%' Response.Write(vermerkeUeberschrift) %></i></u>  </td>-->
|
||||
<td class="vermerkeBody" style="border:0px solid white;text-align:left;width:80%;">
|
||||
<i><% Response.Write(CDate(r("Datum")).ToString("dd.MM.yyyy HH:mm") & ": " & V_LST.getTxt(r("VermerkeCode"), lan)) %></i>
|
||||
</td>
|
||||
|
||||
Reference in New Issue
Block a user