From 0f399cdcfd51d8a9cff19ac5ad169cb1c69a5cdd Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Fri, 26 Oct 2018 22:46:12 +0200
Subject: [PATCH] Added dynamic name in navbar

---
 WebContent/WEB-INF/tags/footer.tag   |  6 +++---
 WebContent/WEB-INF/tags/messages.tag |  6 +++---
 WebContent/WEB-INF/tags/navbar.tag   | 21 +++++++++++----------
 src/zall/ZalleryServlet.java         |  2 --
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/WebContent/WEB-INF/tags/footer.tag b/WebContent/WEB-INF/tags/footer.tag
index c4a9774..9083620 100644
--- a/WebContent/WEB-INF/tags/footer.tag
+++ b/WebContent/WEB-INF/tags/footer.tag
@@ -1,6 +1,6 @@
-<%@tag description="Footer template" pageEncoding="UTF-8" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
+<%@ tag description="Footer template" pageEncoding="UTF-8" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="t" tagdir="/WEB-INF/tags" %>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/tags/messages.tag b/WebContent/WEB-INF/tags/messages.tag
index cc70514..bf826dd 100644
--- a/WebContent/WEB-INF/tags/messages.tag
+++ b/WebContent/WEB-INF/tags/messages.tag
@@ -1,6 +1,6 @@
-<%@tag description="User message template" pageEncoding="UTF-8" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
+<%@ tag description="User message template" pageEncoding="UTF-8" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="t" tagdir="/WEB-INF/tags" %>
 
 <!-- User Messages -->
 <script type="text/javascript">
diff --git a/WebContent/WEB-INF/tags/navbar.tag b/WebContent/WEB-INF/tags/navbar.tag
index 4ceab58..61308b9 100644
--- a/WebContent/WEB-INF/tags/navbar.tag
+++ b/WebContent/WEB-INF/tags/navbar.tag
@@ -1,6 +1,7 @@
-<%@tag description="Navigation bar template" pageEncoding="UTF-8" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
+<%@ tag description="Navigation bar template" pageEncoding="UTF-8" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="t" tagdir="/WEB-INF/tags" %>
+<%@ tag import="zall.ZalleryConstants,zall.bean.User" %>
 
 <!-- Static navbar -->
 <nav class="navbar navbar-default">
@@ -16,8 +17,8 @@
 
     <div class="navbar-collapse collapse">
         <ul class="nav navbar-nav">
-            <li class="active"><a href="#">Gallery</a></li>
-            <li><a href="#">Faces</a></li>
+            <li class="active"><a href="gallery">Gallery</a></li>
+            <li><a href="faces">Faces</a></li>
             <li><a href="#">Geni</a></li>
         </ul>
 
@@ -44,17 +45,17 @@
             <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                     <span class="glyphicon glyphicon-user"></span>
-                    <strong>Ziver Koc</strong>
+                    <strong>${sessionScope.zall_user.getName()}</strong>
                     <span class="caret">
                 </a>
                 <ul class="dropdown-menu">
-                    <li><a href="#">Profile</a></li>
+                    <li><a href="profile">Profile</a></li>
                     <li role="separator" class="divider"></li>
                     <li class="dropdown-header">Administration</li>
-                    <li><a href="#">Users</a></li>
-                    <li><a href="#">Transcoding Queue</a></li>
+                    <li><a href="users">Users</a></li>
+                    <li><a href="transcoding">Transcoding Queue</a></li>
                     <li role="separator" class="divider"></li>
-                    <li><a href="#">Logout</a></li>
+                    <li><a href="logout">Logout</a></li>
                 </ul>
             </li>
         </ul>
diff --git a/src/zall/ZalleryServlet.java b/src/zall/ZalleryServlet.java
index 691314b..bfe9061 100644
--- a/src/zall/ZalleryServlet.java
+++ b/src/zall/ZalleryServlet.java
@@ -26,8 +26,6 @@ public abstract class ZalleryServlet extends HttpServlet {
             request.setAttribute(ENV_KEY_WEBSITE_TITLE, Zallery.WEBSITE_NAME);
             request.setAttribute(ENV_KEY_WEBSITE_NAME,  Zallery.WEBSITE_NAME);
             request.setAttribute(ENV_KEY_WEBSITE_URL,   Zallery.WEBSITE_URL);
-            request.setAttribute(ENV_KEY_ADMIN_NAME,    Zallery.ADMIN_NAME);
-            request.setAttribute(ENV_KEY_ADMIN_EMAIL,   Zallery.ADMIN_EMAIL);
 
             UserMessageManager msgs = Zallery.getUserMessage(request.getSession());
             request.setAttribute(ZalleryConstants.SESSION_KEY_USER_MSG, msgs);