ckeditor 4.2.0 → 4.2.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +1 -0
- data/README.md +31 -4
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/gal_add.jpg +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/gal_add.png +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/gal_del.png +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/gal_more.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/preloader.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/thumbs/avi.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/thumbs/ckfnothumb.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/thumbs/doc.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/thumbs/docx.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/thumbs/exe.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/thumbs/gz.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/thumbs/htm.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/thumbs/jpg.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/thumbs/mp3.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/thumbs/mpg.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/thumbs/pdf.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/thumbs/psd.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/thumbs/rar.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/thumbs/swf.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/thumbs/tar.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/thumbs/txt.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/thumbs/unknown.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/thumbs/wmv.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/thumbs/xls.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/thumbs/xlsx.gif +0 -0
- data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/thumbs/zip.gif +0 -0
- data/app/assets/javascripts/ckeditor/filebrowser/javascripts/{application.js.erb → application.js} +4 -6
- data/app/assets/stylesheets/ckeditor/application.css +1 -1
- data/app/assets/stylesheets/ckeditor/filebrowser/uploader.scss +132 -0
- data/app/controllers/ckeditor/application_controller.rb +9 -10
- data/app/controllers/ckeditor/attachment_files_controller.rb +9 -9
- data/app/controllers/ckeditor/pictures_controller.rb +9 -9
- data/app/views/ckeditor/attachment_files/index.html.erb +5 -5
- data/app/views/ckeditor/pictures/index.html.erb +5 -5
- data/app/views/ckeditor/shared/_asset.html.erb +18 -19
- data/app/views/ckeditor/shared/_asset_tmpl.html.erb +17 -18
- data/app/views/layouts/ckeditor/application.html.erb +2 -2
- data/config/locales/pt-PT.ckeditor.yml +1 -1
- data/config/locales/pt.ckeditor.yml +9 -0
- data/config/locales/sq.ckeditor.yml +9 -0
- data/config/routes.rb +2 -2
- data/lib/ckeditor.rb +5 -1
- data/lib/ckeditor/asset_response.rb +10 -6
- data/lib/ckeditor/helpers/controllers.rb +0 -5
- data/lib/ckeditor/orm/active_record.rb +0 -2
- data/lib/ckeditor/orm/base.rb +1 -1
- data/lib/ckeditor/orm/mongoid.rb +0 -2
- data/lib/ckeditor/paginatable.rb +2 -0
- data/lib/ckeditor/rails.rb +6 -0
- data/lib/ckeditor/text_area.rb +2 -1
- data/lib/ckeditor/utils.rb +18 -12
- data/lib/ckeditor/version.rb +2 -2
- data/lib/generators/ckeditor/templates/active_record/carrierwave/migration.rb +1 -5
- data/lib/generators/ckeditor/templates/active_record/dragonfly/migration.rb +1 -5
- data/lib/generators/ckeditor/templates/active_record/paperclip/migration.rb +1 -4
- data/lib/generators/ckeditor/templates/active_record/refile/migration.rb +1 -5
- data/lib/generators/ckeditor/templates/ckeditor.rb +5 -5
- data/lib/generators/ckeditor/templates/pundit_policy/attachment_file_policy.rb +2 -2
- data/lib/generators/ckeditor/templates/pundit_policy/picture_policy.rb +2 -2
- data/lib/tasks/ckeditor.rake +6 -14
- data/test/generators/install_generator_test.rb +2 -2
- data/test/models/attachment_file_test.rb +1 -1
- data/test/models/utils_test.rb +6 -6
- data/vendor/assets/javascripts/ckeditor/CHANGES.md +104 -2
- data/vendor/assets/javascripts/ckeditor/ckeditor.js +589 -643
- data/vendor/assets/javascripts/ckeditor/config.js +31 -3
- data/vendor/assets/javascripts/ckeditor/contents.css +73 -0
- data/vendor/assets/javascripts/ckeditor/lang/af.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/ar.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/bg.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/bn.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/bs.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/ca.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/cs.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/cy.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/da.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/de-ch.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/de.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/el.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/en-au.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/en-ca.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/en-gb.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/en.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/eo.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/es.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/et.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/eu.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/fa.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/fi.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/fo.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/fr-ca.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/fr.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/gl.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/gu.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/he.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/hi.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/hr.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/hu.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/id.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/is.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/it.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/ja.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/ka.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/km.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/ko.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/ku.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/lt.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/lv.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/mk.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/mn.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/ms.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/nb.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/nl.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/no.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/oc.js +5 -0
- data/vendor/assets/javascripts/ckeditor/lang/pl.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/pt-br.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/pt.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/ro.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/ru.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/si.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/sk.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/sl.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/sq.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/sr-latn.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/sr.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/sv.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/th.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/tr.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/tt.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/ug.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/uk.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/vi.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/zh-cn.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/zh.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js +5 -5
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/af.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js +2 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js +2 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js +7 -7
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js +4 -4
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/da.js +6 -6
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js +3 -4
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/de.js +3 -4
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/el.js +3 -4
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js +2 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/en.js +2 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js +3 -4
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/es.js +7 -6
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/et.js +2 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js +2 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js +7 -6
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js +3 -4
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js +2 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/he.js +2 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js +2 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js +3 -4
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/id.js +7 -7
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/it.js +4 -4
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js +2 -2
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/km.js +2 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js +2 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js +2 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js +2 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js +3 -4
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js +7 -6
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/no.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/oc.js +12 -0
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js +4 -4
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js +3 -4
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/si.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js +4 -4
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js +2 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js +2 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/th.js +2 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js +3 -4
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/about/dialogs/about.js +3 -2
- data/vendor/assets/javascripts/ckeditor/plugins/icons.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/icons_hidpi.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/image/dialogs/image.js +27 -27
- data/vendor/assets/javascripts/ckeditor/plugins/link/dialogs/link.js +24 -22
- data/vendor/assets/javascripts/ckeditor/plugins/link/images/anchor.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/link/images/hidpi/anchor.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/pastefromword/filter/default.js +36 -28
- data/vendor/assets/javascripts/ckeditor/plugins/scayt/dialogs/options.js +19 -19
- data/vendor/assets/javascripts/ckeditor/plugins/scayt/skins/moono-lisa/scayt.css +20 -0
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/eu.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/fr.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/oc.js +12 -0
- data/vendor/assets/javascripts/ckeditor/plugins/wsc/dialogs/wsc.js +9 -9
- data/vendor/assets/javascripts/ckeditor/plugins/wsc/skins/moono-lisa/wsc.css +43 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/dialog.css +5 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/dialog_ie.css +5 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/dialog_ie8.css +5 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/dialog_iequirks.css +5 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/editor.css +5 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/editor_gecko.css +5 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/editor_ie.css +5 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/editor_ie8.css +5 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/editor_iequirks.css +5 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/icons.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/icons_hidpi.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/{moono → moono-lisa}/images/arrow.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/images/close.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/images/hidpi/close.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/images/hidpi/lock-open.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/images/hidpi/lock.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/images/hidpi/refresh.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/images/lock-open.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/images/lock.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/images/refresh.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/{moono → moono-lisa}/images/spinner.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/{moono → moono-lisa}/readme.md +8 -11
- data/vendor/assets/javascripts/ckeditor/styles.js +41 -15
- metadata +59 -173
- data/app/assets/javascripts/ckeditor/filebrowser/stylesheets/uploader.css.erb +0 -128
- data/test/dummy/public/ckeditor_assets/attachments/1/rails_tar.gz +0 -0
- data/test/dummy/public/ckeditor_assets/pictures/1/content_rails.png +0 -0
- data/test/dummy/public/ckeditor_assets/pictures/1/original_rails.png +0 -0
- data/test/dummy/public/ckeditor_assets/pictures/1/thumb_rails.png +0 -0
- data/test/dummy/public/uploads/ckeditor/attachments/1/rails.tar.gz +0 -0
- data/test/dummy/public/uploads/ckeditor/pictures/1/content_rails.png +0 -0
- data/test/dummy/public/uploads/ckeditor/pictures/1/rails.png +0 -0
- data/test/dummy/public/uploads/ckeditor/pictures/1/thumb_rails.png +0 -0
- data/test/dummy/public/uploads/tmp/1468570200-60772-1241/rails.png +0 -0
- data/test/dummy/public/uploads/tmp/1468570200-60772-1405/rails.png +0 -0
- data/test/dummy/public/uploads/tmp/1468570200-60772-2164/rails.png +0 -0
- data/test/dummy/public/uploads/tmp/1468570200-60772-6603/rails.png +0 -0
- data/test/dummy/public/uploads/tmp/1468570200-60772-8111/rails.png +0 -0
- data/test/tmp/app/models/ckeditor/asset.rb +0 -5
- data/test/tmp/app/models/ckeditor/attachment_file.rb +0 -13
- data/test/tmp/app/models/ckeditor/picture.rb +0 -14
- data/test/tmp/config/initializers/ckeditor.rb +0 -58
- data/test/tmp/config/routes.rb +0 -5
- data/vendor/assets/javascripts/ckeditor/plugins/colordialog/dialogs/colordialog.css +0 -20
- data/vendor/assets/javascripts/ckeditor/plugins/colordialog/dialogs/colordialog.js +0 -14
- data/vendor/assets/javascripts/ckeditor/plugins/div/dialogs/div.js +0 -9
- data/vendor/assets/javascripts/ckeditor/plugins/find/dialogs/find.js +0 -25
- data/vendor/assets/javascripts/ckeditor/plugins/flash/dialogs/flash.js +0 -24
- data/vendor/assets/javascripts/ckeditor/plugins/flash/images/placeholder.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/button.js +0 -8
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/checkbox.js +0 -9
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/form.js +0 -8
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/hiddenfield.js +0 -7
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/radio.js +0 -9
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/select.js +0 -20
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/textarea.js +0 -8
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/textfield.js +0 -11
- data/vendor/assets/javascripts/ckeditor/plugins/forms/images/hiddenfield.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/iframe/dialogs/iframe.js +0 -10
- data/vendor/assets/javascripts/ckeditor/plugins/iframe/images/placeholder.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/liststyle/dialogs/liststyle.js +0 -10
- data/vendor/assets/javascripts/ckeditor/plugins/pagebreak/images/pagebreak.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/preview/preview.html +0 -13
- data/vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_address.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_blockquote.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_div.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_h1.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_h2.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_h3.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_h4.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_h5.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_h6.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_p.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/showblocks/images/block_pre.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/dialogs/smiley.js +0 -11
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/angel_smile.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/angel_smile.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/angry_smile.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/angry_smile.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/broken_heart.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/broken_heart.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/confused_smile.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/confused_smile.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/cry_smile.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/cry_smile.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/devil_smile.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/devil_smile.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/embaressed_smile.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/embarrassed_smile.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/embarrassed_smile.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/envelope.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/envelope.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/heart.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/heart.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/kiss.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/kiss.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/lightbulb.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/lightbulb.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/omg_smile.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/omg_smile.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/regular_smile.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/regular_smile.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/sad_smile.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/sad_smile.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/shades_smile.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/shades_smile.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/teeth_smile.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/teeth_smile.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/thumbs_down.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/thumbs_down.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/thumbs_up.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/thumbs_up.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/tongue_smile.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/tongue_smile.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/tounge_smile.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/wink_smile.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/images/wink_smile.png +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/templates/dialogs/templates.css +0 -84
- data/vendor/assets/javascripts/ckeditor/plugins/templates/dialogs/templates.js +0 -10
- data/vendor/assets/javascripts/ckeditor/plugins/templates/templates/default.js +0 -7
- data/vendor/assets/javascripts/ckeditor/plugins/templates/templates/images/template1.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/templates/templates/images/template2.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/plugins/templates/templates/images/template3.gif +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono/dialog.css +0 -5
- data/vendor/assets/javascripts/ckeditor/skins/moono/dialog_ie.css +0 -5
- data/vendor/assets/javascripts/ckeditor/skins/moono/dialog_ie7.css +0 -5
- data/vendor/assets/javascripts/ckeditor/skins/moono/dialog_ie8.css +0 -5
- data/vendor/assets/javascripts/ckeditor/skins/moono/dialog_iequirks.css +0 -5
- data/vendor/assets/javascripts/ckeditor/skins/moono/editor.css +0 -5
- data/vendor/assets/javascripts/ckeditor/skins/moono/editor_gecko.css +0 -5
- data/vendor/assets/javascripts/ckeditor/skins/moono/editor_ie.css +0 -5
- data/vendor/assets/javascripts/ckeditor/skins/moono/editor_ie7.css +0 -5
- data/vendor/assets/javascripts/ckeditor/skins/moono/editor_ie8.css +0 -5
- data/vendor/assets/javascripts/ckeditor/skins/moono/editor_iequirks.css +0 -5
- data/vendor/assets/javascripts/ckeditor/skins/moono/icons.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono/icons_hidpi.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono/images/close.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono/images/hidpi/close.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono/images/hidpi/lock-open.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono/images/hidpi/lock.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono/images/hidpi/refresh.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono/images/lock-open.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono/images/lock.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono/images/refresh.png +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8c5dde5cbe9a0e8847abdb9d3d8509a631f583f9
|
4
|
+
data.tar.gz: 15db649d134d31ef167ff6d0f6ff76679a551044
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4e61e5593b87692593387b2e933f0de00fbb4db0b314c4e78ac90383cd505a3cc7ac22610b77f336acb146d60bae2fed2fa255b83a1039196fd3b6e64a712ab2
|
7
|
+
data.tar.gz: bda25df1bf24b3b9c2839cc4e9b5ab10af2fdebd03e6ea77a6a8c4de2faab19bab08371490a8494b793255e275fd30f1360fb00ad5bc3a4296991fc881d2ca88
|
data/Gemfile
CHANGED
data/README.md
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
# Ckeditor
|
2
2
|
|
3
|
-
[![Build Status](https://semaphoreci.com/api/v1/
|
3
|
+
[![Build Status](https://semaphoreci.com/api/v1/igor-galeta/ckeditor/branches/master/shields_badge.svg)](https://semaphoreci.com/igor-galeta/ckeditor)
|
4
4
|
[![Code Climate](https://codeclimate.com/github/galetahub/ckeditor/badges/gpa.svg)](https://codeclimate.com/github/galetahub/ckeditor)
|
5
5
|
|
6
6
|
CKEditor is a WYSIWYG text editor designed to simplify web content creation. It brings common word processing features directly to your web pages. Enhance your website experience with our community maintained editor.
|
@@ -8,8 +8,8 @@ CKEditor is a WYSIWYG text editor designed to simplify web content creation. It
|
|
8
8
|
|
9
9
|
## Features
|
10
10
|
|
11
|
-
* Ckeditor version 4.
|
12
|
-
* Rails 4.2
|
11
|
+
* Ckeditor version 4.6.1 (08 Dec 2016)
|
12
|
+
* Rails 5.0.x, 4.2.x integration
|
13
13
|
* Files browser
|
14
14
|
* HTML5 file uploader
|
15
15
|
* Hooks for formtastic and simple_form forms generators
|
@@ -29,6 +29,12 @@ or if you'd like to use the latest version from Github:
|
|
29
29
|
gem 'ckeditor', github: 'galetahub/ckeditor'
|
30
30
|
```
|
31
31
|
|
32
|
+
The last version works with Rails 3.2.x is 4.1.3
|
33
|
+
|
34
|
+
```ruby
|
35
|
+
gem 'ckeditor', '4.1.3'
|
36
|
+
```
|
37
|
+
|
32
38
|
For file upload support, you must generate the necessary file storage models.
|
33
39
|
The currently supported backends are:
|
34
40
|
|
@@ -126,7 +132,7 @@ Setup editor version to load (more info here http://cdn.ckeditor.com/)
|
|
126
132
|
|
127
133
|
Ckeditor.setup do |config|
|
128
134
|
# //cdn.ckeditor.com/<version.number>/<distribution>/ckeditor.js
|
129
|
-
config.cdn_url = "//cdn.ckeditor.com/4.
|
135
|
+
config.cdn_url = "//cdn.ckeditor.com/4.6.1/basic/ckeditor.js"
|
130
136
|
end
|
131
137
|
```
|
132
138
|
|
@@ -136,6 +142,14 @@ In view template include ckeditor CDN:
|
|
136
142
|
= javascript_include_tag Ckeditor.cdn_url
|
137
143
|
```
|
138
144
|
|
145
|
+
Precompile ckeditor/config.js:
|
146
|
+
|
147
|
+
```ruby
|
148
|
+
# in config/initializers/assets.rb
|
149
|
+
|
150
|
+
Rails.application.config.assets.precompile += %w(ckeditor/config.js)
|
151
|
+
```
|
152
|
+
|
139
153
|
### Form helpers
|
140
154
|
|
141
155
|
```slim
|
@@ -247,6 +261,19 @@ jQuery sample:
|
|
247
261
|
= form.input :content, as: :ckeditor, input_html: { ckeditor: { toolbar: 'Full' } }
|
248
262
|
```
|
249
263
|
|
264
|
+
### Turbolink integration
|
265
|
+
Create a file app/assets/javascripts/init_ckeditor.coffee
|
266
|
+
|
267
|
+
```coffee
|
268
|
+
ready = ->
|
269
|
+
$('.ckeditor').each ->
|
270
|
+
CKEDITOR.replace $(this).attr('id')
|
271
|
+
|
272
|
+
$(document).ready(ready)
|
273
|
+
$(document).on('page:load', ready) } }
|
274
|
+
```
|
275
|
+
Make sure the file is loaded from your app/assets/javascripts/application.js
|
276
|
+
|
250
277
|
### CanCan integration
|
251
278
|
|
252
279
|
To use cancan with Ckeditor, add this to an initializer:
|
data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/gal_add.jpg
RENAMED
File without changes
|
data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/gal_add.png
RENAMED
File without changes
|
data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/gal_del.png
RENAMED
File without changes
|
data/app/assets/{javascripts/ckeditor/filebrowser/images → images/ckeditor/filebrowser}/gal_more.gif
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
data/app/assets/javascripts/ckeditor/filebrowser/javascripts/{application.js.erb → application.js}
RENAMED
@@ -199,15 +199,13 @@ qq.extend(qq.FileUploaderInput.prototype, {
|
|
199
199
|
format_created_at: '',
|
200
200
|
url_content: "#",
|
201
201
|
controller: "assets",
|
202
|
-
url_thumb: "
|
202
|
+
url_thumb: ""
|
203
203
|
};
|
204
204
|
|
205
|
-
var item = $(this._options.template_id)
|
206
|
-
.tmpl(asset)
|
207
|
-
.attr('qqfileid', id)
|
208
|
-
.prependTo( this._listElement );
|
205
|
+
var item = $(this._options.template_id).tmpl(asset).attr('qqfileid', id)
|
209
206
|
|
210
|
-
item.find('div.img').addClass('preloader');
|
207
|
+
item.find('div.img').html('').addClass('preloader');
|
208
|
+
item.prependTo( this._listElement );
|
211
209
|
|
212
210
|
this._bindCancelEvent(item);
|
213
211
|
}
|
@@ -2,5 +2,5 @@
|
|
2
2
|
* This is a manifest file that'll automatically include all the stylesheets available in this directory
|
3
3
|
* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
|
4
4
|
* the top of the compiled file, but it's generally better to create a new file per style scope.
|
5
|
-
*= require ckeditor/filebrowser/
|
5
|
+
*= require ckeditor/filebrowser/uploader
|
6
6
|
*/
|
@@ -0,0 +1,132 @@
|
|
1
|
+
body {
|
2
|
+
padding: 0;
|
3
|
+
margin: 0;
|
4
|
+
font-family: Arial, Helvetica, sans-serif;
|
5
|
+
}
|
6
|
+
img {
|
7
|
+
border: 0;
|
8
|
+
}
|
9
|
+
.gal-holder {
|
10
|
+
display: block;
|
11
|
+
overflow: hidden;
|
12
|
+
padding: 20px;
|
13
|
+
}
|
14
|
+
.gal-holder .gal-item:first-child {
|
15
|
+
float: left;
|
16
|
+
}
|
17
|
+
.gal-holder .gal-item {
|
18
|
+
display: inline-block;
|
19
|
+
width: 150px;
|
20
|
+
overflow: hidden;
|
21
|
+
position: relative;
|
22
|
+
margin: 0 12px 12px 0;
|
23
|
+
}
|
24
|
+
.gal-holder .gal-item .gal-del {
|
25
|
+
display: block;
|
26
|
+
position: absolute;
|
27
|
+
right: 0;
|
28
|
+
top: 0;
|
29
|
+
background: url(image_path('ckeditor/filebrowser/gal_del.png')) no-repeat left center;
|
30
|
+
width: 17px;
|
31
|
+
height: 17px;
|
32
|
+
}
|
33
|
+
.gal-holder .gal-item .preloader {
|
34
|
+
background: url(image_path('ckeditor/filebrowser/preloader.gif')) no-repeat center center;
|
35
|
+
width: 118px;
|
36
|
+
height: 100px;
|
37
|
+
}
|
38
|
+
.gal-holder .gal-item .gal-del:hover {
|
39
|
+
-moz-opacity: 0.7;
|
40
|
+
-khtml-opacity: 0.7;
|
41
|
+
opacity: 0.7;
|
42
|
+
}
|
43
|
+
.gal-holder .gal-item .gal-upload-holder input {
|
44
|
+
height: 162px;
|
45
|
+
}
|
46
|
+
.gal-holder .gal-item .gal-upload-holder .add:hover {
|
47
|
+
text-decoration: underline;
|
48
|
+
}
|
49
|
+
.gal-holder .gal-item .gal-inner-holder, .gal-holder .gal-item .gal-upload-holder {
|
50
|
+
display: block;
|
51
|
+
margin: 6px 6px 0 0;
|
52
|
+
overflow: hidden;
|
53
|
+
padding: 12px;
|
54
|
+
background: #fff;
|
55
|
+
border: solid 1px #D3D3D3;
|
56
|
+
min-height: 138px;
|
57
|
+
}
|
58
|
+
.gal-holder .gal-item .gal-inner-holder.hover {
|
59
|
+
background: #DFF1FF;
|
60
|
+
border: solid 1px #99CCFF;
|
61
|
+
}
|
62
|
+
.gal-holder .gal-item .gal-inner-holder.selected {
|
63
|
+
background: #B4D9FF;
|
64
|
+
border: solid 1px #6565FE;
|
65
|
+
}
|
66
|
+
.gal-holder .gal-item .gal-upload-holder .add {
|
67
|
+
display: block;
|
68
|
+
color: #2e5aff;
|
69
|
+
background: url(image_path('ckeditor/filebrowser/gal_add.png')) no-repeat left center;
|
70
|
+
padding-left: 33px;
|
71
|
+
line-height: 25px;
|
72
|
+
text-decoration: none;
|
73
|
+
margin: 50px 0 0 10px;
|
74
|
+
font-size: 14px;
|
75
|
+
}
|
76
|
+
.gal-holder .gal-item .gal-inner-holder .img {
|
77
|
+
height: 100px;
|
78
|
+
overflow: hidden;
|
79
|
+
cursor:pointer;
|
80
|
+
}
|
81
|
+
.gal-holder .gal-item .gal-inner-holder .img-data {
|
82
|
+
display: block;
|
83
|
+
overflow: hidden;
|
84
|
+
padding-top: 5px;
|
85
|
+
}
|
86
|
+
.gal-holder .gal-item .gal-inner-holder .img-data .img-name {
|
87
|
+
display: block;
|
88
|
+
color: #333;
|
89
|
+
padding-bottom: 5px;
|
90
|
+
font-size: 12px;
|
91
|
+
overflow: hidden;
|
92
|
+
width: 500px;
|
93
|
+
}
|
94
|
+
.img-name {
|
95
|
+
word-wrap: break-word;
|
96
|
+
width: auto !important;
|
97
|
+
}
|
98
|
+
.gal-holder .gal-item .gal-inner-holder .img-data .time-size {
|
99
|
+
display: block;
|
100
|
+
overflow: hidden;
|
101
|
+
font-size: 10px;
|
102
|
+
color: #666;
|
103
|
+
}
|
104
|
+
.gal-holder .gal-item .gal-inner-holder .img-data .time-size .time {
|
105
|
+
display: block;
|
106
|
+
float: left;
|
107
|
+
}
|
108
|
+
.gal-holder .gal-item .gal-inner-holder .img-data .time-size .size {
|
109
|
+
display: block;
|
110
|
+
float: right;
|
111
|
+
}
|
112
|
+
.gal-more {
|
113
|
+
display: block;
|
114
|
+
overflow: hidden;
|
115
|
+
border-top: dashed 1px #d3d3d3;
|
116
|
+
padding: 20px 0;
|
117
|
+
text-align: center;
|
118
|
+
}
|
119
|
+
.gal-more a {
|
120
|
+
color: #2e5aff;
|
121
|
+
background: url(image_path('ckeditor/filebrowser/gal_more.gif')) no-repeat left center;
|
122
|
+
padding-left: 15px;
|
123
|
+
font-size: 14px;
|
124
|
+
text-decoration: none;
|
125
|
+
}
|
126
|
+
.gal-more a:hover {
|
127
|
+
text-decoration: underline;
|
128
|
+
}
|
129
|
+
|
130
|
+
.pagination, .pagination a {
|
131
|
+
text-decoration: none;
|
132
|
+
}
|
@@ -1,20 +1,19 @@
|
|
1
1
|
class Ckeditor::ApplicationController < Ckeditor.parent_controller.constantize
|
2
|
-
layout
|
2
|
+
layout Ckeditor.controller_layout
|
3
3
|
|
4
|
-
before_action :find_asset, :
|
4
|
+
before_action :find_asset, only: [:destroy]
|
5
5
|
before_action :ckeditor_authorize!
|
6
6
|
before_action :authorize_resource
|
7
7
|
|
8
8
|
protected
|
9
9
|
|
10
|
-
|
11
|
-
|
12
|
-
_callback = ckeditor_before_create_asset(asset)
|
10
|
+
def respond_with_asset(asset)
|
11
|
+
asset_response = Ckeditor::AssetResponse.new(asset, request)
|
13
12
|
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
end
|
13
|
+
if asset.save
|
14
|
+
render asset_response.success(config.relative_url_root)
|
15
|
+
else
|
16
|
+
render asset_response.errors
|
19
17
|
end
|
18
|
+
end
|
20
19
|
end
|
@@ -6,7 +6,7 @@ class Ckeditor::AttachmentFilesController < Ckeditor::ApplicationController
|
|
6
6
|
@attachments = Ckeditor::Paginatable.new(@attachments).page(params[:page])
|
7
7
|
|
8
8
|
respond_to do |format|
|
9
|
-
format.html { render :
|
9
|
+
format.html { render layout: @attachments.first_page? }
|
10
10
|
end
|
11
11
|
end
|
12
12
|
|
@@ -20,18 +20,18 @@ class Ckeditor::AttachmentFilesController < Ckeditor::ApplicationController
|
|
20
20
|
|
21
21
|
respond_to do |format|
|
22
22
|
format.html { redirect_to attachment_files_path }
|
23
|
-
format.json { render :
|
23
|
+
format.json { render json: @attachment, status: 204 }
|
24
24
|
end
|
25
25
|
end
|
26
26
|
|
27
27
|
protected
|
28
28
|
|
29
|
-
|
30
|
-
|
31
|
-
|
29
|
+
def find_asset
|
30
|
+
@attachment = Ckeditor.attachment_file_adapter.get!(params[:id])
|
31
|
+
end
|
32
32
|
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
33
|
+
def authorize_resource
|
34
|
+
model = (@attachment || Ckeditor.attachment_file_model)
|
35
|
+
@authorization_adapter.try(:authorize, params[:action], model)
|
36
|
+
end
|
37
37
|
end
|
@@ -6,7 +6,7 @@ class Ckeditor::PicturesController < Ckeditor::ApplicationController
|
|
6
6
|
@pictures = Ckeditor::Paginatable.new(@pictures).page(params[:page])
|
7
7
|
|
8
8
|
respond_to do |format|
|
9
|
-
format.html { render :
|
9
|
+
format.html { render layout: @pictures.first_page? }
|
10
10
|
end
|
11
11
|
end
|
12
12
|
|
@@ -20,18 +20,18 @@ class Ckeditor::PicturesController < Ckeditor::ApplicationController
|
|
20
20
|
|
21
21
|
respond_to do |format|
|
22
22
|
format.html { redirect_to pictures_path }
|
23
|
-
format.json { render :
|
23
|
+
format.json { render json: @picture, status: 204 }
|
24
24
|
end
|
25
25
|
end
|
26
26
|
|
27
27
|
protected
|
28
28
|
|
29
|
-
|
30
|
-
|
31
|
-
|
29
|
+
def find_asset
|
30
|
+
@picture = Ckeditor.picture_adapter.get!(params[:id])
|
31
|
+
end
|
32
32
|
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
33
|
+
def authorize_resource
|
34
|
+
model = (@picture || Ckeditor.picture_model)
|
35
|
+
@authorization_adapter.try(:authorize, params[:action], model)
|
36
|
+
end
|
37
37
|
end
|
@@ -1,17 +1,17 @@
|
|
1
1
|
<div id="fileupload" class="gal-holder">
|
2
2
|
<div class="gal-item">
|
3
3
|
<div class="fileupload-button gal-upload-holder">
|
4
|
-
|
5
|
-
|
6
|
-
|
4
|
+
<%= link_to I18n.t(:upload, scope: [:ckeditor, :buttons]), 'javascript:void(0)', class: "add" %>
|
5
|
+
</div>
|
6
|
+
</div>
|
7
7
|
|
8
8
|
<div class="fileupload-list">
|
9
|
-
<%= render :
|
9
|
+
<%= render partial: 'ckeditor/shared/asset', collection: @attachments %>
|
10
10
|
</div>
|
11
11
|
|
12
12
|
<% unless @attachments.last_page? %>
|
13
13
|
<div class="pagination">
|
14
|
-
<%= link_to I18n.t("ckeditor.buttons.next"), ckeditor.attachment_files_path(params.merge(:
|
14
|
+
<%= link_to I18n.t("ckeditor.buttons.next"), ckeditor.attachment_files_path(params.merge(page: @attachments.next_page)), class: "next", rel: "next" %>
|
15
15
|
</div>
|
16
16
|
<% end -%>
|
17
17
|
|
@@ -1,17 +1,17 @@
|
|
1
1
|
<div id="fileupload" class="gal-holder">
|
2
2
|
<div class="gal-item">
|
3
3
|
<div class="fileupload-button gal-upload-holder">
|
4
|
-
|
5
|
-
|
6
|
-
|
4
|
+
<%= link_to I18n.t(:upload, scope: [:ckeditor, :buttons]), 'javascript:void(0)', class: "add" %>
|
5
|
+
</div>
|
6
|
+
</div>
|
7
7
|
|
8
8
|
<div class="fileupload-list" data-endless="true">
|
9
|
-
<%= render :
|
9
|
+
<%= render partial: 'ckeditor/shared/asset', collection: @pictures.scoped %>
|
10
10
|
</div>
|
11
11
|
|
12
12
|
<% unless @pictures.last_page? %>
|
13
13
|
<div class="pagination">
|
14
|
-
<%= link_to I18n.t("ckeditor.buttons.next"), ckeditor.pictures_path(params.merge(:
|
14
|
+
<%= link_to I18n.t("ckeditor.buttons.next"), ckeditor.pictures_path(params.merge(page: @pictures.next_page)), class: "next", rel: "next" %>
|
15
15
|
</div>
|
16
16
|
<% end -%>
|
17
17
|
|