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

Änderungen in Tables und container hinzugefügt bzw zur besseren lesbarkeit entfernt.

Browse Source
This commit is contained in:
ja
2021-08-02 17:50:48 +02:00
parent e7a6b8a10f
commit f9437babc3
2 changed files with 57 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
newpageJulius_Sidebar.aspx
View File

@@ -711,7 +711,7 @@
</li> </li>
</nav> </nav>
<div class="float-sm-right"> <div class="float-sm-right">
<div class="position-absolute top-50 end-0 translate-middle-y"> <div class="position-absolute bottom-0 start-0 translate-middle-y">
<div class="d-md-none"> <div class="d-md-none">
<button type="button" id="sidebarCollapse" class="btn btn-info" style="background-color:#fff; color:#043381;"> <button type="button" id="sidebarCollapse" class="btn btn-info" style="background-color:#fff; color:#043381;">
<div class="align-self: center"></div> <div class="align-self: center"></div>
@@ -759,7 +759,7 @@
<% For Each nav As cNavigation In navigation <% For Each nav As cNavigation In navigation
%> %>
<div style="display:flex;"> <div style="display:flex;">
<li class="nav-item dropdown"> <li class="nav-item dropdown" style="background-color:#fff; color:#043381;">
<a class="nav-link dropdown-toggle" href="<%= navParent%>?menuID=<%= nav.id %>&lan=<%= laenderKuerzel %>" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="background-color:#fff; color:#043381;"> <a class="nav-link dropdown-toggle" href="<%= navParent%>?menuID=<%= nav.id %>&lan=<%= laenderKuerzel %>" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="background-color:#fff; color:#043381;">
<%= IIf(nav.bezeichnung <> "", nav.bezeichnung, "XXX") %> <%= IIf(nav.bezeichnung <> "", nav.bezeichnung, "XXX") %>
</a> </a>

96
status_Julius.aspx
View File

@@ -228,10 +228,14 @@
} }
#sidebarCollapse span { #sidebarCollapse span {
display:compact; display:compact;
} }
table th td {
font-size: 12px;
}
} }
@media (min-width: 768px) { @media (min-width: 768px){
#sidebar { #sidebar {
margin-left: -250px; margin-left: -250px;
padding-top:0.5em; padding-top:0.5em;
@@ -239,8 +243,8 @@
} }
#content{ #content{
font-size:1.56em; font-size:1.56em;
max-width:100%; max-width:50%;
min-width:60%; min-width:50%;
} }
#footer_content{ #footer_content{
font-size:0.4em; font-size:0.4em;
@@ -268,16 +272,16 @@
#sidebar.active { #sidebar.active {
margin-left: 0; margin-left: 0;
} }
} }
#navbar.menu_class{ #navbar.menu_class{
width:20px; width:20px;
height:14px; height:14px;
} }
#pagecontent{ #pagecontent{
font-size:2.12em; font-size: 17.92px;
display: flex; font-size:1.12em;
display: flex;
align-items: center; align-items: center;
justify-content: center justify-content: center
} }
@@ -286,8 +290,11 @@
color: #fff; color: #fff;
background-color: #0741a7; background-color: #0741a7;
border-color: #043381; border-color: #043381;
} }
table th td {
font-size: 16px;
}
alert{ alert{
width:40%; width:40%;
} }
@@ -378,13 +385,14 @@
Case "TR" : flagpath = "images/flags/flagge_TR.gif" Case "TR" : flagpath = "images/flags/flagge_TR.gif"
End Select End Select
%> %>
<div class="container" style="width:1230px;"> <div class="container">
<div class="container-xxl"> <div class="row justify-content-xs-center">
<!-- Page Content --> <!-- Page Content -->
<div id="content"> <div id="content">
<div class="d-none d-md-block"> <div class="d-none d-xs-block">
<nav class="navbar navbar-expand-lg navbar-light" style="background-color:#fff"> <nav class="navbar navbar-expand-xs navbar-light" style="background-color:#fff">
<li> <li>
<a class="navbar-brand" href="newpageJulius_Sidebar.aspx?lan2=DE"><img src="images/Logo_small.png" alt="" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"></a> <a class="navbar-brand" href="newpageJulius_Sidebar.aspx?lan2=DE"><img src="images/Logo_small.png" alt="" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"></a>
@@ -420,7 +428,7 @@
</nav> </nav>
</div> </div>
<div class="d-md-none"> <div class="d-xs-none">
<a href="newpageJulius_Sidebar.aspx?lan2=DE"><img src="images/Logo_small.png" alt="" 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="" 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> <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>
</div> </div>
@@ -521,41 +529,47 @@
Case "TR" : lan = "TR" Case "TR" : lan = "TR"
End Select End Select
End If%> End If%>
<table style="width:100%"><tr> <td> <table style="width:100%"><tr> <td>
<table> <table>
<tr><td style="width:150px"></td><td></td></tr> <tr><td style="width:150px"></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:20px"><%= AVISO.LKW_Nr %></span></td></tr>
<tr><td><b><%= LT.getTxt(14, lan, "LKW-ID") %>:</b></td><td><%= AVISO.AvisoID %></td></tr> <tr><td><b><%= LT.getTxt(14, lan, "LKW-ID") %>:</b></td><td><%= AVISO.AvisoID %></td></tr>
<tr style="height:10px"></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><td><b><%= LT.getTxt(8, lan, "Frachtführer") %>:</b></td><td><%= AVISO.Frächter %></td></tr>
<tr style="height:10px"></tr> <tr style="height:10px"></tr>
<tr><td><b>STATUS:</b></td><td><div ><% <tr><td><b>STATUS:</b></td><td><div ><%
Select Case(AVISO.Status) Select Case(AVISO.Status)
Case 0 : Response.Write("<div class=""statusLKW_Erfasst"">" & LT.getTxt(7, lan, "Erfasst") & "</div>") Case 0 : Response.Write("<div class=""statusLKW_Erfasst"">" & LT.getTxt(7, lan, "Erfasst") & "</div>")
Case 1 : Response.Write("<div class=""statusLKW_Freigegeben"">" & LT.getTxt(8, lan, "Freigegeben") & "</div>") Case 1 : Response.Write("<div class=""statusLKW_Freigegeben"">" & LT.getTxt(8, lan, "Freigegeben") & "</div>")
Case 2 : Response.Write("<div class=""statusLKW_Erfasst"">" & LT.getTxt(9, lan, "LKW n.e.") & "</div>") Case 2 : Response.Write("<div class=""statusLKW_Erfasst"">" & LT.getTxt(9, lan, "LKW n.e.") & "</div>")
Case 3 : Response.Write("<div class=""statusLKW_Ankunft"">" & LT.getTxt(10, lan, "Ankunft") & "</div>") Case 3 : Response.Write("<div class=""statusLKW_Ankunft"">" & LT.getTxt(10, lan, "Ankunft") & "</div>")
Case 4 : Response.Write("<div class=""statusLKW_Erfasst"">" & LT.getTxt(11, lan, "Vorbereitet") & "</div>") Case 4 : Response.Write("<div class=""statusLKW_Erfasst"">" & LT.getTxt(11, lan, "Vorbereitet") & "</div>")
Case 5 : Response.Write("<div class=""statusLKW_Erfasst"">" & LT.getTxt(12, lan, "Vorgeschrieben") & "</div>") Case 5 : Response.Write("<div class=""statusLKW_Erfasst"">" & LT.getTxt(12, lan, "Vorgeschrieben") & "</div>")
Case Else : Response.Write("unbekannt") Case Else : Response.Write("unbekannt")
End Select End Select
%></div></td></tr> %></div></td></tr>
</table> </table></div>
<br /> <br />
<br /> <br />
</td> </td>
<td> <td>
<table> <div class="d-none d-md-block">
</div>
<table class="table-responsive-sm">
<% <%
If AVISO.AvisoEingang <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("<tr><td><b>" & LT.getTxt(13, lan, "Aviso-Eingang") & ":&nbsp;&nbsp;<b></td><td>" & AVISO.AvisoEingang & "</td></tr>") If AVISO.AvisoEingang <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("<tr><td><b>" & LT.getTxt(13, lan, "Aviso-Eingang") & ":&nbsp;&nbsp;<b></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") & ":&nbsp;&nbsp;<b></td><td>" & AVISO.Datum & "</td></tr>") If AVISO.Datum <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("<tr><td><b>" & LT.getTxt(7, lan, "Erfasst") & ":&nbsp;&nbsp;<b></td><td>" & AVISO.Datum & "</td></tr>")
If AVISO.Ankunft <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("<tr><td><b>" & LT.getTxt(10, lan, "Ankunft") & ":&nbsp;&nbsp;<b></td><td>" & AVISO.Ankunft & "</td></tr>") If AVISO.Ankunft <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("<tr><td><b>" & LT.getTxt(10, lan, "Ankunft") & ":&nbsp;&nbsp;<b></td><td>" & AVISO.Ankunft & "</td></tr>")
If AVISO.Freigabe <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("<tr><td><b>" & LT.getTxt(15, lan, "Freigabe") & ":&nbsp;&nbsp;<b></td><td>" & AVISO.Freigabe & "</td></tr>") If AVISO.Freigabe <> VERAG_PROG_ALLGEMEIN.cAllgemein.LeerDatum Then Response.Write("<tr><td><b>" & LT.getTxt(15, lan, "Freigabe") & ":&nbsp;&nbsp;<b></td><td>" & AVISO.Freigabe & "</td></tr>")
%> %>
</table> </table>
</td> </td>
<% <%
If true Then 'AVISO.Status <> 1 And AVISO.Status <> 2 Then 'SENDUNGSTABELLE If true Then 'AVISO.Status <> 1 And AVISO.Status <> 2 Then 'SENDUNGSTABELLE
@@ -606,7 +620,7 @@
<div style="height:30px"></div> <div style="height:30px"></div>
<h1><%= LT.getTxt(19, lan, "Sendungsliste!") %></h1> <h1><%= LT.getTxt(19, lan, "Sendungsliste!") %></h1>
<div class="container-lg"> <div class="container-sm">
<table class="tableStatus table-striped" border="8" cellspacing="0"> <table class="tableStatus table-striped" border="8" cellspacing="0">
<thead><tr><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><th> Status </th><th>Infos</th></tr> </thead> <thead><tr><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><th> Status </th><th>Infos</th></tr> </thead>
<% <%
@@ -726,7 +740,7 @@
<br /> <br />
<br /> <br />
<!-- <div style="height:150px; place-self:safe center">--> <!-- <div style="height:150px; place-self:safe center">-->
</div></div> </div>
</div></div> </div> </div></div> </div>