From 874cf851965f91a1de0715bfa47718e414ebf3cd Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Wed, 9 Feb 2022 10:24:13 +0100
Subject: [PATCH] =?UTF-8?q?Anpassung=20des=20Logoutscreens=20an=20Mobilver?=
 =?UTF-8?q?sion=20f=C3=BCr=20Smartphones?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/Customers.master                     |  2 +-
 .../SDL/Formtemplate IDS Tankkarte.aspx.vb     |  2 +-
 login/Logout.aspx                              | 18 ++++++++++++++----
 login/Logout.aspx.vb                           |  3 +++
 login/login_FLEX.aspx.vb                       |  1 -
 5 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/Customers/Customers.master b/Customers/Customers.master
index bef796f..2337ac5 100644
--- a/Customers/Customers.master
+++ b/Customers/Customers.master
@@ -610,7 +610,7 @@
                                                        </div>                            
              
                                            <div class="dropdown" id="dropdownbtnmain"  style="background-color:#fff; color:#043381;position:absolute;top:14%;right:70px;z-index:1032;width:155px">
-                                                  <button class="dropbtn btn btn-primary" id="dropbtnbtnbtn" style="color:#043381;background-color:#fff;position:absolute;top:6%;right:85px;z-index:1032">
+                                                  <button class="dropbtn btn btn-primary" id="dropbtnbtnbtn" style="visibility:hidden;color:#043381;background-color:#fff;position:absolute;top:6%;right:85px;z-index:1032">
                                                   <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff;color:#043381; width:30px;height:30px;white-space:nowrap;margin-top:2px;border:none"><img src="../images/samples/default-avatar.jpg"; style="width:15px;" /><a data-bs-toggle="modal" data-bs-target="#exampleModal"><asp:LoginName class="pointer" ID="LoginName2" runat="server" style="margin-left:6px"/></a></button>
                                               </button>                                                
                                               <ul class="dropdown-content" id="dropdownmenuecont" style="width:210px;top:30px;z-index:1032;margin-right:-2px;position:absolute;padding-top:15px">                           
diff --git a/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb b/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb
index 3a619d7..996e012 100644
--- a/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb	
+++ b/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb	
@@ -98,7 +98,7 @@ Partial Class Customers_Default3
                 If IsNothing(l2.Lieferdatum) = False Then
                     strtempLieferdatum = l2.Lieferdatum.ToString.Substring(0, 10)
                 End If
-                If l2.KartenNr = CardNo Then
+                If l2.KartenNr.ToString = CardNo Then
                     strtempKartenNr = l2.KartenNr.ToString
                 End If
                 If IsNothing(l2.PIN) = False Then
diff --git a/login/Logout.aspx b/login/Logout.aspx
index 0060c39..bd9e2d2 100644
--- a/login/Logout.aspx
+++ b/login/Logout.aspx
@@ -19,10 +19,20 @@
 </head>
 <body>
          <form id="form1" runat="server">
-        <div>         
-                <h1>Du wurdest erfolgreich ausgeloggt.</h1>
-                <button type="button" id="btn_backtostart" runat="server" class="btn btn-primary">Zurück zur Startseite!</button>           
-        </div>
+             <!-- Große Bildschirme-->
+             <div class="d-none d-md-block">
+                 <div class="d-grid gap-4 d-md-block mx-auto"> 
+                    <h1>Du wurdest erfolgreich ausgeloggt.</h1>
+                    <button type="button" id="btn_backtostart" runat="server" class="btn btn-primary" style="width:13%">Zurück zur Startseite!</button>           
+                </div>
+             </div>
+             <!--Smartphone-Bildschirme-->
+             <div class="d-md-none">
+                 <div class="d-grid gap-2 col-6 mx-auto">
+                     <h1>Du wurdest erfolgreich ausgeloggt.</h1>
+                     <button type="button" id="btn_backtostart_m" runat="server" class="btn btn-primary btn-lg">Zurück zur Startseite!</button>
+                </div>
+                 </div>
     </form>
 
     <script type="text/javascript" src="../js/toptions/top_up-min.js"></script>   
diff --git a/login/Logout.aspx.vb b/login/Logout.aspx.vb
index 26bd301..deb2c54 100644
--- a/login/Logout.aspx.vb
+++ b/login/Logout.aspx.vb
@@ -28,4 +28,7 @@ Partial Class login_Logout
     Protected Sub btn_backtostart_Click(sender As Object, e As EventArgs) Handles btn_backtostart.ServerClick
         Response.Redirect("../login/login_FLEX.aspx")
     End Sub
+    Protected Sub btn_backtostart_m_Click(sender As Object, e As EventArgs) Handles btn_backtostart_m.ServerClick
+        Response.Redirect("../login/login_FLEX.aspx")
+    End Sub
 End Class
diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb
index 2560bf7..e86ceaf 100644
--- a/login/login_FLEX.aspx.vb
+++ b/login/login_FLEX.aspx.vb
@@ -273,7 +273,6 @@ Partial Class login_FLEX
         Dim reqfieldvaluserName_M As RequiredFieldValidator = Login2.FindControl("UserName_M_required")
         Dim reqfieldvalpassw As RequiredFieldValidator = Login1.FindControl("Passwordrequired")
         Dim reqfieldvalpassw_M As RequiredFieldValidator = Login2.FindControl("Passwordrequired_M")
-
         Dim regexuserID As RegularExpressionValidator = Login1.FindControl("valid_getNumberInput")
         Dim regexuserID_M As RegularExpressionValidator = Login2.FindControl("valid_getNumber_M_Input")
         Dim regexusername As RegularExpressionValidator = Login1.FindControl("check_UserName_regex")
