@@ -1,7 +1,7 @@ = 0.1.1 === 11th June, 2009 * Added sluggable_finder gem for user permalinks -* New alias routes for "/members" and "/members/user-permalink" +* User routes names as "members" = 0.1.0 === 7th June, 2009 CHANGELOG.rdoc @@ -1,6 +1,6 @@ <p> - <strong><%= link_to h(entry.title), entry.url %></strong> published<%= " #{time_ago_in_words entry.published} ago" if entry.published %> by <%= link_to h(entry.feed.user.name), member_path(entry.feed.user) %> - <%= link_to image_tag(url_for_gravatar(entry.feed.user.email), :alt => h(entry.feed.user.name), :title => h(entry.feed.user.name), :align => 'absmiddle', :hspace => 10), member_path(entry.feed.user) if PLANETOID_CONF[:layout][:entries][:show_avatar] %> + <strong><%= link_to h(entry.title), entry.url %></strong> published<%= " #{time_ago_in_words entry.published} ago" if entry.published %> by <%= link_to h(entry.feed.user.name), entry.feed.user %> + <%= link_to image_tag(url_for_gravatar(entry.feed.user.email), :alt => h(entry.feed.user.name), :title => h(entry.feed.user.name), :align => 'absmiddle', :hspace => 10), entry.feed.user if PLANETOID_CONF[:layout][:entries][:show_avatar] %> </p> <% if PLANETOID_CONF[:layout][:entries][:show_summary] && entry.summary %> app/views/entries/_entry.html.erb @@ -14,7 +14,7 @@ <% @feeds.each do |feed| %> <tr> - <td><%=link_to h(feed.user.name), member_path(feed.user) %></td> + <td><%=link_to h(feed.user.name), feed.user %></td> <td><%= auto_link feed.feed_url %></td> <% if admin? %> <td><%= link_to 'Edit', edit_feed_path(feed) %></td> app/views/feeds/index.html.erb @@ -1,5 +1,5 @@ <div class="span-12 last"> - <h3><strong><%= h project.name %></strong> <small>by <%= project.users.map {|u| "#{link_to(h(u.name), member_path(u))}"}.join(", ") %></small></h3> + <h3><strong><%= h project.name %></strong> <small>by <%= project.users.map {|u| "#{link_to(h(u.name), u)}"}.join(", ") %></small></h3> <p><%= link_to h(project.url.gsub("http://", "")), h(project.url) %></p> <blockquote><%= simple_format(project.description) %></blockquote> app/views/projects/_project.html.erb @@ -1,6 +1,6 @@ <% if session[:admin] %> <div style="float:right; border: 1px solid orange; padding: 5px;"> - <strong>admin</strong>: <%= link_to 'users', users_path %> | + <strong>admin</strong>: <%= link_to 'members', users_path %> | <%= link_to 'feeds', feeds_path %> | <%= link_to 'projects', projects_path %> | <%= link_to 'log out', logout_path %> app/views/shared/_admin_links.html.erb @@ -1,5 +1,5 @@ <div class="span-3"> - <%= link_to image_tag(url_for_gravatar(user.email), :alt => h(user.name), :title => h(user.name)), member_path(user) if PLANETOID_CONF[:layout][:users][:show_avatar] %> + <%= link_to image_tag(url_for_gravatar(user.email), :alt => h(user.name), :title => h(user.name)), user if PLANETOID_CONF[:layout][:users][:show_avatar] %> </div> <div class="span-12 last"> <h3><strong><%= h user.name %></strong></h3> app/views/users/_user.html.erb @@ -1,9 +1,9 @@ <div class="span-7"> - <h2>Users</h2> + <h2>Member</h2> </div> <div class="span-15 leftborder last"> - <h3>Edit user</h3> + <h3>Edit member</h3> <% form_for(@user) do |f| %> <%= f.error_messages %> app/views/users/edit.html.erb @@ -1,5 +1,5 @@ <div class="span-7"> - <h2>Users</h2> + <h2>Members</h2> </div> <div class="span-15 leftborder last"> @@ -11,7 +11,7 @@ <% if admin? %> <br class="clear" /> <p> - <%= link_to 'New user', new_user_path %> + <%= link_to 'New member', new_user_path %> </p> <% end %> </div> app/views/users/index.html.erb @@ -1,9 +1,9 @@ <div class="span-7"> - <h2>Users</h2> + <h2>Members</h2> </div> <div class="span-15 leftborder last"> - <h3>New user</h3> + <h3>New member</h3> <% form_for(@user) do |f| %> <%= f.error_messages %> app/views/users/new.html.erb @@ -7,10 +7,7 @@ ActionController::Routing::Routes.draw do |map| map.resources :entries map.resources :feeds - map.resources :users - - map.members '/members', :controller => 'users', :action => 'index' - map.member '/members/:id', :controller => 'users', :action => 'show' + map.resources :users, :as => 'members' # The priority is based upon order of creation: first created -> highest priority. config/routes.rb @@ -16,7 +16,7 @@ class UsersControllerTest < ActionController::TestCase assert_no_tag :a, :content => "Destroy", :attributes => {:href => user_path(user)} end - assert_no_tag :a, :content => "New user", :attributes => {:href => new_user_path} + assert_no_tag :a, :content => "New member", :attributes => {:href => new_user_path} end def test_should_show_user @@ -52,7 +52,7 @@ class UsersControllerTest < ActionController::TestCase assert_tag :a, :content => "Destroy", :attributes => {:href => user_path(user)} end - assert_tag :a, :content => "New user", :attributes => {:href => new_user_path} + assert_tag :a, :content => "New member", :attributes => {:href => new_user_path} end def test_should_show_user_as_admin test/functional/users_controller_test.rb f830d5ae360036f13329f0520df1220a9879878c Jaime Iniesta jaimeiniesta@gmail.com http://github.com/javier/planetoid/commit/09a28988854cbd80845a20af4909e4e54e2833a3 09a28988854cbd80845a20af4909e4e54e2833a3 2009-06-11T03:28:13-07:00 2009-06-11T03:28:13-07:00 Fixed routes for members 08f7fd7ce8b4b339d3e089ed56dd4ef9502dd758 Jaime Iniesta jaimeiniesta@gmail.com