Commit 80d005392b7ba68a0f647acdeb0d515ad3aee3f9
1 parent
6fe4cacd
Exists in
master
and in
28 other branches
ActionItem1165: throwing dirty hack away
Showing
3 changed files
with
1 additions
and
11 deletions
Show diff stats
app/controllers/public/account_controller.rb
| @@ -230,10 +230,6 @@ class AccountController < ApplicationController | @@ -230,10 +230,6 @@ class AccountController < ApplicationController | ||
| 230 | render :partial => 'identifier_status' | 230 | render :partial => 'identifier_status' |
| 231 | end | 231 | end |
| 232 | 232 | ||
| 233 | - def user_menu | ||
| 234 | - # nothing | ||
| 235 | - end | ||
| 236 | - | ||
| 237 | protected | 233 | protected |
| 238 | 234 | ||
| 239 | def redirect? | 235 | def redirect? |
app/views/account/user_menu.rjs
| @@ -1 +0,0 @@ | @@ -1 +0,0 @@ | ||
| 1 | -page.replace_html 'user_box', :file => 'shared/user_menu' |
app/views/layouts/application.rhtml
| @@ -102,12 +102,7 @@ | @@ -102,12 +102,7 @@ | ||
| 102 | </div> | 102 | </div> |
| 103 | 103 | ||
| 104 | <div id="user_box"> | 104 | <div id="user_box"> |
| 105 | - <%# WARNING this is a horrible hack while we don't have an actual SSO system. %> | ||
| 106 | - <% if environment.enable_ssl && request.host != environment.default_hostname %> | ||
| 107 | - <%= content_tag 'script', '', :type => 'text/javascript', :src => environment.top_url(true) + '/account/user_menu' %> | ||
| 108 | - <% else %> | ||
| 109 | - <%= render :file => 'shared/user_menu' %> | ||
| 110 | - <% end %> | 105 | + <%= render :file => 'shared/user_menu' %> |
| 111 | </div><!-- id='user_box' --> | 106 | </div><!-- id='user_box' --> |
| 112 | 107 | ||
| 113 | <a href="#" id="btShowHelp" class="icon-help32on help-on icon-help-on" | 108 | <a href="#" id="btShowHelp" class="icon-help32on help-on icon-help-on" |