Bladeren bron

Added navigation menu.

Tom Flucke 7 jaren geleden
bovenliggende
commit
b6fec9e672
5 gewijzigde bestanden met toevoegingen van 43 en 22 verwijderingen
  1. 4 1
      conf/ivy.xml
  2. 1 1
      conf/web.xml
  3. 21 0
      web/WEB-INF/tags/navItem.tag
  4. 14 17
      web/WEB-INF/tags/navigation.tag
  5. 3 3
      web/WEB-INF/tags/template.tag

+ 4 - 1
conf/ivy.xml

@@ -11,11 +11,14 @@
     <!-- Spring Framework -->
     <dependency org="commons-logging" name="commons-logging" rev="1.2"/>
     <dependency org="org.springframework" name="spring-webmvc" rev="5.0.9.RELEASE"/>
-    <dependency org="javax.servlet.jsp.jstl" name="jstl-api" rev="1.2" conf="war->default"/>
     <!-- UI Resources -->
     <dependency org="org.webjars" name="bootstrap" rev="4.1.3" conf="war->default"/>
     <dependency org="org.webjars" name="angular-ui-bootstrap" rev="2.5.0" conf="war->default"/>
     <dependency org="org.webjars" name="webjars-locator" rev="0.34" conf="war->default"/>
+
+    <dependency org="javax.servlet" name="jstl" rev="1.2" conf="war->default"/>
+    <dependency org="org.apache.taglibs" name="taglibs-standard-impl" rev="1.2.5" conf="war->default"/>
+
     <!-- Tomcat Resources -->
     <dependency org="javax.servlet" name="javax.servlet-api" rev="4.0.1" conf="provided->default"/>
     <!-- Ant dependencies -->

+ 1 - 1
conf/web.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app xmlns="http://java.sun.com/xml/ns/j2ee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_5_0.xsd"
 	     version="5.0">
 
   <display-name>Online recipe manager.</display-name>

+ 21 - 0
web/WEB-INF/tags/navItem.tag

@@ -0,0 +1,21 @@
+<%@tag description="Standard navigation bar" pageEncoding="UTF-8"%>
+
+<%@attribute name="title" required="true" type="java.lang.String"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+      
+<!-- Navigation Item -->
+<c:set var="body"><jsp:doBody/></c:set>
+<c:choose>
+  <c:when test="${title == body}">
+    <li class="nav-item active">
+      <a class="nav-link" href="#">${body}
+        <span class="sr-only">(current)</span>
+      </a>
+    </li>
+  </c:when>
+  <c:otherwise>
+    <li class="nav-item">
+      <a class="nav-link" href="#">${body}</a>
+    </li>
+  </c:otherwise>
+</c:choose>

+ 14 - 17
web/WEB-INF/tags/navigation.tag

@@ -1,28 +1,25 @@
 <%@tag description="Standard navigation bar" pageEncoding="UTF-8"%>
+<%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
+<%@attribute name="title" required="true" type="java.lang.String"%>
 
 <!-- Navigation -->
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
   <div class="container">
     <a class="navbar-brand" href="#">Start Bootstrap</a>
-    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
-          <span class="navbar-toggler-icon"></span>
-        </button>
+    <button class="navbar-toggler" type="button"
+            data-toggle="collapse"
+            data-target="#navbarResponsive"
+            data-aria-controls="navbarResponsive"
+            data-aria-expanded="false"
+            data-aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
     <div class="collapse navbar-collapse" id="navbarResponsive">
       <ul class="navbar-nav ml-auto">
-        <li class="nav-item active">
-          <a class="nav-link" href="#">Home
-                <span class="sr-only">(current)</span>
-              </a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="#">About</a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="#">Services</a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="#">Contact</a>
-        </li>
+        <t:navItem title="${title}">Home</t:navItem>
+        <t:navItem title="${title}">Add Recipie</t:navItem>
+        <t:navItem title="${title}">Add Food</t:navItem>
+        <t:navItem title="${title}">Settings</t:navItem>
       </ul>
     </div>
   </div>

+ 3 - 3
web/WEB-INF/tags/template.tag

@@ -1,12 +1,12 @@
 <%@tag description="Page template" pageEncoding="UTF-8"%>
 <%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
       
-<%@attribute name="title" fragment="true" %>
+<%@attribute name="title" required="true" %>
 
 <!DOCTYPE html>
 <html>
   <head>
-    <title>iEat - <jsp:invoke fragment="title"/></title>
+    <title>iEat - ${title}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <link type="text/css" href="static/bootstrap/css/bootstrap.min.css" type="text/css" rel="stylesheet"/>
   </head>
@@ -14,7 +14,7 @@
     <div class="container">
       <header class="page-header">
         <!--<h1><jspinvoke fragment="title"></h1>-->
-        <t:navigation/>
+        <t:navigation title="${title}"/>
       </header>
       <div id="body">
         <jsp:doBody/>