From 7b3839706ff81dd7627732a3f8d92c90fec5427f Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Mon, 22 Nov 2021 13:17:08 +0100
Subject: [PATCH] =?UTF-8?q?=C3=84nderung=20Inhaltseiten=20im=20kundenberei?=
 =?UTF-8?q?ch=20sind=20nun=20oben=20an=20der=20Seite.=20Dort=20ist=20nun?=
 =?UTF-8?q?=20der=20100=20m=20Abstand=20nicht=20mehr!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/Customers.master |  2 +-
 Customers/Invoices.aspx    |  1 +
 login/ForgotPW.aspx.vb     | 10 ++++------
 login/login_FLEX.aspx.vb   |  2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Customers/Customers.master b/Customers/Customers.master
index 67e4d4f..c520554 100644
--- a/Customers/Customers.master
+++ b/Customers/Customers.master
@@ -585,7 +585,7 @@
                                 </div>                            
                    </nav></div>   
           <!-- Container zur Ausrichtung des Contents-->          
-        <div style="margin-left:5px;margin-right:5px">
+        <div style="margin-left:5px;margin-right:5px;margin-top:-110px">
          <div style="height:95px;"></div> 
             <form id="leftLinks" runat="server" style="float:initial">                
         <asp:ContentPlaceHolder id="ContentPlaceHolder1" runat="server">
diff --git a/Customers/Invoices.aspx b/Customers/Invoices.aspx
index a94626f..802f040 100644
--- a/Customers/Invoices.aspx
+++ b/Customers/Invoices.aspx
@@ -24,6 +24,7 @@
             .g-3 {
                 margin-left: -4px;
             }
+            
         }
         @media (max-width: 558.98px) {
             body {
diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb
index b5326e1..d18aba6 100644
--- a/login/ForgotPW.aspx.vb
+++ b/login/ForgotPW.aspx.vb
@@ -697,12 +697,11 @@ Partial Class ForgotPW
                     token = VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(Convert.ToBase64String(time.Concat(Key).ToArray()))
                     Return token
                 Catch Ex As Exception
-                    Dim Msg, Style, Title As String
-                    Msg = "Token Generation failed" & vbCrLf & "A new E-mail has been sent to the intern e-mail given."
-                    Style = vbRetry + vbExclamation + vbDefaultButton1
-                    Title = "Error05: Token-Generierung"
+                    'Dim Msg, Style, Title As String
+                    'Msg = "Token Generation failed" & vbCrLf & "A new E-mail has been sent to the intern e-mail given."
+                    'Style = vbRetry + vbExclamation + vbDefaultButton1
+                    'Title = "Error05: Token-Generierung"
                     'MsgBox(Msg, Style, Title)
-
                     'If MsgBox(Msg, Style, Title).Retry Then
                     'genToken(username, password, email)
                     token = VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(Convert.ToBase64String(time.Concat(Key).ToArray()))
@@ -766,7 +765,6 @@ Partial Class ForgotPW
                 htmlbody = "<p> Der User " + txt_Username_M.Text + "hat eine ungültige oder geänderte Session-ID </p> <table><th><td>User</td></th><th><td>neue ID</td></th><tr><td>" + txt_Username_M.Text + "</td><td>" + Session.SessionID + "</td></tr></table>"
             End If
             VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(mailto, Betreff, htmlbody)
-
             Return False
             Else
                 Return True
diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb
index 9840711..7c18e6e 100644
--- a/login/login_FLEX.aspx.vb
+++ b/login/login_FLEX.aspx.vb
@@ -216,4 +216,4 @@ Partial Class login_FLEX
         Session.Add("PW", passw)
 
     End Sub
-End Class
+End Class
\ No newline at end of file