@@ -1,13 +1,17 @@ module Cell class << self def all - require_all_cells - Object.subclasses_of(BaseCell) + @all ||= begin + require_all_cells + Object.subclasses_of(BaseCell) + end end private def require_all_cells - cell_files = Dir[RAILS_ROOT + '/app/cells/*.rb'] + Dir[File.join(RAILS_ROOT, 'vendor', 'adva', 'engines') + '/*/app/cells/*.rb'] + # cell_files = Dir[RAILS_ROOT + '/app/cells/*.rb'] + Dir[File.join(RAILS_ROOT, 'vendor', 'adva', 'engines') + '/*/app/cells/*.rb'] + + # Dir[File.join(RAILS_ROOT, 'vendor', 'adva', 'plugins') + '/*/app/cells/*.rb'] + cell_files = Dir[RAILS_ROOT + '/app/cells/*.rb'] + Dir[File.join(RAILS_ROOT, 'vendor', 'plugins') + '/*/app/cells/*.rb'] cell_files.each { |cell_file| require cell_file } end end engines/adva_cms/lib/cells_ext.rb @@ -1,6 +1,7 @@ class Admin::CellsController < Admin::BaseController def index @cells = Cell.all + p @cells respond_to do |format| format.xml { render :xml => @cells.to_xml(:root => 'cells', :skip_types => true) } plugins/adva_cells/app/controllers/admin/cells_controller.rb @@ -44,7 +44,9 @@ config.to_prepare do # form = template ? ERB.new(view.render(:template => template)).result : '' # FIXME: this implementation is brittle at best and needs to be refactored/corrected ASAP!!! - possible_templates = Dir[RAILS_ROOT + "/app/cells/#{cell_name}/#{state}_form.html.erb"] + Dir[File.join(RAILS_ROOT, 'vendor', 'adva', 'engines') + "/*/app/cells/#{cell_name}/#{state}_form.html.erb"] + # possible_templates = Dir[RAILS_ROOT + "/app/cells/#{cell_name}/#{state}_form.html.erb"] + Dir[File.join(RAILS_ROOT, 'vendor', 'adva', 'engines') + "/*/app/cells/#{cell_name}/#{state}_form.html.erb"] + + # Dir[File.join(RAILS_ROOT, 'vendor', 'adva', 'plugins') + "/*/app/cells/#{cell_name}/#{state}_form.html.erb"] + possible_templates = Dir[RAILS_ROOT + "/app/cells/#{cell_name}/#{state}_form.html.erb"] + Dir[File.join(RAILS_ROOT, 'vendor', 'plugins') + "/*/app/cells/#{cell_name}/#{state}_form.html.erb"] template = possible_templates.first form = template ? ERB.new(File.read(template)).result : '' plugins/adva_cells/init.rb @@ -25,7 +25,7 @@ CellsProcessor.ProcessDocument = function(document) { //replace = DisplayCell(cell.cloneNode(true)); replace = FCKDocumentProcessor_CreateFakeImage('FCK__Cell', cell.cloneNode(true)); replace.style.border = '#a9a9a9 1px solid'; - replace.style.background = 'url(/javascripts/fckeditor/fckeditor/editor/css/images/fck_plugin.gif) center center no-repeat'; + replace.style.background = 'url(/javascripts/adva_fckeditor/fckeditor/editor/css/images/fck_plugin.gif) center center no-repeat'; replace.style.width = '80px'; replace.style.height = '80px'; //replace.src = '/admin/cell.html'; plugins/adva_fckeditor/public/javascripts/adva_fckeditor/fckeditor_plugins/cells/fckplugin.js fb9de3c0845f8153076b80ca579f832a7a6d8067 Clemens Kofler clemens@railway.at http://github.com/svenfuchs/adva_cms/commit/c0a57e27ca5cd3649d83d35763902e32a5f95234 c0a57e27ca5cd3649d83d35763902e32a5f95234 2009-08-28T01:12:29-07:00 2009-08-28T01:12:29-07:00 Fixed cell support. 64d4a00f9357d383d80b0e691398aeeeafbdc320 Clemens Kofler clemens@railway.at