activeadmin_tinymce 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b5abd9c465e64a8acf2753315015a0172af6b62
-  data.tar.gz: dee8faafefe5dbdc3a2a5ad1cfa587ad51d4dfdb
+  metadata.gz: c65e2e67c3a4a1cd9798e77742d7e14dfd945bfe
+  data.tar.gz: 3aa23549d358f5ebc19c303675bbb84ddee7933c
 SHA512:
-  metadata.gz: 80d7433afa69c6e3dd200a075ca71e56fd22eab96b0d0430c840d2e79435a7a7d29dc0b49b80c3070a52f901ce0d67d4d7a568c3aa787936360eeea3b69a0987
-  data.tar.gz: 10e8929f112809a566e57d3e1f23372f541da3d1a67b0699a0baf6f24a9fabff7a57a0c7f7a1795f6e929efa4e50825505f8ff44797f47d2ffc644f8a9443f21
+  metadata.gz: 48433dd9f8376783bd46232875daca17d1c08b5de24a43e84de69e34fa8b516c081d30b0f850aa7a7abb030658d08695c20a5f36576b43918ea2573e6dd4e18d
+  data.tar.gz: 8dbe81447ec48bd0fa00601c2da3670a1faa36a0962ae6ac0633208f149eb595ae2cdd2e439bfa1b068b71632ed0dc260d7cad4074d6ce36d0e983369fb2760e

data/app/views/active_admin/tinymce/modal/_modal.slim

@@ -8,6 +8,7 @@
       a.collection-image data-original="#{image.send(ActiveAdmin::Tinymce.attachment_attr_name).url(:original)}"
         img src="#{image.send(ActiveAdmin::Tinymce.attachment_attr_name).url(:thumb)}"
   div class="modal-footer"
+    = link_to 'Загрузить изображение', "/#{ActiveAdmin::Tinymce.admin_namespace}/#{ActiveAdmin::Tinymce.model_class.to_s.underscore.pluralize}/new"
     button type="button" class="btn btn-primary action-ok" Ok
     button type="button" data-dismiss="modal" class="btn close" Cancel
 

data/lib/active_admin/tinymce/version.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
   module Tinymce
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/lib/active_admin_tinymce.rb

@@ -7,9 +7,11 @@ module ActiveAdmin
     mattr_accessor :attachment_attr_name
     @@attachment_attr_name = 'attachment'
 
+    mattr_accessor :admin_namespace
+    @@admin_namespace = 'admin'
+
     def self.setup
       yield self
     end
-
   end
 end

data/lib/assets/javascripts/admin_lib/init_tinymce.js

@@ -8,7 +8,7 @@ init =  function() {
             type: 'get',
             url: '/modal',
             success: function(response){
-               $('form').append(response)
+               $('form').append(response);
                window.modal = new(Modal);
             }
         })
@@ -23,7 +23,17 @@ init =  function() {
             "searchreplace visualblocks code fullscreen",
             "insertdatetime media table contextmenu paste"
         ],
-        toolbar: "insertfile vundo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image",
+        style_formats: [
+            {
+                title: 'Основной текст',
+                block: 'p'
+            },{
+                title: 'Вставка',
+                block: 'p',
+                classes: 'colorado'
+            }
+        ],
+        toolbar: "insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image",
         setup : function(ed) {
             // Add a custom button
             ed.addButton('insertfile', {
@@ -42,7 +52,7 @@ init =  function() {
 };
 
 remove = function() {
-    tinymce.remove()
+    tinymce.remove();
     return
 };
 $(document).on('page:load', init);

data/lib/generators/active_admin/tinymce/install/templates/active_admin_tinymce.rb

@@ -14,5 +14,12 @@ ActiveAdmin::Tinymce.setup do |config|
   # Defaults:
   # config.attachment_attr_name = 'attachment'
 
+  # == Active Admin namespace
+  #
+  # Name of the admin's namespace
+  #
+  # Defaults:
+  # config.admin_namespace = 'admin'
+
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_tinymce
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kerweb development team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -201,3 +201,4 @@ test_files:
 - test/functional/modal_controller_test.rb
 - test/unit/active_admin_tinymce_test.rb
 - test/test_helper.rb
+has_rdoc: