diff --git a/css/login/ForgotPW.css b/css/login/ForgotPW.css index f2d53f1..ef714f0 100644 --- a/css/login/ForgotPW.css +++ b/css/login/ForgotPW.css @@ -127,5 +127,4 @@ height: 28px; border: 1px gray solid; border-radius: 5px 5px 0px 0px; -} - +} \ No newline at end of file diff --git a/css/login/loginFLEX.css b/css/login/loginFLEX.css index e0e8870..286f5ff 100644 --- a/css/login/loginFLEX.css +++ b/css/login/loginFLEX.css @@ -1,69 +1,88 @@ -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; -} -#Login1_LoginButton { - color: #fff; - background-color: #003680; + +@media (min-width: 558.98px) { + 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; } -#content_container { - display: flex; - justify-content: center; - align-items: center; - width: 1024px; - height: 800px; - margin: 0 auto; - margin-top: 0px; -} -.container-fluid { - width: 400px; - height: 274px; - background-color: rgba(255,255,255,0.5); - margin: 0 auto; - margin-top: 50%; -} -#tbl_main { - font-family: Arial; - font-size: 11px; - border: 1px solid gray; - width: 400px; - height: 250px; -} -#lbl_Ueberschrift { - background-color: #003680; - font-size: 2.55em; - color: #fff; -} -.txt_design { - color: #003680; - font-size: 1.65em; -} -.txt_design2 { - color: #003680; - font-size: 1.695em; - margin-right:1px; -} -#LoginButton { - background-color: #003680; - color: #fff; - width: 140px; - height: 25px; -} -#Password{ - margin-right:-20px; -} -#UserName{ - font-size:17px; -} -#CustomerID { - color: #003680; - font-size: 1.125em; -} + #Login1_LoginButton { + color: #fff; + background-color: #003680; + padding: 0px 0px 0px 0px; + margin: 0px 0px 0px 0px; + } + + #content_container { + display: flex; + justify-content: center; + align-items: center; + width: 1024px; + height: 800px; + margin: 0 auto; + margin-top: 0px; + } + + .container-fluid { + width: 400px; + height: 274px; + background-color: rgba(255,255,255,0.5); + margin: 0 auto; + margin-top: 50%; + } + + #tbl_main { + font-family: Arial; + font-size: 11px; + border: 1px solid gray; + width: 400px; + height: 250px; + } + + #lbl_Ueberschrift { + background-color: #003680; + font-size: 2.55em; + color: #fff; + } + #lbl_login { + background-color: #003680; + font-size: 2.55em; + color: #fff; + } + .txt_design { + color: #003680; + font-size: 1.65em; + } + + .txt_design2 { + color: #003680; + font-size: 1.695em; + margin-right: 1px; + } + + #LoginButton { + background-color: #003680; + color: #fff; + width: 140px; + height: 25px; + } + + #Password { + margin-right: -20px; + } + + #UserName { + font-size: 17px; + } + + #CustomerID { + color: #003680; + font-size: 1.125em; + } +} \ No newline at end of file diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx index 9f49bcc..d1ae401 100644 --- a/login/ForgotPW.aspx +++ b/login/ForgotPW.aspx @@ -6,6 +6,21 @@ <%@ import Namespace="MySql.Data.MySqlClient"%> <%'Dim url As String = Session.Keys.Item("urltochangepw")%> + + + + + + + + + + + + + + + VERAG Spedition AG Passwort vergessen @@ -39,6 +54,158 @@ .txt_design2 { color: #003680; font-size: 1.725em; +} + @media (max-width: 558.98px) { + 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; + } + + #content_container { + display: flex; + justify-content: center; + align-items: center; + width: 400px; + height: 613px; + margin: 0 auto; + margin-top: 0px; + } + + .container-fluid { + width: 400px; + height: 713px; + background-color: rgba(255,255,255,0.5); + margin: 0 auto; + margin-top: 150%; + } + + #tbl_main_M { + font-family: Arial; + font-size: 11px; + border: 1px solid gray; + width: 300px; + height: 713px; + } + + #lbl_Ueberschrift_M { + background-color: #003680; + font-size: 1.85em; + color: #fff; + } + + #lbl_login_M { + background-color: #003680; + font-size: 2em; + color: #fff; + } + + .txt_design { + color: #003680; + font-size: 1.85em; + } + + .txt_design2 { + color: #003680; + font-size: 1.895em; + margin-right: 1px; + } + + #btn_Send_M { + background-color: #003680; + color: #fff; + width: 325px; + height: 32px; + margin-bottom: 0px; + margin-left:-4px; + padding-inline: 2px 2px; + padding: -10px 0px 10px 1px; + font-weight:600; + } + #btn_Back_M { + background-color: #003680; + color: #fff; + width: 325px; + height: 32px; + margin-bottom: -70px; + margin-left:16px; + padding-inline: 2px 2px; + padding: -10px 0px 12px 1px; + border:none; + font-size:18px; + font-weight: 600; + } + + #UserName_M { + font-size: 17px; + width: 325px; + } + + #CustomerID_M { + color: #003680; + font-size: 1.125em; + } + + .bg-email-icon { + background: url("../../images/Icons/service/mail-icon.gif") no-repeat 1.75% 11px white; + padding-left: 28px; + padding-right: 50px; + width: 227px; + height: 32px; + border: 1px gray solid; + border-radius: 5px 5px 0px 0px; + } + + .bg-user-icon { + background: url("../../images/Icons/service/username-icon-png-5.png") no-repeat 1.75% 11px white; + padding-left: 28px; + padding-right: 50px; + width: 227px; + height: 32px; + border: 1px gray solid; + border-radius: 5px 5px 0px 0px; + } + + .bg-key-icon { + background: url("../../images/Icons/service/key-icon-png-22_small.png") no-repeat 1.75% 10px white; + padding-left: 28px; + padding-right: 50px; + width: 227px; + height: 32px; + border: 1px gray solid; + border-radius: 5px 5px 0px 0px; + margin-left: -4px; + } + + .bg-UID-icon { + background: url("../../images/Icons/main/icon0-vector-493-01.png") no-repeat 1.75% 11px white; + padding-left: 28px; + padding-right: 50px; + margin-left: -4px; + width: 207px; + height: 32px; + border: 1px gray solid; + border-radius: 5px 5px 0px 0px; + } + + #RememberMe_M { + font-size: 20px; + } + #txtEmail_M{ + margin-top:40px; + } + #txt_Username{ + margin-top:40px; + } + #lblMessage_M{ + font-size:19px; + } } @@ -78,15 +245,17 @@
+ +
- +
- +
- +
-

Fill in your data here:

+

Fill in your data here:

- + - +
- - + +
- +
+
+ +
+ + + + + + + + + + + + + + + +
+ +
+ +
+ + + + +
+ + +
+ +
+ +
+
+
diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb index 553d859..6ba46e0 100644 --- a/login/ForgotPW.aspx.vb +++ b/login/ForgotPW.aspx.vb @@ -17,23 +17,43 @@ Partial Class login_ForgotPW Dim password As String = String.Empty Dim email As String = String.Empty Dim tokenname As String = String.Empty - valreqtxtEmail.Validate() - check_UserName_regex.Validate() - If valreqtxtEmail.IsValid = True AndAlso check_UserName_regex.IsValid = True Then - email = txtEmail.Text - username = txt_Username.Text - ElseIf valreqtxtEmail.IsValid = False Then - valreqtxtEmail.ErrorMessage = "Annotation: The given Domain is not the company domain." - regexval_txt_Email.Validate() - valreqtxtEmail.IsValid = True - If check_UserName_regex.IsValid = False Then - check_UserName_regex.ErrorMessage = "Annotation: The Username does not match the requirements." - Else - check_UserName_regex.IsValid = True + If txtEmail_M.Text = String.Empty And txt_Username_M.Text = String.Empty Then + valreqtxtEmail_M.Enabled = False + valreqtxtEmail.Validate() + check_UserName_regex.Validate() + If valreqtxtEmail.IsValid = True AndAlso check_UserName_regex.IsValid = True Then + email = txtEmail.Text + username = txt_Username.Text + ElseIf valreqtxtEmail.IsValid = False Then + valreqtxtEmail.ErrorMessage = "Annotation: The given Domain is not the company domain." + regexval_txt_Email.Validate() + valreqtxtEmail.IsValid = True + If check_UserName_regex.IsValid = False Then + check_UserName_regex.ErrorMessage = "Annotation: The Username does not match the requirements." + Else + check_UserName_regex.IsValid = True + End If + End If + Else + valreqtxtEmail_M.Enabled = True + valreqtxtEmail.Enabled = False + valreqtxtEmail_M.Validate() + check_UserName_regex_M.Validate() + If valreqtxtEmail_M.IsValid = True AndAlso check_UserName_regex_M.IsValid = True Then + email = txtEmail_M.Text + username = txt_Username_M.Text + ElseIf valreqtxtEmail_M.IsValid = False Then + valreqtxtEmail_M.ErrorMessage = "Annotation: The given Domain is not the company domain." + regexval_txt_Email_M.Validate() + valreqtxtEmail_M.IsValid = True + If check_UserName_regex_M.IsValid = False Then + check_UserName_regex_M.ErrorMessage = "Annotation: The Username does not match the requirements." + Else + check_UserName_regex_M.IsValid = True + End If End If End If - - If String.IsNullOrEmpty(email) = False AndAlso String.IsNullOrEmpty(tokenname) = True AndAlso String.IsNullOrEmpty(password) = True AndAlso String.IsNullOrEmpty(username) = False Then + If String.IsNullOrEmpty(email) = False AndAlso String.IsNullOrEmpty(tokenname) = True AndAlso String.IsNullOrEmpty(password) = True AndAlso String.IsNullOrEmpty(username) = False Then Dim ConnectionString = String.Empty If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then 'ConnectionString = "Server=DEVELOPER\DEVSQL;Database=VERAG_HOMEPAGE;Uid=sa;Pwd=BmWr501956" diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx index c5e5e33..c75629d 100644 --- a/login/login_FLEX.aspx +++ b/login/login_FLEX.aspx @@ -5,6 +5,19 @@ <%@ import Namespace="MySql.Data.MySqlClient"%> + + + + + + + + + + + + + VERAG Spedition AG Login @@ -80,6 +93,132 @@ height: 28px; border: 1px gray solid; border-radius: 5px 5px 0px 0px; +} +@media (max-width: 558.98px) { + 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; + } + + #content_container { + display: flex; + justify-content: center; + align-items: center; + width: 400px; + height: 613px; + margin: 0 auto; + margin-top: 0px; + } + + .container-fluid { + width: 400px; + height: 713px; + background-color: rgba(255,255,255,0.5); + margin: 0 auto; + margin-top: 150%; + } + #tbl_main_M { + font-family: Arial; + font-size: 11px; + border: 1px solid gray; + width: 300px; + height: 713px; + } + #lbl_Ueberschrift_M { + background-color: #003680; + font-size: 1.85em; + color: #fff; + } + #lbl_login_M { + background-color: #003680; + font-size: 2em; + color: #fff; + } + .txt_design { + color: #003680; + font-size: 1.85em; + } + + .txt_design2 { + color: #003680; + font-size: 1.895em; + margin-right: 1px; + } + + #Login1_LoginButton_M { + background-color: #003680; + color: #fff; + width: 140px; + height: 26px; + margin-bottom:-30px; + padding-inline: 2px 2px; + padding: 12px 1px 0px 1px; + } + + #Password_M { + margin-right: -20px; + } + + #UserName_M { + font-size: 17px; + } + + #CustomerID_M { + color: #003680; + font-size: 1.125em; + } + .bg-email-icon { + background: url("../../images/Icons/service/mail-icon.gif") no-repeat 1.75% 11px white; + padding-left: 28px; + padding-right: 50px; + width: 227px; + height: 38px; + border: 1px gray solid; + border-radius: 5px 5px 0px 0px; + } + + .bg-user-icon { + background: url("../../images/Icons/service/username-icon-png-5.png") no-repeat 1.75% 11px white; + padding-left: 28px; + padding-right: 50px; + width: 227px; + height: 38px; + border: 1px gray solid; + border-radius: 5px 5px 0px 0px; + } + + .bg-key-icon { + background: url("../../images/Icons/service/key-icon-png-22_small.png") no-repeat 1.75% 10px white; + padding-left: 28px; + padding-right: 50px; + width: 227px; + height: 38px; + border: 1px gray solid; + border-radius: 5px 5px 0px 0px; + margin-left: -4px; + } + + .bg-UID-icon { + background: url("../../images/Icons/main/icon0-vector-493-01.png") no-repeat 1.75% 11px white; + padding-left: 28px; + padding-right: 50px; + margin-left: -4px; + width: 207px; + height: 38px; + border: 1px gray solid; + border-radius: 5px 5px 0px 0px; + } + + #Login1_btn_ForgotPW_M{ + font-size:17px; + } } @@ -117,8 +256,10 @@
-
- +
+ +
+
@@ -165,7 +306,59 @@ -
@@ -126,28 +267,28 @@
- +
- +
- +
- +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + +
+ + + +
+ + + +
+ +
+ + + + I forgot my password! +
+ +
+
diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb index b54472f..39465ed 100644 --- a/login/login_FLEX.aspx.vb +++ b/login/login_FLEX.aspx.vb @@ -66,11 +66,6 @@ Partial Class login_login_TEST Protected Sub CustomerID_TextChanged(sender As Object, e As EventArgs) ' valid_getNumberInput.Validate() - Dim var As TextBox = sender - If var.Text.Contains("@verag.ag") = True Then - var.CssClass = "bg-email-icon" - Else - var.CssClass = "bg-UID-icon" - End If + End Sub End Class