From b18f6340e7a174bd364edce7fcf7c71d3594a295 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Sat, 4 Dec 2010 00:51:20 -0500
Subject: [PATCH] renamed sessions to session

---
 app/views/{sessions => session}/new.html.erb  |  2 +-
 app/views/users/_login_header.html.erb        |  2 +-
 app/views/users/_secondary_links.html.erb     |  2 +-
 app/views/users/_secondary_nav_links.html.erb | 15 ---------------
 app/views/users/show.html.erb                 |  2 +-
 config/routes.rb                              |  3 +--
 6 files changed, 5 insertions(+), 21 deletions(-)
 rename app/views/{sessions => session}/new.html.erb (96%)
 delete mode 100644 app/views/users/_secondary_nav_links.html.erb

diff --git a/app/views/sessions/new.html.erb b/app/views/session/new.html.erb
similarity index 96%
rename from app/views/sessions/new.html.erb
rename to app/views/session/new.html.erb
index 02ba7ddfe..dda7b22a2 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/session/new.html.erb
@@ -2,7 +2,7 @@
   <div id="new">
     <section>
       <h2>Login</h2>
-      <% form_tag(sessions_path) do %>
+      <% form_tag(session_path) do %>
         <table width="100%">
           <tfoot>
             <tr>
diff --git a/app/views/users/_login_header.html.erb b/app/views/users/_login_header.html.erb
index 64ca34f0c..984f0e8b5 100644
--- a/app/views/users/_login_header.html.erb
+++ b/app/views/users/_login_header.html.erb
@@ -1,6 +1,6 @@
 <div class="login-header">
   <% if CurrentUser.is_anonymous? %>
-    <% form_tag(sessions_path) do %>
+    <% form_tag(session_path) do %>
       <span class="notice">You are not logged in.</span>
 
       <%= label_tag :name %>
diff --git a/app/views/users/_secondary_links.html.erb b/app/views/users/_secondary_links.html.erb
index a1b35d2ac..d4e2986b9 100644
--- a/app/views/users/_secondary_links.html.erb
+++ b/app/views/users/_secondary_links.html.erb
@@ -9,7 +9,7 @@
     <% end %>
     <% unless CurrentUser.user.is_anonymous? %>
       <li>|</li>
-      <li><%= link_to "Logout", session_path(0), :method => :delete %></li>
+      <li><%= link_to "Logout", session_path, :method => :delete %></li>
     <% end %>
   </menu>
 <% end %>
diff --git a/app/views/users/_secondary_nav_links.html.erb b/app/views/users/_secondary_nav_links.html.erb
deleted file mode 100644
index de325ed6e..000000000
--- a/app/views/users/_secondary_nav_links.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% content_for(:secondary_nav_links) do %>
-  <menu>
-    <li><%= link_to "Listing", users_path %></li>
-    <li><%= link_to "Register", new_user_path %></li>
-    <% if @user && !@user.new_record? %>
-      <li>|</li>
-      <li><%= link_to "Edit", edit_user_path(@user) %></li>
-      <li><%= link_to "Profile", user_path(@user) %></li>
-    <% end %>
-    <% unless CurrentUser.user.is_anonymous? %>
-      <li>|</li>
-      <li><%= link_to "Logout", session_path(0), :method => :delete %></li>
-    <% end %>
-  </menu>
-<% end %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index bc7806332..14bf628e3 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1 +1 @@
-<%= render :partial => "secondary_nav_links" %>
\ No newline at end of file
+<%= render :partial => "secondary_links" %>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index a76ec3293..850aac47d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -36,8 +36,7 @@ Danbooru::Application.routes.draw do
   resources :post_moderation_details
   resources :post_histories
   resources :post_votes
-  resources :reports
-  resources :sessions
+  resource :session
   resources :tags
   resources :tag_aliases do
     member do