From d4e1a1685718db12fe1092d38f845fabe8680d65 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Tue, 15 Feb 2022 10:38:24 +0100
Subject: [PATCH] GUI/Code-design

---
 Customers/LKWs.aspx      | 11 ++++-------
 login/login_FLEX.aspx.vb |  1 -
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Customers/LKWs.aspx b/Customers/LKWs.aspx
index e249475..e9277fe 100644
--- a/Customers/LKWs.aspx
+++ b/Customers/LKWs.aspx
@@ -1,7 +1,6 @@
 <%@ Page Title="" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="LKWs.aspx.vb" Inherits="LKWS" %>
 
-<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server" >
-      
+<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server" >      
     <!-- Required meta tags -->
     <meta charset="utf-8"/>
       
@@ -10,7 +9,7 @@
       
     <link rel="shortcut icon" href="../images/Icons/favicon/favicon.ico" />
     <!--    <link rel="stylesheet" type="text/css" href="css/edit_main.css"> -->
-    <script src="js/netzwerk.js" type="text/javascript"></script>        
+    <script src="js/netzwerk.js" type="text/javascript"></script>      
  
  <!-- Bootstrap CSS -->
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>
@@ -105,7 +104,7 @@
                         <div class="col-9">
                             <div class="col-12"> 
                                 <asp:Image runat="server" ClientIDMode="AutoID" ID="Img_Text1" ImageUrl="~/images/Icons/Aviso.png" style="width:96px;height:96px" />
-                                <asp:Label ID="lbl_sped_Placeholder" ClientIDMode="Static" runat="server" Font-Size="20px" Font-Bold="true">Bitte Spedition wählen</asp:Label>
+                                <asp:Label ID="lbl_sped_Placeholder" ClientIDMode="Static" runat="server" Font-Size="20px" Font-Bold="true">Bitte Spedition wählen:</asp:Label>
                             </div> 
                             <div class="col-12">
                                 <asp:Label ID="lbl_natLKW" runat="server" ClientIDMode="Static" Font-Size="1.12em" style="color:#043381">Nationalität:</asp:Label><asp:Label runat="server" ID="lbl_Placeholder" style="font-size:1.12em">Placeholder</asp:Label>                               
@@ -489,9 +488,7 @@
             });
         }
     </script>
-    <script type="text/javascript">    
-       
-       
+    <script type="text/javascript">      
         function doPostBack(id) {            
             let Speditionslabel = document.getElementById('<%=lbl_sped_Placeholder.ClientID%>');
             let natplaceholder = document.getElementById('<%=lbl_Placeholder.ClientID%>');
diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb
index 2602ff0..84a6b42 100644
--- a/login/login_FLEX.aspx.vb
+++ b/login/login_FLEX.aspx.vb
@@ -379,7 +379,6 @@ Partial Class login_FLEX
                             End If
                             If String.IsNullOrEmpty(tb2.Text) = True AndAlso String.IsNullOrEmpty(tb2_M.Text) = False And String.Equals(tb_M.Text, dr("KundenNr").ToString) = True AndAlso String.Equals(tb2_M.Text, dr("Username").ToString) = True AndAlso String.Equals(tb3_M.Text, dr("Password").ToString) = True Then
                                 FormsAuthentication.SetAuthCookie(Login2.UserName, cb_M.Checked)
-
                                 'If (String.IsNullOrEmpty(passw) = False And String.IsNullOrEmpty(UserNaMe) = False And String.IsNullOrEmpty(Customer_ID) = False) Then
                                 'Dim str = gensaltToken(UserNaMe, passw, Customer_ID, Session.IsNewSession)
                                 'MsgBox(str)