Skip to content

GitLab

Commit 6bb92135 authored by Michael Ritter's avatar Michael Ritter
Browse files

New menuheader with css to emulate bootstraps nav

parent 699e03fb
Hide whitespace changes
Inline Side-by-side
ace-am/src/main/webapp/header.jsp
View file @ 6bb92135
......@@ -12,59 +12,44 @@ on Libraries node in Projects view can be used to add the JSTL 1.1 library.
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<div class="menuheader">
<table>
<tr>
<td align="center">
<div class="menucell">
<um:Auth role="Status" showUnauthenticated="true">
<a href="Status">Status</a>
</um:Auth>
<BR>
</div>
</td>
<ul class="nav justify-content-center">
<um:Auth role="Status" showUnauthenticated="true">
<li class="nav-item">
<a class="nav-link" href="Status">Status</a>
</li>
</um:Auth>
<td align="center">
<um:Auth role="Log">
<div class="menucell">
<a href="EventLog?clear=1">Event Log</a>
<BR>
</div>
</um:Auth>
</td>
<um:Auth role="Log" showUnauthenticated="true">
<li class="nav-item">
<a class="nav-link" href="EventLog?clear=1">Event Log</a>
</li>
</um:Auth>
<td align="center">
<div class="menucell">
<c:if test="${authmanagement}">
<um:Auth role="Users">
<a href="Users">Accounts</a>
</um:Auth>
<um:Auth role="!Users">
<a href="passwordchange.jsp">Change Password</a>
</um:Auth>
</c:if>
<BR>
</div>
</td>
<c:if test="${authmanagement}">
<um:Auth role="Users">
<li class="nav-item">
<a class="nav-link" href="Users">Accounts</a>
</li>
</um:Auth>
<um:Auth role="!Users">
<li class="nav-item">
<a class="nav-link" href="passwordchange.jsp">Change Password</a>
</li>
</um:Auth>
</c:if>
<um:Auth role="Status">
<li class="nav-item">
<a class="nav-link" href="UpdateSettings">System Settings</a>
<td align="center">
<um:Auth role="Status">
<div class="menucell">
<a href="UpdateSettings">System Settings</a>
</div>
</um:Auth>
</td>
</li>
</um:Auth>
<td align="center">
<um:Auth role="Status">
<div class="menucell">
<a href="Statistics">Statistics</a>
</div>
</um:Auth>
</td>
</tr>
</table>
</div>
<um:Auth role="Status">
<li class="nav-item">
<a class="nav-link" href="Statistics">Statistics</a>
</li>
</um:Auth>
</ul>
<div class="header">
<img src="images/title.jpg" alt="ACE Audit Manager"><BR><div style="font-size: large; color: red">${globalMessage}</div>
</div>
\ No newline at end of file
ace-am/src/main/webapp/style.css
View file @ 6bb92135
......@@ -3,8 +3,8 @@ body {
font-size: 10px;
width: 750px;
border: 1px solid #000000;
margin-left: auto;
margin-right: auto;
margin-left: auto !important;
margin-right: auto !important;
}
h1 {
......@@ -31,6 +31,39 @@ input {
font-size: 12px;
}
/*
* Taken from bootstrap. If we import a lot of rules break and we end up
* with broken pages. The ui in general needs an overhaul but that's a lot
* of work.
*/
ul {
margin-top: 0;
margin-bottom: 1rem;
}
.nav {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flex;
display: flex;
padding-left: 0;
margin-bottom: 0;
list-style: none;
}
.nav-link {
display: block;
padding: .5em 1em;
}
.justify-content-center {
-webkit-box-pack: center !important;
-webkit-justify-content: center !important;
-ms-flex-pack: center !important;
justify-content: center !important;
}
.standardBody {
font-size: 12px;
margin-top: 0px;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment