Berechtigungssystem wurde hinzugefügt in Kommentaren damit schneller einsatzbereit.

Hinweis:
Im Commit 96993a6a wurde auch der Button entfernt der fälschlicherweise in der Hauptmenü-Leiste  der Navigationbar war der aber schon in dem Sidemenü vorhanden ist.
This commit is contained in:
ja
2021-09-02 15:29:41 +02:00
parent 96993a6a02
commit 3bd9fd3761
2 changed files with 60 additions and 49 deletions

View File

@@ -264,21 +264,20 @@
<!-- </ul>-->
</li>
<a class="btn btn-primary" data-bs-toggle="collapse" href="#collapseExample2" role="button" aria-expanded="false" aria-controls="collapseExample">
<img src="../images/samples/default-avatar.jpg"; width="20"; /><asp:LoginName ID="LoginName4" runat="server" style="margin-left:6px"/></a>
<div class="collapse" id="collapseExample2">
<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/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" onclick="LogoutButton_Click" style="background-color:#fff;color:#043381"<img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff;"/>Logout</button></li>
</ul>
</div>
<li>
<a href="#UserSubmenu1" data-bs-toggle="collapse" aria-expanded="false" class="dropdown-toggle">User: <%=Me.Page.User.Identity.Name %></a>
<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;"><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" onclick="LogoutButton_Click" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:16px;"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</button> </li>
</ul>
</li>
</ul>
</div></nav>
<nav class="container-xxl" style="align-content:center">
</div></nav>
<!-- Page Content -->
<nav id="content">
<nav class="container-xxl" style="align-content:center">
<nav id="content">
<div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
@@ -301,6 +300,19 @@
<li> Registriert seit: 15/02/2021</li>
<li> Die Berechtigungen im Überblick </li>
<ul>
<%'Dim berecht As Boolean
'Dim imgpath2 As String = ""
'For Each ber In berecht[]
'If ber = True Then
' imgPath = "../images/Icons/main/checkmarkcircle_veragblau.png"
'Else
'imgPath = "../images/Icons/main/cross_wrong_close_delete_icon.png"
'End If
'Next
'End If -->%>
<!-- <li><img src="<%'=imgpath2 %>" style="width:20px;height:20px;"/>"Zoll"</li>
<li> <img src="<%'=imgpath2 %>" style="width:20px;height:20px;"/>"Suben"</li>
<li><img src="<%'=imgpath2 %>" style="width:20px;height:20px;"/>"Waidhaus"</li>-->
<li><img src="../images/Icons/main/checkmarkcircle_veragblau.png" style="width:20px;height:20px;"/>"Zoll"</li>
<li> <img src="../images/Icons/main/checkmarkcircle_veragblau.png" style="width:20px;height:20px;"/>"Suben"</li>
<li><img src="../images/Icons/main/cross_wrong_close_delete_icon.png" style="width:20px;height:20px;"/>"Waidhaus"</li>
@@ -311,32 +323,20 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
</div></div>
</div>
</div>
<div class="d-md-none">
<nav class="navbar navbar-expand-md navbar-light bg-light justify-content-md-center flex-nowrap" data-spy="affix" data-offset-top="197">
<button type="button" id="sidebarCollapse" class="btn btn-info" style="background-color:#fff; color:#043381;">
<nav class="navbar navbar-expand-md navbar-light bg-light justify-content-md-center flex-nowrap" data-spy="affix" data-offset-top="197">
<button type="button" id="sidebarCollapse" class="btn btn-info" style="background-color:#fff; color:#043381;">
<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 class="dropdown" id="dropdownbtnmain" >
<button class="dropbtn"id="dropbtnbtnbtn"
<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="15"; /><a data-bs-toggle="modal" data-bs-target="#exampleModal" <asp:LoginName class="pointer" ID="LoginName1" runat="server" style="margin-left:6px"/></a></button>
</button>
<div class="dropdown-content" id="dropdownmenuecont">
<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff; color:#043381;text-align:left;border:none"><img src="../images/Icons/main/gear_blue.png"; style="width:15px; height:15px;color:#043381;background-color:#fff;margin-right:6px;" />Profil bearbeiten</button>
<button type="button" onclick="LogoutButton_Click" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</button>
<!-- <div class="dropdown-divider"></div>-->
</div> </div>
<button class="btn btn-primary" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasWithBothOptions" aria-controls="offcanvasWithBothOptions" style="background-color:#fff; color:#043381;"><img src="../<%= imgPath%>images/flags/flagge_DE_AT_big.gif" width="25"; /></button>
</nav>
</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>
<button class="btn btn-primary" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasWithBothOptions" aria-controls="offcanvasWithBothOptions" style="background-color:#fff; color:#043381;"><img src="../<%= imgPath%>images/flags/flagge_DE_AT_big.gif" width="25"; /></button>
</nav>
</div>
<div class="offcanvas offcanvas-end" data-bs-scroll="true" tabindex="-1" id="offcanvasWithBothOptions" aria-labelledby="offcanvasWithBothOptionsLabel">
@@ -436,9 +436,18 @@
</div>-->
</div>
</div>
<div style="width:160px;"></div>
<div style="width:110px;"></div>
<div class="dropdown" id="dropdownbtnmain">
<button class="dropbtn" id="dropbtnbtnbtn" style=""
<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="15"; /><asp:LoginName class="pointer" ID="LoginName2" runat="server" style="margin-left:6px"/></button>
</button>
<ul class="dropdown-content" id="dropdownmenuecont">
<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;"><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" onclick="LogoutButton_Click" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:16px;"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</button> </li>
<!-- <div class="dropdown-divider"></div>-->
</ul> </div>
<div class="dropdown" style="background-color:#fff; color:#043381;position:absolute;right:5%;top:15%;z-index:1031">
<button class="dropbtn" id="dropbtnlang"><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>
@@ -459,16 +468,7 @@
</div>
</div>
<div class="dropdown" id="dropdownbtnmain">
<button class="dropbtn" id="dropbtnbtnbtn" style=""
<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="15"; /><asp:LoginName class="pointer" ID="LoginName2" runat="server" style="margin-left:6px"/></button>
</button>
<ul class="dropdown-content" id="dropdownmenuecont">
<li> <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff; color:#043381;text-align:left;border:none"><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" onclick="LogoutButton_Click" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</button> </li>
<!-- <div class="dropdown-divider"></div>-->
</ul> </div>
</nav> </div>
<!-- Container zur Ausrichtung des Contents-->
<div style="margin-left:5px;margin-right:5px">