activeadmin-selleo-cms 0.0.41 → 0.0.42

data/app/admin/activeadmin_selleo_cms/section.rb

@@ -27,8 +27,8 @@ ActiveAdmin.register ActiveadminSelleoCms::Section, as: "Section", sort_order: "
 
     def create
       create! do |success, failure|
-        success.html { redirect_to admin_sections_path  }
-        failure.html { render action: :new  }
+        success.html  { redirect_to admin_sections_path  }
+        failure.html  { render action: :new  }
       end
     end
 

data/app/assets/javascripts/active_admin.js

@@ -0,0 +1,7 @@
+//= require 'active_admin/base'
+//= require 'ckeditor/init'
+//= require 'ckeditor/plugins/inlinesave/plugin'
+//= require 'activeadmin-selleo-cms/custom.js'
+//= require 'activeadmin-selleo-cms/jquery-ui-timepicker-addon.js'
+//= require 'jquery.iframe-transport.js'
+//= require 'jquery.remotipart.js'

data/app/assets/javascripts/ckeditor/plugins/inlinesave/plugin.js

@@ -0,0 +1,45 @@
+/**
+ * @license Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.html or http://ckeditor.com/license
+ */
+
+/**
+ * @fileOverview Save plugin.
+ */
+
+(function() {
+	var saveCmd = {
+		exec: function( editor ) {
+          if ( editor.element.getAttribute('data-id') != null ) {
+              $.ajax({
+                  url: '/admin/sections/' + editor.element.getAttribute('data-id') + '.js',
+                  type: 'PUT',
+                  data: {
+                      'section': {
+                          'body': editor.getData()
+                      }
+                  }
+              });
+          } else {
+              alert('Section id not specified!');
+          }
+		}
+	};
+
+	var pluginName = 'inlinesave';
+
+	// Register a plugin named "save".
+	CKEDITOR.plugins.add( pluginName, {
+		icons: 'save', // %REMOVE_LINE_CORE%
+		init: function( editor ) {
+
+			editor.addCommand( pluginName, saveCmd );
+
+			editor.ui.addButton && editor.ui.addButton( 'Save', {
+				label: 'Save',
+				command: pluginName,
+				toolbar: 'document'
+			});
+		}
+	});
+})();

data/app/assets/stylesheets/{activeadmin-selleo-cms/custom.css → active_admin/cms.css.scss}

@@ -1,3 +1,5 @@
+@import 'jquery-ui.css.scss';
+
 div.translation > input {
     -webkit-appearance: none;
     -webkit-background-clip: border-box;

data/app/helpers/pages_helper.rb

@@ -77,4 +77,8 @@ module PagesHelper
   def root
     page_path(I18n.locale, ActiveadminSelleoCms::Page.root)
   end
+
+  def switch_editing
+    params[:editing] ? request.url.sub(/\?editing=[^&]*/, '?').sub(/\&editing=[^&]*/, '').sub(/\?$/,'') : request.url+'?editing=true'
+  end
 end

data/app/models/activeadmin_selleo_cms/page.rb

@@ -41,6 +41,7 @@ module ActiveadminSelleoCms
 
     after_initialize do
       self.layout_name = Layout.all.first if (new_record? and layout_name.blank?) or (read_attribute(:layout_name) and !layout)
+      create_missing_sections
     end
 
     after_initialize do
@@ -137,6 +138,10 @@ module ActiveadminSelleoCms
       end
     end
 
+    def method_missing(sym, *args)
+      sections.with_name(sym.to_s).first
+    end
+
     class Translation
       attr_protected :id
 

data/app/models/activeadmin_selleo_cms/section.rb

@@ -28,28 +28,28 @@ module ActiveadminSelleoCms
       end
     end
 
+    def current_translation
+      translations.with_locales(I18n.fallbacks[I18n.locale]).first
+    end
+
     def image
-      @image ||= if current_translation = translations.with_locales(I18n.fallbacks[I18n.locale]).detect{|t| t.image}
-        current_translation.image
-      else
-        nil
-      end
+      current_translation.image
     end
 
     def attachment
-      @attachment ||= if current_translation = translations.with_locales(I18n.fallbacks[I18n.locale]).detect{|t| t.attachment}
-        current_translation.attachment
-      else
-        nil
-      end
+      current_translation.attachment
+    end
+
+    def attachments
+      current_translation.attachments
     end
 
     def images
-      @images ||= if current_translation = translations.with_locales(I18n.fallbacks[I18n.locale]).detect{|t| t.images.any? }
-        current_translation.images
-      else
-        []
-      end
+      current_translation.images
+    end
+
+    def related_items
+      current_translation.related_items
     end
 
     def to_s

data/app/views/admin/pages/_translated_fields.html.haml

@@ -21,7 +21,7 @@
 
               %ol
                 - if section.text?
-                  = section_form_translated.input :body, as: section.type, label: "Content", input_html: { toolbar: section.toolbar }
+                  = section_form_translated.input :body, as: section.type, label: "Content", label: false, input_html: { ckeditor: { toolbar: section.toolbar } }
 
                 = section_form_translated.input :locale, :as => :hidden, :label => false
 

data/app/views/admin/sections/update.js.erb

@@ -0,0 +1,5 @@
+<% if resource.valid? %>
+    $('section[data-id="<%= resource.id %>"]').effect('highlight');
+<% else %>
+    alert('Error!');
+<% end %>

data/config/initializers/active_admin.rb

@@ -1,15 +1,4 @@
 ActiveAdmin.application.tap do |config|
-  config.register_javascript 'active_admin/base.js'
-  config.register_javascript 'ckeditor/init.js'
-  config.register_javascript 'activeadmin-selleo-cms/custom.js'
-  config.register_javascript 'activeadmin-selleo-cms/jquery-ui-timepicker-addon.js'
-  config.register_javascript 'jquery.iframe-transport.js'
-  config.register_javascript 'jquery.remotipart.js'
-
-  config.register_stylesheet 'activeadmin-selleo-cms/jquery-ui.css'
-  config.register_stylesheet 'activeadmin-selleo-cms/custom.css'
-  config.register_stylesheet 'activeadmin-selleo-cms/custom.css'
-
   config.load_paths << "#{ActiveadminSelleoCms::Engine.root}/app/admin"
   config.load_paths <<  File.expand_path('app/admin', Rails.root)
 

data/lib/activeadmin-selleo-cms/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminSelleoCms
-  VERSION = "0.0.41"
+  VERSION = "0.0.42"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-selleo-cms
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.42
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.3
+        version: 4.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.3
+        version: 4.0.4
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -128,17 +128,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.8
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
@@ -401,16 +401,18 @@ files:
 - app/admin/activeadmin_selleo_cms/image.rb
 - app/admin/activeadmin_selleo_cms/related_item.rb
 - app/helpers/pages_helper.rb
-- app/assets/stylesheets/activeadmin-selleo-cms/jquery-ui.css
-- app/assets/stylesheets/activeadmin-selleo-cms/application.css
-- app/assets/stylesheets/activeadmin-selleo-cms/custom.css
-- app/assets/stylesheets/activeadmin-selleo-cms/jquery-ui-timepicker-addon.css
+- app/assets/stylesheets/active_admin/jquery-ui.css.scss
+- app/assets/stylesheets/active_admin/cms.css.scss
+- app/assets/javascripts/active_admin.js
 - app/assets/javascripts/ckeditor/config.js
+- app/assets/javascripts/ckeditor/plugins/inlinesave/icons/save.png
+- app/assets/javascripts/ckeditor/plugins/inlinesave/plugin.js
 - app/assets/javascripts/activeadmin-selleo-cms/jquery-ui-timepicker-addon.js
 - app/assets/javascripts/activeadmin-selleo-cms/application.js
 - app/assets/javascripts/activeadmin-selleo-cms/jquery.mjs.nestedSortable.js
 - app/assets/javascripts/activeadmin-selleo-cms/custom.js
 - app/views/admin/sections/_form.html.haml
+- app/views/admin/sections/update.js.erb
 - app/views/admin/pages/_js.html.haml
 - app/views/admin/pages/reorder.html.haml
 - app/views/admin/pages/_form.html.haml

data/app/assets/stylesheets/activeadmin-selleo-cms/application.css

@@ -1,13 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require_tree .
- */

data/app/assets/stylesheets/activeadmin-selleo-cms/jquery-ui-timepicker-addon.css

@@ -1,10 +0,0 @@
-.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
-.ui-timepicker-div dl { text-align: left; }
-.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
-.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
-.ui-timepicker-div td { font-size: 90%; }
-.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
-
-.ui-timepicker-rtl{ direction: rtl; }
-.ui-timepicker-rtl dl { text-align: right; }
-.ui-timepicker-rtl dl dd { margin: 0 65px 10px 10px; }