Skip to content

Commit

Permalink
Corrected routing issues with feedbacks [#5 state:resolved]
Browse files Browse the repository at this point in the history
Added fadeout effects for flash messages
  • Loading branch information
s2j1h committed Jun 24, 2010
1 parent 38dcb66 commit a744c60
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 27,982 deletions.
2 changes: 1 addition & 1 deletion README.textile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ A demo is available on "Vauban beta website":http://vauban.heroku.com

h2. License

Copyright 2010 "Zeneffy Labs":http://labs.zeneffy.fr - J.Raigneau (julien@raigneau.net)
Copyright 2010 "Zeneffy Labs":http://labs.zeneffy.fr - J.Raigneau (julien@zeneffy.fr)

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
6 changes: 3 additions & 3 deletions app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta name="description" content="" />
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>Vauban - Managing your web identities</title>
<%= stylesheet_link_tag 'reset' , 'typography', 'main','jquery-ui', 'feedback' %>
<%= stylesheet_link_tag 'reset' , 'typography', 'main','jquery-ui' %>
<%= javascript_include_tag "jquery", "jquery-ui", "application" %>
<%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? -%>
Expand Down Expand Up @@ -49,11 +49,11 @@
<div id="flash_<%= key %>"><%=h value %></div>
<% end -%>
</div>
<!-- <script>
<script>
$(document).ready(function(){
$("#flash").fadeOut(5000);
});
</script>-->
</script>

<%= yield %>
</div><!--end entry -->
Expand Down
9 changes: 6 additions & 3 deletions config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
ActionController::Routing::Routes.draw do |map|
map.feedback 'feedbacks', :controller => 'feedbacks', :action => 'create'
map.new_feedback 'feedbacks/new', :controller => 'feedbacks', :action => 'new'
map.resources :identities
map.connect 'feedbacks', :conditions => { :method => :get },
:controller => "application", :action => "index"
map.connect 'feedbacks', :conditions => { :method => :post },
:controller => "feedbacks", :action => "create"


map.resources :identities
map.resources :user_sessions
map.resources :users
map.resources :password_resets, :only => [ :new, :create, :edit, :update ]
Expand Down
Binary file modified db/development.sqlite3
Binary file not shown.

0 comments on commit a744c60

Please sign in to comment.