TheDude
/
openproject
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renders menu after heading

Browse Source
pull/6827/head
Hagen Schink 11 years ago committed by kgalli
parent 3f70659dbf
commit ae82e8e8d1
2 changed files with 51 additions and 45 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 93
      app/views/my_projects_overviews/_block_textilizable.html.erb
  2. 3
      app/views/my_projects_overviews/_textilizable.html.erb

93
app/views/my_projects_overviews/_block_textilizable.html.erb
Unescape View File

@ -21,53 +21,56 @@ See doc/COPYRIGHT.md for more details.
<div id="block_<%= block_name.dasherize %>" class="mypage-box"> <div id="block_<%= block_name.dasherize %>" class="mypage-box">
<div class="box-actions"> <% content_for block_name do %>
<%= link_to_remote l(:button_delete), { <div class="box-actions">
:confirm => l(:label_confirm_delete), <%= link_to_remote l(:button_delete), {
:url => { :action => "remove_block", :block => block_name }, :confirm => l(:label_confirm_delete),
:complete => "removeBlock('block_#{block_name.dasherize}')" }, :url => { :action => "remove_block", :block => block_name },
:class => "icon icon-delete" :complete => "removeBlock('block_#{block_name.dasherize}')" },
%> :class => "icon icon-delete"
</div> %>
</div>
<div class="handle"> <div class="handle">
<div id="<%= block_name %>-form-div" style="display: none;"> <div id="<%= block_name %>-form-div" style="display: none;">
<div class="box-actions"> <div class="box-actions">
<a href="#" onclick="return saveTextilizable('<%= block_name %>');" <a href="#" onclick="return saveTextilizable('<%= block_name %>');"
class="icon icon-save1"><%= l(:button_save) %></a> class="icon icon-save1"><%= l(:button_save) %></a>
</div> </div>
<div class="box-actions"> <div class="box-actions">
<a href="#" onclick="return resetTextilizable('<%= block_name %>');" <a href="#" onclick="return resetTextilizable('<%= block_name %>');"
class="icon icon-cancel"><%= l(:button_cancel) %></a> class="icon icon-cancel"><%= l(:button_cancel) %></a>
</div> </div>
<div style="clear: right;"></div> <div style="clear: right;"></div>
<%= form_for :overview, <%= form_for :overview,
:url => {:action => 'update_custom_element'}, :url => {:action => 'update_custom_element'},
:html => {:id => "block_form_#{block_name.dasherize}", :html => {:id => "block_form_#{block_name.dasherize}",
:class => nil, :class => nil,
:method => :put, :method => :put,
:multipart => true} do |f| %> :multipart => true} do |f| %>
<%= hidden_field_tag 'block_name', block_name %> <%= hidden_field_tag 'block_name', block_name %>
<%= text_field_tag "block_title_#{block_name}", block_title %> <%= text_field_tag "block_title_#{block_name}", block_title %>
<%= text_area_tag "textile_#{block_name}", textile, :cols => 40, :rows => 5, :class => 'wiki-edit' %> <%= text_area_tag "textile_#{block_name}", textile, :cols => 40, :rows => 5, :class => 'wiki-edit' %>
<%= wikitoolbar_for "textile_#{block_name}" %> <%= wikitoolbar_for "textile_#{block_name}" %>
<%= submit_tag l(:button_save), <%= submit_tag l(:button_save),
:id => "#{block_name}-form-submit", :style => "display:none;" %> :id => "#{block_name}-form-submit", :style => "display:none;" %>
<p><label><%=l(:label_attachment_plural)%></label><br /> <p><label><%=l(:label_attachment_plural)%></label><br />
<%= render :partial => 'attachments/form' %> <%= render :partial => 'attachments/form' %>
</p> </p>
<% end %> <% end %>
</div> </div>
<div id="<%= block_name %>-preview-div" class="wiki"> <div id="<%= block_name %>-preview-div" class="wiki">
<div class="box-actions"> <div class="box-actions">
<a href="#" onclick="return editTextilizable('<%= block_name %>');" <a href="#" onclick="return editTextilizable('<%= block_name %>');"
class="icon icon-edit"><%= l(:button_edit) %></a> class="icon icon-edit"><%= l(:button_edit) %></a>
</div>
</div> </div>
<%= render :partial => "textilizable",
:locals => { :block_title => block_title,
:textile => textile }
%>
</div> </div>
</div> <% end %>
<%= render :partial => "textilizable",
:locals => { :block_title => block_title,
:textile => textile,
:block_name => block_name }
%>
</div> </div>

3
app/views/my_projects_overviews/_textilizable.html.erb
Unescape View File

@ -20,4 +20,7 @@ See doc/COPYRIGHT.md for more details.
++#%> ++#%>
<h2 class="page-layout-only"><%= block_title || l(:label_custom_element) %></h2> <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) %> <%= textilizable(textile, :object => overview) %>

Write Preview
Loading…
Cancel
Save