fix(views): fix ng includes

angular-fullstack · Dec 22, 2013 · 598c69a · 598c69a
1 parent d07c829
commit 598c69a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/templates/views/html/index.html b/templates/views/html/index.html
@@ -28,7 +28,7 @@
     <% if (ngRoute) {
       %><div class="container" ng-view></div><%
     } else {
-      %><div class="container" ng-include="'views/main.html'" ng-controller="MainCtrl"></div><%
+      %><div class="container" ng-include="'views/main'" ng-controller="MainCtrl"></div><%
     } %>
 
     <!-- Google Analytics: change UA-XXXXX-X to be your site's ID -->

diff --git a/templates/views/html/partials/main.html b/templates/views/html/partials/main.html
@@ -1,4 +1,4 @@
-<div ng-include="'partials/navbar.html'"></div>
+<div ng-include="'partials/navbar'"></div>
 
 <div class="jumbotron">
   <h1>'Allo, 'Allo!</h1>

diff --git a/templates/views/jade/index.jade b/templates/views/jade/index.jade
@@ -30,7 +30,11 @@ html.no-js
       <![endif]
 
     // Add your site or application content here
-    div(class="container", ng-view)
+    div(class="container" ng-view)
+    <% if (ngRoute) { %>
+    div(class="container" ng-view)<%
+    } else { %>
+    div(class="container" ng-include="'views/main'" ng-controller="MainCtrl")<% } %>
 
     // Google Analytics: change UA-XXXXX-X to be your site's ID.
     script.

diff --git a/templates/views/jade/partials/main.jade b/templates/views/jade/partials/main.jade
@@ -1,4 +1,4 @@
-div(ng-include='\'partials/navbar.html\'')
+div(ng-include="'partials/navbar.html'")
 
 .jumbotron
   h1 'Allo, 'Allo!