Änderungen an Schriftgrößen sowie den Abständen der Tabellen zum rand bzw zur weißfläche und auch in AvisoTV_Flex.aspx
This commit is contained in:
ja
@@ -254,7 +254,7 @@
|
||||
background-color: white;
|
||||
color: #043381;
|
||||
overflow-x:auto;
|
||||
font-size:17px;
|
||||
font-size:1.103230890464933vh;
|
||||
}
|
||||
}
|
||||
@media (min-width: 768px) {
|
||||
@@ -263,7 +263,7 @@
|
||||
max-width: 17.692852087756545vw;
|
||||
}
|
||||
#normaltable {
|
||||
font-size:1.188em;
|
||||
font-size:1.103230890464933vh;
|
||||
padding-left: -0.125em;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -82,6 +82,9 @@
|
||||
<script type="text/javascript" src="js/toptions/top_up-min.js"></script>
|
||||
|
||||
<style>
|
||||
p{
|
||||
font-size:1em;
|
||||
}
|
||||
#bodycontent{
|
||||
background-color:#fff;
|
||||
}
|
||||
@@ -262,7 +265,7 @@
|
||||
}
|
||||
#navbar{
|
||||
font-size: initial;
|
||||
position: relative;
|
||||
position: relative;
|
||||
}
|
||||
#sidebar.active {
|
||||
margin-left: 0rem;
|
||||
@@ -281,11 +284,11 @@
|
||||
width: 150px;
|
||||
}
|
||||
table th td {
|
||||
font-size: 16px;
|
||||
font-size: 15px;
|
||||
display:block;
|
||||
}
|
||||
tbody{
|
||||
font-size:19.2px;
|
||||
font-size:2.0134228187919465vw;
|
||||
height: auto;
|
||||
|
||||
overflow-y:auto;
|
||||
@@ -296,11 +299,17 @@
|
||||
overflow-x:auto;
|
||||
}
|
||||
#rowTable{
|
||||
width:80%;
|
||||
width:70%;
|
||||
}
|
||||
#navbar navbar-expand-md navbar-light bg-light{
|
||||
background-color:#fff;
|
||||
}
|
||||
width:40%;
|
||||
}
|
||||
.alert {
|
||||
width:20%;
|
||||
/* width:1328px;*/
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/* @media (min-width: 320px) and (min-height: 640px) {*/
|
||||
@@ -390,7 +399,7 @@
|
||||
border-color: #043381;
|
||||
}
|
||||
table {
|
||||
font-size: 1.12em;
|
||||
font-size: 1.103230890464933vh;
|
||||
}
|
||||
alert alert-success align-items-center{
|
||||
width: 7.813em;
|
||||
@@ -398,7 +407,7 @@
|
||||
height: auto;
|
||||
}
|
||||
alert{
|
||||
width:60%;
|
||||
width:40%;
|
||||
}
|
||||
li {
|
||||
list-style-type: none;
|
||||
@@ -507,7 +516,7 @@
|
||||
curentMenuId = Request.QueryString("menuID")
|
||||
End If%>
|
||||
|
||||
<div style="/*width:62%;*/width: 97.25490196078431vw;"></div>
|
||||
|
||||
<div class="me-auto">
|
||||
<div class="dropdown" style="background-color:#fff; color:#043381; margin-right:9.813rem;">
|
||||
<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>
|
||||
@@ -533,10 +542,11 @@
|
||||
</div>
|
||||
|
||||
<div class="d-md-none">
|
||||
<div class="me-auto">
|
||||
<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>
|
||||
</nav></div>
|
||||
</div>
|
||||
<div class="offcanvas offcanvas-end" data-bs-scroll="true" tabindex="-1" id="offcanvasWithBothOptions" aria-labelledby="offcanvasWithBothOptionsLabel">
|
||||
<div class="offcanvas-header">
|
||||
@@ -632,16 +642,15 @@
|
||||
End If%>
|
||||
|
||||
<div class="d-md-none">
|
||||
<table style="width:100%" class="table-responsive" contenteditable="false"><tr> <td>
|
||||
<table contenteditable="false">
|
||||
<tr><td style="/*width:150px*/ width:9.375em;width=10.615711252653927vw"></td><td></td></tr>
|
||||
<tr><td><b><%= LT.getTxt(3, lan, "LKW-Kennzeichen") %></b></td><td><span style="font-size:1.25em"><%= AVISO.LKW_Nr %></span></td></tr>
|
||||
<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.303964757709251vw;"><%= AVISO.LKW_Nr %></span></td></tr>
|
||||
<tr><td><b><%= LT.getTxt(14, lan, "LKW-ID") %>:</b></td><td><%= 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(8, lan, "Frachtführer") %>:</b></td><td><%= AVISO.Frächter %></td></tr>
|
||||
|
||||
<tr style="/*height:10px*/height=0.7818608287724785vh"></tr>
|
||||
<tr style="/*height:10px*/height:0.7818608287724785vh;font-size:/*15px*/ 3.303964757709251vw;"></tr>
|
||||
<tr><td><b>STATUS:</b></td><td><span ><%
|
||||
Select Case(AVISO.Status)
|
||||
Case 0 : Response.Write("<div class=""statusLKW_Erfasst"">" & LT.getTxt(7, lan, "Erfasst") & "</div>")
|
||||
@@ -653,8 +662,8 @@
|
||||
Case Else : Response.Write("unbekannt")
|
||||
End Select
|
||||
%></span></td></tr>
|
||||
</table>
|
||||
</td><td> <tr><td style="/*width:150px*/ width:9.375em;width=10.615711252653927vw"></td><td></td></tr>
|
||||
|
||||
</td><td> <tr><td style="/*width:150px*/ width:11.25em;width:24.161073825503355vw"></td><td></td></tr>
|
||||
<%
|
||||
If AVISO.AvisoEingang <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("<tr><td><b>" & LT.getTxt(13, lan, "Aviso-Eingang") & "</td><td>" & AVISO.AvisoEingang & "</td></tr>")
|
||||
If AVISO.Datum <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("<tr><td><b>" & LT.getTxt(7, lan, "Erfasst") & ":</td><td>" & AVISO.Datum & "</td></tr>")
|
||||
@@ -665,11 +674,12 @@
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="d-none d-md-block">
|
||||
<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">
|
||||
<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>-->
|
||||
<tr><td><b><%= LT.getTxt(3, lan, "LKW-Kennzeichen") %>:</b></td><td><span style="font-size:20px"><%= AVISO.LKW_Nr %></span></td></tr>
|
||||
<tr><td><b><%= LT.getTxt(3, lan, "LKW-Kennzeichen") %>:</b></td><td><span style="font-size:15px"><%= AVISO.LKW_Nr %></span></td></tr>
|
||||
<tr><td><b><%= LT.getTxt(14, lan, "LKW-ID") %>:</b></td><td><%= AVISO.AvisoID %></td></tr>
|
||||
|
||||
<tr style="height:10px"></tr>
|
||||
@@ -701,7 +711,7 @@
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</table></div>
|
||||
</div>
|
||||
<%
|
||||
If true Then 'AVISO.Status <> 1 And AVISO.Status <> 2 Then 'SENDUNGSTABELLE
|
||||
@@ -752,17 +762,17 @@
|
||||
<h1>Allgemeine Vermerke</h1>
|
||||
<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:100%"> <%
|
||||
<table class="tableStatus table-striped" border="1" cellspacing="0" contenteditable="false" style="width:40%"> <%
|
||||
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") & ":"
|
||||
For Each r In VERMERKE_LKW.Rows()
|
||||
%>
|
||||
<tr class="tableStatusVermerke"><td colspan="3" class="vermerkHeader"><u><i><%Response.Write(vermerkeUeberschrift) %></i></u>  </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 style="border:0px solid white" colspan="4"><i><% Response.Write(CDate(r("Datum")).ToString("dd.MM.yyyy HH:mm") & ": " & V_LST.getTxt(r("VermerkeCode"), lan)) %></i></td></tr>
|
||||
|
||||
<% vermerkeUeberschrift = ""
|
||||
Next
|
||||
If VERMERKE_LKW.Rows().Count = 0 Then %> <tr class="tableStatusVermerke"><!--<td colspan="3" class="vermerkHeader"><u><i></i></u>  </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 style="border:0px solid white;align-items:flex-start" colspan="4"><i>Keine Vermerke vorhanden</i></td></tr>
|
||||
<% End If
|
||||
End If
|
||||
%></table></div>
|
||||
@@ -770,7 +780,7 @@
|
||||
<h1><%= LT.getTxt(19, lan, "Sendungsliste!") %></h1>
|
||||
</div>
|
||||
|
||||
<div id="conovertab" >
|
||||
<div id="conovertab">
|
||||
<div class="container-flex" style="/*margin-right:25px*//*margin-right:1.563em;margin-right:2.6371308016877637vw;/*margin-left:-2px;*//*margin-left:-1.1em;margin-left: 1.2109704641350211vw*/">
|
||||
<table class="tableStatus table-striped" id="tablemain" border="1" cellspacing="0" contenteditable="false">
|
||||
<thead><tr><th>Infos</th><th> Status </th><th ><%= LT.getTxt(20, lan, "Nr.") %></th><th><%= LT.getTxt(21, lan, "Spedition/PosNr") %></th><th><%= LT.getTxt(22, lan, "Sendungsdaten") %></th><th><%= LT.getTxt(23, lan, "Absender") %></th><th><%= LT.getTxt(24, lan, "Empfänger") %></th></tr></thead>
|
||||
@@ -829,10 +839,10 @@
|
||||
<%
|
||||
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; justify-content:center">
|
||||
<td class="vermerkHeader" style="border:0px solid white;text-align:right;width:40%;">
|
||||
<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="vermerkeBody" style="border:0px solid white;text-align:left;width:60%;">
|
||||
<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>
|
||||
</tr> <% vermerkeUeberschrift = ""
|
||||
|
||||
Reference in New Issue
Block a user