diff --git a/app/controllers/public/account_controller.rb b/app/controllers/public/account_controller.rb index a3e893f..d037938 100644 --- a/app/controllers/public/account_controller.rb +++ b/app/controllers/public/account_controller.rb @@ -230,10 +230,6 @@ class AccountController < ApplicationController render :partial => 'identifier_status' end - def user_menu - # nothing - end - protected def redirect? diff --git a/app/views/account/user_menu.rjs b/app/views/account/user_menu.rjs deleted file mode 100644 index aacc18d..0000000 --- a/app/views/account/user_menu.rjs +++ /dev/null @@ -1 +0,0 @@ -page.replace_html 'user_box', :file => 'shared/user_menu' diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml index 4e19cc9..1f4fd5c 100644 --- a/app/views/layouts/application.rhtml +++ b/app/views/layouts/application.rhtml @@ -102,12 +102,7 @@
- <%# WARNING this is a horrible hack while we don't have an actual SSO system. %> - <% if environment.enable_ssl && request.host != environment.default_hostname %> - <%= content_tag 'script', '', :type => 'text/javascript', :src => environment.top_url(true) + '/account/user_menu' %> - <% else %> - <%= render :file => 'shared/user_menu' %> - <% end %> + <%= render :file => 'shared/user_menu' %>