From ea517a06ecb3d7f509ab4164ebaa7bea6e81c535 Mon Sep 17 00:00:00 2001
From: James Brooks <james@gooddogdesign.com>
Date: Mon, 25 Aug 2008 10:55:39 +0930
Subject: [PATCH] Added page delete functionality, added permanent page
 functionality (permanent pages cant be un-published or deleted)

---
 .gitignore                                       |   1 +
 .../hush_cms/templates/hush_cms_migration.rb     |   1 +
 install/images/page_delete.png                   | Bin 0 -> 740 bytes
 install/images/shield.png                        | Bin 0 -> 702 bytes
 install/stylesheets/hush_cms_admin.css           |  12 +++++++++++-
 .../hush_cms_admin/pages_controller.rb           |  10 ++++++++--
 lib/models/hush_cms/page.rb                      |   8 ++++++++
 lib/views/hush_cms_admin/pages/show.html.haml    |  15 ++++++++++-----
 8 files changed, 39 insertions(+), 8 deletions(-)
 create mode 100644 .gitignore
 create mode 100755 install/images/page_delete.png
 create mode 100755 install/images/shield.png

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e43b0f9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/generators/hush_cms/templates/hush_cms_migration.rb b/generators/hush_cms/templates/hush_cms_migration.rb
index a5b9f36..c304903 100644
--- a/generators/hush_cms/templates/hush_cms_migration.rb
+++ b/generators/hush_cms/templates/hush_cms_migration.rb
@@ -5,6 +5,7 @@ def self.up
       t.string :title, :slug
       t.text :content
       t.datetime :published_at
+      t.boolean :permanent, :default => false
       t.timestamps
     end
     
diff --git a/install/images/page_delete.png b/install/images/page_delete.png
new file mode 100755
index 0000000000000000000000000000000000000000..3141467c678d2b53f79deb22086a9cb3a576a08d
GIT binary patch
literal 740
zcmV<A0vr8_P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!c1c7*R2Ufr
z!ApphWf%b9=l%X~&fILgg)|a)q3lLMiinG-MM0^Xf{17nMvGFRf@l{mqIHW<SG5R&
zXq8}#Y9h4@K~zLaQ3eT?HkzX0c+Q;vdwZV9Opm;N;@RoB$!AK~hA9LHWRT6cwKG>P
z<w9J&{OZZWdqx0}nRdPT)yek`Y`d$JSe0}VfJ{h>|1Ep}yDQG09bP~E^Dk?@JiKQJ
z6-pO(3~IOP)IYisL6D6;oAEd;E%zR}{U$rMRNuD6nQV7nesKS>)yLo7JuDCrD>Abi
zbj3uW23?^GA}9jQ{M^8v?ejL?HaT7AX5WPZNkBmfN`w-jL?{tT7ykZt$%Yln?p_m~
z-?>&d(LD(jAd}h=LPltPQbO$*Wbyl@G-_k5jXbb<Qq(er3YjEo6e%U5gg`d3D-0+t
zwAM+5D4;^3A%YMRiEK=CfGDC5SyDqLP@#><q#=-*pcJ%FyCj1og}%`@ph9aYGf7ec
zkU$9i=SPed4p~0;n^Wu7+cEuEWv2>#qffHY03>M1jfEqoPJQ6Mr=Byp=^jfzePZV1
zLjCmNi31hdIJHa%e;5g=1(`u3BRzfeExY%=VCu{loOr{`%2hUR*x>tL^W_TTaj);0
zpPR6CUD1+0>4TQ6zVfH3TQ;%l6#(_%yspK@3gcmG<JNN2i*L^LTBH=9CF@ttyZ+-b
zvqxVvTsrSMu3hc)oxdt9-{>#Q4!WCPyLU93nMKk7E2pcA=l45({2jNho>sdF*A~bA
zxX?-cp~y_z_kFf+yqu3m#QiB}03?Z&9vvR5TNgj<)($Vm)xq5G>|o2sFMag&6aNF+
WAT1?sQBYt20000<MNUMnLSTZ8C{xG)

literal 0
HcmV?d00001

diff --git a/install/images/shield.png b/install/images/shield.png
new file mode 100755
index 0000000000000000000000000000000000000000..3cb4e257893adf230db7220c06fb9371360312e7
GIT binary patch
literal 702
zcmV;v0zv(WP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!P)S5VR5;6}
zlS_z=aTvyb|L=TfE{5YW36m%^#7vehSquxJWFd+qdsz@tvaqm`g_WgCv9Lh7goy<)
z2?;qFL&qg1#xcj7xqX-Oe;<pJ%P?#_^{(Ex=l%8eyiOATqu^i7&o`Fkd)k-&bAyva
z>CSS=grr57X34Zl(zd#$wMb&<%>`t-B(tkBb(psfna0f6_}Do~^xke$ZPQvRr946H
zWWosxshhe2GGhTlX^H4l2T{)>lHM28PjBPv)052H^wfm_GUcM~_VUEV$3cdCKWX1R
z!rT&^3rTv;k{#1R&D<>@Px1a?%-hNzH)w3T)o<w_$ViLlNQ+mn=q<<qVev=e?lTO%
zJODD{-U2dv2oQchhD=plpMa&{3>)siWm4p$YE@#8C&=cg43(z=rJn}gKmtpUPjP_<
zhQXyc#h?f*t`d2Vd9yzWR3(s7PzH#A7!f0%A|E3em_y#OBXS^bn8gJ3v%wOOhaiEV
zN+Bg6K!%U|v5J*O8kij|KR-n{eladP2^TtCnBu~Ophn<Q8WtR(?`1o2x%h0}_QLxS
z22JZ8?i_q`opRS%YNo6wsBa*sNpayInXw@a&4-A3^7M7xz$fX3QKKwxlLrdd7${sP
z+qfAQ&cOwPWE=Mp6}u>PUSs(4yA3V7-gl0O@~?V*x@CTl&E<2=tI5q@L#DQla@S41
zJh{xk+x)uL-5)Og@e9A})romi<ZVX~HtZkQ+(z-i`GQX>TU+;hxI5}I{Y{<6W=--*
k<)9^%y{&t@hew<F2HEUp-Yk*B)c^nh07*qoM6N<$f^*VFCIA2c

literal 0
HcmV?d00001

diff --git a/install/stylesheets/hush_cms_admin.css b/install/stylesheets/hush_cms_admin.css
index 01d0f51..6babe8c 100755
--- a/install/stylesheets/hush_cms_admin.css
+++ b/install/stylesheets/hush_cms_admin.css
@@ -100,12 +100,14 @@ ul#navigation li#nav-comments a {
 #sidebar a#sidebar-publish,
 #sidebar a#sidebar-unpublish,
 #sidebar a#sidebar-edit-page,
+#sidebar a#sidebar-delete-page,
 #sidebar a#sidebar-new-category,
 #sidebar a#sidebar-edit-category,
 #sidebar a#sidebar-new-post,
 #sidebar a#sidebar-edit-post,
 #sidebar a#sidebar-delete-post,
-#sidebar a#sidebar-new-snippet {
+#sidebar a#sidebar-new-snippet,
+#sidebar a#sidebar-permanent {
 	display: block;
 	font-size: 0.8em;
 	color: #278FD5;
@@ -118,6 +120,7 @@ ul#navigation li#nav-comments a {
 #sidebar a#sidebar-publish:hover,
 #sidebar a#sidebar-unpublish:hover,
 #sidebar a#sidebar-edit-page:hover,
+#sidebar a#sidebar-delete-page:hover,
 #sidebar a#sidebar-new-category:hover,
 #sidebar a#sidebar-edit-category:hover,
 #sidebar a#sidebar-new-post:hover,
@@ -138,6 +141,9 @@ ul#navigation li#nav-comments a {
 #sidebar a#sidebar-edit-page {
 	background-image: url(../images/hush_cms/page_edit.png);	
 }
+#sidebar a#sidebar-delete-page {
+	background-image: url(../images/hush_cms/page_delete.png);
+}
 #sidebar a#sidebar-new-category,
 #sidebar a#sidebar-new-post {
 	background-image: url(../images/hush_cms/newspaper_add.png);
@@ -152,6 +158,10 @@ ul#navigation li#nav-comments a {
 #sidebar a#sidebar-delete-post {
 	background-image: url(../images/hush_cms/newspaper_delete.png);
 }
+#sidebar a#sidebar-permanent {
+	color: #B1A656;
+	background-image: url(../images/hush_cms/shield.png);
+}
 
 #content {
 	float: left;
diff --git a/lib/controllers/hush_cms_admin/pages_controller.rb b/lib/controllers/hush_cms_admin/pages_controller.rb
index 7a91011..04f8630 100644
--- a/lib/controllers/hush_cms_admin/pages_controller.rb
+++ b/lib/controllers/hush_cms_admin/pages_controller.rb
@@ -49,15 +49,21 @@ def update
   end
   
   def destroy
+    if @page.permanent?
+      redirect_to :back
+    else
+      @page.destroy
+      redirect_to @page.parent ? hush_cms_admin_page_url(@page.parent) : hush_cms_admin_pages_url
+    end
   end
   
   def publish
-    @page.publish!
+    @page.publish! if @page.permanent?
     redirect_to hush_cms_admin_page_url(@page)
   end
   
   def unpublish
-    @page.unpublish!
+    @page.unpublish! if @page.permanent?
     redirect_to hush_cms_admin_page_url(@page)
   end
   
diff --git a/lib/models/hush_cms/page.rb b/lib/models/hush_cms/page.rb
index 63882d7..306a0e6 100644
--- a/lib/models/hush_cms/page.rb
+++ b/lib/models/hush_cms/page.rb
@@ -35,6 +35,14 @@ def unpublish!
     update_attribute :published_at, nil
   end
   
+  def make_permanent!
+    update_attribute :permanent, true
+  end
+  
+  def make_unpermanent!
+    update_attribute :permanent, false
+  end
+  
   def breadcrumbs
     parent ? parent.breadcrumbs << self : [self]
   end
diff --git a/lib/views/hush_cms_admin/pages/show.html.haml b/lib/views/hush_cms_admin/pages/show.html.haml
index c25a9a6..07bba32 100644
--- a/lib/views/hush_cms_admin/pages/show.html.haml
+++ b/lib/views/hush_cms_admin/pages/show.html.haml
@@ -2,12 +2,17 @@
 - add_link hush_cms_page_url(@page.path)
 
 - content_for :sidebar do
-  - if @page.published?
-    = link_to 'Un-publish Page', unpublish_hush_cms_admin_page_path(@page), :method => :put, :id => 'sidebar-publish'
+  - if @page.permanent?
+    = link_to_function 'Permanent Page', 'alert("This page is permanent and cannot be deleted or un-published")', :id => 'sidebar-permanent'
   - else
-    = link_to 'Publish Page', publish_hush_cms_admin_page_path(@page), :method => :put, :id => 'sidebar-unpublish'
-
-  = link_to 'Edit Page', edit_hush_cms_admin_page_path(@page), :id => 'sidebar-edit-page'
+    - if @page.published?
+      = link_to 'Un-publish Page', unpublish_hush_cms_admin_page_path(@page), :method => :put, :id => 'sidebar-publish'
+    - else
+      = link_to 'Publish Page', publish_hush_cms_admin_page_path(@page), :method => :put, :id => 'sidebar-unpublish'
+    
+    = link_to 'Delete Page', hush_cms_admin_page_path(@page), :method => :delete, :confirm => 'Are you sure?', :id => 'sidebar-delete-page'
+    
+  = link_to 'Edit Page', edit_hush_cms_admin_page_path(@page), :id => 'sidebar-edit-page'    
   = link_to 'New Sub-page', new_hush_cms_admin_page_path(:parent => @page.id), :id => 'sidebar-new-page'
 
   = render :partial => 'pages', :object => @page.children