From 9c37eb99a161c71f4fdb726b43efd72eb79e9a28 Mon Sep 17 00:00:00 2001
From: Ken Johnson <cktricky@Kens-MacBook-Pro.local>
Date: Thu, 25 Apr 2013 15:23:07 -0400
Subject: [PATCH] lost track of what I was doing so I cant tell you what Ive
 done, heh

---
 app/controllers/tutorials_controller.rb      |  3 +++
 app/controllers/users_controller.rb          |  3 +++
 app/views/layouts/shared/_header.html.erb    |  4 +--
 app/views/layouts/tutorial/_sidebar.html.erb |  4 +--
 app/views/tutorials/guard.html.erb           | 27 ++++++++++++++++++++
 app/views/users/account_settings.html.erb    |  0
 config/routes.rb                             |  3 ++-
 db/schema.rb                                 |  1 -
 8 files changed, 38 insertions(+), 7 deletions(-)
 create mode 100644 app/views/tutorials/guard.html.erb
 create mode 100644 app/views/users/account_settings.html.erb

diff --git a/app/controllers/tutorials_controller.rb b/app/controllers/tutorials_controller.rb
index 9565ce8..bbef330 100755
--- a/app/controllers/tutorials_controller.rb
+++ b/app/controllers/tutorials_controller.rb
@@ -51,4 +51,7 @@ class TutorialsController < ApplicationController
   def redirects
   end
   
+  def guard
+  end
+  
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 152a54b..01972a9 100755
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -17,4 +17,7 @@ class UsersController < ApplicationController
     end
   end
   
+  def account_settings
+  end
+  
 end
diff --git a/app/views/layouts/shared/_header.html.erb b/app/views/layouts/shared/_header.html.erb
index 38e4b73..b9b5ef2 100755
--- a/app/views/layouts/shared/_header.html.erb
+++ b/app/views/layouts/shared/_header.html.erb
@@ -11,9 +11,7 @@
        <span class="caret"></span>
        <ul class="dropdown-menu pull-right">
          <li>
-           <a href="#">
-             account settings
-           </a>
+			<%= link_to "account settings", user_account_settings_path(:user_id => current_user.id) %>
          </li>
          <li>
            <%= link_to "logout", logout_path %>
diff --git a/app/views/layouts/tutorial/_sidebar.html.erb b/app/views/layouts/tutorial/_sidebar.html.erb
index 43a7e21..20663af 100755
--- a/app/views/layouts/tutorial/_sidebar.html.erb
+++ b/app/views/layouts/tutorial/_sidebar.html.erb
@@ -88,7 +88,7 @@
         A10 Redirects
      <% end %>
     </li>
-    <li class="submenu">
+    <li id="submenu" class="submenu">
       <a href="#" class="selected">
         <div class="icon">
           <span class="fs1" aria-hidden="true" data-icon="&#xe0b8;"></span>
@@ -97,7 +97,7 @@
       </a>
       <ul>
         <li>
-          <a href="#">Guard</a>
+         <%= link_to "Guard", guard_tutorials_path %>
         </li>
         <li>
           <a href="#">Session Secret</a>
diff --git a/app/views/tutorials/guard.html.erb b/app/views/tutorials/guard.html.erb
new file mode 100644
index 0000000..5b673b0
--- /dev/null
+++ b/app/views/tutorials/guard.html.erb
@@ -0,0 +1,27 @@
+<div class="dashboard-wrapper">
+	<div class="main-container">
+		<div class="row-fluid">
+		    <div class="span6">
+		      <div class="widget">
+		        <div class="widget-header">
+					<div class="title">
+			            <span class="fs1" aria-hidden="true" data-icon="&#xe012;"></span> Using Guard with Brakeman and Bundle-Audit
+			          </div>
+				</div>
+				<div class="widget-body">
+					<iframe src="http://player.vimeo.com/video/63901340" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
+		        </div>  
+			</div>
+		</div>
+	</div>
+</div>
+
+
+
+<script type="text/javascript">
+function openSub(){
+	$('li[id="submenu"]').addClass('open');
+};
+
+$(document).ready(openSub);
+</script>
\ No newline at end of file
diff --git a/app/views/users/account_settings.html.erb b/app/views/users/account_settings.html.erb
new file mode 100644
index 0000000..e69de29
diff --git a/config/routes.rb b/config/routes.rb
index 1fbe26a..50bd38e 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -9,7 +9,7 @@ resources :sessions do
 end
 
 resources :users do
-
+  get "account_settings"
 end
 
 resources :tutorials do
@@ -24,6 +24,7 @@ resources :tutorials do
     get "url_access"
     get "ssl_tls"
     get "redirects"
+    get "guard"
   end
 end
 
diff --git a/db/schema.rb b/db/schema.rb
index 8281efe..715ccf4 100755
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -16,7 +16,6 @@ ActiveRecord::Schema.define(:version => 20130424220355) do
   create_table "users", :force => true do |t|
     t.string   "email"
     t.string   "password"
-    t.string   "user_id"
     t.boolean  "admin"
     t.string   "first_name"
     t.string   "last_name"