edv/VERAG_Homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Änderungen an Container und h1 Überschriften css sowie Language mobil sidemenue picker

Browse Source
This commit is contained in:
ja
2021-08-27 17:00:03 +02:00
parent 7507d9ed4e
commit fd0a71ee93
13 changed files with 77 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Customers/Customers.master
View File

@@ -271,7 +271,7 @@
<div class="collapse" id="collapseExample">
<ul style="list-style:unset">
<li> <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff;color:#043381"><img src="../images/samples/default-avatar.jpg"; width="80"; /></button> </li>
<li><button type="button" class="btn btn-primary" style="background-color:#fff"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px" />Logout</button></li>
<li><button type="button" class="btn btn-primary" id="LogoutButton" style="background-color:#fff"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px" />Logout</button></li>
</ul>
</div>
</li>
@@ -310,7 +310,6 @@
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" id="butclose" class="btn btn-secondary" style="background-color:#043381;color:#fff" data-bs-dismiss="modal">Close</button>
@@ -322,20 +321,21 @@
<nav class="navbar navbar-expand-md navbar-light bg-light justify-content-md-center flex-nowrap">
<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">
<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>
</div>
</button>
<a class="navbar-brand" id="navbarhomebar" href="../newpageJulius_Sidebar.aspx"><img src="../images/Logo_small.png" style="width:90%;height:90%;" alt="VERAG Spedition AG Logo with blue word color until grey AG" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"></a>
<div style="margin-right:50px">
<ul class="nav nav-pills">
<li class="nav-item dropdown">
<a class="nav-link" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false"><asp:LoginName ID="LoginName2" runat="server" /></a>
<a class="nav-link" data-bs-toggle="dropdown" role="button" aria-expanded="false"><asp:LoginName ID="LoginName2" runat="server" /></a>
<ul class="dropdown-menu">
<li><a class="dropdown-item" href="#">Profil bearbeiten</a>
<li><a class="dropdown-item">Profil bearbeiten</a>
<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff"><img src="../images/samples/default-avatar.jpg"; width="80"; /></button>
</li>
<div class="dropdown-divider"></div>
<li><a id="ButtonLogOut"href="../login/LogOut.aspx" class="stretched-link" style="text-decoration: none;background-color:#fff;color:#043381"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff;"/>Logout</a></li>
<li><a id="LogoutButton" style="text-decoration: none;background-color:#fff;color:#043381"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff;"/>Logout</a></li>
</ul></li>
</ul>
</div>
@@ -360,27 +360,27 @@
<li style="transform: rotate(0);">
<!--<a id="ButtonDeutschLangPicker" class="btn btn-primary btn-sm" href="<%'= navParent%>&lan=DE"><img src="<%'= imgPath%>images/flags/flagge_DE_AT.gif" <%' If laenderkuerzel = "de" Then Response.Write("style='border:1px solid #000'")%>/>DE/AT</a>-->
<a id="ButtonDeutschLangPicker2" href="<%= navParent%>?lan2=DE&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_DE_AT_big.gif"; width="20" <% If laenderkuerzel = "de" Then Response.Write("style='border:1px solid #000'")%>/><%=strDElang %></a>
<a id="ButtonDeutschLangPicker2" href="<%= navParent%>?lan2=DE&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_DE_AT_big.gif"; width="20" <% If laenderkuerzel = "DE" & lan3 = "0" Then Response.Write("style='border:1px solid #000'")%>/><%=strDElang %></a>
</li>
<li style="transform: rotate(0);">
<!--<a id="ButtonEnglischLangPicker" class="btn btn-primary btn-sm" href="<%'= navParent%>&lan=EN"><img src="<%'= imgPath%>images/flags/flagge_GB.gif" <%' If laenderkuerzel = "en" Then Response.Write("style='border:1px solid #000'")%>/>EN</a>-->
<a id="ButtonEnglischLangPicker2" href="<%= navParent%>?lan2=EN&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_GB_big.gif"; width="20"; <% If laenderkuerzel = "en" Then Response.Write("style='border:1px solid #000'")%>/><%=strENlang %></a>
<a id="ButtonEnglischLangPicker2" href="<%= navParent%>?lan2=EN&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_GB_big.gif"; width="20"; <% If laenderkuerzel = "EN" & lan3 = "0" Then Response.Write("style='border:1px solid #000'")%>/><%=strENlang %></a>
</li>
<li style="transform: rotate(0);">
<!--<a id="ButtonSerbischLangPicker" class="btn btn-primary btn-sm" href="<%'= navParent%>&lan=SRB"><img src="<%'= imgPath%>images/flags/flagge_BIH.gif" <%' If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%> />BIH</a>-->
<a id="ButtonSerbischLangPicker2" href="<%= navParent%>?lan2=SRB&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_BIH_big.gif"; width="20"; <% If laenderkuerzel = "de" Then Response.Write("style='border:1px solid #000'")%>/><%=strBIHLang %></a>
<a id="ButtonSerbischLangPicker2" href="<%= navParent%>?lan2=SRB&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_BIH_big.gif"; width="20"; <% If laenderkuerzel = "SRB" & lan3 = "0" Then Response.Write("style='border:1px solid #000'")%>/><%=strBIHLang %></a>
</li>
<li style="transform: rotate(0);">
<!--<a id="ButtonSerbischZweiLangPicker" class="btn btn-primary btn-sm" href="<%'= navParent%>&lan=SM"><img src="<'%= imgPath%>images/flags/flagge_SM.gif" <%' If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%> />SRB</a>-->
<a id="ButtonSerbischZweiLangPicker2" href="<%= navParent%>?lan2=SRB&lan3=1" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_SM_big.gif"; width="20"; <% If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%>/><%=strSRBlang %></a>
<a id="ButtonSerbischZweiLangPicker2" href="<%= navParent%>?lan2=SRB&lan3=1" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_SM_big.gif"; width="20"; <% If laenderkuerzel = "SRB" & lan3 = "1" Then Response.Write("style='border:1px solid #000'")%>/><%=strSRBlang %></a>
</li>
<li style="transform: rotate(0);">
<!--<a id="ButtonBulgariaLangPicker" class="btn btn-primary btn-sm" href="<%'= navParent%>&lan=BG"><img src="<%'= imgPath%>images/flags/flagge_BG.gif" <%' If laenderkuerzel = "bg" Then Response.Write("style='border:1px solid #000'")%>/>BG</a>-->
<a id="ButtonBulgariaLangPicker2" href="<%= navParent%>?lan2=BG&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_BG_big.gif"; width="20"; <% If laenderkuerzel = "bg" Then Response.Write("style='border:1px solid #000'")%>/><%=strBGlang %></a>
<a id="ButtonBulgariaLangPicker2" href="<%= navParent%>?lan2=BG&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_BG_big.gif"; width="20"; <% If laenderkuerzel = "BG" & lan3 = "0" Then Response.Write("style='border:1px solid #000'")%>/><%=strBGlang %></a>
</li>
<li style="transform: rotate(0);">
<!--<a id="ButtonTürkeiLangPicker" class="btn btn-primary btn-sm" href="<%'= navParent%>&lan=TR"><img src="<%'= imgPath%>images/flags/flagge_TR.gif" <%' If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%>/>TR</a>-->
<a id="ButtonTürkeiLangPicker2" href="<%= navParent%>?lan2=TR&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_TR_big.gif"; width="20";" <% If laenderkuerzel = "en" Then Response.Write("style='border:1px solid #000'")%>/><%=strENlang%></a> ' If laenderkuerzel = "yu" %></a>
<a id="ButtonTürkeiLangPicker2" href="<%= navParent%>?lan2=TR&lan3=0" class="stretched-link" style="text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_TR_big.gif"; width="20"; <% If laenderkuerzel = "TR" & lan3 = "0" Then Response.Write("style='border:1px solid #000'")%>/><%=strTRlang%></a>
</li>
</ul>
</div>
@@ -441,7 +441,7 @@
<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff"><img src="../images/samples/default-avatar.jpg"; width="80"; /></button>
</li>
<div class="dropdown-divider"></div>
<li><a id="ButtonLogOut2"href="../login/LogOut.aspx" class="stretched-link" style="text-decoration: none;background-color:#fff;color:#043381"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff;"/>Logout</a></li>
<li><a id="LogoutButton" class="stretched-link" style="text-decoration: none;background-color:#fff;color:#043381"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff;"/>Logout</a></li>
</ul>
</ul>
@@ -459,9 +459,9 @@
Dim stringTR = "&nbsp TR"%>
<!--<a id="ButtonOesterreichLangPicker" class="btn btn-primary btn-sm" onclick="changeflag(A)" href="<%'= navParent%>?menuID=<%'= curentMenuId %>&lan=de"><img src="<%'= imgPath%>images/flags/flagge_A.gif" <%' If laenderkuerzel = "de" Then Response.Write("style='border:1px solid #000'")%> /> DE</a>-->
<a id="ButtonDeutschLangPicker" class="btn btn-primary btn-sm" href="<%= navParent%>&lan2=DE&lan3=0" style="background-color:#fff;color:#043381;text-decoration: none;" ><img src="../<%= imgPath%>images/flags/flagge_DE_AT_big.gif"; width="20"; <% If laenderkuerzel = "de" Then Response.Write("style='border:1px solid #000'")%>/><%=stringDE%></a>
<a id="ButtonTürkeiLangPicker" class="btn btn-primary btn-sm" href="<%= navParent%>&lan2=TR&lan3=0" style="background-color:#fff;color:#043381;text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_TR_big.gif"; width="20"; <% If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%>/><%=stringTR%></a>
<a id="ButtonEnglischLangPicker" class="btn btn-primary btn-sm" href="<%= navParent%>&lan2=EN&lan3=0" style="background-color:#fff;color:#043381;text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_GB_big.gif"; width="20"; <% If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%>/><%=stringEN%></a>
<a id="ButtonSerbischLangPicker" class="btn btn-primary btn-sm" href="<%= navParent%>&lan2=SRB&lan3=0" style="background-color:#fff;color:#043381;text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_BIH_big.gif"; width="20"; <% If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%> /><%=stringBIH%></a>
<a id="ButtonTürkeiLangPicker" class="btn btn-primary btn-sm" href="<%= navParent%>&lan2=TR&lan3=0" style="background-color:#fff;color:#043381;text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_TR_big.gif"; width="20"; <% If laenderkuerzel = "TR" Then Response.Write("style='border:1px solid #000'")%>/><%=stringTR%></a>
<a id="ButtonEnglischLangPicker" class="btn btn-primary btn-sm" href="<%= navParent%>&lan2=EN&lan3=0" style="background-color:#fff;color:#043381;text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_GB_big.gif"; width="20"; <% If laenderkuerzel = "gb" Then Response.Write("style='border:1px solid #000'")%>/><%=stringEN%></a>
<a id="ButtonSerbischLangPicker" class="btn btn-primary btn-sm" href="<%= navParent%>&lan2=SRB&lan3=0" style="background-color:#fff;color:#043381;text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_BIH_big.gif"; width="20"; <% If laenderkuerzel = "BIH" Then Response.Write("style='border:1px solid #000'")%> /><%=stringBIH%></a>
<a id="ButtonSerbischZweiLangPicker" class="btn btn-primary btn-sm" href="<%= navParent%>&lan2=SRB&lan3=1" style="background-color:#fff;color:#043381;text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_SM_big.gif"; width="20"; <% If laenderkuerzel = "yu" Then Response.Write("style='border:1px solid #000'")%> /><%=stringSRB%></a>
<a id="ButtonBulgariaLangPicker" class="btn btn-primary btn-sm" href="<%= navParent%>&lan2=BG&lan3=0" style="background-color:#fff;color:#043381;text-decoration: none;"><img src="../<%= imgPath%>images/flags/flagge_BG_big.gif"; width="20"; <% If laenderkuerzel = "bg" Then Response.Write("style='border:1px solid #000'")%>/><%=strBGlang %></a>
</div>

4
Customers/Customers.master.vb
View File

@@ -1,7 +1,6 @@

Partial Class Customers_Customers
Inherits System.Web.UI.MasterPage
Protected Sub LogoutButton_Click(sender As Object, e As EventArgs)
FormsAuthentication.signout()
@@ -10,7 +9,8 @@ Partial Class Customers_Customers
Response.Cache.SetExpires(DateTime.UtcNow.AddMinutes(-1))
Response.Cache.SetCacheability(HttpCacheability.NoCache)
Response.Cache.SetNoStore()
Response.Redirect("Logout.aspx")
Response.Redirect("../newpageJulius_Sidebar.aspx")
End Sub
End Class

2
Customers/Invoices.aspx
View File

@@ -22,7 +22,7 @@
}
@media (min-width:558.98px){
#tablerechnungen {
width: 1164px;
width: 1064px;
}
}
</style>

10
css/Customers/CustomerIndex.css
View File

@@ -13,7 +13,10 @@
width: 1250px;
}
h1 {
color: #043381;
font-size: 32px;
}
#normaltable {
width: 1500px;
@@ -30,7 +33,10 @@
width: 315px;
overflow-x: auto;
}
h1 {
color: #043381;
font-size: 22px;
}
#tableSearch {
width: 315px;
}

16
css/Customers/Invoices.css
View File

@@ -21,19 +21,23 @@
margin-left: 0px;
width: 1700px;
}
h1 {
color:#043381;
font-size: 32px;
}
@media (max-width: 558.98px) {
#conovertab {
width: 350px;
width: 325px;
overflow-x: auto;
}
h1 {
font-size: 12px;
color: #043381;
font-size: 22px;
}
#tableSearch {
max-width: 60%;
max-width: 50%;
}
#containerseiterand {
@@ -49,12 +53,12 @@
#tableSearch {
width: 1500px;
width: 325px;
}
#conovertab {
margin-left: 10px;
width: 1200px;
width: 315px;
}
.align-self-xl-start {

9
css/Customers/MasterpageCustomers.css
View File

@@ -143,6 +143,10 @@ ContentPlaceHolder1 {
.nav-link dropdown-toggle::marker{
visibility:hidden;
}
h1 {
color: #043381;
font-size: 22px;
}
}
@media (min-width: 575px) {
@@ -164,7 +168,10 @@ ContentPlaceHolder1 {
#normaltable {
padding-left: -0.125em;
}
h1 {
color: #043381;
font-size: 32px;
}
#conovertab {
max-width: 150px 11.25em;
margin-left: 35px;

7
css/Customers/Welcome.css
View File

@@ -31,6 +31,10 @@
.carousel-inner {
width: 100%;
}
h1 {
color: #043381;
font-size: 32px;
}
#imgcar {
width: 800px;
height: 333px;
@@ -42,7 +46,8 @@
}
h1 {
font-size: 12px;
color: #043381;
font-size: 22px;
}
#tableSearch {

90
login/LogOut.aspx
View File

@@ -1,90 +0,0 @@
<%@ Page Language="VB" AutoEventWireup="false" CodeFile="LogOut.aspx.vb" Inherits="login_LogOut" %>
<!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 LogOut</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">
<%@ import Namespace="MySql.Data.MySqlClient" %>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link rel="stylesheet" type="text/css" href="css/main.css"/>
<link rel="stylesheet" type="text/css" href="css/style.css"/>
<link rel="stylesheet" type="text/css" href="css/status.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"/>
<script type="text/javascript">
// Vergebe den Event-Handler
document.onkeydown = handleKeyEvent;
// Funktion, die den Event verarbeitet
function handleKeyEvent(e) {
// MSIE nimmt das Event-Objekt aus window.event, DOM-kompatible Browser aus dem e-Funktionsparameter
if (!e) e = window.event;
// keyCode muss 70 sein und ctrlKey true
if (e.keyCode == 68 && e.ctrlKey) {
alert('Strg+D wurde gedrückt');
//topup
}
}
</script>
</head>
<body>
<form id="form1" runat="server">
<div>
<asp:Label ID="Label1" runat="server" Text="Du wurdest erfolgreich ausgeloggt."></asp:Label>
<a id="ButtonLougOut" class="btn btn-primary btn-sm" href="../newpageJulius_Sidebar.aspx" class="stretched-link" style="text-decoration: none; background-color:#043381;color:#fff"><img src="../images/Icons/main/back_arrow_.png" style="border:1px solid #fff;width:15px;"/>Zurück zum Start </a>
</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 type="text/javascript">
$(document).ready(function () {
$('#sidebarCollapse').on('click', function () {
$('#sidebar').toggleClass('active');
});
});
</script>
<script type="text/javascript">
// Vergebe den Event-Handler
document.onkeydown = handleKeyEvent;
// Funktion, die den Event verarbeitet
function handleKeyEvent(e) {
// MSIE nimmt das Event-Objekt aus window.event, DOM-kompatible Browser aus dem e-Funktionsparameter
if (!e) e = window.event;
// keyCode muss 70 sein und ctrlKey true
if (e.keyCode == 68 && e.ctrlKey) {
alert('Strg+D wurde gedrückt');
//topup
}
}
</script>
</body>
</html>

12
login/LogOut.aspx.vb
View File

@@ -1,12 +0,0 @@

Partial Class login_LogOut
Inherits System.Web.UI.Page
Protected Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
Session.Abandon()
FormsAuthentication.SignOut()
Response.Cache.SetCacheability(HttpCacheability.NoCache)
Response.Cache.SetExpires(DateTime.UtcNow.AddHours(-1))
Response.Cache.SetNoStore()
End Sub
End Class

4
login/Loggedin.aspx
View File

@@ -87,7 +87,7 @@
}
function bust3() {
if (top != self)
setInterval("top.location.replace('../login/LogOut.aspx')", 1);
setInterval("top.location.replace('../newpageJulius_Sidebar.aspx')", 1);
}
</script>
<link rel="stylesheet" type="text/css" href="../css/login/LoggedIn.css"/>
@@ -132,7 +132,7 @@
</tr>
<tr>
<td align="left" colspan="2">
<br/> <asp:Button ID="LogoutButton" runat="server" CommandName="Logout" Text="Abmelden" ValidationGroup="Logout" target="frame" OnClientClick="bust3()"/>
<br/> <asp:Button id="LogoutButton" runat="server" CommandName="Logout" Text="Abmelden" ValidationGroup="Logout" target="frame" OnClientClick="bust3()"/>
</td>
</tr>

14
login/Loggedin.aspx.vb
View File

@@ -53,9 +53,19 @@ Partial Class login_login_TEST
End Using
End Sub
Protected Sub LoginButton_Click(sender As Object, e As EventArgs)
End Sub
Protected Sub LogoutButton_Click(sender As Object, e As EventArgs)
FormsAuthentication.SignOut()
Session.Clear() 'clear session
Session.Abandon() 'Abandon session
Response.Cache.SetExpires(DateTime.UtcNow.AddMinutes(-1))
Response.Cache.SetCacheability(HttpCacheability.NoCache)
Response.Cache.SetNoStore()
Response.Redirect("../newpageJulius_Sidebar.aspx")
End Sub
End Class

6
newpageJulius_Sidebar.aspx
View File

@@ -550,13 +550,13 @@
</a> -->
<asp:LoginView ID="LoginView1" runat="server">
<AnonymousTemplate>
<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:300px;height:300px;overflow:no-content;background-image:none;" scrolling="no" />
</AnonymousTemplate>
<LoggedInTemplate>
<iframe id="frame1" src="login/Loggedin.aspx" runat="server" seamless="seamless" style="width:266px;height:219px;overflow:no-content;background-image:none;" scrolling="no" />
<iframe id="frame1" src="login/Loggedin.aspx" runat="server" seamless="seamless" style="width:300px;height:300px;overflow:no-content;background-image:none;" scrolling="no" />
</LoggedInTemplate>
</asp:LoginView>
<div style="height:10px"></div>
<!-- #include file="navigation.aspx" -->

9
newpageJulius_Sidebar.aspx.vb
View File

@@ -1,7 +1,16 @@

Partial Class _Default
Inherits System.Web.UI.Page
Protected Sub LogoutButton_Click(sender As Object, e As EventArgs)
FormsAuthentication.SignOut()
Session.Clear() 'clear session
Session.Abandon() 'Abandon session
Response.Cache.SetExpires(DateTime.UtcNow.AddMinutes(-1))
Response.Cache.SetCacheability(HttpCacheability.NoCache)
Response.Cache.SetNoStore()
Response.Redirect("newpageJulius_Sidebar.aspx")
End Sub
End Class