From b86004fde44d4eb7027bc250a01a55632c3df0d3 Mon Sep 17 00:00:00 2001 From: ja Date: Mon, 4 Oct 2021 16:59:28 +0200 Subject: [PATCH] =?UTF-8?q?=C3=84nderungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Customers/Customers.master | 9 ++-- Customers/CustomsAviso.aspx | 79 ++++++++++++++++++--------------- Customers/CustomsAviso.aspx.vb | 2 +- Web.config | 2 +- css/Customers/CustomerAVISO.css | 58 ++++++++++++++++-------- login/login_FLEX.aspx | 8 ++-- login/login_FLEX.aspx.vb | 8 +--- 7 files changed, 94 insertions(+), 72 deletions(-) diff --git a/Customers/Customers.master b/Customers/Customers.master index ac12598..6429895 100644 --- a/Customers/Customers.master +++ b/Customers/Customers.master @@ -3,10 +3,8 @@ - - - - + + - + diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx index 86a1951..b8c6da3 100644 --- a/Customers/CustomsAviso.aspx +++ b/Customers/CustomsAviso.aspx @@ -13,7 +13,7 @@ font-size: 0; visibility: hidden; color: #043381; - } + } @@ -30,7 +30,7 @@ - +
@@ -40,6 +40,7 @@

Hier finden Sie Informationen zu den aktuellen Aufträgen.

+ <%Try VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.SHOW 'Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(799124) @@ -58,7 +59,8 @@ Dim AVISO_dt As System.Data.DataTable = VERAG_PROG_ALLGEMEIN.cAviso.getAVISO_List(STANDORT) If AVISO_dt IsNot Nothing Then - If True Then 'AVISO.Status <> 1 And AVISO.Status <> 2 Then 'SENDUNGSTABELLE'%> + If True Then 'AVISO.Status <> 1 And AVISO.Status <> 2 Then 'SENDUNGSTABELLE'%> +
@@ -72,51 +74,52 @@
-
- +
- - - - - - + + + + + +
-
+
- - - - - - + + + + + +
-
-
+
+
- -
+ +
+
+

- +

@@ -129,7 +132,7 @@
-
+ @@ -168,11 +171,11 @@
-
-
+
- +
+
@@ -188,7 +191,9 @@
-
+ + +


<% End If @@ -210,39 +215,41 @@ $(e.target).data('bs.collapse').$trigger.attr('src', 'https://s22.postimg.org/9takvqkal/Mathematic_Plus2.png'); }); + + - + \ No newline at end of file diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb index 79b69b6..e91f1be 100644 --- a/Customers/CustomsAviso.aspx.vb +++ b/Customers/CustomsAviso.aspx.vb @@ -16,7 +16,7 @@ Partial Class Kundenbereich_Default Protected Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load Page.UnobtrusiveValidationMode = UnobtrusiveValidationMode.WebForms DataBind() - tbl_Header_row.TableSection = TableRowSection.TableHeader + tbl_Header_row.TableSection = TableRowSection.TableHeader ' MsgBox(datebis) If (Page.IsPostBack And normaltable.EnableViewState = False) Then normaltable.EnableViewState = True diff --git a/Web.config b/Web.config index df11fcb..518b836 100644 --- a/Web.config +++ b/Web.config @@ -25,7 +25,7 @@ --> - + diff --git a/css/Customers/CustomerAVISO.css b/css/Customers/CustomerAVISO.css index 5263775..bbd0da8 100644 --- a/css/Customers/CustomerAVISO.css +++ b/css/Customers/CustomerAVISO.css @@ -76,26 +76,25 @@ hr{ font-size:/*17px*/1.063em; margin-left:4px; } -@media (prefers-reduced-motion:reduce) { - .accordion-button { - transition: none; - } -} .accordion-button:not(.collapsed) { color: #043381; background-color: #fff; box-shadow: inset 0 -1px 0 rgba(4, 51, 129,.125); - border:none; -} -.accordion-button:not(.collapsed)::after { - background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%230c63e4'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e"); border: none; - transform: rotate(-180deg) + height: 14px; } + + .accordion-button:not(.collapsed)::after { + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%230c63e4'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e"); + border: none; + transform: rotate(-180deg); + height: 14px; + } + .accordion-button::after { flex-shrink: 0; width: 1.25rem; - height: 1.25rem; + height: 14px; margin-left: auto; content: ""; background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23212529'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e"); @@ -103,20 +102,33 @@ hr{ background-size: 1.25rem; transition: transform .2s ease-in-out } + @media (prefers-reduced-motion:reduce) { - .accordion-button::after { - transition: none + .accordion-button { + transition: none; + height: 14px; } } -.accordion-button:hover { - z-index: 2 + +@media (prefers-reduced-motion:reduce) { + .accordion-button::after { + transition: none; + height: 14px; + } } + +.accordion-button:hover { + z-index: 2; + height: 14px; +} + .accordion-button:focus { z-index: 3; border-color: #043381; outline: 0; - box-shadow: 0 0 0 .25rem rgba(4, 51, 129,.25) -} + box-shadow: 0 0 0 .25rem rgba(4, 51, 129,.25); + height: 14px; +} #btn_resetForm { padding-right:-800px; } @@ -201,7 +213,17 @@ hr{ margin-left: /*14px*/ 3.0837004405286343vw; max-width: /*390px;*/ 85.90308370044053vw; overflow-x: auto; - } + } + #btn_Auftraege{ + height:15px; + width:120%; + } + #pickdate1{ + border: 1px solid #000000; + } + #pickdate1 { + border: 1px solid #000000; + } } @media (min-width: 558.98px) { #txt_Absender { diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx index 8b2bdae..02ca824 100644 --- a/login/login_FLEX.aspx +++ b/login/login_FLEX.aspx @@ -86,7 +86,7 @@
- + @@ -131,7 +131,7 @@
-
+
Admin-Login @@ -166,8 +166,8 @@ alert("send:" + zipphone2_1) alert("send:" + zipphone2_2) alert("send:" + zipphone2_3) - //parent.location.replace('../Customers/Welcome.aspx'); - top.location = '../newpageJulius_Sidebar.aspx'; + parent.location.replace('../Customers/Welcome.aspx'); + // top.location = '../newpageJulius_Sidebar.aspx'; } } diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb index 39192e2..2352153 100644 --- a/login/login_FLEX.aspx.vb +++ b/login/login_FLEX.aspx.vb @@ -38,16 +38,14 @@ Partial Class login_login_TEST Login1.FailureText = "Account has not been activated." Exit Select Case Else - + FormsAuthentication.RedirectFromLoginPage(User.Identity.Name, True) Session.Add("test", Login1.UserName) CustomerIDTextBox = Login1.FindControl("CustomerID") Session.Add("CustomerID", CustomerIDTextBox.Text) - Session.Add("PW", Login1.Password) - FormsAuthentication.RedirectFromLoginPage(Login1.UserName, Login1.RememberMeSet) 'FormsAuthentication.SetAuthCookie(Login1.UserName, True) - 'Response.Redirect("mypage.aspx") + 'Response.Redirect("../Customers/CustomsAviso.aspx") Exit Select End Select End If @@ -57,8 +55,6 @@ Partial Class login_login_TEST End Using End Sub - - Protected Sub LoginButton_Click(sender As Object, e As EventArgs) End Sub