Änderungen an Userseiten und Erstellung von Login-Panels

This commit is contained in:
ja
2021-08-24 09:55:25 +02:00
parent 8c413da367
commit ebfa4f10bf
11 changed files with 174 additions and 51 deletions

View File

@@ -23,7 +23,6 @@
} }
} }
</style> </style>
<link rel="stylesheet" type="text/css" href="../css/navbarsidebar2.css"/>
</asp:Content> </asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server"> <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">

View File

@@ -114,8 +114,8 @@
<!-- Scroll Script--> <!-- Scroll Script-->
<script src="//code.jquery.com/jquery-1.11.3.min.js"></script> <script src="//code.jquery.com/jquery-1.11.3.min.js"></script>
<link rel="stylesheet" type="text/css" href="../css/navbarsidebar2.css"/>
<link rel="stylesheet" type="text/css" href="../css/StyleSheetWebsiteNew.css"/> <link rel="stylesheet" type="text/css" href="../css/StyleSheetWebsiteNew.css"/>
<link rel="stylesheet" type="text/css" href="../css/navbarsidebar2.css"/>
<script type="text/javascript" src="../js/languageupdatescript.js"></script> <script type="text/javascript" src="../js/languageupdatescript.js"></script>
<!--Hover Info --> <!--Hover Info -->
@@ -164,9 +164,7 @@
ContentPlaceHolder1{ ContentPlaceHolder1{
width:1725px; width:1725px;
} }
#sidebarCollapse{
margin-left:-250px;
}
@media (max-width: 575px){ @media (max-width: 575px){
table { table {
border-collapse: collapse; border-collapse: collapse;
@@ -183,20 +181,6 @@
color:#043381; color:#043381;
background-color:#fff; background-color:#fff;
} }
#sidebar{
min-width: 250px;
max-width: 250px;
min-height: 100vh;
background-color: #fff;
color: #043381;
}
#sidebar.active {
margin-left: 0;
}
#sidebar.active {
margin-left: -250px;
}
} }
@media (min-width: 575px) { @media (min-width: 575px) {
#offcanvasWithBothOptions { #offcanvasWithBothOptions {
@@ -247,9 +231,7 @@
background-color:#fff; background-color:#fff;
max-width:250px; max-width:250px;
} }
a[data-toggle="collapse"] {
position: relative;
}
.dropdown-toggle::after { .dropdown-toggle::after {
display: block; display: block;
@@ -330,7 +312,7 @@
<a class="navbar-brand" href="../newpageJulius_Sidebar.aspx"><img src="../images/Logo_small.png" width="175" height="35" alt="Logo VERAG Spedition AG" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"/></a> <a class="navbar-brand" href="../newpageJulius_Sidebar.aspx"><img src="../images/Logo_small.png" width="175" height="35" alt="Logo VERAG Spedition AG" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"/></a>
</div> </div>
<ul class="collapse list-unstyled"> <ul class="list-unstyled components">
<p style="font-size:medium;font-weight:600;" data-toggle="tooltip" data-placement="right" title="Durchklicken und mehr über uns erfahren!">VERAG Hauptmenü:</p> <p style="font-size:medium;font-weight:600;" data-toggle="tooltip" data-placement="right" title="Durchklicken und mehr über uns erfahren!">VERAG Hauptmenü:</p>
<li class="active"> <li class="active">
<li> <li>
@@ -388,7 +370,7 @@
<div id="content"> <div id="content">
<div class="d-md-none"> <div class="d-md-none">
<nav class="navbar navbar-expand-lg navbar-light bg-light justify-content-md-center flex-nowrap"> <nav class="navbar navbar-expand-lg navbar-light bg-light justify-content-md-center flex-nowrap">
<button type="button" id="sidebarCollapse1" class="btn btn-info" style="background-color:#fff; color:#043381;"> <button type="button" id="sidebarCollapse" class="btn btn-info" style="background-color:#fff; color:#043381;">
<div class="align-self: center"></div> <div class="align-self: center"></div>
<span><img src="../images/Icons/main/menu veragblau.svg" style="width:initial;height:initial;" alt="Hamburger Menu Stripes in Verag Blue" data-toggle="tooltip" data-placement="top" title="Zeigt das Menü an."></span> <span><img src="../images/Icons/main/menu veragblau.svg" style="width:initial;height:initial;" alt="Hamburger Menu Stripes in Verag Blue" data-toggle="tooltip" data-placement="top" title="Zeigt das Menü an."></span>
</button> </button>
@@ -486,6 +468,26 @@
</div>--> </div>-->
</div> </div>
</div> </div>
<div style="padding-right:240px;">
<ul class="nav nav-pills">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false">
<asp:LoginName ID="LoginName1" runat="server" />
</a>
<ul class="dropdown-menu">
<div class="col-2">
<li> <iframe id="frame1" src="LoggedinUserPanel.aspx" runat="server" seamless="seamless" style="width:266px;height:219px;overflow:no-content;background-image:none;" scrolling="no"/>Accountverwaltung</li>
<li><a class="dropdown-item" href="#">Another action</a></li>
</div>
<div class="col-2">
<img src="../images/samples/default-avatar.jpg" style="width:40px;height:40px;" alt="Avatar Picture sample" data-toggle="tooltip" data-placement="top" title="Upload Photo.">
</div>
</ul>
</li> </ul></div>
</asp:LoginView>
</nav> </nav>
</div> </div>
<form id="form1" runat="server"> <form id="form1" runat="server">

View File

@@ -48,6 +48,9 @@
width:90%; width:90%;
justify-content:start; justify-content:start;
} }
#input-group{
max-width:90%;
}
} }
/* @media (min-width: 320px) and (min-height: 640px) {*/ /* @media (min-width: 320px) and (min-height: 640px) {*/
@media (min-width: 558.98px) { @media (min-width: 558.98px) {

View File

@@ -0,0 +1,76 @@
<%@ Page Language="VB" AutoEventWireup="false" CodeFile="LoggedinUserPanel.aspx.vb" Inherits="Customers_LoggedinUserPanel" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>VERAG LoggedinUserStatus</title>
<!-- Bootstrap -->
<html lang="en">
<!-- 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"/>
<!-- 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 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"/>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" title="VERAG Spedition AG"/>
<link rel="stylesheet" type="text/css" href="/css/navbarsidebar.css"/>
<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"/>
</head>
<body>
<form id="form1" runat="server">
<div class="flex-fill">
<asp:Panel ID="Panel1" runat="server" style="width:60px;height:fit-content">
Herzlich Willkommen:
<a href="#LeistungenSubmenu" data-toggle="collapse" aria-expanded="false" class="dropdown-toggle">
<asp:LoginName ID="LoginName1" runat="server" />
</a>
<a href="#AccverwSubmenu" data-toggle="collapse" aria-expanded="false" class="dropdown-toggle">Account verwalten:</a>
<ul class="collapse list-unstyled" id="AccverwSubmenu">
<li class="nav-item dropdown">
<a class="dropdown-item" onclick="bust1()"><img src="../images/Icons/main/edit.gif" width="35" height="35" alt="Edit symbol" data-toggle="tooltip" data-placement="top" title="Editiere deinen Account."/> Account editieren</a>
</li>
<li>
<a class="dropdown-item" href="Userverwaltung.aspx"><img src="../images/Icons/main/edit.gif" width="35" height="35" alt="Edit symbol" data-toggle="tooltip" data-placement="top" title="Editiere deinen Account."/> Account editieren</a>
</li>
</ul>
</asp:Panel></div>
<div>
</div>
</form>
<script type="text/javascript" src="js/toptions/top_up-min.js"></script>
<!-- jQuery CDN - Slim version (=without AJAX) -->
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<!-- Popper.JS -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" integrity="sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ" crossorigin="anonymous"></script>
<!-- Bootstrap JS -->
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js" integrity="sha384-uefMccjFJAIv6A+rW+L4AHf99KvxDjWSu1z9VI8SKNVmz4sk7buKt/6v9KI65qnm" crossorigin="anonymous"></script>
<!-- jQuery Custom Scroller CDN -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/malihu-custom-scrollbar-plugin/3.1.5/jquery.mCustomScrollbar.concat.min.js"></script>
<script src="bootstrap-5.0.2-dist/js/bootstrap.min.js"></script>
<script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
<script>
function bust1() {
if (top != self)
top.location.replace('Login_Edit_User.aspx');
}
</script>
</body>
</html>

View File

@@ -0,0 +1,5 @@

Partial Class Customers_LoggedinUserPanel
Inherits System.Web.UI.Page
End Class

View File

@@ -0,0 +1,12 @@
<%@ Page Title="" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="Login_Edit_User.aspx.vb" Inherits="Customers_Default" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="head" Runat="Server">
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
<div class="flex-fill">
<asp:Label ID="Label1" runat="server" Text="Userwerwaltung"></asp:Label>
</div>
</asp:Content>

View File

@@ -0,0 +1,5 @@

Partial Class Customers_Default
Inherits System.Web.UI.Page
End Class

View File

@@ -0,0 +1,15 @@
<%@ Page Language="VB" AutoEventWireup="false" CodeFile="Userwerwaltung.aspx.vb" Inherits="Customers_Userwerwaltung" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>VERAG Userwerwaltung</title>
</head>
<body>
<form id="form1" runat="server">
</form>
</body>
</html>

View File

@@ -0,0 +1,5 @@

Partial Class Customers_Userwerwaltung
Inherits System.Web.UI.Page
End Class

View File

@@ -118,8 +118,6 @@ a:focus {
} }
#sidebar .sidebar-header { #sidebar .sidebar-header {
padding: 20px;
padding: 1.25em;
background: #fff; background: #fff;
} }
@@ -203,20 +201,23 @@ a:focus {
CONTENT STYLE CONTENT STYLE
----------------------------------------------------- */ ----------------------------------------------------- */
#content { #content {
max-width: /*575px;*/ 126.65198237885463vw; max-width: /*2048px;*/ 451.10132158590307vw;
padding: 20px; padding: 20px;
padding: 1.25em; padding: 1.25em;
min-height: 100vh; min-height: 100vh;
transition: all 0.5s; transition: all 0.5s;
background-color: #fff;
}
#container-xxl {
background-color: #fff;
} }
/* --------------------------------------------------- /* ---------------------------------------------------
MEDIAQUERIES MEDIAQUERIES
----------------------------------------------------- */ ----------------------------------------------------- */
/* @media (max-width: 320px) and (max-height: 640px){*/
/* @media (max-width: 320px) and (max-height: 640px){*/ @media (max-width: 575.98px) {
@media (max-width: 575.98px) { #sidebar {
#sidebar {
padding: /*2px*/ 0.44052863436123346vw; padding: /*2px*/ 0.44052863436123346vw;
font-size: 1em; font-size: 1em;
margin-left: -250px; margin-left: -250px;
@@ -227,15 +228,15 @@ a:focus {
margin-left: 0; margin-left: 0;
} }
#content { #content {
font-size: 1.57em; font-size: 1.57em;
font-size: 3.270833333333333vw; font-size: 3.270833333333333vw;
max-width: /*776px;*/ 44.57208500861574vw; max-width: /*575px;*/ 126.65198237885463vw;
} }
#content_all { #content_all {
max-width: /*776px;*/ 44.57208500861574vw; max-width: /*575px;*/ 126.65198237885463vw;
} }
#footer_content b { #footer_content b {
font-size: 1em; font-size: 1em;
@@ -311,7 +312,7 @@ a:focus {
font-size: 1.2333000033333vw; font-size: 1.2333000033333vw;
min-width: 110%; min-width: 110%;
float: left; float: left;
background-color:#fff;
} }
#footer_content b { #footer_content b {

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.0 KiB