Separated the menu model out of the app model.

rapidoid · Nov 1, 2015 · 154f8f3 · 154f8f3
1 parent 416136b
commit 154f8f3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/rapidoid-html/src/main/resources/rapidoid/partials/page-menu.default.html b/rapidoid-html/src/main/resources/rapidoid/partials/page-menu.default.html
@@ -1,6 +1,6 @@
         <div id="collapsable" class="collapse navbar-collapse">
 
-            {{#app.menu.leftItems}}
+            {{#menu.leftItems}}
             <ul class="nav navbar-nav navbar-left">
                 <li class="dropdown">
                     <a{{#submenu}} class="dropdown-toggle" data-toggle="dropdown"{{/submenu}} href="{{target}}">{{caption}}{{#submenu}}<span class="caret"></span>{{/submenu}}</a>
@@ -21,9 +21,9 @@
                     {{/submenu}}
                 </li>
             </ul>
-            {{/app.menu.leftItems}}
+            {{/menu.leftItems}}
 
-            {{#app.menu.rightItemsReversed}}
+            {{#menu.rightItemsReversed}}
             <ul class="nav navbar-nav navbar-right">
                 <li class="dropdown">
                     <a{{#submenu}} class="dropdown-toggle" data-toggle="dropdown"{{/submenu}} href="{{target}}">{{caption}}{{#submenu}}<span class="caret"></span>{{/submenu}}</a>
@@ -44,7 +44,7 @@
                     {{/submenu}}
                 </li>
             </ul>
-            {{/app.menu.rightItemsReversed}}
+            {{/menu.rightItemsReversed}}
 
 {{>navbar-custom}}
 

diff --git a/rapidoid-http/src/main/java/org/rapidoid/http/HttpExchangeImpl.java b/rapidoid-http/src/main/java/org/rapidoid/http/HttpExchangeImpl.java
@@ -57,6 +57,7 @@
 import org.rapidoid.util.RapidoidConf;
 import org.rapidoid.util.UTILS;
 import org.rapidoid.webapp.AppCtx;
+import org.rapidoid.webapp.WebApp;
 import org.rapidoid.wire.Wire;
 import org.rapidoid.wrap.BoolWrap;
 
@@ -1361,7 +1362,10 @@ public synchronized Map<String, Object> model() {
 			model.put("home", home());
 			model.put("host", host());
 			model.put("dev", isDevMode());
-			model.put("app", AppCtx.app());
+
+			WebApp app = AppCtx.app();
+			model.put("app", app);
+			model.put("menu", app != null ? app.getMenu() : null);
 
 			List<String> providers = U.list("google", "facebook", "linkedin", "github");
 			Map<String, Object> oauth = U.map("popup", true, "providers", providers);

diff --git a/rapidoid-http/src/main/java/org/rapidoid/webapp/WebApp.java b/rapidoid-http/src/main/java/org/rapidoid/webapp/WebApp.java
@@ -53,7 +53,7 @@ public class WebApp {
 
 	private final Config config;
 
-	private volatile AppMenu menu;
+	private volatile Object menu;
 
 	public WebApp(String id, Set<String> owners, Set<String> hostnames, Set<String> uriContexts, AppMode mode,
 			Router router, PojoDispatcher dispatcher, Classes classes, Config config) {
@@ -124,16 +124,16 @@ public boolean dev() {
 		return getMode().equals(AppMode.DEVELOPMENT);
 	}
 
-	public AppMenu getMenu() {
-		return menu;
+	public Config getConfig() {
+		return config;
 	}
 
-	public void setMenu(AppMenu menu) {
+	public void setMenu(Object menu) {
 		this.menu = menu;
 	}
 
-	public Config getConfig() {
-		return config;
+	public Object getMenu() {
+		return menu;
 	}
 
 }