summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-05-01 03:58:53 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-05-01 03:58:53 +0000
commite1920cc9e42db1c692661c168c3ac082e7bbf50e (patch)
tree5f20da0ee689a0c8ed5ce74ee13c326d5ca048b8 /app
parentf10fed295a474e6d10316bbe04327394c6f963f9 (diff)
downloadredmine-e1920cc9e42db1c692661c168c3ac082e7bbf50e.tar.gz
redmine-e1920cc9e42db1c692661c168c3ac082e7bbf50e.zip
recovery base.html.erb "call_hook :view_layouts_base_sidebar" changed in Rails3 r9528
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9595 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/views/layouts/base.html.erb5
1 files changed, 1 insertions, 4 deletions
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index 68b175848..fdb8aff7d 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -56,13 +56,10 @@
<% end %>
</div>
-<% content_for :sidebar do %>
- <%= call_hook :view_layouts_base_sidebar %>
-<% end %>
-
<%= tag('div', {:id => 'main', :class => (has_content?(:sidebar) ? '' : 'nosidebar')}, true) %>
<div id="sidebar">
<%= yield :sidebar %>
+ <%= call_hook :view_layouts_base_sidebar %>
</div>
<div id="content">