caboose-cms 0.7.85 → 0.8.1

data/app/controllers/caboose/modal_controller.rb

@@ -2,12 +2,13 @@ module Caboose
   class ModalController < Caboose::ApplicationController    
     layout 'caboose/application'
     
-    # GET /modal
+    # @route GET /modal
     def layout
       render 'layouts/caboose/modal', layout: false
     end
-    
-    # GET /modal/:url
+        
+    # @route GET /modal/:url
+    # @route_constraints {:url => /.*/}
     def index
       @url = "/#{params[:url]}"
       @url << "?#{request.query_string}" if request.query_string      

data/app/controllers/caboose/modification_values_controller.rb

@@ -1,7 +1,7 @@
 module Caboose
   class ModificationValuesController < Caboose::ApplicationController
     
-    # GET /admin/products/:product_id/modifications/:mod_id/values/json
+    # @route GET /admin/products/:product_id/modifications/:mod_id/values/json
     def admin_json
       return if !user_is_allowed('products', 'view')
       
@@ -9,13 +9,13 @@ module Caboose
       render :json => m.modification_values            
     end
     
-    # GET /admin/products/:product_id/modifications/:mod_id/values/:id/json
+    # @route GET /admin/products/:product_id/modifications/:mod_id/values/:id/json
     def admin_json_single
       mv = ModificationValue.find(params[:id])
       render :json => mv      
     end
           
-    # PUT /admin/products/:product_id/modifications/:mod_id/values/:id    
+    # @route PUT /admin/products/:product_id/modifications/:mod_id/values/:id    
     def admin_update
       return if !user_is_allowed('products', 'edit')
       
@@ -45,7 +45,7 @@ module Caboose
       render :json => resp
     end
     
-    # POST /admin/products/:product_id/modifications/:mod_id/values
+    # @route POST /admin/products/:product_id/modifications/:mod_id/values
     def admin_add
       return if !user_is_allowed('products', 'add')
       
@@ -64,7 +64,7 @@ module Caboose
       render :json => resp    
     end
     
-    # DELETE /admin/products/:product_id/modifications/:mod_id/values/:id
+    # @route DELETE /admin/products/:product_id/modifications/:mod_id/values/:id
     def admin_delete
       return if !user_is_allowed('products', 'delete')
       mv = ModificationValue.find(params[:id]).destroy      
@@ -73,7 +73,7 @@ module Caboose
       })
     end
     
-    # PUT /admin/products/:product_id/modifications/:mod_id/values/sort-order
+    # @route PUT /admin/products/:product_id/modifications/:mod_id/values/sort-order
     def admin_update_sort_order            
       params[:modification_value_ids].each_with_index do |mv_id, i|
         mv = ModificationValue.where(:id => mv_id).first

data/app/controllers/caboose/modifications_controller.rb

@@ -1,7 +1,7 @@
 module Caboose
   class ModificationsController < Caboose::ApplicationController
     
-    # GET /admin/products/:product_id/modifications/json
+    # @route GET /admin/products/:product_id/modifications/json
     def admin_json
       return if !user_is_allowed('products', 'view')
       
@@ -9,13 +9,13 @@ module Caboose
       render :json => p.modifications.as_json(:include => :modification_values)            
     end
     
-    # GET /admin/products/:product_id/modifications/:id/json
+    # @route GET /admin/products/:product_id/modifications/:id/json
     def admin_json_single
       m = Modification.find(params[:id])
       render :json => m.as_json(:include => :modification_values)      
     end
           
-    # PUT /admin/products/:product_id/modifications/:id    
+    # @route PUT /admin/products/:product_id/modifications/:id    
     def admin_update
       return if !user_is_allowed('products', 'edit')
       
@@ -32,7 +32,7 @@ module Caboose
       render :json => resp
     end
     
-    # POST /admin/products/:product_id/modifications
+    # @route POST /admin/products/:product_id/modifications
     def admin_add
       return if !user_is_allowed('products', 'add')
       
@@ -49,7 +49,7 @@ module Caboose
       render :json => resp    
     end
     
-    # DELETE /admin/products/:product_id/modifications/:id
+    # @route DELETE /admin/products/:product_id/modifications/:id
     def admin_delete
       return if !user_is_allowed('products', 'delete')
       m = Modification.find(params[:id]).destroy      
@@ -58,7 +58,8 @@ module Caboose
       })
     end
     
-    # PUT /admin/products/:product_id/modifications/sort-order
+    # @route_priority 1
+    # @route PUT /admin/products/:product_id/modifications/sort-order
     def admin_update_sort_order            
       params[:modification_ids].each_with_index do |mod_id, i|
         m = Modification.where(:id => mod_id).first

data/app/controllers/caboose/my_account_controller.rb

@@ -1,13 +1,13 @@
 module Caboose
   class MyAccountController < Caboose::ApplicationController
             
-    # GET /my-account
+    # @route GET /my-account
     def index
       return if !verify_logged_in
       @user = logged_in_user      
     end
     
-    # PUT /my-account
+    # @route PUT /my-account
     def update  
       return if !logged_in?
       

data/app/controllers/caboose/my_account_invoices_controller.rb

@@ -0,0 +1,166 @@
+module Caboose
+  class MyAccountInvoicesController < Caboose::ApplicationController
+            
+    helper :authorize_net
+    protect_from_forgery :except => :authnet_relay
+    
+    # @route GET /my-account/invoices
+    def index
+      return if !verify_logged_in
+            
+      @pager = Caboose::PageBarGenerator.new(params, {
+        'customer_id'          => logged_in_user.id,         
+        'status'               => [Invoice::STATUS_PENDING, Invoice::STATUS_CANCELED, Invoice::STATUS_READY_TO_SHIP, Invoice::STATUS_SHIPPED]        
+      }, {
+        'model'          => 'Caboose::Invoice',
+        'sort'           => 'invoice_number',
+        'desc'           => 1,
+        'base_url'       => '/my-account/invoices',
+        'use_url_params' => false
+      })      
+      @invoices = @pager.all_items
+    end
+    
+    # @route GET /my-account/invoices/:id/payment-form
+    def payment_form
+      return if !logged_in?
+      
+      @invoice = Invoice.find(params[:id])
+      if @invoice.customer_id != logged_in_user.id
+        @error = "The given invoice does not belong to you."
+        render :file => 'caboose/extras/error'
+        return
+      end
+  
+      if @invoice.financial_status != Invoice::FINANCIAL_STATUS_PENDING        
+        @error = "This invoice does not require payment at this time."
+        render :file => 'caboose/extras/error'
+        return
+      end
+        
+      sc = @site.store_config
+      case sc.pp_name
+        when 'authorize.net'
+                      
+          @sim_transaction = AuthorizeNet::SIM::Transaction.new(
+            sc.authnet_api_login_id, 
+            sc.authnet_api_transaction_key, 
+            @invoice.total,                          
+            :relay_response => 'TRUE',              
+            :relay_url => "#{sc.authnet_relay_domain}/my-account/invoices/authnet-relay",
+            :transaction_type => 'AUTH_ONLY',                        
+            :test => sc.pp_testing
+          )
+          @request = request
+          @show_relay = params[:show_relay] && params[:show_relay].to_i == 1
+          
+        when 'stripe'
+          # TODO: Implement manual invoice payment for stripe
+          
+      end      
+      render :layout => false      
+    end
+    
+    # @route GET /my-account/invoices/:id/json
+    def invoice_json
+      return if !logged_in?
+      
+      invoice = Invoice.find(params[:id])
+      if invoice.customer_id != logged_in_user.id        
+        render :json => { :error => "The given invoice does not belong to you." } 
+        return
+      end
+      
+      if invoice.shipping_address_id.nil?
+        sa = Address.create
+        invoice.shipping_address_id = sa.id
+        invoice.save
+      end
+      render :json => invoice.as_json(:include => [        
+        { :line_items => { :include => { :variant => { :include => :product }}}},
+        { :invoice_packages => { :include => [:shipping_package, :shipping_method] }},
+        { :discounts => { :include => :gift_card }},
+        :customer,
+        :shipping_address,
+        :billing_address,
+        :invoice_transactions
+      ])
+    end
+    
+    # @route GET  /my-account/invoices/authnet-relay
+    # @route POST /my-account/invoices/authnet-relay
+    def authnet_relay
+      Caboose.log("Authorize.net relay for my account, invoice #{params[:x_invoice_id]}")
+      
+      invoice = Caboose::Invoice.find(params[:x_invoice_num])
+      ot = Caboose::InvoiceTransaction.new(
+        :invoice_id => invoice.id,
+        :date_processed => DateTime.now.utc,
+        :transaction_type => Caboose::InvoiceTransaction::TYPE_AUTHORIZE
+      )
+      ot.success        = params[:x_response_code] && params[:x_response_code] == '1'
+      ot.transaction_id = params[:x_trans_id] if params[:x_trans_id]              
+      ot.auth_code      = params[:x_auth_code] if params[:x_auth_code]
+      ot.response_code  = params[:x_response_code] if params[:x_response_code]
+      ot.amount         = invoice.total
+      ot.save
+      
+      error = nil
+      if ot.success
+        invoice.financial_status = Invoice::FINANCIAL_STATUS_AUTHORIZED
+        invoice.status = Invoice::STATUS_PENDING if invoice.status == Invoice::STATUS_CART
+        invoice.invoice_number = @site.store_config.next_invoice_number if invoice.invoice_number.nil?
+        
+        # Send out emails        
+        InvoicesMailer.configure_for_site(@site.id).customer_new_invoice(invoice).deliver                
+        
+        # Emit invoice event
+        Caboose.plugin_hook('invoice_authorized', invoice)        
+      else
+        invoice.financial_status = Invoice::FINANCIAL_STATUS_PENDING        
+        error = "There was a problem processing your payment."
+      end
+            
+      invoice.save
+      
+      @url = params[:x_after_relay]
+      @url << (ot.success ? "?success=1" : "?error=#{error}")             
+                  
+      render :layout => false
+    end
+    
+    # @route GET  /my-account/invoices/:id/authnet-response
+    # @route POST /my-account/invoices/:id/authnet-response    
+    def authnet_response
+      Caboose.log("Authorize.net response for my account, invoice #{params[:id]}")
+      
+      @resp = Caboose::StdClass.new
+      @resp.success = true if params[:success]
+      @resp.error = params[:error] if params[:error]
+      
+      # Go ahead and capture funds if the invoice only contained downloadable items
+      @invoice = Invoice.find(params[:id])
+      if !@invoice.has_shippable_items?
+        capture_resp = @invoice.capture_funds
+        if capture_resp.error
+          @resp.success = false
+          @resp.error = capture_resp.error
+        end        
+      end      
+      render :layout => false
+    end
+    
+    # @route GET /my-account/invoices/:id
+    def edit
+      return if !verify_logged_in
+      
+      @invoice = Invoice.find(params[:id])
+      if @invoice.customer_id != logged_in_user.id
+        @error = "The given invoice does not belong to you."
+        render :file => 'caboose/extras/error'
+        return
+      end
+    end
+            
+  end
+end

data/app/controllers/caboose/my_account_line_items_controller.rb

@@ -1,37 +1,39 @@
 module Caboose
   class MyAccountLineItemsController < Caboose::ApplicationController
-            
-    # GET /my-account/orders/:order_id/line-items
+    
+    # @route GET /my-account/invoices/:invoice_id/line-items
     def index
       return if !verify_logged_in      
-      @order = Order.find(params[:order_id])
-      if @order.customer_id != logged_in_user.id
-        @error = "The given order does not belong to you."
+      @invoice = Invoice.find(params[:invoice_id])
+      if @invoice.customer_id != logged_in_user.id
+        @error = "The given invoice does not belong to you."
         render :file => 'caboose/extras/error'
         return
       end
     end
       
-    # GET /my-account/orders/:order_id/line-items/:id
+    # @route_priority 2
+    # @route GET /my-account/invoices/:invoice_id/line-items/:id
     def edit
       return if !verify_logged_in
       
-      @order = Order.find(params[:order_id])
+      @invoice = Invoice.find(params[:invoice_id])
       @line_item = LineItem.find(params[:id])
-      if @order.customer_id != logged_in_user.id
-        @error = "The given order does not belong to you."
+      if @invoice.customer_id != logged_in_user.id
+        @error = "The given invoice does not belong to you."
         render :file => 'caboose/extras/error'
         return
       end      
     end
     
-    # GET /my-account/orders/:order_id/line-items/:id/download
+    # @route_priority 1
+    # @route GET /my-account/invoices/:invoice_id/line-items/:id/download
     def download
       return if !verify_logged_in
       
-      order = Order.find(params[:order_id])      
-      if order.customer_id != logged_in_user.id
-        @error = "The given order does not belong to you."
+      invoice = Invoice.find(params[:invoice_id])      
+      if invoice.customer_id != logged_in_user.id
+        @error = "The given invoice does not belong to you."
         render :file => 'caboose/extras/error'
         return
       end

data/app/controllers/caboose/page_custom_fields_controller.rb

@@ -3,13 +3,13 @@ module Caboose
     
     helper :application
          
-    # GET /admin/page-custom-fields    
+    # @route GET /admin/page-custom-fields    
     def admin_index
       return if !user_is_allowed_to 'view', 'pagecustomfields'              
       render :layout => 'caboose/admin'    
     end
     
-    # GET /admin/page-custom-fields/json        
+    # @route GET /admin/page-custom-fields/json        
     def admin_json
       return if !user_is_allowed_to 'view', 'pagecustomfields'
       pager = self.fields_pager        
@@ -33,21 +33,21 @@ module Caboose
       })
     end
     
-    # GET /admin/page-custom-fields/:id/json    
+    # @route GET /admin/page-custom-fields/:id/json    
     def admin_json_single
       return if !user_is_allowed_to 'view', 'pagecustomfields'
       f = PageCustomField.find(params[:id])      
       render :json => f
     end
                       
-    # GET /admin/page-custom-fields/:id
+    # @route GET /admin/page-custom-fields/:id
     def admin_edit
       return if !user_is_allowed('pagecustomfields', 'edit')    
       @page_custom_field = PageCustomField.find(params[:id])      
       render :layout => 'caboose/admin'
     end
         
-    # PUT /admin/page-custom-fields/:id
+    # @route PUT /admin/page-custom-fields/:id
     def admin_update      
       return if !user_is_allowed('pagecustomfields', 'edit')
       
@@ -68,7 +68,7 @@ module Caboose
       render :json => resp
     end
   
-    # POST /admin/page-custom-fields
+    # @route POST /admin/page-custom-fields
     def admin_add
       return if !user_is_allowed('pagecustomfields', 'add')
   
@@ -90,7 +90,7 @@ module Caboose
       render :json => resp
     end
     
-    # DELETE /admin/page-custom-fields/:id
+    # @route DELETE /admin/page-custom-fields/:id
     def admin_delete
       return if !user_is_allowed('pagecustomfields', 'edit')
 
@@ -108,7 +108,8 @@ module Caboose
       render :json => { 'redirect' => '/admin/page-custom-fields' }      
     end
         
-    # GET /admin/page-custom-fields/:field-options    
+    # @route_priority 1
+    # @route GET /admin/page-custom-fields/:field-options    
     def admin_options
       return if !user_is_allowed_to 'view', 'pagecustomfields'  
 	    options = []

data/app/controllers/caboose/page_permissions_controller.rb

@@ -2,7 +2,7 @@
 module Caboose
   class PagePermissionsController < ApplicationController
     
-    # POST /admin/page-permissions
+    # @route POST /admin/page-permissions
     def admin_add
       return unless user_is_allowed('pages', 'add')
 
@@ -19,8 +19,8 @@ module Caboose
       render :json => resp
     end
 
-    # DELETE /admin/page-permissions
-    # DELETE /admin/page-permissions/:id
+    # @route DELETE /admin/page-permissions
+    # @route DELETE /admin/page-permissions/:id
     def admin_delete
       return unless user_is_allowed('pages', 'edit')
 

data/app/controllers/caboose/pages_controller.rb

@@ -6,9 +6,15 @@ module Caboose
     
     def before_action
       @page = Page.page_with_uri(request.host_with_port, '/admin')      
-    end    
+    end
+    
+    # @route GET /pages/:id/redirect
+    def redirect
+      @page = Page.find(params[:id])
+      redirect_to "/#{@page.uri}"
+    end
 
-    # GET /pages/:id
+    # @route GET /pages/:id
     def show
       
       # Find the page with an exact URI match 
@@ -127,17 +133,11 @@ module Caboose
 
     end
     
-    # GET /pages/1/redirect
-    def redirect
-      @page = Page.find(params[:id])
-      redirect_to "/#{@page.uri}"
-    end
-    
     #===========================================================================
     # Admin actions
     #===========================================================================
     
-    # GET /admin/pages
+    # @route GET /admin/pages
     def admin_index
       return if !user_is_allowed('pages', 'view')            
       @domain = Domain.where(:domain => request.host_with_port).first
@@ -148,7 +148,7 @@ module Caboose
       render :layout => 'caboose/admin'      
     end
 
-    # GET /admin/pages/new
+    # @route GET /admin/pages/new
     def admin_new
       return unless user_is_allowed('pages', 'add')
       @parent_id = params[:parent_id] ? params[:parent_id] : Page.where(:site_id => @site.id, :parent_id => -1).first.id
@@ -156,15 +156,7 @@ module Caboose
       render :layout => 'caboose/admin'
     end
     
-    # GET /admin/pages/:id/edit
-    def admin_edit_general
-      return if !user_is_allowed('pages', 'edit')
-      #return if !Page.is_allowed(logged_in_user, params[:id], 'edit')            
-      @page = Page.find(params[:id])
-      render :layout => 'caboose/admin'
-    end
-    
-    # GET /admin/page/:id/custom-fields
+    # @route GET /admin/pages/:id/custom-fields
     def admin_edit_custom_fields
       return if !user_is_allowed('pages', 'edit')    
       @page = Page.find(params[:id])
@@ -172,14 +164,14 @@ module Caboose
       render :layout => 'caboose/modal'
     end
     
-    # GET /admin/pages/:id/permissions
+    # @route GET /admin/pages/:id/permissions
     def admin_edit_permissions
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:id])
       render :layout => 'caboose/admin'
     end
     
-    # PUT /admin/pages/:id/update-child-permissions
+    # @route PUT /admin/pages/:id/update-child-permissions
     def admin_update_child_permissions
       return unless user_is_allowed('pages', 'edit')      
       page = Page.find(params[:id])
@@ -189,7 +181,7 @@ module Caboose
       render :json => { :success => true }
     end
                
-    # GET /admin/pages/:id/content
+    # @route GET /admin/pages/:id/content
     def admin_edit_content
       return unless user_is_allowed('pages', 'edit')      
       @page = Page.find(params[:id])
@@ -200,14 +192,14 @@ module Caboose
       @editing = true
     end
     
-    # GET /admin/pages/:id/layout
+    # @route GET /admin/pages/:id/layout
     def admin_edit_layout
       return unless user_is_allowed('pages', 'edit')      
       @page = Page.find(params[:id])
       render :layout => 'caboose/admin'
     end
     
-    # PUT /admin/pages/:id/layout
+    # @route PUT /admin/pages/:id/layout
     def admin_update_layout
       return unless user_is_allowed('pages', 'edit')      
       bt = BlockType.find(params[:block_type_id])
@@ -219,14 +211,14 @@ module Caboose
       render :json => resp
     end
     
-    # GET /admin/pages/:id/block-order
+    # @route GET /admin/pages/:id/block-order
     def admin_edit_block_order
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:id])
       render :layout => 'caboose/admin'
     end
     
-    # PUT /admin/pages/:id/block-order
+    # @route PUT /admin/pages/:id/block-order
     def admin_update_block_order
       return unless user_is_allowed('pages', 'edit')
       block_ids = params[:block_ids]      
@@ -238,42 +230,42 @@ module Caboose
       render :json => true
     end
     
-    # GET /admin/pages/:id/new-blocks
+    # @route GET /admin/pages/:id/new-blocks
     def admin_new_blocks
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:id])
       render :layout => 'caboose/admin'
     end        
     
-    # GET /admin/pages/:id/css
+    # @route GET /admin/pages/:id/css
     def admin_edit_css
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:id])
       render :layout => 'caboose/admin'
     end
     
-    # GET /admin/pages/:id/js
+    # @route GET /admin/pages/:id/js
     def admin_edit_js
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:id])
       render :layout => 'caboose/admin'
     end
     
-    # GET /admin/pages/:id/seo
+    # @route GET /admin/pages/:id/seo
     def admin_edit_seo
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:id])
       render :layout => 'caboose/admin'
     end
     
-    # GET /admin/pages/:id/child-order
+    # @route GET /admin/pages/:id/child-order
     def admin_edit_child_sort_order
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:id])
       render :layout => 'caboose/admin'
     end
     
-    # PUT /admin/pages/:id/child-order
+    # @route PUT /admin/pages/:id/child-order
     def admin_update_child_sort_order
       return unless user_is_allowed('pages', 'edit')      
       @page = Page.find(params[:id])
@@ -288,7 +280,67 @@ module Caboose
       render :json => true
     end
     
-    # POST /admin/pages
+    # @route GET /admin/pages/:id/duplicate
+    def admin_duplicate_form
+      return unless user_is_allowed('pages', 'add')
+      @page = Page.find(params[:id])      
+      render :layout => 'caboose/admin'      
+    end
+    
+    # @route POST /admin/pages/:id/duplicate
+    def admin_duplicate
+      return unless user_is_allowed('pages', 'add')
+      
+      resp = Caboose::StdClass.new
+      
+      p = Page.where(:id => params[:id]).first      
+      site_id              = params[:site_id]
+      parent_id            = params[:parent_id]
+      block_type_id        = params[:block_type_id]
+      child_block_type_id  = params[:child_block_type_id]
+      duplicate_children   = params[:duplicate_children] ? true : false
+      
+      if p.nil?            then resp.error = "Invalid page"
+      elsif site_id.nil?   then resp.error = "Invalid site"
+      elsif parent_id.nil? then resp.error = "Invalid parent"
+      else
+        resp.new_id = p.duplicate(site_id, parent_id, duplicate_children, block_type_id, child_block_type_id)
+        resp.success = true
+      end
+      
+      render :json => resp
+    end
+      
+    # @route GET /admin/pages/:id/delete
+    def admin_delete_form
+      return unless user_is_allowed('pages', 'delete')
+      @page = Page.find(params[:id])      
+      render :layout => 'caboose/admin'      
+    end
+    
+    # @route GET /admin/pages/:id/uri
+    def admin_page_uri
+      return unless user_is_allowed('pages', 'view')
+      p = Page.find(params[:id])
+      render :json => { 'uri' => p.uri }
+		end
+    
+    # @route GET /admin/pages/:id/sitemap
+    def admin_sitemap
+      return unless user_is_allowed('pages', 'delete')
+      @page = Page.find(params[:id])
+      render :layout => 'caboose/admin'
+    end
+
+    # @route GET /admin/pages/:id
+    def admin_edit_general
+      return if !user_is_allowed('pages', 'edit')
+      #return if !Page.is_allowed(logged_in_user, params[:id], 'edit')            
+      @page = Page.find(params[:id])
+      render :layout => 'caboose/admin'
+    end
+    
+    # @route POST /admin/pages
     def admin_create
       return unless user_is_allowed('pages', 'add')
 
@@ -351,7 +403,7 @@ module Caboose
       render json: resp
     end
     
-    # PUT /admin/pages/:id
+    # @route PUT /admin/pages/:id
     def admin_update
       return unless user_is_allowed('pages', 'edit')
       
@@ -473,45 +525,7 @@ module Caboose
       render json: resp
     end
     
-    # GET /admin/pages/:page_id/duplicate
-    def admin_duplicate_form
-      return unless user_is_allowed('pages', 'add')
-      @page = Page.find(params[:id])      
-      render :layout => 'caboose/admin'      
-    end
-    
-    # POST /admin/pages/:page_id/duplicate
-    def admin_duplicate
-      return unless user_is_allowed('pages', 'add')
-      
-      resp = Caboose::StdClass.new
-      
-      p = Page.where(:id => params[:id]).first      
-      site_id              = params[:site_id]
-      parent_id            = params[:parent_id]
-      block_type_id        = params[:block_type_id]
-      child_block_type_id  = params[:child_block_type_id]
-      duplicate_children   = params[:duplicate_children] ? true : false
-      
-      if p.nil?            then resp.error = "Invalid page"
-      elsif site_id.nil?   then resp.error = "Invalid site"
-      elsif parent_id.nil? then resp.error = "Invalid parent"
-      else
-        resp.new_id = p.duplicate(site_id, parent_id, duplicate_children, block_type_id, child_block_type_id)
-        resp.success = true
-      end
-      
-      render :json => resp
-    end
-      
-    # GET /admin/pages/:page_id/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
+    # @route DELETE /admin/pages/:id
     def admin_delete
       return unless user_is_allowed('pages', 'delete')
       p = Page.find(params[:id])
@@ -522,27 +536,52 @@ module Caboose
       })
       render json: resp
     end
-    
-    # GET /admin/pages/:page_id/sitemap
-    def admin_sitemap
-      return unless user_is_allowed('pages', 'delete')
-      @page = Page.find(params[:id])
-      render :layout => 'caboose/admin'
-    end
-
-    # GET /admin/pages/sitemap-options
-    def admin_sitemap_options
-      parent_id = params[:parent_id]
-      p = nil
-      if params[:site_id] && @site.is_master && user_is_allowed('admin', 'admin') 
-        p = parent_id ? Page.find(parent_id) : Page.index_page(params[:site_id].to_i)
-      else
-        p = parent_id ? Page.find(parent_id) : Page.index_page(@site.id)
+        
+    # @route GET /admin/pages/:field-options
+    # @route GET /admin/pages/:id/:field-options    
+    def admin_options
+      if !user_is_allowed('pages', 'edit')
+        render :json => false
+        return
       end
-      options = []
-      if p
-        sitemap_helper(p, options)
-     	end
+      
+      case params[:field]
+        when nil
+        
+        when 'sitemap'
+          parent_id = params[:parent_id]
+          p = nil
+          if params[:site_id] && @site.is_master && user_is_allowed('admin', 'admin') 
+            p = parent_id ? Page.find(parent_id) : Page.index_page(params[:site_id].to_i)
+          else
+            p = parent_id ? Page.find(parent_id) : Page.index_page(@site.id)
+          end
+          options = []
+          if p
+            sitemap_helper(p, options)
+     	    end
+     	  when 'robots'
+     	    options = [
+            { 'value' => 'index'      , 'text' => 'index'     },
+            { 'value' => 'noindex'    , 'text' => 'noindex'   },
+            { 'value' => 'follow'     , 'text' => 'follow'    },
+            { 'value' => 'nofollow'   , 'text' => 'nofollow'  },
+            { 'value' => 'nosnippet'  , 'text' => 'nosnippet' },
+            { 'value' => 'noodp'      , 'text' => 'noodp'     },
+            { 'value' => 'noarchive'  , 'text' => 'noarchive' }
+          ]
+        when 'format'
+          options = [
+            { 'value' => 'html', 'text' => 'html' },
+            { 'value' => 'text', 'text' => 'text' },
+            { 'value' => 'ruby', 'text' => 'ruby' }
+          ]
+        when 'block'
+          options = []
+          Block.where("parent_id is null and page_id = ?", params[:id]).reorder(:sort_order).all.each do |b|
+            admin_block_options_helper(options, b, "") 
+          end
+      end              
       render :json => options 		
     end
 
@@ -552,48 +591,6 @@ module Caboose
         sitemap_helper(kid, options, prefix + ' - ')
       end
     end
-
-    # GET /admin/pages/robots-options
-    def admin_robots_options
-      options = [
-        { 'value' => 'index'      , 'text' => 'index'     },
-        { 'value' => 'noindex'    , 'text' => 'noindex'   },
-        { 'value' => 'follow'     , 'text' => 'follow'    },
-        { 'value' => 'nofollow'   , 'text' => 'nofollow'  },
-        { 'value' => 'nosnippet'  , 'text' => 'nosnippet' },
-        { 'value' => 'noodp'      , 'text' => 'noodp'     },
-        { 'value' => 'noarchive'  , 'text' => 'noarchive' }
-      ]
-      render json: options 		
-    end
-
-    # GET /admin/pages/format-options
-    def admin_content_format_options
-      options = [
-        { 'value' => 'html', 'text' => 'html' },
-        { 'value' => 'text', 'text' => 'text' },
-        { 'value' => 'ruby', 'text' => 'ruby' }
-      ]
-      render json: options 		
-    end
-    
-    # GET /admin/pages/:id/uri
-    def admin_page_uri
-      return unless user_is_allowed('pages', 'view')
-      p = Page.find(params[:id])
-      render :json => { 'uri' => p.uri }
-		end
-		
-		# GET /admin/pages/:id/block-options        
-    def admin_block_options
-      return unless user_is_allowed('pages', 'edit')      
-      
-      options = []
-      Block.where("parent_id is null and page_id = ?", params[:id]).reorder(:sort_order).all.each do |b|
-        admin_block_options_helper(options, b, "") 
-      end      
-      render :json => options
-    end        
       
     def admin_block_options_helper(options, b, prefix)
       options << { 'value' => b.id, 'text' => "#{prefix}#{b.title}" }