Merge branch 'master' of git.tflucke.name:tflucke/iEat2

conf/ant/ivy.xml

@@ -18,6 +18,7 @@
     <!-- JSON API Serialization -->
     <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.9.6"/>
     <!-- UI Resources -->
+    <dependency org="org.webjars" name="jquery" rev="2.2.4" 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"/>

web/WEB-INF/tags/navigation.tag

@@ -10,7 +10,15 @@
     </div>
     <ul class="nav navbar-nav">
       <t:navItem title="${title}" href="/ieat-2.0.0">Home</t:navItem>
-      <t:navItem title="${title}" href="/ieat-2.0.0/addFood">Add Food</t:navItem>
+      <li class="dropdown">
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+          Food<span class="caret"></span>
+        </a>
+        <ul class="dropdown-menu">
+          <t:navItem title="${title}" href="/ieat-2.0.0/browseFood">Manage Food</t:navItem>
+          <t:navItem title="${title}" href="/ieat-2.0.0/addFood">Add Food</t:navItem>
+        </ul>
+      </li>
       <t:navItem title="${title}" href="/ieat-2.0.0/addRecipe">Add Recipe</t:navItem>
       <t:navItem title="${title}" href="/ieat-2.0.0">Settings</t:navItem>
     </ul>

web/WEB-INF/tags/template.tag

@@ -11,6 +11,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link type="text/css" href="static/bootstrap/css/bootstrap.min.css" type="text/css" rel="stylesheet"/>
+    <script type="text/javascript" src="static/jquery/jquery.min.js"></script>
+    <script type="text/javascript" src="static/bootstrap/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="static/angularjs/angular.min.js"></script>
     <script type="text/javascript" src="static/angularjs/angular-resource.min.js"></script>
     <script type="text/javascript" src="static/angular-ui-bootstrap/ui-bootstrap.min.js"></script>

web/views/browseFood.jsp

@@ -1,7 +1,7 @@
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
 <%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
 <t:template>
-  <jsp:attribute name="title">Add Food</jsp:attribute>
+  <jsp:attribute name="title">Manage Food</jsp:attribute>
   <jsp:attribute name="head">
     <script type="text/javascript" src="static/ndbDatabase.js"></script>
     <script type="text/javascript" src="static/basicFoodEditor.js"></script>