Commit 4a5fd335a944857f6434a902e1216c41ecd6dca7
1 parent
41ca51a9
Exists in
master
and in
29 other branches
ActionItem980: better destroy screen
Showing
1 changed file
with
10 additions
and
9 deletions
Show diff stats
app/views/cms/destroy.rhtml
| @@ -4,16 +4,8 @@ | @@ -4,16 +4,8 @@ | ||
| 4 | 4 | ||
| 5 | <% labelled_form_for 'article', @article, :url => { :action => 'destroy' }, :method => 'post' do |f| %> | 5 | <% labelled_form_for 'article', @article, :url => { :action => 'destroy' }, :method => 'post' do |f| %> |
| 6 | 6 | ||
| 7 | - <h2><%= @article.title %></h2> | ||
| 8 | - | ||
| 9 | - <%= @article.to_html %> | ||
| 10 | - | ||
| 11 | - <%= hidden_field_tag('id', @article) %> | ||
| 12 | - | ||
| 13 | - <hr/> | ||
| 14 | - | ||
| 15 | <strong> | 7 | <strong> |
| 16 | - <% if @article.blog? %> | 8 | + <% if @article.folder? %> |
| 17 | <%= _('Are you sure that you want to remove this folder? Note that all the items inside it will also be removed!') %> | 9 | <%= _('Are you sure that you want to remove this folder? Note that all the items inside it will also be removed!') %> |
| 18 | <% else %> | 10 | <% else %> |
| 19 | <%= _('Are you sure that you want to remove this item?') %> | 11 | <%= _('Are you sure that you want to remove this item?') %> |
| @@ -24,4 +16,13 @@ | @@ -24,4 +16,13 @@ | ||
| 24 | <%= submit_button :save, _('Yes, I want.') %> | 16 | <%= submit_button :save, _('Yes, I want.') %> |
| 25 | <%= button :cancel, _("No, I don't want."), @article.url %> | 17 | <%= button :cancel, _("No, I don't want."), @article.url %> |
| 26 | <% end %> | 18 | <% end %> |
| 19 | + | ||
| 20 | + <h2><%= @article.title %></h2> | ||
| 21 | + | ||
| 22 | + <%= @article.to_html %> | ||
| 23 | + | ||
| 24 | + <%= hidden_field_tag('id', @article) %> | ||
| 25 | + | ||
| 26 | + <hr/> | ||
| 27 | + | ||
| 27 | <% end %> | 28 | <% end %> |