diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx index 910a47c..a1f126d 100644 --- a/Customers/CustomsAviso.aspx +++ b/Customers/CustomsAviso.aspx @@ -16,7 +16,26 @@ } @media (max-width: 558.98px) { body { - max-width: 390px; + max-width: 558.98px; + } + + h1 { + color: #043381; + font-size: 22px; + } + + h2 { + color: #043381; + font-size: 28px; + } + + #tableSearch { + width: 53%; + border: 1px solid grey; + } + @media (max-width: 349.98px) { + body { + max-width: 349.98px; } h1 { diff --git a/Customers/Invoices.aspx b/Customers/Invoices.aspx index 14edc3a..3a8e59f 100644 --- a/Customers/Invoices.aspx +++ b/Customers/Invoices.aspx @@ -151,26 +151,34 @@
-
+
LKW Kennzeichen: - + - +
+
+ KundenNr-Auftrag: +
- - + Absender: + + - +
+
+ Empfänger +
- + Rechnungs-Nummer: +
@@ -211,7 +219,7 @@ Customer Order Number Sender Reciever - Information + Information
diff --git a/Customers/Invoices.aspx.vb b/Customers/Invoices.aspx.vb index f8e1572..f14a658 100644 --- a/Customers/Invoices.aspx.vb +++ b/Customers/Invoices.aspx.vb @@ -1,7 +1,10 @@ Imports System.Data Imports System.Data.SqlClient Imports System.Globalization +Imports System.IO Imports System.Web.Services +Imports iTextSharp.text +Imports iTextSharp.text.pdf Partial Class Customers_Default3 Inherits System.Web.UI.Page @@ -120,14 +123,15 @@ Partial Class Customers_Default3 End If If String.IsNullOrEmpty(t8.Text) Then t8.BackColor = white - t8.BackColor = schwarz + + t8.Width = Unit.Percentage(100) + t8.Height = Unit.Percentage(100) Else t8.BackColor = white t8.ForeColor = veragblue End If - t8.Width = Unit.Pixel(22) - t8.Height = Unit.Pixel(26) + th1.Font.Bold = True th2.Font.Bold = True th3.Font.Bold = True @@ -152,7 +156,7 @@ Partial Class Customers_Default3 th6.ForeColor = white th7.ForeColor = white th8.ForeColor = white - th8.Width = Unit.Pixel(22) + th8.Width = Unit.Percentage(100) End Sub Protected Sub btn_b_Click(sender As Object, e As EventArgs) @@ -448,16 +452,22 @@ Partial Class Customers_Default3 Dim btn As New ImageButton btn.ViewStateMode = ViewStateMode.Enabled btn.CssClass = "btn btn-primary" - btn.ImageUrl = "../images/Icons/main/833px-PDF_file_icon_small.gif" - btn.ImageAlign = ImageAlign.Middle + btn.ImageUrl = "../images/Icons/main/833px-PDF_file_icon_small_more.png" + btn.BackColor = Drawing.Color.FromArgb(0, Drawing.Color.GhostWhite) + btn.BorderStyle = BorderStyle.None + 'Hier PDF-File creation einfügen + btn.Style.Add("Display", "table-cell") + btn.Style.Add("Vertical-align", "middle") + btn.Style.Add("margin", "2px 2px 8px 4px") + btn.ControlStyle.Width = Unit.Percentage(100) + btn.Height = Unit.Percentage(100) 'btn.Attributes.Add("href", "pdfviewer.aspx?P1=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.FilialenNr).ToString() + "&P2=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.AbfertigungsNr).ToString + "&P3=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.RK_ID).ToString) btn.Attributes.Add("onclick", "window.open('../pdf/Bonizertifikat.pdf')") - btn.Width = Unit.Pixel(72) - btn.Height = Unit.Pixel(56) + 'btn.PostBackUrl = "pdfviewer.aspx?P1=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.FilialenNr).ToString + "&P2=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.AbfertigungsNr).ToString + "&P3=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.RK_ID).ToString tbl_Cell_Info.ValidateRequestMode = UI.ValidateRequestMode.Enabled - tbl_Cell_Info.Width = Unit.Pixel(22) - tbl_Cell_Info.Height = Unit.Pixel(26) + tbl_Cell_Info.Width = Unit.Percentage(80) + tbl_Cell_Info.Height = Unit.Percentage(100) tbl_Cell_Info.Controls.Add(btn) tr.Cells.Add(tbl_Cell_Info) initcells(tr, tbl_Cell_Index, tbl_Cell_ReNr, tbl_Cell_LKWs, tbl_Cell_Auftragsdat, tbl_Cell_KundAuftrNr, tbl_Cell_Absender, tbl_Cell_Empfaenger, tbl_Cell_Info, @@ -528,7 +538,6 @@ Partial Class Customers_Default3 End Sub Protected Sub valdaterange_2_ServerValidate(source As Object, args As ServerValidateEventArgs) - If Date.Parse(pickdate2.Text) > Date.ParseExact(Date.Now.ToShortDateString, "dd.MM.yyyy", provider) Then VERAG_VARIABLES.seterrorcount(10) lbl_status.ForeColor = Drawing.Color.Red diff --git a/Customers/Welcome.aspx b/Customers/Welcome.aspx index 3a8fad7..1f0b905 100644 --- a/Customers/Welcome.aspx +++ b/Customers/Welcome.aspx @@ -35,6 +35,20 @@ font-size: 22px; } + h2 { + color: #043381; + font-size: 28px; + } + @media (max-width: 349.98px) { + body { + max-width: 349.98px; + } + + h1 { + color: #043381; + font-size: 22px; + } + h2 { color: #043381; font-size: 28px; diff --git a/css/Customers/CustomerAVISO.css b/css/Customers/CustomerAVISO.css index f0f61c8..02df258 100644 --- a/css/Customers/CustomerAVISO.css +++ b/css/Customers/CustomerAVISO.css @@ -170,7 +170,7 @@ hr{ } @media (max-width: 558.98px) { body{ - max-width:390px; + max-width:558px; } h1 { color: #043381; @@ -205,22 +205,22 @@ hr{ padding-left: 60px; } .container-fluid { - width: 700px; + width: 558px; } #cont1 { - width: 700px; + width: 558px; } #containerseiterand { min-width: 700px; } .flex-fill { - width: 700px; + width: 558px; } #cont3 { - width: 700px; + width: 558px; } #cont4 { - min-width: 750px; + min-width: 550px; } tbody { font-size: 3.303964757709251vw; @@ -277,47 +277,64 @@ hr{ background-color: lightcoral; } } -@media (min-width: 558.98px) { +@media (min-width: 322.98px) { + body { + width: 322.98px; + } + #txt_Absender { - width: 850px; + width: 279.98px; } + #txt_Empfaenger { - width: 850px; + width: 279.98px; } + #txt_LKWNr { - width: 850px; + width: 279.98px; } + #txt_KdNrAuftrag { - width: 850px; + width: 279.98px; } + #normaltable { - width: 100%; + width: 322.98px; } + #txt_LKWNr:valid { color: black; } + #txt_LKWNr:invalid { border: 1px solid red; background-color: lightcoral; } + #txt_KdNrAuftrag:valid { color: black; } + #txt_KdNrAuftrag:invalid { border: 1px solid red; background-color: lightcoral; } + #txt_Absender:valid { color: black; } + #txt_Absender:invalid { border: 1px solid red; background-color: lightcoral; - } #txt_Empfaenger:valid { + } + + #txt_Empfaenger:valid { color: black; } + #txt_Empfaenger:invalid { border: 1px solid red; background-color: lightcoral; - } + } } diff --git a/css/Customers/Invoices.css b/css/Customers/Invoices.css index ebea666..c526698 100644 --- a/css/Customers/Invoices.css +++ b/css/Customers/Invoices.css @@ -161,5 +161,110 @@ ContentPlaceHolder1_Send_Data { border: 1px solid #000000; margin-left: 15px; } - -} \ No newline at end of file + @media (max-width: 349.98px) { + body { + width: 349.98px; + max-width: 349.98px; + } + + tbody { + font-size: 3.303964757709251vw; + height: auto; + flex-wrap: wrap; + width: 349.98px; + max-width: 350px; + } + + #normaltable { + width: 10%; + } + + #conovertab { + /* max-width:width:150px 11.25em;*/ + margin-left: /*14px*/ 3.0837004405286343vw; + max-width: /*390px;*/ 85.90308370044053vw; + overflow-x: auto; + } + + h1 { + color: #043381; + font-size: 22px; + } + + h2 { + color: #043381; + font-size: 30px; + } + + #containerseiterand { + margin-left: 5px; + margin-right: 5px; + width: 349.98px; + max-width: 349.98px; + } + + .flex-fill { + width: 349px; + } + + #cont3 { + width: 349.98px; + } + + #cont4 { + min-width: 349.98px; + } + + #pickdate1 { + border: 1px solid #000000; + } + + #pickdate1 { + border: 1px solid #000000; + } + + .flex-fill { + width: 349.98px; + } + + #cont3 { + width: 349.98px; + } + + #cont4 { + min-width: 349.98px; + } + + tbody { + font-size: 3.303964757709251vw; + height: auto; + flex-wrap: wrap; + width: fit-content; + } + + #normaltable { + width: 100%; + } + + #ContentPlaceHolder1_conovertab { + /* max-width:width:150px 11.25em;*/ + margin-left: /*14px*/ 3.0837004405286343vw; + max-width: /*390px;*/ 85.90308370044053vw; + overflow-x: auto; + } + + #ContentPlaceHolder1_Send_Data { + height: 15px; + width: 349.98px; + } + + #ContentPlaceHolder1_lbl_bis { + border: 1px solid #000000; + margin-left: 15px; + } + + #ContentPlaceHolder1_pickdate1 { + border: 1px solid #000000; + margin-left: 15px; + } + } \ No newline at end of file diff --git a/css/Customers/LKWs.css b/css/Customers/LKWs.css index adf99b5..8c37d17 100644 --- a/css/Customers/LKWs.css +++ b/css/Customers/LKWs.css @@ -43,3 +43,33 @@ width: 350px; } } +@media (max-width: 349.98px) { + #conovertab { + width: 348px; + overflow-x: auto; + } + + body { + width: 348px; + } + + h1 { + color: #043381; + font-size: 22px; + } + + h2 { + color: #043381; + font-size: 30px; + } + + #tableSearch { + max-width: 348px; + } + + #containerseiterand { + margin-left: 5px; + margin-right: 5px; + width: 348px; + } +} diff --git a/css/Customers/Welcome.css b/css/Customers/Welcome.css index 37153ed..87d11a3 100644 --- a/css/Customers/Welcome.css +++ b/css/Customers/Welcome.css @@ -42,9 +42,6 @@ h1 { width: 1200px; height: 333px; } -body{ - width: -} @media (max-width: 558.98px) { #conovertab { width: 350px; @@ -83,10 +80,10 @@ body{ height: 72px; } - .carousel-item active { - width: 360px; - height: 72px; - } + .carousel-item active { + width: 360px; + height: 72px; + } #imgcar.d-block w-100 { width: 360px; @@ -104,4 +101,44 @@ body{ .modal-content{ width:400px; } +} +@media (max-width: 323px) { + #conovertab{ + width: 320px; + overflow-x: auto; + } + + body { + width: 320px; + } + + h1 { + color: #043381; + font-size: 21px; + } + + #tableSearch { + max-width: 315px; + } + + #containerseiterand { + margin-left: 5px; + margin-right: 5px; + width: 315px; + } + + #imgcar { + width: 310px; + height: auto; + } + + .carousel-inner { + width: 320px; + height: 72px; + } + + .carousel-item { + width: 320px; + height: 72px; + } } \ No newline at end of file diff --git a/images/Icons/main/833px-PDF_file_icon_small_more.png b/images/Icons/main/833px-PDF_file_icon_small_more.png new file mode 100644 index 0000000..cade5a5 Binary files /dev/null and b/images/Icons/main/833px-PDF_file_icon_small_more.png differ diff --git a/login/Change_PW.aspx b/login/Change_PW.aspx index 9dc4c91..ee3ac2a 100644 --- a/login/Change_PW.aspx +++ b/login/Change_PW.aspx @@ -92,14 +92,14 @@ display: flex; justify-content: center; align-items: center; - width: 400px; + width: 390px; height: 613px; margin: 0 auto; margin-left:10%; } .container-fluid { - width: 400px; + width: 390px; background-color: rgba(255,255,255,0.5); height: 613px; top:50%; @@ -133,6 +133,74 @@ margin-left:15px; } } + @media (max-width: 323px) { + body { + font-family: 'Poppins', sans-serif; + background: #fafafa; + background-image: url(../../images/road.jpg); + background-position: center center; + background-repeat: no-repeat; + background-attachment: fixed; + background-size: cover; + background-color: #fff; + overflow-y: clip; + overflow-x: clip; + max-width:323px; + } + h1 { + color: #043381; + font-size: 24px; + } + h2 { + color: #043381; + font-size: 30px; + } + #content_container { + display: flex; + justify-content: center; + align-items: center; + width: 323px; + height: 613px; + margin: 0 auto; + margin-left:10%; + } + + .container-fluid { + width: 325px; + background-color: rgba(255,255,255,0.5); + height: 613px; + top:50%; + bottom: -4px; + left: -195px; + right: 520px; + margin: 0 auto; + } + + #tbl_main_M { + font-family: Arial; + font-size: 11px; + border: 1px solid gray; + width: 323px; + height: 613px; + margin-top:80px; + } + #btn_submitpw_M{ + background-color: #003680; + color: #fff; + width: 315px; + height: 32px; + margin-bottom: 0px; + margin-left:-15px; + padding-inline: 2px 2px; + padding: -10px 0px 10px 1px; + font-weight:600; + font-size:14px; + } + #lbl_Ueberschrift_M{ + font-size:26px; + margin-left:15px; + } + } diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb index cb6ea0e..53ee040 100644 --- a/login/login_FLEX.aspx.vb +++ b/login/login_FLEX.aspx.vb @@ -8,14 +8,8 @@ Partial Class login_FLEX Dim UserNaMe As String = String.Empty Dim passw As String = String.Empty - Protected Sub Page_Load(sender As Object, e As EventArgs) - If Me.Page.User.Identity.IsAuthenticated Then - Response.Redirect("../Customers/Welcome.aspx", False) - End If - If Not Me.Page.User.Identity.IsAuthenticated Then - FormsAuthentication.RedirectToLoginPage() - Response.End() - End If + Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load + End Sub Protected Sub ValidateUser(sender As Object, e As EventArgs) diff --git a/login/login_TEST.aspx b/login/login_TEST.aspx index af5c4aa..d4bfb8a 100644 --- a/login/login_TEST.aspx +++ b/login/login_TEST.aspx @@ -84,7 +84,7 @@ - * + * @@ -93,7 +93,7 @@ - * + *