Rechnungen wurden geändert und die Buttons angepasst bei Sprache sowie die Buttons darin geändert bzw dem LogoutButton angepasst.
This commit is contained in:
ja
@@ -101,5 +101,4 @@
|
||||
</table>
|
||||
</div>
|
||||
</div>--%>
|
||||
</asp:Content>
|
||||
|
||||
</asp:Content>
|
||||
@@ -323,19 +323,18 @@
|
||||
</div>
|
||||
</button>
|
||||
<a class="navbar-brand" id="navbarhomebar" href="../newpageJulius_Sidebar.aspx"><img src="../images/Logo_small.png" style="width:90%;height:90%;" alt="VERAG Spedition AG Logo with blue word color until grey AG" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"></a>
|
||||
<div style="margin-right:50px">
|
||||
<ul class="nav nav-pills">
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link" data-bs-toggle="dropdown" role="button" aria-expanded="false" style="z-index:1031"><img src="../images/samples/default-avatar.jpg"; width="10"; /></button><asp:LoginName ID="LoginName2" runat="server" /></a>
|
||||
<ul class="dropdown-menu" style="z-index:1031">
|
||||
<li>
|
||||
<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff; color:#043381;"> Profil bearbeiten</button>
|
||||
</li>
|
||||
<!--<div class="dropdown-divider"></div>-->
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="dropdown" style="background-color:#fff; color:#043381;position:absolute;right:5%;top:15%;z-index:1031">
|
||||
<button class="dropbtn" style="background-color:#fff;color:#043381;border:none;z-index:1031; position:absolute"
|
||||
<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff;color:#043381"><img src="../images/samples/default-avatar.jpg"; width="15"; /><asp:LoginName class="pointer" ID="LoginName1" runat="server" style="margin-left:6px"/></button>
|
||||
</button>
|
||||
|
||||
<div class="dropdown-content" style="margin-right:-25%;margin-top:2%">
|
||||
<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff; color:#043381;"><img src="../images/Icons/main/gear_blue.png"; style="width:15px; height:15px;color:#043381;background-color:#fff;margin-right:6px;" />Profil bearbeiten</button>
|
||||
<button type="button" onclick="LogoutButton_Click" style="text-decoration: none;background-color:#fff;color:#043381"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</button>
|
||||
<!-- <div class="dropdown-divider"></div>-->
|
||||
</div> </div>
|
||||
|
||||
<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 src="../images/samples/default-avatar.jpg"; width="25"; /><asp:LoginName ID="LoginName3" runat="server" style="margin-left:6px"/></button>
|
||||
</nav>
|
||||
</div>
|
||||
@@ -381,17 +380,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="dropdown" style="background-color:#fff; color:#043381;position:absolute;right:5%;top:1%;z-index:1031">
|
||||
<button class="dropbtn" style="background-color:#fff;color:#043381;border:none;z-index:1031; position:sticky"
|
||||
<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff;color:#043381"><img src="../images/samples/default-avatar.jpg"; width="15"; /></button><asp:LoginName ID="LoginName1" runat="server" style="margin-left:6px"/>
|
||||
</button>
|
||||
|
||||
<div class="dropdown-content" style="margin-right:-25%;margin-top:2%">
|
||||
<a type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff; color:#043381;">Profil bearbeiten</a>
|
||||
<button type="button" onclick="LogoutButton_Click" style="text-decoration: none;background-color:#fff;color:#043381"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff;"/>Logout</button>
|
||||
<!-- <div class="dropdown-divider"></div>-->
|
||||
</div> </div>
|
||||
|
||||
|
||||
<nav class="navbar fixed-top navbar-expand-lg navbar-light" style="background-color:#fff" data-spy="affix" data-offset-top="197">
|
||||
<a class="navbar-brand" href="../newpageJulius_Sidebar.aspx?lan2=DE&lan3=0"><img src="../images/Logo_small.png" style:"width:120px" alt="Schriftzug: Verag AG Blaue Schrift: Verag Spedition Graue Schrift: AG" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"/></a>
|
||||
<div style="margin-left:25%;margin-right:-25%">
|
||||
@@ -447,8 +436,11 @@
|
||||
</div>-->
|
||||
</div>
|
||||
</div>
|
||||
<div style="width:160px;"></div>
|
||||
<div class="dropdown" style="background-color:#fff; color:#043381; position:absolute;right:15%;top:12%">
|
||||
<div style="width:160px;"></div>
|
||||
|
||||
|
||||
|
||||
<div class="dropdown" style="background-color:#fff; color:#043381;position:absolute;right:5%;top:15%;z-index:1031">
|
||||
<button class="dropbtn" style="margin-right:-39%;margin-top:2%"><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>
|
||||
<div class="dropdown-content" style="margin-right:39%;margin-top:2%">
|
||||
<% Dim stringDE = "  DE"
|
||||
@@ -465,7 +457,18 @@
|
||||
<a id="ButtonSerbischZweiLangPicker" class="btn btn-primary btn-sm" href="<%= navParent%>&lan2=SRB&lan3=1" style="background-color:#fff;color:#043381;text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_SM_big.gif"; width="20"; <% If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%> /><%=stringSRB%></a>
|
||||
<a id="ButtonBulgariaLangPicker" class="btn btn-primary btn-sm" href="<%= navParent%>&lan2=BG&lan3=0" style="background-color:#fff;color:#043381;text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_BG_big.gif"; width="20"; <% If laenderkuerzel = "bg" Then Response.Write("style='border:1px solid #000'")%>/><%=stringBG%></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="dropdown" style="background-color:#fff; color:#043381;position:absolute;right:5%;top:15%;z-index:1031">
|
||||
<button class="dropbtn" style="background-color:#fff;color:#043381;border:none;z-index:1031; position:sticky"
|
||||
<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff;color:#043381"><img src="../images/samples/default-avatar.jpg"; width="15"; /><asp:LoginName class="pointer" ID="LoginName2" runat="server" style="margin-left:6px"/></button>
|
||||
</button>
|
||||
|
||||
<div class="dropdown-content" style="margin-right:-25%;margin-top:2%">
|
||||
<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff; color:#043381;"><img src="../images/Icons/main/gear_blue.png"; style="width:15px; height:15px;color:#043381;background-color:#fff;margin-right:6px;" />Profil bearbeiten</button>
|
||||
<button type="button" onclick="LogoutButton_Click" style="text-decoration: none;background-color:#fff;color:#043381"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</button>
|
||||
<!-- <div class="dropdown-divider"></div>-->
|
||||
</div> </div>
|
||||
</nav> </div>
|
||||
<!-- Container zur Ausrichtung des Contents-->
|
||||
<div style="margin-left:5px;margin-right:5px">
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
</asp:Content>
|
||||
|
||||
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
|
||||
<div class="align-self-flex-center" style="/*margin-top:5px;*/margin-left:25px; margin-top:0.6510416666666667vw; margin-right:25px;">
|
||||
<div class="align-self-flex-center" style="/*margin-top:5px;*/margin-left:5px; margin-top:0.6510416666666667vw; margin-right:5px;">
|
||||
<div id="containerseiterand">
|
||||
<div class="d-flex flex-col-4" style="align-content:center">
|
||||
<h1>Rechnungen</h1>
|
||||
@@ -66,9 +66,9 @@
|
||||
|
||||
<div style="height:/*20px*/2.1621621621621623vh;"></div>
|
||||
|
||||
<div id="conovertab">
|
||||
<div id="conovertab" style="width:100%">
|
||||
|
||||
<table class="table table-hover table-responsive table-primary" id="tablerechnungen" contenteditable="false">
|
||||
<table class="table table-hover table-responsive table-primary" id="tablerechnungen" contenteditable="false" style="width:100%">
|
||||
<thead style="width:fit-content;font-size:14px;"><tr><th>Rechnungsnr</th><th>Rechnungsdatum</th><th>LKW</th><th>Grenzsztelle</th><th>Rechnungsbetrag</th><th>Abfertigungsdatum</th><th>Filiale</th><th>Abfertigungsnr.</th><th style="width:/*20px*/ 0.7927070947284979vw;"></th></tr></thead>
|
||||
<tbody id="bodyoftable">
|
||||
<tr><td>045100110</td><td>18.08.2021</td><td>14334234</td><td>SUBEN</td><td>509,21€</td><td>18.08.2021</td><td>SUBEN</td><td>512</td><td><center><button type="button" class="btn btn-primary" data-toggle="tooltip" data-placement="top" title="Hier klicken zum Downlaod der Rechnungen."><img src="../images/pdficon.gif" width="15" height="15"/></button></center></td></tr>
|
||||
|
||||
@@ -191,6 +191,7 @@ ContentPlaceHolder1 {
|
||||
}
|
||||
#conovertab {
|
||||
max-width: 150px 11.25em;
|
||||
width:100%;
|
||||
margin-left: 35px;
|
||||
overflow-x: auto;
|
||||
}
|
||||
@@ -350,6 +351,9 @@ ContentPlaceHolder1 {
|
||||
z-index: 1031;
|
||||
position: relative;
|
||||
}
|
||||
.pointer {
|
||||
cursor:pointer;
|
||||
}
|
||||
}
|
||||
#ContentPlaceHolder1 {
|
||||
align-self: center;
|
||||
@@ -374,3 +378,4 @@ ContentPlaceHolder1 {
|
||||
background-image: linear-gradient(to right, #003680, #0055cc);
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
|
||||
BIN
images/Icons/main/gear_blue.gif
Normal file
BIN
images/Icons/main/gear_blue.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
BIN
images/Icons/main/gear_blue.png
Normal file
BIN
images/Icons/main/gear_blue.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 29 KiB |
Reference in New Issue
Block a user