From 4a5fd335a944857f6434a902e1216c41ecd6dca7 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@colivre.coop.br>
Date: Sat, 4 Apr 2009 09:17:11 -0300
Subject: [PATCH] ActionItem980: better destroy screen

---
 app/views/cms/destroy.rhtml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/views/cms/destroy.rhtml b/app/views/cms/destroy.rhtml
index 58be7f8..e9fcb08 100644
--- a/app/views/cms/destroy.rhtml
+++ b/app/views/cms/destroy.rhtml
@@ -4,16 +4,8 @@
 
 <% labelled_form_for 'article', @article, :url => { :action => 'destroy' }, :method => 'post' do |f| %>
 
-  <h2><%= @article.title %></h2>
-
-  <%= @article.to_html %>
-
-  <%= hidden_field_tag('id', @article) %>
-
-  <hr/>
-
   <strong>
-    <% if @article.blog? %>
+    <% if @article.folder? %>
       <%= _('Are you sure that you want to remove this folder? Note that all the items inside it will also be removed!') %>
     <% else %>
       <%= _('Are you sure that you want to remove this item?') %>
@@ -24,4 +16,13 @@
     <%= submit_button :save, _('Yes, I want.') %>
     <%= button :cancel, _("No, I don't want."), @article.url %>
   <% end %>
+
+  <h2><%= @article.title %></h2>
+
+  <%= @article.to_html %>
+
+  <%= hidden_field_tag('id', @article) %>
+
+  <hr/>
+
 <% end %>
--
libgit2 0.21.2