From 20c7c0ef02784a229779a7590ab78d31594803b5 Mon Sep 17 00:00:00 2001 From: Benjamin Meichsner Date: Sat, 17 Oct 2009 11:53:17 +0200 Subject: [PATCH] Revert "Tasks should be default page in foodcoop module." This reverts commit b5b27cee6eceba0f4d9c4ed671c129fe9b2dcf4c. --- app/views/layouts/_main_tabnav.html.erb | 6 +++--- config/routes.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/_main_tabnav.html.erb b/app/views/layouts/_main_tabnav.html.erb index a26dc086..0fcec695 100644 --- a/app/views/layouts/_main_tabnav.html.erb +++ b/app/views/layouts/_main_tabnav.html.erb @@ -8,14 +8,14 @@ { :name => "Mein Profil", :url => "/home/profile"} ] }, - { :name => "Foodcoop", :url => "/foodcoop", + { :name => "Foodcoop", :url => "/tasks", :active => ["foodcoop", "tasks", "messages", "foodcoop/ordergroups", "foodcoop/workgroups", "foodcoop/users"], :subnav => [ - { :name => "Aufgaben", :url => "/tasks"}, { :name => "Mitglieder", :url => "/foodcoop/users"}, { :name => "Abeitsgruppen", :url => "/foodcoop/workgroups"}, { :name => "Bestellgruppen", :url => "/foodcoop/ordergroups"}, - { :name => "Nachrichten", :url => "/messages"} + { :name => "Nachrichten", :url => "/messages"}, + { :name => "Aufgaben", :url => "/tasks"} ] }, { :name => "Wiki", :url => "/wiki", :active => ["pages", "wiki"], diff --git a/config/routes.rb b/config/routes.rb index edcc1147..a8fcaa91 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -16,7 +16,7 @@ ActionController::Routing::Routes.draw do |map| map.resources :invites, :only => [:new, :create] map.namespace :foodcoop do |foodcoop| - foodcoop.root :controller => "tasks", :action => "index" + foodcoop.root :controller => "users", :action => "index" foodcoop.resources :users, :only => [:index] foodcoop.resources :ordergroups, :only => [:index] foodcoop.resources :workgroups, :only => [:index, :edit, :update],