lost track of what I was doing so I cant tell you what Ive done, heh

This commit is contained in:
Ken Johnson
2013-04-25 15:23:07 -04:00
parent 01c246c902
commit 9c37eb99a1
8 changed files with 38 additions and 7 deletions
+3
View File
@@ -51,4 +51,7 @@ class TutorialsController < ApplicationController
def redirects def redirects
end end
def guard
end
end end
+3
View File
@@ -17,4 +17,7 @@ class UsersController < ApplicationController
end end
end end
def account_settings
end
end end
+1 -3
View File
@@ -11,9 +11,7 @@
<span class="caret"></span> <span class="caret"></span>
<ul class="dropdown-menu pull-right"> <ul class="dropdown-menu pull-right">
<li> <li>
<a href="#"> <%= link_to "account settings", user_account_settings_path(:user_id => current_user.id) %>
account settings
</a>
</li> </li>
<li> <li>
<%= link_to "logout", logout_path %> <%= link_to "logout", logout_path %>
+2 -2
View File
@@ -88,7 +88,7 @@
A10 Redirects A10 Redirects
<% end %> <% end %>
</li> </li>
<li class="submenu"> <li id="submenu" class="submenu">
<a href="#" class="selected"> <a href="#" class="selected">
<div class="icon"> <div class="icon">
<span class="fs1" aria-hidden="true" data-icon="&#xe0b8;"></span> <span class="fs1" aria-hidden="true" data-icon="&#xe0b8;"></span>
@@ -97,7 +97,7 @@
</a> </a>
<ul> <ul>
<li> <li>
<a href="#">Guard</a> <%= link_to "Guard", guard_tutorials_path %>
</li> </li>
<li> <li>
<a href="#">Session Secret</a> <a href="#">Session Secret</a>
+27
View File
@@ -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>
+2 -1
View File
@@ -9,7 +9,7 @@ resources :sessions do
end end
resources :users do resources :users do
get "account_settings"
end end
resources :tutorials do resources :tutorials do
@@ -24,6 +24,7 @@ resources :tutorials do
get "url_access" get "url_access"
get "ssl_tls" get "ssl_tls"
get "redirects" get "redirects"
get "guard"
end end
end end
-1
View File
@@ -16,7 +16,6 @@ ActiveRecord::Schema.define(:version => 20130424220355) do
create_table "users", :force => true do |t| create_table "users", :force => true do |t|
t.string "email" t.string "email"
t.string "password" t.string "password"
t.string "user_id"
t.boolean "admin" t.boolean "admin"
t.string "first_name" t.string "first_name"
t.string "last_name" t.string "last_name"