<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>app/views/layouts/old_surveys.html.haml</filename>
    </added>
    <added>
      <filename>app/views/users/_form.html.haml</filename>
    </added>
    <added>
      <filename>app/views/users/edit.html.haml</filename>
    </added>
    <added>
      <filename>app/views/users/new.html.haml</filename>
    </added>
    <added>
      <filename>app/views/users/show.html.haml</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -11,12 +11,25 @@
     = stylesheet_link_tag 'survey'
 
   %body
+    %p
+      - if !current_user
+        = link_to &quot;Register&quot;, new_account_path
+        |
+        = link_to &quot;Log In&quot;, new_user_session_path
+      - else
+        = link_to &quot;My Account&quot;, account_path
+        |
+        = link_to &quot;Logout&quot;, user_session_path, :method =&gt; :delete
+        |
+        = link_to &quot;Surveys&quot;, surveys_path
+      
     %a{ :href =&gt; root_path }
       %img{ :src =&gt; &quot;/images/logo1.png&quot;, :alt =&gt; &quot;nugeeks logo&quot;, :id =&gt; &quot;header_img&quot; }
     
     %p{:style =&gt; &quot;color: green&quot;}= flash[:notice]
     
-    = yield
+    #yield
+      = yield
     
     = render :partial =&gt; &quot;shared/analytics&quot; if RAILS_ENV == 'production'
 </diff>
      <filename>app/views/layouts/application.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -2,6 +2,4 @@
 %p If you would like to hear more, please fill out the simple form below with your email address and any geeky topics you might be interested in (computers, programming languages, networking, gaming, etc.).
 %p Thanks for stopping by!
 
-= render :partial =&gt; &quot;form&quot;, :locals =&gt; { :button_name =&gt; &quot;Submit completed survey.&quot; }
-        
-%p= link_to 'Back', surveys_path
\ No newline at end of file
+= render :partial =&gt; &quot;form&quot;, :locals =&gt; { :button_name =&gt; &quot;Submit completed survey.&quot; }
\ No newline at end of file</diff>
      <filename>app/views/surveys/new.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -2,6 +2,7 @@ ActionController::Routing::Routes.draw do |map|
   map.resources :surveys
   map.resources :users
   map.resource :user_session
+  map.resource :account, :controller =&gt; &quot;users&quot;
 
   # The priority is based upon order of creation: first created -&gt; highest priority.
 </diff>
      <filename>config/routes.rb</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>db/development.sqlite3</filename>
    </modified>
    <modified>
      <diff>@@ -13,4 +13,8 @@ h1
 p
   width: 500px
   margin: auto
-  padding: 10px 0 0
\ No newline at end of file
+  padding: 10px 0 0
+  
+div#yield
+  width: 500px
+  margin: auto
\ No newline at end of file</diff>
      <filename>public/stylesheets/sass/survey.sass</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>app/views/layouts/surveys.html.haml</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>f764137d9b8f04d0d7626d944d6ee95ebd5bd2da</id>
    </parent>
  </parents>
  <author>
    <name>Bob Martens</name>
    <email>boblmartens@gmail.com</email>
  </author>
  <url>http://github.com/boblmartens/nugeeks/commit/d28d53b4041bb7c76e0df6cf2642ef1c20cd9dad</url>
  <id>d28d53b4041bb7c76e0df6cf2642ef1c20cd9dad</id>
  <committed-date>2009-10-23T09:36:58-07:00</committed-date>
  <authored-date>2009-10-23T09:36:58-07:00</authored-date>
  <message>authentication via authlogic working, account creation working</message>
  <tree>82122224ce2a910fc559bec67a4217736b0a2559</tree>
  <committer>
    <name>Bob Martens</name>
    <email>boblmartens@gmail.com</email>
  </committer>
</commit>
