drg_cms 0.6.1.11 → 0.7.0.8

data/lib/generators/convert_to_ar/convert_to_ar_generator.rb

@@ -0,0 +1,158 @@
+class ConvertToArGenerator < Rails::Generators::NamedBase
+  
+source_root File.expand_path('../templates', __FILE__)
+desc "This generator converts mongoid model to active_record migration"
+argument :model_name, :type => :string, :default => 'dc_*'
+argument :migration_name, :type => :string, :default => 'initial_migration'
+
+TYPES = {
+  String => :string,
+  Time => :datetime,
+  DateTime => :datetime,
+  Object => :integer,
+  Integer => :integer,
+  BSON::ObjectId => :integer,
+  Mongoid::Boolean => :boolean,
+  BigDecimal => [:decimal, :precision => 8, :scale => 2, :default => 0.00],
+  Date => :date,
+  Hash => :text,
+  Array => :text
+}
+
+###########################################################################
+#
+###########################################################################
+def create_migration
+  p model_name, migration_name
+
+  code = model_name.match(/\*/) ? migrate_many(model_name) : migrate_one(model_name)
+  code = top(migration_name) + code + bottom
+  create_file "db/#{source_file_name(migration_name).underscore}.rb", code
+end
+
+private
+
+###########################################################################
+#
+###########################################################################
+def source_file_name(migration)
+  "#{Time.now.strftime("%Y%m%d%H%M%S")}_#{migration}"
+end
+
+###########################################################################
+#
+###########################################################################
+def migrate_one(model_name)
+  mongo_model = model_name.classify.constantize
+  new_model_name = model_name.start_with?('dc_') ? model_name.sub('dc_', 'ar_') : model_name
+  code = %(    create_table :#{new_model_name.pluralize} do |t|\n)
+  left = '      t.'
+  timestamps = false
+  # fields
+  document = mongo_model.new
+  document.attribute_names.each do |attribute_name|
+    next if attribute_name == '_id'
+    if %w[created_at updated_at].include?(attribute_name)
+      timestamps = true
+      next
+    end
+
+    options = mongo_model.fields[attribute_name].options
+    pp "Undefined type #{options[:type]} for #{mongo_model}.#{attribute_name}" unless TYPES[options[:type]]
+    att_name = attribute_name.sub(/^dc_/,'ar_')
+    code << %(#{left}#{TYPES[options[:type]]} :#{att_name})
+    code << %(, default: #{get_default(options[:default], options[:type])}) if options[:default]
+    code << "\n"
+  end
+  code << %(\n#{left}timestamps\n) if timestamps
+
+  # indexes
+  if document.index_specifications.any?
+    code << "\n"
+    document.index_specifications.each do |index|
+      code << "#{left}index "
+      code << (index.fields.size > 1 ? "[:#{index.fields.join(', :')}]" : ":#{index.fields.first}")
+      code << ", #{index.options.to_s.gsub(/\{|\}/, '')}" if index.options.size > 0
+      code << "\n"
+    end
+  end
+
+  # export some test data
+  data = []
+  mongo_model.all.limit(5).each do |doc|
+    #data << doc.as_document.inject([]) { |r, e| [e.first.sub(/^dc_/,'ar_'), e.last] }
+    data << doc.as_document.map { |e| [e.first.sub(/^dc_/,'ar_'), e.last] }
+  end
+  File.write("db/#{new_model_name}.json", data.to_json)
+
+  code << "    end\n\n"
+end
+
+###########################################################################
+#
+###########################################################################
+def get_default(default, type)
+  case type.to_s
+  when 'String' then "'#{default}'"
+  else default
+  end
+end
+
+#########################################################################
+# Return array of all models found in application.
+#########################################################################
+def all_collections
+  collections = []
+  DrgCms.paths(:forms).each do |path|
+    models_dir = File.expand_path("../models", path)
+    Dir["#{models_dir}/*.rb"].each do |model_file|
+      model_file =~ /(.*)\/(.*).rb/
+      # check if model exists
+      collection = $2.camelize.constantize.new rescue nil
+      collections << collection.class.to_s.underscore if collection&.respond_to?(:_id)
+    end
+  end
+  collections.sort
+end
+
+###########################################################################
+#
+###########################################################################
+def migrate_many(model_name)
+  selector = model_name[0, model_name.index('*') - 1].downcase
+  p selector
+
+  list = all_collections.select { |name| name.starts_with?(selector) }
+  list.inject('') { |r, e| r << migrate_one(e) }
+end
+
+###########################################################################
+#class #{migration_name} < ActiveRecord::Migration[7.0]
+#   def change
+#     create_table :products do |t|
+#       t.string :name
+#       t.text :description
+#
+#       t.timestamps = true
+#     end
+#   end
+# end
+###########################################################################
+def top(migration_name)
+  <<EOT
+class #{migration_name.classify} < ActiveRecord::Migration[7.0]
+  def change
+EOT
+end
+
+###########################################################################
+#
+###########################################################################
+def bottom
+  <<EOT
+  end
+end
+EOT
+end
+
+end

data/lib/tasks/dc_cleanup.rake

@@ -36,30 +36,29 @@ namespace :drg_cms do
   task :clear_sessions, [:name] => :environment do |t, args|
     p 'This is just an example how to clear sessions collection. It wont do anything because of next line.'
     return if true
-# This should remove all sessions documents created by robots
-# It is quite a task to compare two dates in mongoid. This should not be problem if it is run daily
+    # This should remove all sessions documents created by robots
+    # It is quite a task to compare two dates in mongoid. This should not be problem if it is run daily
     ActionDispatch::Session::MongoidStore::Session.all.each do |doc|
-      doc.delete if (doc.created_at == doc.updated_at or doc.updated_at < 100.days.ago)
+      doc.delete if (doc.created_at == doc.updated_at || doc.updated_at < 100.days.ago)
     end
-# or if you want to clear everything older than 1 week    
+    # or if you want to clear everything older than 1 week
     ActionDispatch::Session::MongoidStore::Session.where(:updated_at.lt => 1.week.ago).delete
-    DcSite.collection.database.command(eval: "db.runCommand ( { compact: 'sessions' } )" )
+    DcSite.collection.database.command(compact: 'sessions')
   end
 
 ###########################################################################
   desc 'Clears mongodb session documents created by web robots'
   task :clear_sessions_from_robots, [:name] => :environment do |t, args|
-# This should remove all sessions documents created by web robots
-# ActionDispatch::Session::MongoidStore::Session.where('$where' => 'this.created_at == this.updated_at').limit(1000).each do |doc|
+    # This should remove all sessions documents created by web robots
     n = 0
     ActionDispatch::Session::MongoidStore::Session.batch_size(1000).all.each do |doc|
-      if (doc.created_at + 2 > doc.updated_at or doc.updated_at < 1.year.ago)
+      if (doc.created_at + 2 > doc.updated_at || doc.updated_at < 1.year.ago)
         doc.delete 
-        p "Deleted #{n}" if (n+=1)%1000 == 0
+        p "Deleted #{n}" if (n += 1) % 1000 == 0
       end
     end
     p "Deleted #{n}"
-    DcSite.collection.database.command(eval: "db.runCommand ( { compact: 'sessions' } )" )
+    DcSite.collection.database.command(compact: 'sessions')
   end
 
 ###########################################################################
@@ -72,16 +71,14 @@ namespace :drg_cms do
     return (p "#{archive_file} exists") if File.exist?(archive_file)
 
     date_to = Time.local(date[0,4].to_i, date[4,2].to_i, date[6,2].to_i).beginning_of_day
-    n = 0
-    save = ''
+    n, save = 0, ''
     DcVisit.where(:time.lt => date_to).each do |visit|
       save << visit.to_json + "\n"
-#      visit.delete
-      p "Deleted #{n}" if (n+=1)%10000 == 0
+      p "Deleted #{n}" if (n += 1) % 10000 == 0
     end
     DcVisit.where(:time.lt => date_to).delete
-    File.open(archive_file,'w') {|f| f.write(save)}
-    DcSite.collection.database.command(eval: "db.runCommand ( { compact: 'dc_visits' } )" )
+    File.write(archive_file, save)
+    DcSite.collection.database.command(compact: 'dc_visits')
   end
 
 ###########################################################################
@@ -90,39 +87,20 @@ namespace :drg_cms do
     input = read_input("Just press Enter to start. If you type in anything process won't start.")
     return unless input.to_s.size == 0
     today = Time.now.beginning_of_day
-    n = 0
-    save_stat, save_ads = '', ''
+    n, save_stat, save_ads = 0, '', ''
     DcAd.all.each do |ad|
-      if !ad.active or (ad.valid_to and ad.valid_to < today)
+      if !ad.active || (ad.valid_to && ad.valid_to < today)
         save_ads << ad.to_json + "\n"
         DcAdStat.where(:dc_ad_id => ad._id).each do |stat|
           save_stat << stat.to_json + "\n"
-          p "Deleted #{n}" if (n+=1)%10000 == 0
+          p "Deleted #{n}" if (n += 1) % 10000 == 0
         end        
         DcAdStat.where(:dc_ad_id => ad._id).delete
       end
     end
-    File.open("ads_stat_#{Time.now.strftime('%Y%d%m')}.json",'w') {|f| f.write(save_stat)}
-    File.open("ads_#{Time.now.strftime('%Y%d%m')}.json",'w') {|f| f.write(save_ads)}
-    DcSite.collection.database.command(eval: "db.runCommand ( { compact: 'dc_ad_stats' } )" )
+    File.write("ads_stat_#{Time.now.strftime('%Y%d%m')}.json", save_stat)
+    File.write("ads_#{Time.now.strftime('%Y%d%m')}.json", save_ads)
+    DcSite.collection.database.command(compact: 'dc_ad_stats')
   end
-  
-=begin  
-###########################################################################
-  desc "Correct error when ad_id ield is used instead of dc_ad_id."
-  task :repair_ad_stats, [:name] => :environment do |t, args|
-    input = read_input("Just press Enter to start. If you type in anything process won't start.")
-    return unless input.to_s.size == 0
-    n = 0
-    p DcAdStat.only(:id).where(:dc_ad_id => nil).to_a.size
-    DcAdStat.where(:dc_ad_id => nil).each do |stat|
-      stat.dc_ad_id = stat.ad_id
-      stat.ad_id = nil
-      stat.save
-      
-      p n if (n+=1)%1000 == 0
-    end
-  end
-=end
-  
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.6.1.11
+  version: 0.7.0.8
 platform: ruby
 authors:
 - Damjan Rems
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-12 00:00:00.000000000 Z
+date: 2023-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: non-stupid-digest-assets
+  name: non-digest-assets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -84,16 +84,16 @@ dependencies:
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kaminari-mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +159,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- History.log
+- CHANGELOG.md
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -196,7 +196,7 @@ files:
 - app/assets/images/throbber.gif
 - app/assets/javascripts/drg_cms/drg_cms.js
 - app/assets/javascripts/drg_cms/jquery-migrate.js
-- app/assets/javascripts/drg_cms/jquery.bpopup.min.js
+- app/assets/javascripts/drg_cms/jquery.bpopup.js
 - app/assets/javascripts/drg_cms/jquery.datetimepicker.js
 - app/assets/javascripts/drg_cms/jstree.min.js
 - app/assets/javascripts/drg_cms/select-multiple.js
@@ -217,7 +217,9 @@ files:
 - app/controllers/dc_main_controller.rb
 - app/controls/browse_models_control.rb
 - app/controls/cmsedit_control.rb
+- app/controls/dc_gallery_control.rb
 - app/controls/dc_help_control.rb
+- app/controls/dc_image_control.rb
 - app/controls/dc_page_control.rb
 - app/controls/dc_poll_result_control.rb
 - app/controls/dc_report.rb
@@ -232,12 +234,15 @@ files:
 - app/forms/dc_browse_fields.yml
 - app/forms/dc_browse_models.yml
 - app/forms/dc_category.yml
+- app/forms/dc_category_as_tree.yml
 - app/forms/dc_design.yml
 - app/forms/dc_filter.yml
 - app/forms/dc_folder_permission.yml
 - app/forms/dc_gallery.yml
 - app/forms/dc_help_1.yml
 - app/forms/dc_ident.yml
+- app/forms/dc_image.yml
+- app/forms/dc_image_search.yml
 - app/forms/dc_journal.yml
 - app/forms/dc_json_ld.yml
 - app/forms/dc_key_value.yml
@@ -266,12 +271,16 @@ files:
 - app/forms/dc_user.yml
 - app/forms/dc_user_role.yml
 - app/forms/drgcms_cms.yml
+- app/forms/help/dc_category_as_tree.en
+- app/forms/help/dc_category_as_tree.sl
 - app/forms/json_ld_schema.yml
 - app/helpers/cms_common_helper.rb
 - app/helpers/cms_edit_helper.rb
 - app/helpers/cms_helper.rb
 - app/helpers/cms_index_helper.rb
 - app/helpers/dc_application_helper.rb
+- app/helpers/dc_category_helper.rb
+- app/helpers/dc_image_helper.rb
 - app/models/concerns/dc_page_concern.rb
 - app/models/concerns/dc_piece_concern.rb
 - app/models/concerns/dc_policy_rule_concern.rb
@@ -290,6 +299,7 @@ files:
 - app/models/dc_folder_permission.rb
 - app/models/dc_gallery.rb
 - app/models/dc_ident.rb
+- app/models/dc_image.rb
 - app/models/dc_internals.rb
 - app/models/dc_journal.rb
 - app/models/dc_json_ld.rb
@@ -371,7 +381,6 @@ files:
 - app/views/dc_common/_help.html.erb
 - app/views/dc_common/_iframe_edit.html.erb
 - app/views/dc_common/paste_clipboard.html.erb
-- app/views/layouts/__cmsedit.html.erb
 - app/views/layouts/cms.html.erb
 - app/views/layouts/content.html.erb
 - app/views/layouts/models.html.erb
@@ -391,6 +400,8 @@ files:
 - lib/drg_cms.rb
 - lib/drg_cms/engine.rb
 - lib/drg_cms/version.rb
+- lib/generators/convert_to_ar/USAGE
+- lib/generators/convert_to_ar/convert_to_ar_generator.rb
 - lib/generators/new_drg_form/USAGE
 - lib/generators/new_drg_form/new_drg_form_generator.rb
 - lib/tasks/browse_models.rake
@@ -435,7 +446,7 @@ homepage: https://www.drgcms.org
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -450,8 +461,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: 'DRG: Rapid web application development tool and CMS for Ruby, Rails and
   MongoDB'

data/History.log

@@ -1,109 +0,0 @@
-
-New features for DRG CMS version up to 0.5.51.1
-    Rails version 5.1 compatibility
-    Ruby version 2.3 is now required
-    select field with multiple can now properly process non BSON array values
-    DRG CMS Form readonly field with readonly : yes option will not be saved to database on save
-    dc_dummy collection will be deprecated and replaced with dc_memory collection. Name was chosen unfortunately  
-    DrgForms can now be used for editing YAML settings saved in dc_page document. This enables editing dynamic settings of elements embedded in design
-    cms_edit url can now be used only as cms 
-
-Bugs resolved for DRG CMS version up to 0.5.51.1
-    journal is now able to undelete deleted document
-
-New features for DRG CMS version up to 0.5.50.4
-    Rails 5.0 compatibility
-    category types can now be defined in dc_big_table under dc_category_type key
-    DrgCms gem routes can now be defined as DrgCms.routes
-    new field tree_select added to DRG CMS Forms. Tree select will be used as data entry field for categories instead of select field with multiple option
-    switch to Rails concern for main model definitions which may be reused.
-    site policy can be inherited from other site
-    menus can now belong to site
-    clear_link method is now a class method of DcPage model and can thus be called directly from other parts of application
-
-Bugs resolved for DRG CMS version up to 0.5.50.4
-    journal is now able to undelete deleted document
-
-
-New features for DRG CMS version 0.5.10.14
-    table_style added to result_set DRGCMS Forms option. This allows CSS style like width: 150% which will result in horizontal scroler on table and view more columns on result set.
-    result_set filter now has is empty option allowing to filter fields with null value.
-    filter OFF icon now displays currently active filter when hovered.
-    request_process field added to dc_site collection. It allowis for site to have different requests processing as defined in rails routes file. Single rails instance can now mix single document sites with complex sites.
-    multiple option is added to DRGCMS Forms select_field. 
-    is_email? class method added to dc_user model.
-    form generator has now list of all model fields added at the end of generated form. Field names can be used as template in YAML translation file.
-    dc_choices4_field method implemented. It returns choices that are defined in localization files.
-    categories field changed from multitext_autocomplete to select field with multiple options.
-    a poll form can now be surrounded by div tag thus allowing for additional styling of polls
-    drgcms_controlls files can now also be defined only as control files.
-    journal documents can now be filtered by document id
-    CMS menu redesigned. Instead of pulldown menus are now displayed fixed on the left side of edit area
-
-Bugs resolved for DRG CMS version 0.5.10.14
-    prevent double form submit when browser is restarted.
-    when user has no role defined guest role is automatically applied
-    dc_cleanup rake task deletes 1000 session documents created by robots at once instead of all which ended in error if number of documents was higher then 100.000
-
-
-New features for DRG CMS version 0.5.10
-
-    jQuery javascript library forced to jQuery2
-    Choices for select fields are now UTF-8 sorted since MongoDB does not provide utf sorting.
-    Placeholder text added for text_autocomplete field. It can also be defined in form field html options.
-    Filters option can now have "like" keyword for fields that are not defined on form. For example created_by like user_id.
-    
-Bugs resolved for DRG CMS version 0.5.10
-
-    jQuery migrate udated to version 1.3. This was required by jquery-rails gem which included latest version of jQuery which resulted in an runtime error.
-    Call before_new callback only when new empty record has been created.
-
---
-
-New features for DRG CMS version 0.5.9
-
-    Main CMS menu was becoming to large and was divided into two menus.
-    Result set browse filter data entry redesigned. Values can now be entered directly on actions area. Value of entered fied is also retained beetwen calls. 
-    New DcInternals model introduced. It will be used for accessing internal variables.
-    DRG Forms has new option columns. Option defines number of columns per tab or fields. Field option also got colspan option indicating over how many columns field spans.
-    DRG Forms field size can now also be defined on same level as field type. Before it was defined in html sublevel.
-    
-Bugs resolved for DRG CMS version 0.5.9
-
-    Improved readonly display of select and text_autocomplete DRG Forms fields.
-    Text_autocomplete field is set to nil when content of field is deleted.
-
---
-
-New features for DRG CMS version 0.5.8
-
-    Browsing array of hashes is now possible with DRG Forms
-    Simple browsing of all defined models and field definitions added to CMS System menu
-    new result_set options table_style, table_class, tr_style, tr_class, td_style, td_class. Welcome colors to result_set browser
-    result_set has been renewed for more modern design. Header elements have now sorting icons
-    dblclick and click actions can now be defined on result set and can fire any action when clicked or double clicked on result set row.
-
-Bugs resolved for DRG CMS version 0.5.8
-
-    associated menu can now be selected on dc_page form also for non dc_simple_menu menus
-
---
-
-New features for DRG CMS version 0.5.7
-
-    single site document. All data for the site can be saved to single dc_site document and processed by dc_single_sitedoc_request
-    site parts can now also be saved and collected from dc_site document
-    CMS menu done right
-    Page title is now set from dc_page_renderer default method
-
-Bugs resolved for DRG CMS version 0.5.7
-
-    Corrected bug when multitext_autocomplete field was not displaying right values when displayed readonly
-
-    dc_choices4 now checks if model has active field defined and returns only choices of documents that have active field value set to true
-
-    Design and page edit icons are now displayed only when design or page documents are available
-
-    return_to from drgcms_control was not properly handled
-
-    Mouse cursor now changes to pointer when moved over ajax link

data/app/assets/javascripts/drg_cms/jquery.bpopup.min.js

@@ -1,7 +0,0 @@
-/*================================================================================
- * @name: bPopup - if you can't get it up, use bPopup
- * @author: (c)Bjoern Klinggaard (twitter@bklinggaard)
- * @demo: http://dinbror.dk/bpopup
- * @version: 0.11.0.min
- ================================================================================*/
- (function(c){c.fn.bPopup=function(A,E){function L(){a.contentContainer=c(a.contentContainer||b);switch(a.content){case "iframe":var d=c('<iframe class="b-iframe" '+a.iframeAttr+"></iframe>");d.appendTo(a.contentContainer);t=b.outerHeight(!0);u=b.outerWidth(!0);B();d.attr("src",a.loadUrl);l(a.loadCallback);break;case "image":B();c("<img />").load(function(){l(a.loadCallback);F(c(this))}).attr("src",a.loadUrl).hide().appendTo(a.contentContainer);break;default:B(),c('<div class="b-ajax-wrapper"></div>').load(a.loadUrl,a.loadData,function(d,b,e){l(a.loadCallback,b);F(c(this))}).hide().appendTo(a.contentContainer)}}function B(){a.modal&&c('<div class="b-modal '+e+'"></div>').css({backgroundColor:a.modalColor,position:"fixed",top:0,right:0,bottom:0,left:0,opacity:0,zIndex:a.zIndex+v}).appendTo(a.appendTo).fadeTo(a.speed,a.opacity);C();b.data("bPopup",a).data("id",e).css({left:"slideIn"==a.transition||"slideBack"==a.transition?"slideBack"==a.transition?f.scrollLeft()+w:-1*(x+u):m(!(!a.follow[0]&&n||g)),position:a.positionStyle||"absolute",top:"slideDown"==a.transition||"slideUp"==a.transition?"slideUp"==a.transition?f.scrollTop()+y:z+-1*t:p(!(!a.follow[1]&&q||g)),"z-index":a.zIndex+v+1}).each(function(){a.appending&&c(this).appendTo(a.appendTo)});G(!0)}function r(){a.modal&&c(".b-modal."+b.data("id")).fadeTo(a.speed,0,function(){c(this).remove()});a.scrollBar||c("html").css("overflow","auto");c(".b-modal."+e).unbind("click");f.unbind("keydown."+e);k.unbind("."+e).data("bPopup",0<k.data("bPopup")-1?k.data("bPopup")-1:null);b.undelegate(".bClose, ."+a.closeClass,"click."+e,r).data("bPopup",null);clearTimeout(H);G();return!1}function I(d){y=k.height();w=k.width();h=D();if(h.x||h.y)clearTimeout(J),J=setTimeout(function(){C();d=d||a.followSpeed;var e={};h.x&&(e.left=a.follow[0]?m(!0):"auto");h.y&&(e.top=a.follow[1]?p(!0):"auto");b.dequeue().each(function(){g?c(this).css({left:x,top:z}):c(this).animate(e,d,a.followEasing)})},50)}function F(d){var c=d.width(),e=d.height(),f={};a.contentContainer.css({height:e,width:c});e>=b.height()&&(f.height=b.height());c>=b.width()&&(f.width=b.width());t=b.outerHeight(!0);u=b.outerWidth(!0);C();a.contentContainer.css({height:"auto",width:"auto"});f.left=m(!(!a.follow[0]&&n||g));f.top=p(!(!a.follow[1]&&q||g));b.animate(f,250,function(){d.show();h=D()})}function M(){k.data("bPopup",v);b.delegate(".bClose, ."+a.closeClass,"click."+e,r);a.modalClose&&c(".b-modal."+e).css("cursor","pointer").bind("click",r);N||!a.follow[0]&&!a.follow[1]||k.bind("scroll."+e,function(){if(h.x||h.y){var d={};h.x&&(d.left=a.follow[0]?m(!g):"auto");h.y&&(d.top=a.follow[1]?p(!g):"auto");b.dequeue().animate(d,a.followSpeed,a.followEasing)}}).bind("resize."+e,function(){I()});a.escClose&&f.bind("keydown."+e,function(a){27==a.which&&r()})}function G(d){function c(e){b.css({display:"block",opacity:1}).animate(e,a.speed,a.easing,function(){K(d)})}switch(d?a.transition:a.transitionClose||a.transition){case "slideIn":c({left:d?m(!(!a.follow[0]&&n||g)):f.scrollLeft()-(u||b.outerWidth(!0))-200});break;case "slideBack":c({left:d?m(!(!a.follow[0]&&n||g)):f.scrollLeft()+w+200});break;case "slideDown":c({top:d?p(!(!a.follow[1]&&q||g)):f.scrollTop()-(t||b.outerHeight(!0))-200});break;case "slideUp":c({top:d?p(!(!a.follow[1]&&q||g)):f.scrollTop()+y+200});break;default:b.stop().fadeTo(a.speed,d?1:0,function(){K(d)})}}function K(d){d?(M(),l(E),a.autoClose&&(H=setTimeout(r,a.autoClose))):(b.hide(),l(a.onClose),a.loadUrl&&(a.contentContainer.empty(),b.css({height:"auto",width:"auto"})))}function m(a){return a?x+f.scrollLeft():x}function p(a){return a?z+f.scrollTop():z}function l(a,e){c.isFunction(a)&&a.call(b,e)}function C(){z=q?a.position[1]:Math.max(0,(y-b.outerHeight(!0))/2-a.amsl);x=n?a.position[0]:(w-b.outerWidth(!0))/2;h=D()}function D(){return{x:w>b.outerWidth(!0),y:y>b.outerHeight(!0)}}c.isFunction(A)&&(E=A,A=null);var a=c.extend({},c.fn.bPopup.defaults,A);a.scrollBar||c("html").css("overflow","hidden");var b=this,f=c(document),k=c(window),y=k.height(),w=k.width(),N=/OS 6(_\d)+/i.test(navigator.userAgent),v=0,e,h,q,n,g,z,x,t,u,J,H;b.close=function(){r()};b.reposition=function(a){I(a)};return b.each(function(){c(this).data("bPopup")||(l(a.onOpen),v=(k.data("bPopup")||0)+1,e="__b-popup"+v+"__",q="auto"!==a.position[1],n="auto"!==a.position[0],g="fixed"===a.positionStyle,t=b.outerHeight(!0),u=b.outerWidth(!0),a.loadUrl?L():B())})};c.fn.bPopup.defaults={amsl:50,appending:!0,appendTo:"body",autoClose:!1,closeClass:"b-close",content:"ajax",contentContainer:!1,easing:"swing",escClose:!0,follow:[!0,!0],followEasing:"swing",followSpeed:500,iframeAttr:'scrolling="no" frameborder="0"',loadCallback:!1,loadData:!1,loadUrl:!1,modal:!0,modalClose:!0,modalColor:"#000",onClose:!1,onOpen:!1,opacity:.7,position:["auto","auto"],positionStyle:"absolute",scrollBar:!0,speed:250,transition:"fadeIn",transitionClose:!1,zIndex:9997}})(jQuery);

data/app/views/layouts/__cmsedit.html.erb

@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>  
-  <title><%= @page_title %></title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <%= stylesheet_link_tag "cms", media: 'all' %>
-  <style type="text/css" media="all"><%= "#{@site.css}#{@design.css}\n#{@page.css}".html_safe if @page %></style>
-  <%= @site.header.html_safe if @site %>
-  <%= javascript_include_tag "cms" %>
-  <%= csrf_meta_tags %>
-</head>
-
-<body>
-<%= yield %>
-</body>
-</html>