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

Anpassung Verhalten Menüleitse und Rechnungsaussehen

Browse Source
This commit is contained in:
ja
2021-12-01 15:54:26 +01:00
parent 8a85ececfd
commit 8b62dd33b3
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Customers/Customers.master
View File

@@ -513,7 +513,7 @@
<div class="d-none d-md-block">
<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:30%;margin-right:-30%">
<div style="margin-left:26%;margin-right:auto">
<div class="btn-group">
<%If Me.Page.User.Identity.Name = "test" Then %>
<a type="button" class="btn btn-primary" href="Welcome.aspx">Startseite</a>

10
Customers/Invoices.aspx
View File

@@ -169,25 +169,25 @@
<div class="row" style="height:166px">
<div id="rowcols4" class="row-cols-1" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<asp:Label ID="lbl_LKW_M" runat="server" style="color:#043381" Font-Size="1em">LKW Kennzeichen:</asp:Label>
<asp:TextBox ID="txt_LKW_M" runat="server" style="width:155px;margin-left:28px" ClientIDMode="Predictable"></asp:TextBox>
<asp:TextBox ID="txt_LKW_M" runat="server" style="width:155px;margin-left:37px" ClientIDMode="Predictable"></asp:TextBox>
<asp:RequiredFieldValidator ControlToValidate="txt_LKW_M" runat="server" ID="regval_txt_LKW_M" Enabled="false"></asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ControlToValidate="txt_LKW_M" runat="server" ForeColor="Red" ID="regex_txt_LKW_M" ValidationExpression="[A-Z0-9]{4,30}\d" Display="Dynamic" ErrorMessage="Wrong plate format!" SetFocusOnError="true" Enabled="false"></asp:RegularExpressionValidator>
</div>
<div id="rowcols7" class="row-cols-1" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<asp:Label ID="lbl_KdnNrAuftrag_M" runat="server" style="color:#043381;font-size:1em">KundenNr-Auftrag:</asp:Label>
<asp:TextBox ID="txt_KdNrAuftrag_M" runat="server" style="width:155px;margin-left:20px" ClientIDMode="Predictable"></asp:TextBox>
<asp:TextBox ID="txt_KdNrAuftrag_M" runat="server" style="width:155px;margin-left:28px" ClientIDMode="Predictable"></asp:TextBox>
<asp:RequiredFieldValidator ControlToValidate="txt_KdNrAuftrag_M" runat="server" ForeColor="Red" Enabled="false" ID="reqval_txt_KdNrAuftrag_M"></asp:RequiredFieldValidator>
<asp:RegularExpressionValidator runat="server" ID="regex_txt_KdNrAuftrag_M" ControlToValidate="txt_KdNrAuftrag_M" ForeColor="Red" Display="Dynamic" ValidationExpression="[A-Z0-9]{5,30}/d" Enabled="false" ErrorMessage="No valid input found!"></asp:RegularExpressionValidator>
</div>
<div id="rowcols5" class="row-cols-1" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<asp:Label ID="lbl_absender_M" runat="server" style="color:#043381" Font-Size="1em">Absender:</asp:Label>
<asp:TextBox ID="txt_Absender_M" runat="server" style="width:155px;margin-left:72px"></asp:TextBox>
<asp:TextBox ID="txt_Absender_M" runat="server" style="width:155px;margin-left:100px"></asp:TextBox>
<asp:RequiredFieldValidator ControlToValidate="txt_Absender_M" runat="server" style="width:155px;margin-left:18px" Enabled="false" ID="req_txt_Absender_M" ErrorMessage="" ForeColor="Red"></asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ControlToValidate="txt_Absender_M" runat="server" ID="regex_txt_Absender_M" Enabled="false" ValidationExpression="[^!,]{2,90}" ForeColor="Red" SetFocusOnError="true" Display="Dynamic" ErrorMessage="Wrong Input! Try again!"></asp:RegularExpressionValidator>
</div>
<div id="rowcols8" class="row-cols-1" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<asp:Label ID="lbl_Empfaenger_M" runat="server" style="color:#043381" Font-Size="1em">Empfänger</asp:Label>
<asp:TextBox ID="txt_Empfaenger_M" runat="server" style="width:155px;margin-left:67px"></asp:TextBox>
<asp:TextBox ID="txt_Empfaenger_M" runat="server" style="width:155px;margin-left:91px"></asp:TextBox>
<asp:RequiredFieldValidator ControlToValidate="txt_Empfaenger_M" runat="server" ID="reqval_txt_Empfaenger_M" ForeColor="Red" Enabled="false" Display="Dynamic"></asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger_M" ID="regex_txt_Empaenger_M" runat="server" ForeColor="Red" Enabled="false" ValidationExpression="[^!,]{2,90}" Display="Dynamic" style="width:105px;margin-left:13px" SetFocusOnError="true" ErrorMessage="Error! Try again!"></asp:RegularExpressionValidator>
</div>
@@ -221,7 +221,7 @@
</div>
</div>
<div id="Abstand_laenger" style="height:/*24px*/ 1.873536299765808vh;"></div>
<asp:Button ID="btn_SendData" ClientIDMode="Predictable" CssClass="btn btn-primary" runat="server" Text="Erhalte Rechnungen!" CausesValidation="false" style="margin-top:2px;margin-bottom:auto;padding-bottom:2px;color:#043381;font-size:1.33em;background-color:#fff;height:30px;width:221px;"/>
<asp:Button ID="btn_SendData" ClientIDMode="Predictable" CssClass="btn btn-primary" runat="server" Text="Erhalte Rechnungen!" CausesValidation="false" style="margin-top:2px;margin-bottom:auto;padding-bottom:2px;color:#043381;font-size:1.33em;background-color:#fff;height:35px;width:250px;"/>
<div id="Abstand_lang" style="height: /*32px*/ 2.498048399687744vh;"></div>
<div class="g-3">
<div id="conovertab">

2
css/Customers/Invoices.css
View File

@@ -168,7 +168,7 @@ ContentPlaceHolder1_Send_Data {
}
#ContentPlaceHolder1_Send_Data {
height: 15px;
height: 25px;
width: 300px;
}

4
login/login_FLEX.aspx.vb
View File

@@ -238,7 +238,7 @@ Partial Class login_FLEX
Try
Dim salt As String = VERAG_VARIABLES.GenerateSalt(My1stRandomNumber)
Dim passw As String = password
token = VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(VERAG_VARIABLES.HashPassword(passw, salt, 10101, My1stRandomNumber))
token = VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(VERAG_VARIABLES.HashPassword(passw, salt, 101, My1stRandomNumber))
Return token
Catch Ex As Exception
'Dim Msg, Style, Title As String
@@ -250,7 +250,7 @@ Partial Class login_FLEX
'genToken(username, password, email)
Dim salt As String = VERAG_VARIABLES.GenerateSalt(My1stRandomNumber)
Dim passw As String = password
token = VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(VERAG_VARIABLES.HashPassword(passw, salt, 10101, My2ndRandomNumber))
token = VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(VERAG_VARIABLES.HashPassword(passw, salt, 101, My2ndRandomNumber))
'Else