started moving content to corretn divs

views/admin/index.jade

@@ -1,16 +1,16 @@
-extends ../layout
+//extends ../layout
 
-block content
-  h1 Bodyrep
-  p Admin Index
+//block content
+h1 Bodyrep
+p Admin Index
 
-  p
-    a(href="/users") List Users
-  p
-    a(href="/workouts") List workouts
-  p
-    a(href="/admin") Admin Index
-  p
-    a(href="/admin/users") Admin Users
-  p
-    a(href="/admin/exercises") Admin Exercises
+p
+  a(href="/users") List Users
+p
+  a(href="/workouts") List workouts
+p
+  a(href="/admin") Admin Index
+p
+  a(href="/admin/users") Admin Users
+p
+  a(href="/admin/exercises") Admin Exercises

views/session/user.jade

@@ -1,17 +1,18 @@
-- if (session.user)
-  p
-    span
-     b UserName 
-    span= session.user.name
-    span
-     b  &nbspUserID 
-    span= session.user._id
-  p
-    form(method="POST", action="/session")
-      input(type="hidden", name="_method", value="DELETE")
-      input(type="submit", value="Log out")
-- else
-  p
-    a(href="/session/new") Login
-    span  or 
-    a(href="/users/new") Join Bodyrep Now!
+div#top
+
+  - if (session.user)
+    p
+      span
+       b UserName 
+      span= session.user.name
+      span
+       b  &nbspUserID 
+      span= session.user._id
+      form(method="POST", action="/session")
+        input(type="hidden", name="_method", value="DELETE")
+        input(type="submit", value="Log out")
+  - else
+    p
+      a(href="/session/new") Login
+      span  or 
+      a(href="/users/new") Join Bodyrep Now!

views/users/profile.jade

@@ -1,25 +1,29 @@
 extends ../layout
+//block additionalscripts
+//    script(src='/javascripts/workout.js')
+
 block content
 
-  h1= user.name
+  div#Leftpane
+    h2= user.name
 
-  - if (session.user)
-    - if (session.user.name === requested)
-      h1 Private View
+    - if (session.user)
+      - if (session.user.name === requested)
+        h2 Private View
+        div
+          button.map-link(value="/workouts/" + encodeURIComponent(session.user.name) + "/recent") Recent workouts
+        div
+          button.map-link(value="/workouts/new") Create new workout
 
-        p
-          a(href="/workouts/new") Create new workout
+    - else
+      h2 Public View
 
-  - else
-    h1 Public View
+    - if (session.user)
+      - if (session.user.is_admin === true)
+        div
+          button.map-link(value="/admin") Goto Admin Page
 
-  h2 Recent workouts:
-  ul
-  - recentworkouts.forEach(function(workout) {
-    li
-      a(href="/workouts/" + encodeURIComponent(workout._id))= workout._id
-  - });
+  div#Rightpane
+
+    include ../workouts/recent
 
-  - if (session.user)
-    - if (session.user.is_admin === true)
-      a(href="/admin") Goto Admin Page

views/workouts/new.jade

@@ -1,45 +1,43 @@
-extends ../layout
+//extends ../layout
+//block content
+h1 New workout
 
-block additionalscripts
-    script(src='/javascripts/workout.js')
+h3 Exercises (dynamically loaded from database)
+ul#exerciselist
+          li Unpopulated
 
-block content
-  h1 New workout
+div#filters
+  h3 Filters 
+  label Free Weights
+  input.filter(type="checkbox", checked=true, value="Free Weights")
+  label Bodyweight
+  input.filter(type="checkbox", checked=true, value="Bodyweight")
+  label Exercise Machines
+  input.filter(type="checkbox", checked=true, value='Exercise Machine')
+  label Kettlebells
+  input.filter(type="checkbox", checked=true, value='Kettlebells')
+  label Cardio
+  input.filter(type="checkbox", checked=true, value='Cardio')
 
-  h3 Exercises (dynamically loaded from database)
-  ul#exerciselist
+//button#addExercise(type="button") Add Exercise
+hr
 
-  div#filters
-    h3 Filters 
-    label Free Weights
-    input.filter(type="checkbox", checked=true, value="Free Weights")
-    label Bodyweight
-    input.filter(type="checkbox", checked=true, value="Bodyweight")
-    label Exercise Machines
-    input.filter(type="checkbox", checked=true, value='Exercise Machine')
-    label Kettlebells
-    input.filter(type="checkbox", checked=true, value='Kettlebells')
-    label Cardio
-    input.filter(type="checkbox", checked=true, value='Cardio')
+form#newworkout(method="POST", action="/workouts")
+      ul
+        li
+          label(for="title", value="UserID") UserID
+          input#title(name="userID", value=session.user._id)
+        li
+          label(for="datepicker", value="Date") workoutDate
+          input.datepicker(name="workoutDate")
+        li
+          label(for="timepicker", value="Time") workoutTime
+          select(name="workoutTime")
+            option(value='0100') 1 AM 
+            option(value='0130') 1:30 AM
+            option(value='0200') 2 AM
 
-  //button#addExercise(type="button") Add Exercise
-  hr
+      ul#exercises
 
-  form#newworkout(method="POST", action="/workouts")
-        ul
-          li
-            label(for="title", value="UserID") UserID
-            input#title(name="userID", value=session.user._id)
-          li
-            label(for="datepicker", value="Date") workoutDate
-            input.datepicker(name="workoutDate")
-          li
-            label(for="timepicker", value="Time") workoutTime
-            select(name="workoutTime")
-              option(value='0100') 1 AM 
-              option(value='0130') 1:30 AM
-              option(value='0200') 2 AM
 
-        ul#exercises
-
-        button(type="submit", value="Save") Save
+      button(type="submit", value="Save") Save

views/workouts/workout.jade

@@ -1,6 +1,6 @@
 extends ../layout
 
-   
+
 block content
   h1= workout.title