##// END OF EJS Templates
cleanup syntax of Relation#all at app/views/wiki/edit.html.erb...
Toshi MARUYAMA -
r12312:5d535f899644
parent child
Show More
@@ -1,46 +1,47
1 <%= wiki_page_breadcrumb(@page) %>
1 <%= wiki_page_breadcrumb(@page) %>
2
2
3 <h2><%= h @page.pretty_title %></h2>
3 <h2><%= h @page.pretty_title %></h2>
4
4
5 <%= form_for @content, :as => :content,
5 <%= form_for @content, :as => :content,
6 :url => {:action => 'update', :id => @page.title},
6 :url => {:action => 'update', :id => @page.title},
7 :html => {:method => :put, :multipart => true, :id => 'wiki_form'} do |f| %>
7 :html => {:method => :put, :multipart => true, :id => 'wiki_form'} do |f| %>
8 <%= f.hidden_field :version %>
8 <%= f.hidden_field :version %>
9 <% if @section %>
9 <% if @section %>
10 <%= hidden_field_tag 'section', @section %>
10 <%= hidden_field_tag 'section', @section %>
11 <%= hidden_field_tag 'section_hash', @section_hash %>
11 <%= hidden_field_tag 'section_hash', @section_hash %>
12 <% end %>
12 <% end %>
13 <%= error_messages_for 'content' %>
13 <%= error_messages_for 'content' %>
14
14
15 <div class="box tabular">
15 <div class="box tabular">
16 <%= text_area_tag 'content[text]', @text, :cols => 100, :rows => 25,
16 <%= text_area_tag 'content[text]', @text, :cols => 100, :rows => 25,
17 :class => 'wiki-edit', :accesskey => accesskey(:edit) %>
17 :class => 'wiki-edit', :accesskey => accesskey(:edit) %>
18
18
19 <% if @page.safe_attribute_names.include?('parent_id') && @wiki.pages.any? %>
19 <% if @page.safe_attribute_names.include?('parent_id') && @wiki.pages.any? %>
20 <%= fields_for @page do |fp| %>
20 <%= fields_for @page do |fp| %>
21 <p>
21 <p>
22 <label><%= l(:field_parent_title) %></label>
22 <label><%= l(:field_parent_title) %></label>
23 <%= fp.select :parent_id,
23 <%= fp.select :parent_id,
24 content_tag('option', '', :value => '') +
24 content_tag('option', '', :value => '') +
25 wiki_page_options_for_select(@wiki.pages.all(:include => :parent) -
25 wiki_page_options_for_select(
26 @wiki.pages.includes(:parent).all -
26 @page.self_and_descendants, @page.parent) %>
27 @page.self_and_descendants, @page.parent) %>
27 </p>
28 </p>
28 <% end %>
29 <% end %>
29 <% end %>
30 <% end %>
30
31
31 <p><label><%= l(:field_comments) %></label><%= f.text_field :comments, :size => 120 %></p>
32 <p><label><%= l(:field_comments) %></label><%= f.text_field :comments, :size => 120 %></p>
32 <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
33 <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
33 </div>
34 </div>
34
35
35 <p><%= submit_tag l(:button_save) %>
36 <p><%= submit_tag l(:button_save) %>
36 <%= preview_link({:controller => 'wiki', :action => 'preview', :project_id => @project, :id => @page.title }, 'wiki_form') %></p>
37 <%= preview_link({:controller => 'wiki', :action => 'preview', :project_id => @project, :id => @page.title }, 'wiki_form') %></p>
37 <%= wikitoolbar_for 'content_text' %>
38 <%= wikitoolbar_for 'content_text' %>
38 <% end %>
39 <% end %>
39
40
40 <div id="preview" class="wiki"></div>
41 <div id="preview" class="wiki"></div>
41
42
42 <% content_for :header_tags do %>
43 <% content_for :header_tags do %>
43 <%= robot_exclusion_tag %>
44 <%= robot_exclusion_tag %>
44 <% end %>
45 <% end %>
45
46
46 <% html_title @page.pretty_title %>
47 <% html_title @page.pretty_title %>
General Comments 0
You need to be logged in to leave comments. Login now