Merge remote-tracking branch 'origin/szzh' into szzh
This commit is contained in:
commit
912fdf480a
|
@ -1,17 +1,19 @@
|
|||
<h3><%=l(:label_confirmation)%></h3>
|
||||
<div class="warning">
|
||||
<p><strong><%=h @project_to_destroy %></strong><br />
|
||||
<%=l(:text_project_destroy_confirmation)%>
|
||||
|
||||
<% if @project_to_destroy.descendants.any? %>
|
||||
<br /><%= l(:text_subprojects_destroy_warning,
|
||||
content_tag('strong', h(@project_to_destroy.descendants.collect{|p| p.to_s}.join(', ')))).html_safe %>
|
||||
<% end %>
|
||||
</p>
|
||||
<p>
|
||||
<%= form_tag(project_path(@project_to_destroy), :method => :delete) do %>
|
||||
<label><%= check_box_tag 'confirm', 1 %> <%= l(:general_text_Yes) %></label>
|
||||
<%= submit_tag l(:button_delete) %>
|
||||
<% end %>
|
||||
</p>
|
||||
<div class="project_r_h">
|
||||
<h2 class="project_h2"><%=l(:label_confirmation)%></h2>
|
||||
</div>
|
||||
<div class="warning">
|
||||
<p><strong><h3><%=h @project_to_destroy %></h3></strong>
|
||||
<%=l(:text_project_destroy_confirmation)%>
|
||||
|
||||
<% if @project_to_destroy.descendants.any? %>
|
||||
<br /><%= l(:text_subprojects_destroy_warning,
|
||||
content_tag('strong', h(@project_to_destroy.descendants.collect{|p| p.to_s}.join(', ')))).html_safe %>
|
||||
<% end %>
|
||||
</p>
|
||||
<p>
|
||||
<%= form_tag(project_path(@project_to_destroy), :method => :delete) do %>
|
||||
<label><%= check_box_tag 'confirm', 1, checked = true %> <%= l(:general_text_Yes) %></label>
|
||||
<%= submit_tag l(:button_delete) %>
|
||||
<% end %>
|
||||
</p>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue