caboose-cms 0.2.64 → 0.2.65

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzgwMDA5N2FjZjllMDg4YTU3NjNkYjQ0NGZhNTI3MmRlNmU2MGZhNQ==
+    OGQ1Mzc1ZTI2OWIwMzZiZDc5NmZjNjAyY2ZkODk3YzkxYjVmNDVjYw==
   data.tar.gz: !binary |-
-    MTE0OWFlNmQwMGRkM2FkZmYxODNlYzRmZDFhOWNjYzY0MWViMDViZQ==
+    MWQwOGQ0OWExZWYwMjUzY2ZjOTM4NmRkMDQ3ZGVlZGNkZGVhOWRkNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2I2NzcwM2UzOWQ3OWUyZTNhZGFkY2ViYmNkYmQwNWI3ZGIyZGRlYjllZGU1
-    OTc2ZjBlMzg0MGE4MzUzZDE1ZGYwMDZjYTAzZTRhODkzM2U5NjNkNDc1Yjg1
-    NTUwODNiNjU1OGZiNjFjNzY1ZmQ4Njg3ODBlZDhmMGZlNjA5OTM=
+    ZGJkMGExMzdkM2E3Yjc4ZWU1NThjMzk1ODY3ODg0NjlhNDJjZGM0ZWEzNWMw
+    NGQyYjFmZjkxZjI4MmIwYmViYmQwNmFiZDNiZDA3MjgyM2Y0ZmUxNGI1ZWVk
+    NmI0MDUzMjU1MzI0ZGQ1N2U4NGE5MmQ4NTlmZjdlMDM5ZjhlMTQ=
   data.tar.gz: !binary |-
-    NjY2NzQ2Y2EwYjMzMDBlOWQyZDNlMjcyY2JlODY1MjBlNWVhZTMzYjVkNGFj
-    ODljNjlkNjNkOWM3ZDNjZjk2NzczMjJhNTA4ODMzNDBlZDUyYTJhOTY5OWMz
-    YmExNjcxMTBiYzdjZDEwOGUyNjVlMWRiNThkYmNlMWFkNDY4OWQ=
+    YzNhMzU3YjNlYTZmNzJlYTRlNzBlMzNlNzcxZDhkYzRlNTNkNTZlMDBkYTI4
+    Nzc5MjBiNWIzNTY4OGEzMDVkNzk1MmUwYzhiNDk3YWFiMzZmZjJjNmE5MmRi
+    ZjkxNjYzNzNlN2NiYTlkZTVhODI2MDUwMTQ0NmEwNDk5ZjlhYjM=

data/app/controllers/caboose/pages_controller.rb

@@ -106,7 +106,7 @@ module Caboose
     # GET /admin/pages/new
     def admin_new
       return unless user_is_allowed('pages', 'add')
-      @parent_id = params[:parent_id].nil? ? params[:parent_id] : 1
+      @parent_id = params[:parent_id] ? params[:parent_id] : 1
       @parent = Page.find(@parent_id)
       render :layout => 'caboose/admin'
     end
@@ -194,7 +194,7 @@ module Caboose
       Caboose::Page.update_authorized_for_action(page.id, 'edit', editors)
 
       # Send back the response
-      resp.redirect = "/pages/#{page.id}/edit"
+      resp.redirect = "/admin/pages/#{page.id}/edit"
       render json: resp
     end
     
@@ -297,14 +297,21 @@ module Caboose
       render json: resp
     end
       
+    # GET /admin/pages/1/delete
+    def admin_delete_form
+      return unless user_is_allowed('pages', 'delete')
+      @page = Page.find(params[:id])      
+      render :layout => 'caboose/admin'      
+    end
+    
     # DELETE /admin/pages/1
-    def admin_destroy
+    def admin_delete
       return unless user_is_allowed('pages', 'delete')
-      user = Page.find(params[:id])
-      user.destroy
+      p = Page.find(params[:id])
+      p.destroy
       
       resp = StdClass.new({
-        'redirect' => '/pages'
+        'redirect' => '/admin/pages'
       })
       render json: resp
     end

data/app/views/caboose/pages/{admin_delete.html.erb → admin_delete_form.html.erb}

@@ -2,9 +2,9 @@
 <%= render :partial => 'caboose/pages/admin_header' %>
 
 <div id='message'>
-<p class='note warning'>Are you sure you want to delet the page?  This can't be undone.<br /><br />
-<input type='button' onclick='delete_page(<%= @page.id %>, true);' />
-<input type='button' onclick="window.location='/admin/pages/<%= @page.id %>/edit';" />
+<p class='note error'>Are you sure you want to delet the page?  This can't be undone.<br /><br />
+<input type='button' value='Yes' onclick='delete_page(<%= @page.id %>, true);' />
+<input type='button' value='No'  onclick="window.location='/admin/pages/<%= @page.id %>/edit';" />
 </p>
 </div>
 
@@ -17,7 +17,7 @@ function delete_page(page_id, confirm)
 {
   $('#message').html("<p class='loading'>Deleting page...</p>");
   $.ajax({
-    url: '/admin/pages/' + page_id + '/delete',
+    url: '/admin/pages/' + page_id,
     type: 'delete',
     success: function(resp) {
       if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");

data/app/views/caboose/pages/admin_index.html.erb

@@ -1,5 +1,5 @@
 <h1>Pages</h1>
 
-<p><a href='/pages/new'>New Page</a></p>
+<p><a href='/admin/pages/new'>New Page</a></p>
 
 <%= raw pages_list(@home_page) %>

data/app/views/caboose/pages/admin_new.html.erb

@@ -3,7 +3,10 @@
 <p>Parent: <%= @parent ? @parent.title : "Home" %></p>
 <input type='hidden' id='parent_id' name='parent_id' value='<%= @parent_id %>' />
 <p><input type='text' id='title' name='title' placeholder='Title' style="width: 400px;" /></p>
-<p><input type='submit' value='Add Page' onclick='add_page();' /></p>
+<p>
+<input type='button' value='< Back' onclick="window.location='/admin/pages';" />
+<input type='submit' value='Add Page' onclick='add_page();' />
+</p>
 
 <% content_for :caboose_js do %>
 <%= javascript_include_tag "caboose/model/all" %>
@@ -18,7 +21,7 @@ function add_page()
 {
   modal.autosize("<p class='loading'>Adding page...</p>");
   $.ajax({
-    url: '/pages',
+    url: '/admin/pages',
     type: 'post',
     data: {
       parent_id: $('#parent_id').val(),

data/config/routes.rb

@@ -50,7 +50,8 @@ Caboose::Engine.routes.draw do
   get     "admin/pages/sitemap-options"   => "pages#admin_sitemap_options"
   get     "admin/pages/robots-options"    => "pages#admin_robots_options"
   get     "admin/pages/format-options"    => "pages#admin_content_format_options"
-  get     "admin/pages/new"               => "pages#admin_new"  
+  get     "admin/pages/new"               => "pages#admin_new"
+  get     "admin/pages/:id/delete"        => "pages#admin_delete_form"  
   get     "admin/pages/:id/sitemap"       => "pages#admin_sitemap"
   get     "admin/pages/:id/edit"          => "pages#admin_edit_general"
   get     "admin/pages/:id/css"           => "pages#admin_edit_css"
@@ -60,7 +61,7 @@ Caboose::Engine.routes.draw do
   put     "admin/pages/:id"               => "pages#admin_update"
   get     "admin/pages"                   => "pages#admin_index"
   post    "admin/pages"                   => "pages#admin_create"  
-  delete  "admin/pages/:id"               => "pages#admin_destroy"
+  delete  "admin/pages/:id"               => "pages#admin_delete"
   
   match '*path' => 'pages#show'
   root :to => 'pages#show'

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.64'
+  VERSION = '0.2.65'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.64
+  version: 0.2.65
 platform: ruby
 authors:
 - William Barry
@@ -217,7 +217,7 @@ files:
 - app/views/caboose/login/index.html.erb
 - app/views/caboose/pages/_admin_footer.html.erb
 - app/views/caboose/pages/_admin_header.html.erb
-- app/views/caboose/pages/admin_delete.html.erb
+- app/views/caboose/pages/admin_delete_form.html.erb
 - app/views/caboose/pages/admin_edit_content.html.erb
 - app/views/caboose/pages/admin_edit_css.html.erb
 - app/views/caboose/pages/admin_edit_general.html.erb