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

Logout Button wurde gefixed

Browse Source
This commit is contained in:
ja
2021-09-16 14:45:29 +02:00
parent 773c15e9e6
commit 64c3227b33
6 changed files with 86 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Customers/Customers.master
View File

@@ -29,9 +29,7 @@
<%@ import Namespace="MySql.Data.MySqlClient" %>
<script runat="server">
Sub Page_Load() Handles Me.Load
'Login-Validierung
If Not Me.Page.User.Identity.IsAuthenticated Then
FormsAuthentication.RedirectToLoginPage()
@@ -66,7 +64,6 @@
' Response.Redirect("~{login/login.aspx")'
'End If '
End Sub
' Public ReadOnly Property CurrentCity() As String
' Get
' Return "asd"
@@ -156,18 +153,15 @@
navParent = "admin.aspx"
imgPath = "../"
End If
Dim curentMenuId As String = "1"
If Not Request.QueryString("menuID") Is Nothing Then
curentMenuId = Request.QueryString("menuID")
End If
If Not Request.QueryString("lan") Is Nothing Then
laenderkuerzel = Request.QueryString("lan")
End If
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
Dim LT As New VERAG_PROG_ALLGEMEIN.cLanguageText_LIST("HOMEPAGE", "LOGIN", "STATUS", "")
Dim V_LST As New VERAG_PROG_ALLGEMEIN.cVermerkeCodes_LIST
Dim lan = "DE"
@@ -190,6 +184,7 @@
ElseIf laenderkuerzel = "TR" And lan3 = "0" Then
flagpath = "images/flags/flagge_TR.gif"
End If
%>
<li class="wrapper">
<!-- Sidebar -->
@@ -275,7 +270,7 @@
<ul style="list-style: none;"class="collapse list-unstyled" id="UserSubmenu1">
<span class="navbar-toggler-icon"></span>
<li><button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:16px;white-space: nowrap; height:20px"><img src="../images/Icons/main/gear_blue.png"; style="width:15px; height:15px;color:#043381;background-color:#fff;margin-right:6px;" />Profil bearbeiten</button> </li>
<li><button type="button" class="btn btn-primary" id="LogoutButton1" href="../login/Logout.aspx" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:16px;width:200px;z-index:1032;margin-left:-16px"><img src="../images/Icons/main/Logout.svg.png"; style="font-size:14px;width:20px; height:20px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</button></li>
<li><a type="button" class="btn btn-primary" href="../login/Logout.aspx" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:16px;width:200px;z-index:1032;margin-left:-16px"><img src="../images/Icons/main/Logout.svg.png"; style="font-size:14px;width:20px; height:20px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</a></li>
</ul>
</li>
</ul>
@@ -461,7 +456,7 @@
</button>
<ul class="dropdown-content" id="dropdownmenuecont" style="width:210px;right:-198px;top:45px;z-index:1032;margin-right:-2px;">
<li><button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="text-decoration: none;background-color:#fff;color:#043381;z-index:1032;text-align:left;margin-left:-16px;border:none;font-size:16px;white-space: nowrap; width:200px"><img src="../images/Icons/main/gear_blue.png"; style="font-size:14px;width:15px; height:15px;color:#043381;background-color:#fff;margin-right:6px;" />Profil bearbeiten</button></li>
<li><button type="button" class="btn btn-primary" id="LogoutButton1" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:16px;width:200px;z-index:1032;margin-left:-16px;width:200px"><img src="../images/Icons/main/Logout.svg.png"; style="font-size:14px;width:20px; height:20px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</button></li>
<li><a type="button" class="btn btn-primary" href="../login/Logout.aspx" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:16px;width:200px;z-index:1032;margin-left:-16px;width:200px"><img src="../images/Icons/main/Logout.svg.png"; style="font-size:14px;width:20px; height:20px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</a></li>
<!-- <div class="dropdown-divider"></div>-->
</ul></div>

21
Customers/CustomsAviso.aspx
View File

@@ -41,6 +41,7 @@
<h3>Hier finden Sie Informationen zu den aktuellen Aufträgen.</h3>
</div>
<%Try
VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.SHOW
'Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(799124)
Dim VERAGSQL = New VERAG_PROG_ALLGEMEIN.SQL
@@ -132,7 +133,6 @@
</div>
</div>
</div>
</div>
</div>
<div style="height:/*24px*/1.873536299765808vh"></div>
@@ -164,18 +164,14 @@
</table>-->
</div>
</div></div></div>
</div>
</div>
<br /><br /><br />
<% End If
End If
End If
Catch ex As Exception
Response.Write(ex.Message & ex.StackTrace)
End Try %>
End If
End If
Catch ex As Exception
Response.Write(ex.Message & ex.StackTrace)
End Try %>
<div></div></div>
<%-- <div class="footer_menu">
<div class="footer_menu_content">
@@ -199,8 +195,7 @@
</script>
<script type='text/javascript'>
$(document).ready(function () {
$("#container2").hide();
$("#container2").hide();
$('#<%=RadioButtonList1.ClientID %> input[type="radio"]').change(function () {
if ($(this).val() == "Freigabe") {
$("#container2").show();