diff --git a/Customers/Customers.master b/Customers/Customers.master index 11ede6b..24d493a 100644 --- a/Customers/Customers.master +++ b/Customers/Customers.master @@ -271,7 +271,7 @@
@@ -310,7 +310,6 @@ -
@@ -322,20 +321,21 @@
@@ -441,7 +441,7 @@
-
  • Logout
    • +
  • Logout
    • @@ -459,9 +459,9 @@ Dim stringTR = "  TR"%> /><%=stringDE%> - /><%=stringTR%> - /><%=stringEN%> - /><%=stringBIH%> + /><%=stringTR%> + /><%=stringEN%> + /><%=stringBIH%> /><%=stringSRB%> /><%=strBGlang %> diff --git a/Customers/Customers.master.vb b/Customers/Customers.master.vb index 8878eab..54b9621 100644 --- a/Customers/Customers.master.vb +++ b/Customers/Customers.master.vb @@ -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 diff --git a/Customers/Invoices.aspx b/Customers/Invoices.aspx index e8a792f..b69753f 100644 --- a/Customers/Invoices.aspx +++ b/Customers/Invoices.aspx @@ -22,7 +22,7 @@ } @media (min-width:558.98px){ #tablerechnungen { - width: 1164px; + width: 1064px; } } diff --git a/css/Customers/CustomerIndex.css b/css/Customers/CustomerIndex.css index f6ce266..dfbe8a0 100644 --- a/css/Customers/CustomerIndex.css +++ b/css/Customers/CustomerIndex.css @@ -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; } diff --git a/css/Customers/Invoices.css b/css/Customers/Invoices.css index 89361e0..008a4fa 100644 --- a/css/Customers/Invoices.css +++ b/css/Customers/Invoices.css @@ -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 { diff --git a/css/Customers/MasterpageCustomers.css b/css/Customers/MasterpageCustomers.css index f963d8f..34cd276 100644 --- a/css/Customers/MasterpageCustomers.css +++ b/css/Customers/MasterpageCustomers.css @@ -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; diff --git a/css/Customers/Welcome.css b/css/Customers/Welcome.css index a845607..cf207e2 100644 --- a/css/Customers/Welcome.css +++ b/css/Customers/Welcome.css @@ -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 { diff --git a/login/LogOut.aspx b/login/LogOut.aspx deleted file mode 100644 index 5f428e2..0000000 --- a/login/LogOut.aspx +++ /dev/null @@ -1,90 +0,0 @@ -<%@ Page Language="VB" AutoEventWireup="false" CodeFile="LogOut.aspx.vb" Inherits="login_LogOut" %> - - - - - - - VERAG LogOut - - - - - - - - - - - - - - - - - <%@ import Namespace="MySql.Data.MySqlClient" %> - - - - - - - - - - - - -
    -
    - - Zurück zum Start -
    -
    - - - - - - - - - - - - - - - diff --git a/login/LogOut.aspx.vb b/login/LogOut.aspx.vb deleted file mode 100644 index 39a47ca..0000000 --- a/login/LogOut.aspx.vb +++ /dev/null @@ -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 diff --git a/login/Loggedin.aspx b/login/Loggedin.aspx index c55d791..9a4568e 100644 --- a/login/Loggedin.aspx +++ b/login/Loggedin.aspx @@ -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); } @@ -132,7 +132,7 @@ -
    +
    diff --git a/login/Loggedin.aspx.vb b/login/Loggedin.aspx.vb index 8791881..51ee5e7 100644 --- a/login/Loggedin.aspx.vb +++ b/login/Loggedin.aspx.vb @@ -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 diff --git a/newpageJulius_Sidebar.aspx b/newpageJulius_Sidebar.aspx index c89e2a3..f12ef0f 100644 --- a/newpageJulius_Sidebar.aspx +++ b/newpageJulius_Sidebar.aspx @@ -550,13 +550,13 @@ --> -