Removed hardcoded links from main tabnav.

* Reorganized routes and foodsoft config
* Avoid saving of wrong foodcoop tokens when following hard coded link

app/controllers/tasks_controller.rb

@@ -6,7 +6,7 @@ class TasksController < ApplicationController
     @groups = Workgroup.all
   end
   
-  def myTasks
+  def user
     @unaccepted_tasks = @current_user.unaccepted_tasks
     @accepted_tasks = @current_user.accepted_tasks
   end
@@ -78,7 +78,7 @@ class TasksController < ApplicationController
       task.assignments.create(:user => current_user, :accepted => true)
     end
     flash[:notice] = "Du hast die Aufgabe übernommen"
-    redirect_to my_tasks_path
+    redirect_to user_tasks_path
   end
   
   # deletes assignment between current_user and given task

app/views/home/index.html.haml

@@ -21,11 +21,11 @@
       - unless @unaccepted_tasks.empty?
         %h3 Aufgaben übernehmen
         Du bis für Aufgaben verantwortlich.
-        = link_to "Aufgaben übernehmen/ablehnen", my_tasks_path
+        = link_to "Aufgaben übernehmen/ablehnen", user_tasks_path
       - unless @unassigned_tasks_number == 0
         %h3 Offene Aufgaben
         = "Es gibt #{@unassigned_tasks_number} #{link_to 'offene Aufgabe(n)', :controller => 'tasks'}"
-      %p{:style => "clear:both"}= link_to "Meine Aufgaben", my_tasks_path
+      %p{:style => "clear:both"}= link_to "Meine Aufgaben", user_tasks_path
 
   - if @ordergroup
     // Current orders

app/views/layouts/_main_tabnav.html.erb

@@ -3,55 +3,55 @@
   tabs = [
       { :name => "Start", :url => root_path, :active => ["index", "home"],
         :subnav => [
-          { :name => "Meine Aufgaben", :url => "/home/tasks" },
-          { :name => "Meine Bestellgruppe", :url => "/home/ordergroup", :access_denied? => (!u.ordergroup)},
-          { :name => "Mein Profil", :url => "/home/profile"}
+          { :name => "Meine Aufgaben", :url => user_tasks_path },
+          { :name => "Meine Bestellgruppe", :url => my_ordergroup_path, :access_denied? => (!u.ordergroup)},
+          { :name => "Mein Profil", :url => my_profile_path}
         ]
       },
-      { :name => "Foodcoop", :url => "/tasks", 
+      { :name => "Foodcoop", :url => tasks_path,
         :active => ["foodcoop", "tasks", "messages", "foodcoop/ordergroups", "foodcoop/workgroups", "foodcoop/users"],
         :subnav => [
-          { :name => "Mitglieder", :url => "/foodcoop/users"},
-          { :name => "Abeitsgruppen", :url => "/foodcoop/workgroups"},
-          { :name => "Bestellgruppen", :url => "/foodcoop/ordergroups"},
-          { :name => "Nachrichten", :url => "/messages"},
-          { :name => "Aufgaben", :url => "/tasks"}
+          { :name => "Mitglieder", :url => foodcoop_users_path},
+          { :name => "Abeitsgruppen", :url => foodcoop_workgroups_path},
+          { :name => "Bestellgruppen", :url => foodcoop_ordergroups_path},
+          { :name => "Nachrichten", :url => messages_path},
+          { :name => "Aufgaben", :url => tasks_path}
         ]
       },
-      { :name => "Wiki", :url => "/wiki", :active => ["pages", "wiki"],
+      { :name => "Wiki", :url => wiki_path, :active => ["pages", "wiki"],
         :subnav => [
-          { :name => "Startseite", :url => "/wiki" },
-          { :name => "Alle Seiten", :url => "/pages/all" }
+          { :name => "Startseite", :url => wiki_path },
+          { :name => "Alle Seiten", :url => all_pages_path }
         ]
       },
-      { :name => "Bestellungen", :url => u.ordergroup ? "/ordering/" : "/orders",
+      { :name => "Bestellungen", :url => u.ordergroup ? ordering_path : orders_path,
         :active => ["orders", "ordering"],
         :subnav => [
-          { :name => "Bestellen!", :url => "/ordering" },
-          { :name => "Meine Bestellungen", :url => "/ordering/myOrders" },
-          { :name => "Bestellverwaltung", :url => "/orders", :access_denied? => (!u.role_orders?) }
+          { :name => "Bestellen!", :url => ordering_path },
+          { :name => "Meine Bestellungen", :url => my_orders_path },
+          { :name => "Bestellverwaltung", :url => orders_path, :access_denied? => (!u.role_orders?) }
         ]
       },
-      { :name => "Artikel", :url => "/suppliers",
+      { :name => "Artikel", :url => suppliers_path,
         :active => ["articles", "suppliers", "deliveries", "article_categories", "stockit", "stock_takings"],
         :access_denied? => (!u.role_article_meta? && !u.role_suppliers?),
         :subnav => [
           { :name => "Artikel", :url => supplier_articles_path(Supplier.first) },
-          { :name => "Lager", :url => "/stockit" },
+          { :name => "Lager", :url => stock_articles_path },
           { :name => "Lieferantinnen", :url => suppliers_path, :access_denied? => (!u.role_suppliers?) },
-          { :name => "Kategorien", :url => "/article_categories"}
+          { :name => "Kategorien", :url => article_categories_path }
         ]
       },
-      { :name => "Finanzen", :url => "/finance",
+      { :name => "Finanzen", :url => finance_root_path,
         :active => ["finance/invoices", "finance/transactions", "finance/balancing"],
         :access_denied? => (!u.role_finance?),
         :subnav => [
-          { :name => "Konten verwalten", :url => "/finance/transactions" },
-          { :name => "Bestellungen abrechnen", :url => "/finance/balancing/list" },
+          { :name => "Konten verwalten", :url => finance_transactions_path },
+          { :name => "Bestellungen abrechnen", :url => finance_balancing_path },
           { :name => "Rechnungen", :url => finance_invoices_path }
         ]
       },
-      { :name => "Administration", :url => "/admin",
+      { :name => "Administration", :url => admin_root_path,
         :active => ["admin", "admin/users", "admin/ordergroups", "admin/workgroups"],
         :access_denied? => (!u.role_admin?),
         :subnav => [

app/views/layouts/application.haml

@@ -15,7 +15,7 @@
     
     #header
       #logo
-        %a{:href => "/"}
+        - link_to root_path do
           <span>food</span>soft
         %span{:style => "color:white; font-size:45%; letter-spacing: -1px;"}= Foodsoft.config[:name]
       #nav= render :partial => 'layouts/main_tabnav'

app/views/tasks/_nav.haml

@@ -8,7 +8,7 @@
     %li 
       Seiten
       %ul
-        %li= link_to "Meine Aufgaben", my_tasks_path
+        %li= link_to "Meine Aufgaben", user_tasks_path
         %li= link_to "Alle Aufgaben", :action => "index"
         %li= link_to "Erledigt Aufgaben (Archiv)", :action => "archive"