From a8b38545f20ada73b443ce22671f0c2f22690514 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Thu, 18 Nov 2021 15:15:00 +0100
Subject: [PATCH] =?UTF-8?q?Revert=20"=C3=84nderungen=20GUI"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 9460ded7fd4ae0a1b679cd0834d412899e7f36f2.
---
 login/ForgotPW.aspx          | 35 +++++++++++++++++------------------
 login/login_FLEX_iFrame.aspx | 32 +++++---------------------------
 newpageJulius_Sidebar.aspx   |  9 +++------
 3 files changed, 25 insertions(+), 51 deletions(-)

diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index 54489d5..1b9626c 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -77,26 +77,25 @@
         height: 613px;
         margin: 0 auto;
         margin-top: 0px;
-        margin-left: -135px;
+        margin-left: 5%;
     }
     .container-fluid {
-        width: 390px;
-        height: 813px;
+        width: 395px;
+        height: 613px;
         background-color: rgba(255,255,255,0.5);
         top:50%;
         bottom: auto;
-        left: 160px;
-        right: 42px;
-        margin: 0 -40px 20px 20px;
-        margin-left:235px;
+        left: -2px;
+        right: 520px;
+        margin: auto;
     }
     #tbl_main_M {
         font-family: Arial;
         font-size: 11px;
         border: 1px solid gray;
-        width: 395px;
-        height: 713px;       
-        
+        width: 295px;
+        height: 713px;
+        margin-left:2px;
     }
     #lbl_Ueberschrift_M {
         background-color: #003680;
@@ -288,7 +287,7 @@
             <center>
                    <!-- Große Bildschirme-->   
             <div class="d-none d-md-block">
-            <table id="tbl_main" cellpadding="0" style="margin: 50% auto 50% auto; border:none;">
+            <table id="tbl_main" cellpadding="0" style="margin: 14px auto 14px auto; border:none;">
                 <tr style="color:#003680;height:48px;">
                                    <td>
                                        <asp:Button ID="btn_Back" runat="server" Width="265" CausesValidation="false" Text="Back" OnClick="btn_Back_Click" style="margin-left:49px;height:31px;font-weight:300;font-size:20px"/>
@@ -296,7 +295,7 @@
                                </tr>
                  <tr style="color:#003680; height:32px;font-size:14px">
                    <td align="center" colspan="2" style="color:#fff;font-kerning:auto;font-weight:700;">                                     
-            <asp:Label ID="lbl_PWvergessen" Text="Forgot your Password?" runat="server" style="color:#003680; margin-left:79px;font-size:19px;font-weight:300"></asp:Label>
+            <asp:Label ID="lbl_PWvergessen" Text="Forgot your Password?" runat="server" style="color:#003680; margin-left:79px;font-size:20px;font-weight:300"></asp:Label>
                    </td></tr>  
                <!-- <tr style=" background-color:#fff; color:#003680; height:30px;font-size:12px">
                    <td align="center" colspan="2" style="color:#fff;font-kerning:auto;font-weight:700;">                                     
@@ -340,7 +339,7 @@
                 </div>
                  <!--Smartphone-Bildschirme-->   
                       <div class="d-md-none"> 
-                          <table id="tbl_main_M" cellpadding="0" style="margin:40% 50% 50% 4px; border: none;">
+                          <table id="tbl_main_M" cellpadding="0" style="margin:10px 8px 10px 8px; border: none;">
                 <tr style="color:#003680;height:65px;margin-top:-70px">
                                    <td>
                                        <asp:Button ID="btn_Back_M" runat="server" Text="Back" OnClick="btn_Back_Click" Height="37px"/>
@@ -348,21 +347,21 @@
                                </tr>
                  <tr style="color:#003680; height:92px;">
                    <td align="left" colspan="2" style="color:#fff;font-kerning:auto;font-weight:700;">                                     
-                        <asp:Label ID="lbl_PWvergessen_M" Text="Forgot your password?" runat="server" style="color:#003680; margin-left:61px;font-size:19px; "></asp:Label>
+                        <asp:Label ID="lbl_PWvergessen_M" Text="Forgot your password?" runat="server" style="color:#003680; margin-left:61px;font-size:22px; "></asp:Label>
                    </td></tr>                
-                              <tr style="color:#003680;height:20px;margin-top:-10px">
+                              <tr style="color:#003680;height:20px">
                                   <td>
                                       <asp:Label ID="lbl_filldatahere_M" Text="Fill in your data here" runat="server" style="color:#003680;margin-left:67px;font-weight:300" Font-Size="22px"></asp:Label>
                                   </td>
                               </tr>
-              <tr style="color:#003680;height:40px; margin-top:30px">                                
+              <tr style="color:#003680;height:40px;">                                
                      <td align="left" colspan="2">  
-                         <asp:TextBox ID="txt_CustomerID_M" CssClass="bg-UID-icon" runat="server" ValidationGroup="val-mobil" Width="325" Placeholder="Customer-ID" Font-Size="2.025em" style="margin:15px 21px auto 22px;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>                                             
+                         <asp:TextBox ID="txt_CustomerID_M" CssClass="bg-UID-icon" runat="server" ValidationGroup="val-mobil" Width="325" Placeholder="Customer-ID" Font-Size="2.025em" style="margin:0 21px auto 22px;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>                                             
                          <asp:RequiredFieldValidator ID="CustomerID_M_required" runat="server" ControlToValidate="txt_CustomerID_M" SetFocusOnError="true" ForeColor="Red" Font-Size="24px" style="margin-left:22px;" ValidationGroup="val-mobil" ErrorMessage="Die Kundenummer muss angegeben werden!"></asp:RequiredFieldValidator>                                                               
                          </td></tr>
                 <tr style="color:#003680; height:40px;">                                 
                     <td align="left" colspan="2">  
-                        <asp:TextBox ID="txtEmail_M" runat="server" Width="325px" ValidationGroup="val-mobil" Font-Size="2.025em" Placeholder="E-Mail" CssClass="bg-email-icon" style="margin-top:-5px;margin-left:25px;color:#003680;margin-bottom:40px;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"/>                    
+                        <asp:TextBox ID="txtEmail_M" runat="server" Width="325px" ValidationGroup="val-mobil" Font-Size="2.025em" Placeholder="E-Mail" CssClass="bg-email-icon" style="margin-left:25px;color:#003680;margin-bottom:60px;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"/>                    
                         <asp:RequiredFieldValidator ID="valreqtxtEmail_M" SetFocusOnError="true" ControlToValidate="txtEmail_M" ValidationGroup="val-mobil" runat="server" Text="" ErrorMessage="Die E-mail muss angegeben werden!" ></asp:RequiredFieldValidator>                   
                     </td></tr>
                 <tr style="color:#003680; height:40px;">                                
diff --git a/login/login_FLEX_iFrame.aspx b/login/login_FLEX_iFrame.aspx
index 6cb14a0..0b180dd 100644
--- a/login/login_FLEX_iFrame.aspx
+++ b/login/login_FLEX_iFrame.aspx
@@ -5,30 +5,16 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
        <%@ import Namespace="MySql.Data.MySqlClient"%> 
-    
+
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <title>VERAG Spedition AG Login</title>
         <link rel="stylesheet" type="text/css" href="../css/main.css"/>
         <link rel="stylesheet" type="text/css" href="../css/style.css"/>
         <LINK REL="SHORTCUT ICON" HREF="../images/Icons/favicon/favicon.ico" />
-
-        <!-- Bootstrap -->
-   <html lang="en"></html>
-    <!-- Required meta tags -->
-    <meta charset="utf-8"/>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <!-- 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"/>
-    <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
-
     <!--    <link rel="stylesheet" type="text/css" href="css/edit_main.css"> -->
         <script src="js/netzwerk.js" type="text/javascript"></script>        
-    <link rel="stylesheet" type="text/css" href="../css/style.css"/>
-    <link href="bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>
-    <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
 
-    
+    <link rel="stylesheet" type="text/css" href="../css/style.css"/>
    
     <script type="text/javascript">
         function FocusOnInput() {
@@ -76,13 +62,6 @@
                 window.history.back()
       }  
     </script>      
-       <style>
-           #Login1_LoginButton {
-            background-color:#003680;
-           }#Login1_LinkButton2{
-                color:#003680;
-            }
-       </style>
 </head>
  
  <body onload="FocusOnInput()" style="background-image:none">     
@@ -101,7 +80,7 @@
                                </tr>
                                     <tr>                                         
                                         <td>                                
-                                            <asp:TextBox ID="CustomerID" runat="server" type="text" TextMode="Number" Placeholder="Kundennummer" ToolTip="Die Kundennummer ist erforderlich"></asp:TextBox> 
+                                            <asp:TextBox ID="CustomerID" runat="server" TextMode="Number" Placeholder="Kundennummer" ToolTip="Die Kundennummer ist erforderlich"></asp:TextBox> 
                                             <asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="CustomerID" ErrorMessage="" ValidationGroup="Login1"></asp:RequiredFieldValidator>                                             
                                         </td>
                                     </tr>  
@@ -130,9 +109,8 @@
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td align="left" colspan="2" height="60px">
-                                            <center>
-                                           <br/> <asp:Button ID="LoginButton" class="btn btn-primary" runat="server" CommandName="Login" Text="Login" ValidationGroup="Login1" target="_top" OnClientClick="bust2()" style="margin-left:-80px"/> </center>
+                                        <td align="left" colspan="2">
+                                           <br/> <asp:Button ID="LoginButton" runat="server" CommandName="Login" Text="Login" ValidationGroup="Login1" target="_top" OnClientClick="bust2()"/>
                                         </td>
                                       </tr> 
                                <tr>                                  
diff --git a/newpageJulius_Sidebar.aspx b/newpageJulius_Sidebar.aspx
index 565ae60..3cfcf9d 100644
--- a/newpageJulius_Sidebar.aspx
+++ b/newpageJulius_Sidebar.aspx
@@ -113,7 +113,7 @@
           background-attachment:fixed;
           background-size:cover;
          /* background-color:#043381;*/
-            }          
+            }
            #sidebar{
              background-color: #fff;
              color: #043381;
@@ -182,9 +182,6 @@
                 #content_all{
                     width:385.98px;
                 }
-                #dropdown{
-                    margin-right:-40px
-                }
             }  
             @media (max-width: 323px){
                 wrapper{
@@ -531,8 +528,8 @@
             </div>
                 </li>     
                       <li>
-                             <div class="dropdown" style="background-color:#fff; color:#043381;margin-top:-20px; margin-right:-55px">
-                                              <button class="dropbtn"><center><img id="myImage" src="<%=flagpath%>" style="border:1px solid #fff;width:32px; justify-items:center;color:#043381;background-color:#fff;margin-top:-14px" alt="Logo Schriftzug: Verag Spedition AG Blaue Schrift: Verag Spedition Graue Schrift: AG" /></center></button>
+                             <div class="dropdown" style="background-color:#fff; color:#043381;">
+                                              <button class="dropbtn"><center><img id="myImage" src="<%=flagpath%>" style="border:1px solid #fff;width:32px; justify-items:center;color:#043381;background-color:#fff" alt="Logo Schriftzug: Verag Spedition AG Blaue Schrift: Verag Spedition Graue Schrift: AG" /></center></button>
                                               <div class="dropdown-content">     
                                                   <%  Dim stringDE = "&nbsp  DE"
                                                       Dim stringEN = "&nbsp  EN"