move all markup to ng templates

SheSharpGr · Nov 22, 2015 · 9200bd7 · 9200bd7
1 parent 0b8224c
commit 9200bd7
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 39 deletions.
diff --git a/_includes/header.html b/_includes/header.html
@@ -6,5 +6,11 @@
         <div class="brand-name"><span class="capital">B</span>ORDER<span class="capital">S</span>HARE</h1></div>
       </div>
     </div>
+    <div class="row">
+      <div class="col-md-12">
+        <a href="/signup">Sign up</a>
+        <a href="/login">Log in</a>
+      </div>
+    </div>
   </div>
 </header>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -7,8 +7,10 @@
       <div class="container">
         {% include header.html %}
 
-        <div class="main">
-          {{ content }}
+        <div class="main" ng-app="app">
+            <div ng-view>
+              {{ content }}
+            </div>
         </div>
 
         {% include footer.html %}

diff --git a/index.html b/index.html
@@ -1,38 +1,3 @@
 ---
 layout: default
 ---
-
-<div class="home" ng-app="app">
-  <div ng-view></div>
-  <div class="row">
-    <div class="col-md-12">
-      <a href="/signup">Sign up</a>
-      <a href="/login">Log in</a>
-    </div>
-  </div>
-  <div class="row">
-    <h1>Welcome</h1>
-    <p>Lorem ipsum lalalalalalalalalal</p>
-  </div>
-  <div class="row">
-    <h1 class="no-margin-bottom">Places</h1>
-    <div class="filters">
-      All / Kalamaria / Kentro / Ntepo
-    </div>
-    <div class="col-md-3">
-      <div class="name">
-        Namezzz
-      </div>
-      <div class="address">
-        Address
-      </div>
-      <div class="available">
-        Available
-      </div>
-      <div class="collecticons">
-        icons wrapper
-      </div>
-    </div>
-  </div>
-
-</div>
diff --git a/login/index.html b/login/index.html
@@ -0,0 +1,3 @@
+---
+layout: default
+---
diff --git a/ngtpl/places.html b/ngtpl/places.html
@@ -1,6 +1,29 @@
-<div class="row" ng-controller="PlacesCtrl as placesCtrl">
+<div class="row home" ng-controller="PlacesCtrl as placesCtrl">
   <div class="col-md-12">
-    <h1>Hello World</h1>
+    <div class="row">
+      <h1>Welcome</h1>
+      <p>Lorem ipsum lalalalalalalalalal</p>
+    </div>
+    <div class="row">
+      <h1 class="no-margin-bottom">Places</h1>
+      <div class="filters">
+        All / Kalamaria / Kentro / Ntepo
+      </div>
+      <div class="col-md-3">
+        <div class="name">
+          Namezzz
+        </div>
+        <div class="address">
+          Address
+        </div>
+        <div class="available">
+          Available
+        </div>
+        <div class="collecticons">
+          icons wrapper
+        </div>
+      </div>
+    </div>
 
   </div>
 </div>
diff --git a/signup/index.html b/signup/index.html
@@ -0,0 +1,3 @@
+---
+layout: default
+---