From 88117b74a307b1442401a690d85996030492e299 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Thu, 09 Feb 2017 22:40:12 +0000
Subject: [PATCH] Nav umgestellt (in Arbeit)
---
web/ui/index.html | 25 +++++++++++++++++++++++++
src/java/de/uhilger/um/api/UserMgr.java | 23 ++++++++++++++++++++++-
2 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/src/java/de/uhilger/um/api/UserMgr.java b/src/java/de/uhilger/um/api/UserMgr.java
index 1399575..f32072a 100644
--- a/src/java/de/uhilger/um/api/UserMgr.java
+++ b/src/java/de/uhilger/um/api/UserMgr.java
@@ -21,6 +21,7 @@
import de.uhilger.baselink.GenericRecord;
import de.uhilger.baselink.PersistenceManager;
import de.uhilger.baselink.Record;
+import de.uhilger.transit.web.RequestKontext;
import de.uhilger.transit.web.WebKontext;
import de.uhilger.um.Digester;
import de.uhilger.um.daten.User;
@@ -31,6 +32,7 @@
import java.util.Properties;
import java.util.logging.Logger;
import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
/**
* <p>Die Methoden der Klasse UserMgr sind
@@ -57,12 +59,14 @@
*
* @version 2, December 27, 2016
*/
-public class UserMgr implements WebKontext {
+public class UserMgr implements WebKontext, RequestKontext {
private static final Logger logger = Logger.getLogger(UserMgr.class.getName());
/** Zeiger zum Servlet-Kontext dieser Anwendung */
private ServletContext ctx;
+
+ private HttpServletRequest request;
/** Name, unter dem das Properties-Objekt mit den SQL-Befehlen im ServletContext hinterlegt ist */
public static final String UM_SQL_PROPERTIES = "umSqlProperties";
@@ -124,6 +128,11 @@
return deletedUser;
}
+ public String logout() {
+ getRequest().getSession().invalidate();
+ return "logged out";
+ }
+
/* ------------ Rollen ------------------ */
public UserRole grantRole(UserRole role) {
@@ -179,5 +188,17 @@
this.ctx = servletContext;
}
+ /* ------------- Implementierung RequestKontext ------------- */
+
+ @Override
+ public HttpServletRequest getRequest() {
+ return request;
+ }
+
+ @Override
+ public void setRequest(HttpServletRequest r) {
+ this.request = r;
+ }
+
}
diff --git a/web/ui/index.html b/web/ui/index.html
index d07633f..eb4b61c 100644
--- a/web/ui/index.html
+++ b/web/ui/index.html
@@ -16,11 +16,35 @@
</head>
<body>
<div id="inhalt">
+ <!--
<div class="breadcrumb">
<a class="breadcrumb-item" href="/">WebBox</a>
<a class="breadcrumb-item" href="/wbx/">Verwaltung</a>
<span class="breadcrumb-item active">Benutzer</span>
</div>
+ -->
+ <ul class="nav">
+ <li class="nav-item">
+ <a class="nav-link active" href="/">WebBox</a>
+ </li>
+ <li class="nav-item dropdown">
+ <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">Verwaltung</a>
+ <div class="dropdown-menu">
+ <a class="dropdown-item" href="/wbx/mng">Apps</a>
+ <a class="dropdown-item disabled" href="#">Benutzer</a>
+ </div>
+ </li>
+ <li class="nav-item dropdown">
+ <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">Dropdown</a>
+ <div class="dropdown-menu">
+ <a class="dropdown-item" href="#">Action</a>
+ <a class="dropdown-item" href="#">Another action</a>
+ <a class="dropdown-item" href="#">Something else here</a>
+ <div class="dropdown-divider"></div>
+ <a class="dropdown-item" href="#">Separated link</a>
+ </div>
+ </li>
+ </ul>
<!-- <h1>Benutzer</h1> -->
<div id="user-list-form">
<select multiple class="form-control eingabe role-select" size="5" name="nutzerliste" id="nutzerliste"></select>
@@ -56,6 +80,7 @@
</div>
</div>
<script src="/jslib/jquery/jquery.min.js"></script>
+ <script src="/jslib/bootstrap/js/bootstrap.min.js"></script>
<script src="/jslib/mustache/mustache.min.js"></script>
<script src="ui.js"></script>
<script type="text/javascript" charset="utf-8">
--
Gitblit v1.9.3