Verbesserungen am Design

This commit is contained in:
ja
2021-08-17 14:08:32 +02:00
parent f3820caa5d
commit ba75eb6ec6
2 changed files with 54 additions and 19 deletions

View File

@@ -6,7 +6,6 @@
<head> <head>
<%@ import Namespace="MySql.Data.MySqlClient" %> <%@ import Namespace="MySql.Data.MySqlClient" %>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>VERAG Spedition AG Login</title> <title>VERAG Spedition AG Login</title>
<link rel="stylesheet" type="text/css" href="../css/main.css"/> <link rel="stylesheet" type="text/css" href="../css/main.css"/>
@@ -15,7 +14,6 @@
<!-- <link rel="stylesheet" type="text/css" href="css/edit_main.css"> --> <!-- <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>
<link rel="stylesheet" type="text/css" href="../../stylesheets/style.css"/> <link rel="stylesheet" type="text/css" href="../../stylesheets/style.css"/>
<link rel="stylesheet" type="text/css" href="../../stylesheets/example.css"/> <link rel="stylesheet" type="text/css" href="../../stylesheets/example.css"/>
<style> <style>
@@ -23,6 +21,10 @@
background-color:#fff; background-color:#fff;
background-image:none; background-image:none;
} }
#Login1_LoginButton{
color:#fff;
background-color:#003680;
}
@media (min-width: 768px) { @media (min-width: 768px) {
} }
@@ -72,6 +74,16 @@
{ {
window.history.back() window.history.back()
} }
</script>
<script>
function bust1() {
if (top != self)
setInterval("top.location.replace('../Kundenseite.aspx')", 1);
}
function bust2() {
if (top != self)
setInterval("top.location.replace('../admin/admin.aspx')", 1);
}
</script> </script>
</head> </head>
@@ -82,8 +94,8 @@
<asp:Login ID = "Login1" runat = "server" OnAuthenticate= "ValidateUser"> <asp:Login ID = "Login1" runat = "server" OnAuthenticate= "ValidateUser">
<LayoutTemplate> <LayoutTemplate>
<table cellpadding="0" style="font-family:Arial;font-size:11px;border:1px solid gray"> <table cellpadding="0" style="font-family:Arial;font-size:11px;border:1px solid gray">
<tr style="background-color:#003680;color:#fff;height:30px;font-size:12px"> <tr style=" background-image: linear-gradient(to right, #003680 , #0055cc);color:#fff;height:30px;font-size:12px">
<td align="center" colspan="2" style="color:#fff;">Bitte melden Sie sich an:</td> <td align="center" colspan="2" style="color:#fff;font-kerning:auto;font-weight:600;">Bitte melden Sie sich an:</td>
</tr> </tr>
<tr> <tr>
<td align="right"> <td align="right">
@@ -114,7 +126,7 @@
</tr> </tr>
<tr> <tr>
<td></td> <td></td>
<td > <td>
<asp:CheckBox ID="RememberMe" runat="server" Text="Anmeldedaten speichern." /> <asp:CheckBox ID="RememberMe" runat="server" Text="Anmeldedaten speichern." />
</td> </td>
</tr> </tr>
@@ -125,10 +137,10 @@
</tr> </tr>
<tr> <tr>
<td align="left" colspan="2"> <td align="left" colspan="2">
<br/> <asp:Button ID="LoginButton" runat="server" CommandName="Login" Text="Anmelden" ValidationGroup="Login1"/> <br/> <asp:Button ID="LoginButton" runat="server" CommandName="Login" Text="Anmelden" ValidationGroup="Login1" target="frame" OnClientClick="bust1()"/>
</td> </td>
<td align="middle" colspan="2"> <td align="middle" colspan="2">
<asp:LinkButton ID="LinkButton1" href="../login/login_TEST.aspx" runat="server">Admin-Login</asp:LinkButton> <asp:LinkButton ID="LinkButton1" href="../login/login_TEST.aspx" runat="server" target="_top" OnClientClick="bust2()">Admin-Login</asp:LinkButton>
</td></td> </td></td>
</tr> </tr>
</table> </table>

View File

@@ -20,6 +20,8 @@
<link href="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"/> <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
<%@ import Namespace="MySql.Data.MySqlClient" %> <%@ import Namespace="MySql.Data.MySqlClient" %>
<script runat="server"> <script runat="server">
Sub Page_Load() Handles Me.Load Sub Page_Load() Handles Me.Load
@@ -281,7 +283,6 @@
margin-bottom: 5px; margin-bottom: 5px;
margin-bottom: 0.313rem; margin-bottom: 0.313rem;
} }
/* a.download { /* a.download {
background: #fff; background: #fff;
color: #043381; color: #043381;
@@ -517,6 +518,27 @@
color: #043381; color: #043381;
} }
</style> </style>
<script type="text/javascript">
window.onscroll = function () {
growShrinkLogo()
};
function growShrinkLogo() {
var Logo = document.getElementById("Logo")
var Navbar = document.getElementById("navbar navbar-expand-lg navbar-light bg-light")
if (document.body.scrollTop > 4 || document.documentElement.scrollTop > 4) {
Logo.style.width = '120px';
Navbar.style.width = '126.65198237885463vw';
Logo.style.height = '21px';
} else {
Logo.style.width = '150px';
Navbar.style.width = /*575px;*/ '126.65198237885463vw';
Logo.style.height = '26px';
}
}
</script>
</head> </head>
<body> <body>
@@ -737,7 +759,7 @@
<div id="content"> <div id="content">
<div class="d-none d-md-block"> <div class="d-none d-md-block">
<nav class="navbar navbar-expand-lg navbar-light bg-light"> <nav class="navbar navbar-expand-lg navbar-light bg-light">
<a class="navbar-brand" id="navbarbrandhauptpage" href="newpageJulius_Sidebar.aspx?lan2=DE"><img src="images/Logo_small.png" alt="Logo Verag Spedition (Blaue Schrift) AG (Graue Schrift)" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"/></a> <a class="navbar-brand" id="navbarbrandhauptpage" href="newpageJulius_Sidebar.aspx?lan2=DE"><img src="images/Logo_small.png" id="Logo" alt="Logo Verag Spedition (Blaue Schrift) AG (Graue Schrift)" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag" style="align-items:safe center;"/></a>
<!-- <button class="btn btn-primary d-inline-block d-lg-none ml-auto" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> <!-- <button class="btn btn-primary d-inline-block d-lg-none ml-auto" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
</button> --> <% </button> --> <%
@@ -832,11 +854,12 @@
Next Next
%> %>
</div> </div>
</div> </div>
</li> </li>
<li> <li>
<div class="dropdown" style="background-color:#fff; color:#043381;"> <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;" alt="Logo Schriftzug: Verag Spedition AG Blaue Schrift: Verag Spedition Graue Schrift: AG" /></center></button> <button class="dropbtn"><center><img id="myImage" src="<%=flagpath%>" style="border:1px solid #fff;width:32px; justify-items:center;" alt="Logo Schriftzug: Verag Spedition AG Blaue Schrift: Verag Spedition Graue Schrift: AG" /></center></button>
<div class="dropdown-content"> <div class="dropdown-content">
<% Dim stringDE = "&nbsp DE" <% Dim stringDE = "&nbsp DE"
Dim stringEN = "&nbsp EN" Dim stringEN = "&nbsp EN"
@@ -925,7 +948,7 @@
</div> </div>
</div> </div>
</a> --> </a> -->
<iframe id="frame1" src="login/login_FLEX.aspx" runat="server" seamless="seamless" style="width:266px;height:219px;overflow:no-content;background-image:none;" scrolling="no"/> <iframe id="frame1" src="login/login_FLEX.aspx" runat="server" seamless="seamless" style="width:266px;height:219px;overflow:no-content;background-image:none;" scrolling="no" />
<!-- #include file="navigation.aspx" --> <!-- #include file="navigation.aspx" -->
<div id="main-page"> <div id="main-page">
<!-- <div class="pagecontent"> --> <!-- <div class="pagecontent"> -->