From a679ea1deb360df9cd167e597f86c81494bbe5ea Mon Sep 17 00:00:00 2001
From: Eugene Korbut <me@mvl.ru>
Date: Sun, 8 Feb 2009 05:07:53 +1000
Subject: [PATCH] fix navigation links at contacts page

---
 app/helpers/application_helper.rb |  2 +-
 app/helpers/contact_helper.rb     | 10 +++++-----
 config/routes.rb                  |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index fac9c0d..6f9f8da 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -117,7 +117,7 @@ module ApplicationHelper
   end
 
   def link_main 
-    link_to(_('Contacts'), :controller => '/contacts/contact', :action => 'list') 
+    link_to(_('Contacts'), :controller => '/contact', :action => 'list') 
   end
 
   def alternator
diff --git a/app/helpers/contact_helper.rb b/app/helpers/contact_helper.rb
index c16b526..c8bef05 100644
--- a/app/helpers/contact_helper.rb
+++ b/app/helpers/contact_helper.rb
@@ -1,6 +1,6 @@
 module ContactHelper
   def link_import_preview() "/contacts/contact/import_preview" end
-  def link_main_index() "/webmail/webmail/folders" end
+  def link_main_index() "/webmail/folders" end
   def link_contact_save() "/contacts/contact/save" end
   def link_contact_import() "/contacts/contact/import" end
   def link_contact_choose() "/contacts/contact/choose" end
@@ -22,19 +22,19 @@ module ContactHelper
   end
 
   def link_folders
-    link_to(_('Folders'), :controller=>"/webmail/webmail", :action=>"messages")
+    link_to(_('Folders'), :controller=>"/webmail", :action=>"messages")
   end
   
   def link_send_mail
-    link_to(_('Compose'), :controller=>"/webmail/webmail", :action=>"compose")
+    link_to(_('Compose'), :controller=>"/webmail", :action=>"compose")
   end
 
   def link_mail_prefs
-    link_to(_('Preferences'), :controller=>"/webmail/webmail", :action=>"prefs")
+    link_to(_('Preferences'), :controller=>"/webmail", :action=>"prefs")
   end
   
   def link_mail_filters
-    link_to(_('Filters'), :controller=>"/webmail/webmail", :action=>"filters")
+    link_to(_('Filters'), :controller=>"/webmail", :action=>"filters")
   end
 
 end
diff --git a/config/routes.rb b/config/routes.rb
index 1205db4..de397f0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -11,7 +11,7 @@ ActionController::Routing::Routes.draw do |map|
 
   map.connect 'webmail/:action', :controller=>'webmail'
   
-  map.connect 'contacts/contact/:action', :controller=>'contacts/contact'
+  map.connect '/contact/:action', :controller=>'contact'
   
   map.connect 'admin/main', :controller=> 'login', :action=>'logout'
   # Allow downloading Web Service WSDL as a file with an extension