From f675e58dd98c7441618891a697486257f30e342d Mon Sep 17 00:00:00 2001
From: Hagen Schink <h.schink@finn.de>
Date: Tue, 11 Mar 2014 16:27:00 +0100
Subject: [PATCH] Renders menu after heading

---
 .../_block_textilizable.html.erb              | 93 ++++++++++---------
 .../_textilizable.html.erb                    |  3 +
 2 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/app/views/my_projects_overviews/_block_textilizable.html.erb b/app/views/my_projects_overviews/_block_textilizable.html.erb
index ccc799255d..e90b8ad257 100644
--- a/app/views/my_projects_overviews/_block_textilizable.html.erb
+++ b/app/views/my_projects_overviews/_block_textilizable.html.erb
@@ -20,53 +20,56 @@ See doc/COPYRIGHT.md for more details.
 
 <div id="block_<%= block_name.dasherize %>" class="mypage-box">
 
-  <div class="box-actions">
-    <%= link_to_remote l(:button_delete), {
-          :confirm => l(:label_confirm_delete),
-          :url => { :action => "remove_block", :block => block_name },
-          :complete => "removeBlock('block_#{block_name.dasherize}')" },
-        :class => "icon icon-delete"
-        %>
-  </div>
+  <% content_for block_name do %>
+    <div class="box-actions">
+      <%= link_to_remote l(:button_delete), {
+            :confirm => l(:label_confirm_delete),
+            :url => { :action => "remove_block", :block => block_name },
+            :complete => "removeBlock('block_#{block_name.dasherize}')" },
+          :class => "icon icon-delete"
+          %>
+    </div>
 
-  <div class="handle">
-    <div id="<%= block_name %>-form-div" style="display: none;">
-      <div class="box-actions">
-	<a href="#" onclick="return saveTextilizable('<%= block_name %>');"
-	   class="icon icon-save1"><%= l(:button_save) %></a>
-      </div>
-      <div class="box-actions">
-	<a href="#" onclick="return resetTextilizable('<%= block_name %>');"
-	   class="icon icon-cancel"><%= l(:button_cancel) %></a>
-      </div>
-      <div style="clear: right;"></div>
-        <%= form_for :overview,
-                     :url => {:action => 'update_custom_element'},
-                     :html => {:id => "block_form_#{block_name.dasherize}",
-                               :class => nil,
-                               :method => :put,
-                               :multipart => true} do |f| %>
+    <div class="handle">
+      <div id="<%= block_name %>-form-div" style="display: none;">
+        <div class="box-actions">
+    <a href="#" onclick="return saveTextilizable('<%= block_name %>');"
+       class="icon icon-save1"><%= l(:button_save) %></a>
+        </div>
+        <div class="box-actions">
+    <a href="#" onclick="return resetTextilizable('<%= block_name %>');"
+       class="icon icon-cancel"><%= l(:button_cancel) %></a>
+        </div>
+        <div style="clear: right;"></div>
+          <%= form_for :overview,
+                       :url => {:action => 'update_custom_element'},
+                       :html => {:id => "block_form_#{block_name.dasherize}",
+                                 :class => nil,
+                                 :method => :put,
+                                 :multipart => true} do |f| %>
 
-          <%= hidden_field_tag 'block_name', block_name %>
-          <%= text_field_tag "block_title_#{block_name}", block_title %>
-          <%= text_area_tag "textile_#{block_name}", textile, :cols => 40, :rows => 5, :class => 'wiki-edit' %>
-          <%= wikitoolbar_for "textile_#{block_name}" %>
-          <%= submit_tag l(:button_save),
-          :id => "#{block_name}-form-submit", :style => "display:none;" %>
-        <p><label><%=l(:label_attachment_plural)%></label><br />
-          <%= render :partial => 'attachments/form' %>
-        </p>
-      <% end %>
-    </div>
-    <div id="<%= block_name %>-preview-div" class="wiki">
-      <div class="box-actions">
-	<a href="#" onclick="return editTextilizable('<%= block_name %>');"
-	   class="icon icon-edit"><%= l(:button_edit) %></a>
+            <%= hidden_field_tag 'block_name', block_name %>
+            <%= text_field_tag "block_title_#{block_name}", block_title %>
+            <%= text_area_tag "textile_#{block_name}", textile, :cols => 40, :rows => 5, :class => 'wiki-edit' %>
+            <%= wikitoolbar_for "textile_#{block_name}" %>
+            <%= submit_tag l(:button_save),
+            :id => "#{block_name}-form-submit", :style => "display:none;" %>
+          <p><label><%=l(:label_attachment_plural)%></label><br />
+            <%= render :partial => 'attachments/form' %>
+          </p>
+        <% end %>
+      </div>
+      <div id="<%= block_name %>-preview-div" class="wiki">
+        <div class="box-actions">
+    <a href="#" onclick="return editTextilizable('<%= block_name %>');"
+       class="icon icon-edit"><%= l(:button_edit) %></a>
+        </div>
       </div>
-      <%= render :partial => "textilizable",
-                 :locals => { :block_title => block_title,
-                              :textile => textile }
-            %>
     </div>
-  </div>
+  <% end %>
+  <%= render :partial => "textilizable",
+             :locals => { :block_title => block_title,
+                          :textile => textile,
+                          :block_name => block_name }
+        %>
 </div>
diff --git a/app/views/my_projects_overviews/_textilizable.html.erb b/app/views/my_projects_overviews/_textilizable.html.erb
index 2cb79931b1..815c15ab3b 100644
--- a/app/views/my_projects_overviews/_textilizable.html.erb
+++ b/app/views/my_projects_overviews/_textilizable.html.erb
@@ -19,4 +19,7 @@ See doc/COPYRIGHT.md for more details.
 ++#%>
 
 <h2 class="page-layout-only"><%= block_title || l(:label_custom_element) %></h2>
+<% if defined? block_name %>
+  <%= content_for block_name %>
+<% end %>
 <%= textilizable(textile, :object => overview) %>