From a170fba850984f5878747711ba1f9b411d09cc4d Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Wed, 25 Aug 2021 15:01:23 +0200
Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20Men=C3=BC=20und=20Seiten=20te?=
 =?UTF-8?q?st=20und=20test2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/Cards_Boxes.aspx     |  2 +-
 Customers/Customers.master     | 18 +++++++--
 Customers/LKWs.aspx            | 72 ++++++++++++++++++++++++++++++++++
 Customers/Login_Edit_User.aspx | 64 ++++++++++++++++++++++++------
 css/navbarsidebar.css          |  6 +--
 5 files changed, 143 insertions(+), 19 deletions(-)
diff --git a/Customers/Cards_Boxes.aspx b/Customers/Cards_Boxes.aspx
index 5dd3e59..3660f51 100644
--- a/Customers/Cards_Boxes.aspx
+++ b/Customers/Cards_Boxes.aspx
@@ -60,7 +60,7 @@
      
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
-    <div style="height:/*90px*/9.68783638320775vh;"></div> 
+   
     <h1> Karten / Boxen:</h1>
 </asp:Content>
 
diff --git a/Customers/Customers.master b/Customers/Customers.master
index 621bc7e..e5a4607 100644
--- a/Customers/Customers.master
+++ b/Customers/Customers.master
@@ -183,7 +183,15 @@
                 width:17.621145374449338vw;
                 color:#043381;
                 background-color:#fff;
-            }                 
+            }    
+           #btnsubmenu{
+               background-color:#043381;
+               color:#fff;
+           }
+            #btnsubmenu:hover{
+               background-color:#fff;
+               color:#043381;
+           }
            }
         @media (min-width: 575px) {
             #offcanvasWithBothOptions {
@@ -312,7 +320,11 @@
                 </div>
 
                 <ul class="list-unstyled components">
+                    <%If Me.Page.User.Identity.Name = "test" Then %>
                             <p style="font-size:medium;font-weight:600;" data-toggle="tooltip" data-placement="right" title="Durchklicken und mehr über uns erfahren!">VERAG Hauptmenü:</p>
+                    <%ElseIf Me.Page.User.Identity.Name = "test2" Then %>
+                     <p style="font-size:medium;font-weight:600;" data-toggle="tooltip" data-placement="right" title="Durchklicken und mehr über uns erfahren!">Kunden Hauptmenü:</p>
+                    <%End If %>
                             <li class="active">                                        
                                  <li>
                                                            <!-- <a href="#WelcomeSubmenu1" data-toggle="collapse" aria-expanded="false" class="dropdown-toggle">Startseite</a>                        
@@ -500,7 +512,7 @@
          
             <img src="../images/samples/default-avatar.jpg" style="width:60px;height:60px;" alt="Avatar Picture sample" data-toggle="tooltip" data-placement="top" title="Upload Photo."></li>
          <div class="dropdown-divider" />
-                <li><a class="dropdown-item" href="GroupPolicies.aspx">Gruppenrichtlinien festlegen</a></li>
+                <li><a class="dropdown-item" id="btnsubmenu" href="GroupPolicies.aspx">Gruppenrichtlinien festlegen</a></li>
          
              </div>
     </ul>
@@ -511,7 +523,7 @@
 
     <form id="form1" runat="server">
     <div>
-         <div style="height:/*34px*/2.65625vh"></div> 
+         <div style="height:95px"></div> 
         <asp:ContentPlaceHolder id="ContentPlaceHolder1" runat="server">
            
         </asp:ContentPlaceHolder>
diff --git a/Customers/LKWs.aspx b/Customers/LKWs.aspx
index 4baa770..e81eaf0 100644
--- a/Customers/LKWs.aspx
+++ b/Customers/LKWs.aspx
@@ -1,6 +1,78 @@
 ﻿<%@ Page Title="" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="LKWs.aspx.vb" Inherits="Customers_Default" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
+      <!-- Bootstrap -->
+    <html lang="en"></html>
+    <!-- Required meta tags -->
+    <meta charset="utf-8"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1" title="Verag Spedition AG AvisoTV Flex"/>
+   
+    <!-- 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"/>
+           <!-- Bootstrap CSS -->
+    
+     
+     <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
+    <link rel="shortcut icon" href="images/Icons/favicon/favicon.ico" />
+    <style>
+             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:#043381;*/
+     }
+         .btn btn-primary{
+               color: #043381;
+               background-color: #fff;
+            }
+         #tableSearch{
+              width:1500px;              
+         }
+         .align-self-xl-start{
+             width:100%;
+         }         
+         #normaltable{
+             width:1500px;
+         }
+        @media (max-width: 558.98px) {
+            #conovertab {
+                width: 350px;
+                overflow-x: auto;
+            }
+
+            h1 {
+                font-size: 12px;
+            }
+
+            #tableSearch {
+                max-width: 350px;
+            }
+
+            #containerseiterand {
+                margin-left: 5px;
+                margin-right: 5px;
+                width: 350px;
+            }
+        }
+    </style>
+    <%@ import Namespace="MySql.Data.MySqlClient" %>
+     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" title="VERAG IndexCustomer"/>      
+   
+    <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" />
+    <!--    <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="../stylesheets/style.css"/>
+    <link rel="stylesheet" type="text/css" href="../stylesheets/example.css"/>   
+     
+    <link rel="stylesheet" href="../css/navbarsidebar.css" type="text/css" />
 </asp:Content>
 
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
diff --git a/Customers/Login_Edit_User.aspx b/Customers/Login_Edit_User.aspx
index bfad987..98fea91 100644
--- a/Customers/Login_Edit_User.aspx
+++ b/Customers/Login_Edit_User.aspx
@@ -18,6 +18,16 @@
      <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
     <link rel="shortcut icon" href="images/Icons/favicon/favicon.ico" />
     <style>
+              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:#043381;*/
+     }
          .btn btn-primary{
                color: #043381;
                background-color: #fff;
@@ -47,27 +57,57 @@
                margin-right:5px;
                width:350px;
            }
-             .modal-dialog modal-dialog-scrollable{
-                width:250px;
-                overflow-x:auto;
+           .modal-dialog modal-dialog-scrollable{
+               width:30%;
+           }
+           .modal-content{
+              width:40%;
+              overflow-x:no-content;
+           }
+          .modal-header{
+               width:40%;
+           }
+           .modal-footer{
+                width:40%;
+           }
+           #exampleModalLabel{
+                font-size:12px;
             }
-            #exampleModalLabel{
-                 font-size:12px;
-             }
-            #Image1{
-                width:40px;
-                height:40px;
+           .modal-body{
+           /* background-color:#043381;*/
+                background-image: linear-gradient(to right, #003680 , #0055cc);
+                color:#fff; 
+                width:40%;
+            }
+           #Image1{
+                width:40%;
+                height:40%;
             }
            #butclose{
                transform:translateX(-50%);
            }  
-        }   
+        } 
+        .modal-body{
+           /* background-color:#043381;*/
+           background-image: linear-gradient(to right, #003680 , #0055cc);
+           color:#fff;            
+        }
+        .modal-header{
+           background-image: linear-gradient(to right, #003680 , #0055cc);
+           color:#fff;
+        }
+           
          textcontent1{
            font-size:/*18px*/0.7377049180327869vw;
        }
         @media (min-width: 575px) {
             .modal-dialog modal-dialog-scrollable{
-                width:850px;
+                width:850px;                
+            }
+            .modal-content{
+                 margin-top:51px;
+                 overflow-x:auto;
+                 width:40%;
             }
         }  
     </style>
@@ -99,7 +139,7 @@
                             																		<div class="modal-dialog modal-dialog-scrollable" style="min-width: 850px; min-height: 800px;  overflow: hidden; place-self:center">
                               																				<div class="modal-content">
                                																		 	<div class="modal-header">
-                                 																		 	<h5 class="modal-title" id="exampleModalLabel">Profilbild:</h5>
+                                 																		 	<h5 class="modal-title" id="exampleModalLabel">Profilbild: User: <%=Me.Page.User.Identity.Name %></h5>
                                  																		 	<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                                 																		</div>
                                																			<div class="modal-body">
diff --git a/css/navbarsidebar.css b/css/navbarsidebar.css
index 634087a..2e6537d 100644
--- a/css/navbarsidebar.css
+++ b/css/navbarsidebar.css
@@ -363,13 +363,13 @@ a:focus {
 
 .btn-primary {
     color: #fff;
-    background-color: #fff;
+    background-color: #043381;
     border-color: #043381;
 }
 
     .btn-primary:hover {
-        color: #fff;
-        background-color: #043381;
+        color:#043381;
+        background-color: #fff;
         border-color: #0a58ca;
     }
 
