Download as
Browse Code »

Commit 80d005392b7ba68a0f647acdeb0d515ad3aee3f9

Authored by Antonio Terceiro
1 parent 6fe4cacd
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem1165: throwing dirty hack away

Showing 3 changed files with 1 additions and 11 deletions   Show diff stats
app/controllers/public/account_controller.rb
  Diff comments   View file @80d0053
... ... @@ -230,10 +230,6 @@ class AccountController < ApplicationController
230 230 render :partial => 'identifier_status'
231 231 end
232 232  
233   - def user_menu
234   - # nothing
235   - end
236   -
237 233 protected
238 234  
239 235 def redirect?
... ...
app/views/account/user_menu.rjs
View file @6fe4cac
... ... @@ -1 +0,0 @@
1   -page.replace_html 'user_box', :file => 'shared/user_menu'
app/views/layouts/application.rhtml
  Diff comments   View file @80d0053
... ... @@ -102,12 +102,7 @@
102 102 </div>
103 103  
104 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 106 </div><!-- id='user_box' -->
112 107  
113 108 <a href="#" id="btShowHelp" class="icon-help32on help-on icon-help-on"
... ...