Updated routes

app/controllers/application_controller.rb

@@ -25,7 +25,7 @@ def self.add_breadcrumb(name, url = '', options = {})
       end  
     end
 
-    add_breadcrumb 'Home', '/', :if => Proc.new { |controller| controller.send(:current_domain) != "community" }
+    add_breadcrumb 'Home', '/', :if => Proc.new { |controller| controller.send(:current_subdomain) != "community" }
 
    def found_asset(asset)
       unless @asset || asset.nil?
@@ -450,7 +450,7 @@ def require_authentic
       unless current_user
         flash[:warning] = t('require_authentic')
 
-        store_location_and_redirect_to new_user_session_url
+        store_location_and_redirect_to new_session_url
       end
     end
 

app/controllers/passwords_controller.rb

@@ -28,7 +28,7 @@ def create
     flash[:notice] = t('created')
 
     respond_to do |format|
-      format.html { redirect_to new_user_session_url }
+      format.html { redirect_to new_session_url }
     end
   end
 
@@ -58,7 +58,7 @@ def find_user
       unless @user = @users.find_using_perishable_token(params[:id], 1.week)
         flash[:warning] = t('not_found')
 
-        redirect_to new_user_session_path
+        redirect_to new_session_path
       end
     end
 

app/controllers/search_controller.rb

@@ -26,15 +26,15 @@ class SearchController < ApplicationController
 
   # GET /search
   def index
-    add_breadcrumb 'Search', search_index_path
+    add_breadcrumb 'Search', search_path
 
     respond_to do |format|
       format.html
     end
   end
 
   def forums
-    add_breadcrumb 'Search', search_index_path(:q => @query)
+    add_breadcrumb 'Search', search_path(:q => @query)
     add_breadcrumb 'Forums', forums_search_path(:q => @query)
 
     respond_to do |format|
@@ -43,7 +43,7 @@ def forums
   end
 
   def groups
-    add_breadcrumb 'Search', search_index_path(:q => @query)
+    add_breadcrumb 'Search', search_path(:q => @query)
     add_breadcrumb 'Groups', groups_search_path(:q => @query)
 
     respond_to do |format|
@@ -52,7 +52,7 @@ def groups
   end
 
   def members
-    add_breadcrumb 'Search', search_index_path(:q => @query)
+    add_breadcrumb 'Search', search_path(:q => @query)
     add_breadcrumb 'Members', members_search_path(:q => @query)
 
     respond_to do |format|
@@ -61,7 +61,7 @@ def members
   end
 
   def pages
-    add_breadcrumb 'Search', search_index_path(:q => @query)
+    add_breadcrumb 'Search', search_path(:q => @query)
     add_breadcrumb 'Pages', pages_search_path(:q => @query)
 
     respond_to do |format|
@@ -70,7 +70,7 @@ def pages
   end
 
   def posts
-    add_breadcrumb 'Search', search_index_path(:q => @query)
+    add_breadcrumb 'Search', search_path(:q => @query)
     add_breadcrumb 'Posts', posts_search_path(:q => @query)
 
     respond_to do |format|
@@ -79,7 +79,7 @@ def posts
   end
 
   def topics
-    add_breadcrumb 'Search', search_index_path(:q => @query)
+    add_breadcrumb 'Search', search_path(:q => @query)
     add_breadcrumb 'Topics', topics_search_path(:q => @query)
 
     respond_to do |format|
@@ -88,7 +88,7 @@ def topics
   end
 
   def wiki_pages
-    add_breadcrumb 'Search', search_index_path(:q => @query)
+    add_breadcrumb 'Search', search_path(:q => @query)
     add_breadcrumb 'Wiki Pages', wiki_pages_search_path(:q => @query)
 
     respond_to do |format|

app/controllers/user_sessions_controller.rb

@@ -35,7 +35,7 @@ def destroy
     flash[:notice] = t('destroyed')
 
     respond_to do |format|
-      format.html { redirect_to new_user_session_path }
+      format.html { redirect_to new_session_path }
     end
   end
 

app/controllers/users_controller.rb

@@ -65,7 +65,7 @@ def find_user
       unless @user = @users.find_using_perishable_token(params[:id], 1.week)
         flash[:warning] = t('not_found')
 
-        redirect_to new_user_session_path
+        redirect_to new_session_path
       end
     end    
 

app/helpers/application_helper.rb

@@ -1,15 +1,15 @@
 module ApplicationHelper
   # Site copyright notice
   def copyright_notice
-    %Q(<p>Copyright &copy; #{copyright_period} NIHR CLAHRC for the Southwest Peninsula</p>)
+    raw %Q(<p>Copyright &copy; #{copyright_period} NIHR CLAHRC for the Southwest Peninsula</p>)
   end
 
   # Period to which the site copyright notice applies
   def copyright_period
     if Time.now.year > 2009
-      %Q(2009&ndash;#{Time.now.year})
+      raw %Q(2009&ndash;#{Time.now.year})
     else
-      %Q(2009)
+      raw %Q(2009)
     end
   end
 end

app/helpers/user_sessions_helper.rb

@@ -1,10 +1,10 @@
 module UserSessionsHelper
   def link_to_login
-    link_to t('login'), new_user_session_path, :title => t('login_title'), :class => 'new session'
+    link_to t('login'), new_session_path, :title => t('login_title'), :class => 'new session'
   end
 
   def link_to_logout
-    link_to t('logout'), user_session_path, :method => :delete, :title => t('logout_title'), :class => 'destroy session'
+    link_to t('logout'), session_path, :method => :delete, :title => t('logout_title'), :class => 'destroy session'
   end
 
   def session_links

app/helpers/users_helper.rb

@@ -1,6 +1,6 @@
 module UsersHelper
   def link_to_register
-    link_to t('register'), new_user_path, :title => t('register_title'), :class => 'new user'
+    link_to t('register'), new_member_path, :title => t('register_title'), :class => 'new user'
   end
 
   def prepare_user(user)

app/views/search/index.html.haml

@@ -1,6 +1,6 @@
 - content_for :content_header do
   %h1 Search Results
-- form_tag(search_index_path, :method => :get) do
+- form_tag(search_path, :method => :get) do
   %ol
     %li
       = text_field_tag :q, @query || 'Search', :onclick => 'if(this.value=="Search"){this.value=""}', :onblur => 'if(this.value==""){this.value="Search"}'

app/views/shared/_header.html.haml

@@ -3,5 +3,5 @@
     %a{ :href => 'http://clahrc.net/', :title => 'CLAHRC' }
       %img{ :src => '/images/logo.png' }
   .search
-    - form_tag(search_index_path, :method => :get) do
+    - form_tag(search_path, :method => :get) do
       = text_field_tag :q, 'Search', :onclick => 'if(this.value=="Search"){this.value=""}', :onblur => 'if(this.value==""){this.value="Search"}'

app/views/shared/_session.html.haml

@@ -6,4 +6,4 @@
       = link_to_friendships
       = link_to_memberships
   .rhs
-    = session_links
+    = raw session_links

app/views/user_sessions/new.html.haml

@@ -1,6 +1,6 @@
 = content_for :content_header do
   %h1= t('new')
-- form_for @user_session, :url => user_session_path do |f|
+- form_for @user_session, :url => session_path do |f|
   = error_messages_for :user_session
   %ol
     %li

config/routes.rb

@@ -1,56 +1,56 @@
 Clahrc::Application.routes.draw do |map|
   constraints CommunitySubdomain do
-    resources :users, :as => :members, :only => [ :new, :edit, :create, :update ], :path_names => {  :new => 'register', :edit => 'activate' }
-    resource :user_session, :as => :session, :only => [ :new, :create, :destroy ], :path_names => { :new => 'login' }
+    resources :members, :controller => :users, :only => [ :new, :edit, :create, :update ], :path_names => {  :new => 'register', :edit => 'activate' }
+    resource :session, :controller => :user_sessions, :only => [ :new, :create, :destroy ], :path_names => { :new => 'login' }
     resources :passwords, :only => [ :new, :edit, :create, :update ], :path_names => { :new => 'reset', :edit => 'reset' }
 
     # Members
     resources :members, :only => [ :index, :show ], :collection => { :autocomplete => :get }, :paged => { :name => :directory } do
       # Activities
-      resources :activities, :as => 'activity', :only => [ :index ], :paged => { :name => :directory }
+      resources :activity, :controller => :ativities, :only => [ :index ], :paged => { :name => :directory }
 
       # Friendships
-      resources :friendships, :as => 'friends', :only => [ :index, :create ], :paged => { :name => :directory }
+      resources :friends, :controller => :friendships, :only => [ :index, :create ], :paged => { :name => :directory }
 
       # Memberships
-      resources :memberships, :as => 'groups', :only => [ :index ], :paged => { :name => :directory }
+      resources :groups, :controller => :memberships, :only => [ :index ], :paged => { :name => :directory }
 
       # Messages
       resources :messages, :only => [ :new, :create ]
 
       # Assets
-      resources :assets, :as => 'files', :only => [ :index ], :collection => { :block => :get }, :paged => { :name => :directory, :index => true }
+      resources :files, :controller => :assets, :only => [ :index ], :collection => { :block => :get }, :paged => { :name => :directory, :index => true }
 
       # Content
       resources :pages, :only => [ :index ], :collection => { :block => :get }, :paged => { :name => :directory, :index => true }
       resources :posts, :only => [ :index ], :collection => { :block => :get }, :paged => { :name => :directory, :index => true }
-      resources :wiki_pages, :as => :wiki, :only => [ :index, :show ]
+      resources :wiki, :controller => :wiki_pages, :only => [ :index, :show ]
     end
 
     # Groups
     resources :groups, :paged => { :name => :directory } do
       # Activitites
-      resources :activities, :as => 'activity', :only => [ :index ], :paged => { :name => :directory }
+      resources :activity, :controller => :activities, :only => [ :index ], :paged => { :name => :directory }
 
       # Memberships
-      resources :memberships, :as => 'members', :collection => { :pending => :get, :invite => :post }, :member => { :accept => :put, :promote => :put, :reject => :delete }, :only => [ :index, :new, :create ], :paged => { :name => :directory }
-      resources :moderatorships, :as => 'moderators', :member => { :promote => :put }, :only => [ :index ], :paged => { :name => :directory }
-      resources :ownerships, :as => 'owners', :only => [ :index ], :paged => { :name => :directory }
+      resources :members, :controller => :memberships, :collection => { :pending => :get, :invite => :post }, :member => { :accept => :put, :promote => :put, :reject => :delete }, :only => [ :index, :new, :create ], :paged => { :name => :directory }
+      resources :moderators, :controller => :moderatorships, :member => { :promote => :put }, :only => [ :index ], :paged => { :name => :directory }
+      resources :owners, :controller => :ownerships, :only => [ :index ], :paged => { :name => :directory }
 
       # Messages
       resources :messages, :only => [ :new, :create ]
 
       # Assets
-      resources :assets, :as => 'files', :only => [ :index, :new, :create ], :collection => { :block => :get }, :paged => { :name => :directory, :index => true }
+      resources :files, :controller => :assets, :only => [ :index, :new, :create ], :collection => { :block => :get }, :paged => { :name => :directory, :index => true }
 
       # Content
       resources :forums, :only => [ :index, :new, :create ], :paged => { :name => :directory }
       resources :pages, :only => [ :index, :new, :create ], :collection => { :block => :get }, :paged => { :name => :directory, :index => true }
-      resources :wiki_pages, :as => :wiki
+      resources :wiki, :controller => :wiki_pages
     end
 
     # Assets
-    resources :assets, :as => 'files', :only => [ :show, :edit, :update, :destroy ]
+    resources :files, :controller => :assets, :only => [ :show, :edit, :update, :destroy ]
 
     # Forums
     resources :forums, :only => [ :show, :edit, :update, :destroy ] do
@@ -73,7 +73,14 @@
     end
 
     # Search
-    resources :search, :only => [ :index ], :collection => { :forums => :get, :groups => :get, :members => :get, :pages => :get, :posts => :get, :topics => :get, :wiki_pages => :get }
+    match '/search', :to => 'search#index'
+    match '/search/forums', :to => 'search#forums'
+    match '/search/groups', :to => 'search#groups'
+    match '/search/members', :to => 'search#members'
+    match '/search/pages', :to => 'search#pages'
+    match '/search/posts', :to => 'search#posts'
+    match '/search/topics', :to => 'search#topics'
+    match '/search/wiki_pages', :to => 'search#wiki_pages'
 
     # Comments
     resources :comments, :only => [ :show, :edit, :update, :destroy ], :member => { :reply => :get }
@@ -92,25 +99,25 @@
       my.resource :profile, :only => [ :edit, :update ]
 
       # Activities
-      my.resources :activities, :as => 'activity', :only => [ :index ], :paged => { :name => :directory }
+      my.resources :activity, :controller => :activities, :only => [ :index ], :paged => { :name => :directory }
 
       # Assets
-      my.resources :assets, :as => 'files', :paged => { :name => :directory }
+      my.resources :files, :as => :assets, :paged => { :name => :directory }
 
       # Content
       my.resources :pages, :collection => { :sort => :put }, :paged => { :name => :directory }
       my.resources :posts, :paged => { :name => :directory }
-      my.resources :wiki_pages, :as => :wiki
+      my.resources :wiki, :controller => :wiki_pages
 
       # Friendships
-      my.resources :friendships, :as => 'friends', :collection => { :pending => :get }, :member => { :accept => :put, :reject => :delete }, :only => [ :index, :create, :destroy ], :paged => { :name => :directory }
+      my.resources :friends, :controller => :friendships, :collection => { :pending => :get }, :member => { :accept => :put, :reject => :delete }, :only => [ :index, :create, :destroy ], :paged => { :name => :directory }
 
       # Messages
-      my.resources :sent_messages, :as => :sent, :only => [ :index, :show, :destroy ], :path_prefix => 'messages', :paged => { :name => :directory }
-      my.resources :received_messages, :as => :messages, :only => [ :index, :show, :destroy ], :collection => { :unread => :get }, :member => { :reply => :get }, :paged => { :name => :directory }
+      my.resources :sent, :controller => :sent_messages, :only => [ :index, :show, :destroy ], :path_prefix => 'messages', :paged => { :name => :directory }
+      my.resources :messages, :controller => :received_messages, :only => [ :index, :show, :destroy ], :collection => { :unread => :get }, :member => { :reply => :get }, :paged => { :name => :directory }
 
       # Memberships
-      my.resources :memberships, :as => 'groups', :collection => { :invited => :get }, :member => { :accept => :put, :reject => :delete }, :only => [ :index, :destroy ], :paged => { :name => :directory }
+      my.resources :groups, :controller => :memberships, :collection => { :invited => :get }, :member => { :accept => :put, :reject => :delete }, :only => [ :index, :destroy ], :paged => { :name => :directory }
     end
   end
 end

themes/community/views/shared/_header.html.haml

@@ -5,5 +5,5 @@
     %a{ :href => 'http://community.clahrc.net/', :title => 'CLAHRC Community' }
       %img{ :src => '/images/community-logo.png' }
   .search
-    - form_tag(search_index_path, :method => :get) do
+    - form_tag(search_path, :method => :get) do
       = text_field_tag :q, 'Search', :onclick => 'if(this.value=="Search"){this.value=""}', :onblur => 'if(this.value==""){this.value="Search"}'

themes/my/views/shared/_header.html.haml

@@ -5,5 +5,5 @@
     %a{ :href => 'http://my.clahrc.net/', :title => 'My CLAHRC' }
       %img{ :src => '/images/my-logo.png' }
   .search
-    - form_tag(search_index_path, :method => :get) do
+    - form_tag(search_path, :method => :get) do
       = text_field_tag :q, 'Search', :onclick => 'if(this.value=="Search"){this.value=""}', :onblur => 'if(this.value==""){this.value="Search"}'