caboose-cms 0.3.12 → 0.3.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTQxYjY4ZjYyNTE4ODQ3ODg5MDRkOGVlNjVkMzgzYzQxYmVlYjE2ZA==
+    MzM5Yzk3ZmMyZDA3MTIzZjQ5NjcxNjEyOWY3NWQ3ZTk4ZDE1ZDA2MQ==
   data.tar.gz: !binary |-
-    ZmFkM2ZjZmY0NDBjZGU3NWZiYmNhYzdlOWUyM2UwOWZjODAzODEzMQ==
+    ZTc2ZGZmYTkxYTI0MTI5ZGRiM2Y2ZTg4ZDBkNjQyYjk0OWE3YjJjMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Yjk5ZWI2MDM5MmYyNGQzOWQyYzU0OTY3YzcyNzYxYmI4M2IyZDQ1ZjVjNGVh
-    OTA3MWQzYThhNTMyNTNiYWRhNjEwMTY0YTJiMDA0MDNjNjNhMTU3OWIyMjFh
-    YjRkZTYyMWM5NWFhM2YxOGU2YTE5YjA5MGE5YmNlYjQ5MzBhZTg=
+    NWMwZThjYjUwMzliOGEzZmQ4ZTlhNTYzYWI5M2U5MmU0M2I4NjUwYWNjZDY0
+    NWU4OTA2ZTg3M2YwNWZjYjJiMmMxMjlmYzVjMzE0Y2M1ZDA2OTM0NjViMjAx
+    NmRmODA1MGNkMmEzYThlOGZmMzU4OTNmNmRiMDU1M2Y0YWVkNjQ=
   data.tar.gz: !binary |-
-    MDIyNDkwODc4N2MzNjFmMzIyNDJkZWI4OTRlZTYwYjc2MjJhNWZjM2UyNDNl
-    YTgxMDJjOTk0YzAxMjkyMTBjY2YwNDY3Nzg0ZjYxNTc1Y2I1ODcyZjdiZjc2
-    MjM0NWFjYmU0OTEyN2ZmYzBlMzU0ZjQ3MWEzZGYxZjgzYjJmNjQ=
+    YjMxYzUyN2I0MGFjNTdjM2E5MjU5YWYwOTc0MjY3N2ZkMjAzOWIzODk1NWEw
+    ZmU0YmE1NjFmZWE3OTJhMjc5Y2E2ZDk3NWE5Mzg2OTU2ZjkwZDkwZjRjMTdm
+    N2E1YjcwYmM3ODRiNDY1YWZiMDBmNzVjNDhlYmUwZTEzNjVkZWQ=

data/app/assets/javascripts/caboose/admin_page_edit_content.js

@@ -4,7 +4,7 @@ var PageContentController = function(page_id) { this.init(page_id); };
 PageContentController.prototype = {
 
   page_id: false,    
-  new_block_type: false,
+  new_block_type_id: false,
   
   init: function(page_id)
   {
@@ -23,18 +23,18 @@ PageContentController.prototype = {
       placeholder: 'sortable-placeholder',
       handle: '.sort_handle',
       receive: function(e, ui) {      
-        that.new_block_type = ui.item.attr('id').replace('new_block_', '');    
+        that.new_block_type_id = ui.item.attr('id').replace('new_block_', '');    
       },
       update: function(e, ui) {        
-        if (that.new_block_type)
+        if (that.new_block_type_id)
         {
           $.ajax({
             url: '/admin/pages/' + that.page_id + '/blocks',
             type: 'post',
-            data: { block_type: that.new_block_type, index: ui.item.index() },
+            data: { page_block_type_id: that.new_block_type_id, index: ui.item.index() },
             success: function(resp) { that.render_blocks(function() { that.edit_block(resp.block.id); }); }
           });                    
-          that.new_block_type = false;
+          that.new_block_type_id = false;
         }
         else
         {        
@@ -126,7 +126,7 @@ PageContentController.prototype = {
   },
   
   render_block_html: function(block_id, html)
-  {
+  {        
     var that = this;    
     $('#pageblock_' + block_id).empty().html(html);
     $('#pageblock_' + block_id).attr('onclick','').unbind('click');    

data/app/controllers/caboose/page_block_field_values_controller.rb

@@ -0,0 +1,27 @@
+
+module Caboose
+  class PageBlockFieldValuesController < ApplicationController
+    
+    # PUT /admin/page-block-field-values/:id
+    def admin_update
+      return unless user_is_allowed('pages', 'edit')
+      
+      resp = StdClass.new({'attributes' => {}})
+      fv = PageBlockFieldValue.find(params[:id])
+                  
+      save = true
+      user = logged_in_user      
+      
+      params.each do |k,v|
+        case k
+          when 'value'
+            fv.value = v        
+        end
+      end      
+               
+      resp.success = save && fv.save
+      render :json => resp
+    end
+		
+  end  
+end

data/app/controllers/caboose/page_block_fields_controller.rb

@@ -0,0 +1,139 @@
+
+module Caboose
+  class PageBlockFieldsController < ApplicationController
+    
+    #===========================================================================
+    # Admin actions
+    #===========================================================================
+    
+    # GET /admin/page-block-types/:block_type_id/fields
+    def admin_index
+      return if !user_is_allowed('pages', 'view')
+      fields = PageBlockField.where(:page_block_type_id => params[:block_type_id]).reorder(:name).all
+      render :json => fields      
+    end
+
+    # GET /admin/page-block-types/:block_type_id/fields/new
+    def admin_new
+      return unless user_is_allowed('pages', 'add')      
+      @block_type = PageBlockType.find(params[:block_type_id])
+      @field = PageBlockField.new
+      render :layout => 'caboose/admin'
+    end
+    
+    # GET /admin/page-block-types/:block_type_id/fields/:id/edit
+    def admin_edit
+      return unless user_is_allowed('pages', 'edit')      
+      @field = PageBlockField.find(params[:id])
+      render :layout => 'caboose/admin'
+    end
+    
+    # POST /admin/page-block-types/:block_type_id
+    def admin_create
+      return unless user_is_allowed('pages', 'add')
+
+      resp = Caboose::StdClass.new({
+          'error' => nil,
+          'redirect' => nil
+      })
+
+      field = PageBlockField.new(
+        :page_block_type_id => params[:block_type_id],
+        :name => params[:name].downcase.gsub(' ', '_'),
+        :nice_name => params[:name],                
+        :field_type => 'text'
+      )
+      field.save      
+
+      # Send back the response
+      resp.redirect = "/admin/page-block-types/#{params[:block_type_id]}/fields/#{field.id}/edit"
+      render :json => resp
+    end
+    
+    # PUT /admin/page-block-types/:block_type_id/fields/:id
+    def admin_update
+      return unless user_is_allowed('pages', 'edit')
+      
+      resp = StdClass.new({'attributes' => {}})
+      field = PageBlockField.find(params[:id])      
+
+      save = true
+      user = logged_in_user
+
+      params.each do |k,v|
+        case k
+          when 'page_block_type_id' 
+            field.page_block_type_id = v
+            break
+          when 'name'               
+            field.name = v
+            break
+          when 'field_type'
+            field.field_type = v
+            break
+          when 'nice_name'      
+            field.nice_name = v
+            break
+          when 'default'       
+            field.default = v
+            break
+          when 'width'       
+            field.width = v
+            break
+          when 'height'    
+            field.height = v
+            break
+          when 'fixed_placeholder'
+            field.fixed_placeholder = v
+            break
+          when 'options'            
+            field.options = v
+            break
+          when 'options_url' 
+            field.options_url = v
+            break
+        end
+      end
+    
+      resp.success = save && field.save
+      render :json => resp
+    end
+    
+    # DELETE /admin/page-block-types/:block_type_id/fields/:id
+    def admin_delete
+      return unless user_is_allowed('pages', 'delete')                    
+      PageBlockField.find(params[:id]).destroy            
+      resp = StdClass.new({
+        'redirect' => "/admin/page-block-types/#{params[:block_type_id]}/edit"
+      })
+      render :json => resp
+    end
+    
+    # GET /admin/page-block-fields/field-type-options
+    def admin_field_type_options
+      return unless user_is_allowed('pages', 'edit')      
+      options = [ 
+        { 'value' => 'checkbox'           , 'text' => 'checkbox'          }, 
+        { 'value' => 'checkbox_multiple'  , 'text' => 'checkbox_multiple' }, 
+        { 'value' => 'image'              , 'text' => 'image'             }, 
+        { 'value' => 'richtext'           , 'text' => 'richtext'          }, 
+        { 'value' => 'select'             , 'text' => 'select'            }, 
+        { 'value' => 'text'               , 'text' => 'text'              }, 
+        { 'value' => 'textarea'           , 'text' => 'textarea'          }
+      ]
+      render :json => options
+    end
+    
+    # GET /admin/page-block-fields/:id/options
+    def admin_field_options
+      return unless user_is_allowed('pages', 'edit')
+      f = PageBlockField.find(params[:id])            
+      options = []
+      if f.options
+        options = f.options.strip.split("\n").collect { |line| { 'value' => line, 'text' => line }}
+      end        
+      render :json => options
+    end
+		
+  end  
+end

data/app/controllers/caboose/page_block_types_controller.rb

@@ -0,0 +1,100 @@
+
+module Caboose
+  class PageBlockTypesController < ApplicationController
+    
+    #===========================================================================
+    # Admin actions
+    #===========================================================================
+    
+    # GET /admin/page-block-types
+    def admin_index
+      return if !user_is_allowed('pages', 'view')
+      @block_types = PageBlockType.reorder(:name).all
+      render :layout => 'caboose/admin'      
+    end
+    
+    # GET /admin/page-block-types/:id
+    def admin_show
+      return if !user_is_allowed('pages', 'view')
+      block_type = PageBlockType.find(params[:id])
+      render :json => block_type      
+    end
+
+    # GET /admin/page-block-types/new
+    def admin_new
+      return unless user_is_allowed('pages', 'add')      
+      @block_type = PageBlockType.new
+      render :layout => 'caboose/admin'
+    end
+    
+    # GET /admin/page-block-types/:id/edit
+    def admin_edit
+      return unless user_is_allowed('pages', 'edit')      
+      @block_type = PageBlockType.find(params[:id])
+      render :layout => 'caboose/admin'
+    end
+    
+    # POST /admin/page-block-types
+    def admin_create
+      return unless user_is_allowed('pages', 'add')
+
+      resp = Caboose::StdClass.new({
+          'error' => nil,
+          'redirect' => nil
+      })
+
+      bt = PageBlockType.new(
+        :name => params[:name].downcase.gsub(' ', '_'),
+        :description => params[:name],
+        :use_render_function => false
+      )
+      bt.save      
+      
+      # Send back the response
+      resp.redirect = "/admin/page-block-types/#{bt.id}/edit"
+      render :json => resp
+    end
+    
+    # PUT /admin/page-block-types/:id
+    def admin_update
+      return unless user_is_allowed('pages', 'edit')
+      
+      resp = StdClass.new({'attributes' => {}})
+      bt = PageBlockType.find(params[:id])
+
+      save = true
+      user = logged_in_user
+
+      params.each do |k,v|
+        case k
+          when 'name'
+            bt.name = v
+            break
+          when 'description'
+            bt.description = v
+            break
+          when 'use_render_function'
+            bt.use_render_function = v
+            break
+          when 'render_function'
+            bt.render_function = v
+            break            
+        end
+      end
+    
+      resp.success = save && bt.save
+      render :json => resp
+    end
+    
+    # DELETE /admin/page-block-types/:id
+    def admin_delete
+      return unless user_is_allowed('pages', 'delete')                  
+      PageBlockType.find(params[:id]).destroy            
+      resp = StdClass.new({
+        'redirect' => "/admin/page-block-types"
+      })
+      render :json => resp
+    end
+		
+  end  
+end

data/app/controllers/caboose/page_blocks_controller.rb

@@ -31,22 +31,46 @@ module Caboose
     # GET /admin/pages/:page_id/blocks/:id/render
     def admin_render
       return unless user_is_allowed('pages', 'edit')      
-      block = PageBlock.find(params[:id])             
-      render :text => block.render(params[:empty_text])
+      b = PageBlock.find(params[:id])
+      bt = b.page_block_type
+      html = nil
+      
+      if bt.use_render_function && bt.render_function
+        html = b.render_from_function(params[:empty_text])        
+      else        
+        html = render_to_string({
+          :partial => "caboose/page_blocks/#{b.page_block_type.name}",
+          :locals => { 
+            :block => b,
+            :empty_text => params[:empty_text] 
+          }
+        })
+      end
+      render :json => html            
     end
     
     # GET /admin/pages/:page_id/blocks/render
     def admin_render_all
       return unless user_is_allowed('pages', 'edit')
       p = Page.find(params[:page_id])
-      blocks = p.blocks.collect { |b| {
-        :id => b.id,
-        :block_type => b.block_type,
-        :sort_order => b.sort_order,          
-        :name => b.name,
-        :value => b.value,
-        :html => b.render(params[:empty_text])
-      }}      
+      blocks = p.page_blocks.collect do |b|
+        bt = b.page_block_type
+        html = nil        
+        if bt.use_render_function && bt.render_function
+          html = b.render_from_function(params[:empty_text])        
+        else        
+          html = render_to_string({
+            :partial => "caboose/page_blocks/#{bt.name}",
+            :locals => { :block => b, :empty_text => params[:empty_text] }
+          })
+        end                     
+        {
+          :id => b.id,
+          :page_block_type_id => bt.id,
+          :sort_order => b.sort_order,
+          :html => html        
+        }
+      end
       render :json => blocks
     end
     
@@ -54,8 +78,10 @@ module Caboose
     def admin_edit
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:page_id])
-      @block = PageBlock.find(params[:id])
-      render "caboose/page_blocks/admin_edit_#{@block.block_type}", :layout => 'caboose/modal'
+      PageBlock.create_field_values(params[:id])
+      @block = PageBlock.find(params[:id])              
+      #render "caboose/page_blocks/admin_edit_#{@block.block_type}", :layout => 'caboose/modal'
+      render :layout => 'caboose/modal'
     end
     
     # POST /admin/pages/:page_id/blocks
@@ -68,10 +94,8 @@ module Caboose
       })
 
       b = PageBlock.new            
-      b.page_id     = params[:page_id].to_i
-      b.block_type  = params[:block_type]
-      b.name        = params[:name]  if params[:name]
-      b.value       = params[:value] if params[:value]      
+      b.page_id = params[:page_id].to_i
+      b.page_block_type_id = params[:page_block_type_id]
                     
       if !params[:index].nil?      
         b.sort_order = params[:index].to_i
@@ -101,28 +125,16 @@ module Caboose
       
       resp = StdClass.new({'attributes' => {}})
       b = PageBlock.find(params[:id])
+      obj = b.object      
       
       save = true
-      user = logged_in_user
-      params.each do |name, value|
-        case name          
-        when 'block_type'
-          b.block_type = value
-        when 'sort_order'          
-          b.sort_order = value.to_i
-          i = b.sort_order + 1
-          PageBlock.where("page_id = ? and sort_order >= ?", b.page_id, b.sort_order).reorder(:sort_order).each do |b2|
-            b2.sort_order = i
-            b2.save
-            i = i + 1          
-          end        
-        when 'name'
-          b.name = value          
-        when 'value'    
-          b.value = value      
-        end
-      end
-    
+      user = logged_in_user      
+      
+      b.block_type_definition[:attributes].each do |attrib|        
+        obj[attrib[:name]] = params[attrib[:name]] if params[attrib[:name]]
+      end      
+      
+      b.value = JSON.generate(obj)    
       resp.success = save && b.save
       render :json => resp
     end
@@ -138,4 +150,5 @@ module Caboose
     end
 		
   end
+  
 end