push_type_wysiwyg 0.2.1 → 0.3.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/push_type/froala_overrides/file_upload.js +11 -2
- data/app/assets/javascripts/push_type/froala_overrides/froala_editor.js +50 -27
- data/app/assets/javascripts/push_type/froala_overrides/image_editor.js +23 -32
- data/app/assets/javascripts/push_type/froala_overrides/media_manager.js +42 -4
- data/app/assets/javascripts/push_type/wysiwyg.js.coffee +7 -2
- data/app/assets/stylesheets/push_type/froala_overrides.scss +4 -0
- data/app/assets/stylesheets/push_type/pt_theme.scss +3 -1
- data/test/dummy/app/controllers/application_controller.rb +0 -16
- data/test/dummy/app/models/page.rb +1 -3
- data/test/dummy/app/views/nodes/page.html.erb +1 -1
- data/test/dummy/config/initializers/push_type.rb +1 -1
- data/test/dummy/config/secrets.yml +2 -2
- data/test/dummy/db/migrate/{20150209204402_create_push_type_users.push_type.rb → 20150222152513_create_push_type_users.push_type.rb} +0 -0
- data/test/dummy/db/migrate/{20150209204403_create_push_type_nodes.push_type.rb → 20150222152514_create_push_type_nodes.push_type.rb} +0 -0
- data/test/dummy/db/migrate/{20150209204404_create_push_type_node_hierarchies.push_type.rb → 20150222152515_create_push_type_node_hierarchies.push_type.rb} +0 -0
- data/test/dummy/db/migrate/{20150209204405_create_push_type_assets.push_type.rb → 20150222152516_create_push_type_assets.push_type.rb} +0 -0
- data/test/dummy/db/schema.rb +1 -1
- data/test/dummy/log/development.log +2964 -34212
- data/test/dummy/log/test.log +607 -607
- data/test/dummy/public/system/dragonfly/development/2015/02/22/1l58rmwrzh_unnamed.jpg +0 -0
- data/test/dummy/public/system/dragonfly/development/2015/02/{17/6xzqa5lr5o_unnamed.png.meta.yml → 22/1l58rmwrzh_unnamed.jpg.meta.yml} +1 -1
- data/test/dummy/tmp/cache/assets/development/sass/2df752541ff0a319141a1cb83ca971d2ffd2d050/admin.scssc +0 -0
- data/test/dummy/tmp/cache/assets/development/sass/b6b9d28ca2724256eca65bb09714d576b729c931/froala_overrides.scssc +0 -0
- data/test/dummy/tmp/cache/assets/development/sass/b6b9d28ca2724256eca65bb09714d576b729c931/pt_theme.scssc +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/{7d07558d12b9bd9b9dfa778344bab4ac → 00ba3b70f9c53c57d22cf0bee1c37172} +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/04e7b5cc79c9b1c549820832eb88d319 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/{2d1bc2b9dc5ee0ed5635abc31fb1bc88 → 092ab959c3e9331b83af5258e71da363} +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/096eddf7a98fd625176db364d134da81 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/0aa9b91b3ecfb11e422aa5d7764e96b9 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/0e01ae9de0f3914c8317853aedd9ace4 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/106c19f564ec5217ee478cbab34720f1 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/{e568172da8ab8581f83f98dad0a73d29 → 13f28eb9e74d963db85d096c41d1a0dc} +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/1c77a98139216e228eba134f34095843 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/20d629f8f2d27d8418db0113f0346abc +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/21bfe84f05ed2fba3ce99db95bb959b3 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/23c10c485dbe7ea46614928874120ecf +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/24cb56346b5c952d3e54370706a44947 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/{badf6e6ab7c3d1cc2b180e5883005a40 → 281682b191417684daf9036d98ef6f6a} +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/28d688f439ef90b05d8061d8c3209a34 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/{c988fd2c5c9497ccef54f79a9e444ac6 → 2acc8cc9d4b7a10606e6cdf14f6c3bbd} +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/30905e99aec45e80d3e9f20ed6100f7b +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/30f88df6b769522639aee569e18ab005 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/3220d70364d496c9cec094a51213d58a +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/3250647bb1e816f8ee380676051395a0 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/34180a46a1fc802cc4e37f4db0626478 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/3508023b6222e6b0876c773e38ec700d +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/398116cdc953ef489a67c3a7e7a1aece +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/{932f699ead87a4b9910d47334ed14d60 → 3c6444c7e7cefae32b10e67f32c0277a} +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/3d35d51d6f620f3b4354d36d7959c89d +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/3d913c6890c084026be6278d4e2e8547 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/463cf86d1833a97b9145f6e36ab75d53 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/488d63b20534d2642d48b86b5a267a3b +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/4a0db6a94f7ee4df38bb9fc2ca66f0c7 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/4b55a223c2dc35a5f80af7af884749f3 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/55bff739aaf7938f394017db041e742e +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/56a23304bd86f6f426dd44b6a14e0bbf +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/576b745d6338e8f7635e82939abb6e5f +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/5b03a21e24f2318345666c69b686067a +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/5c3ab7f66e6c662a3ff250afdeb61a44 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/5c7a9715a4d34606731b486f1251151d +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/5e0b7b9458a23ccc5c66e2ab0398a17c +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/5f85da4ac11a64f005e2656b99be44ac +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/{805c63977d339feb2ea7b61e1141a32f → 615c2789eb50bd461f700dbbe612375a} +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/61a4c97ff14ea9dc6f5d8ca42c65b34f +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/{7b63c613f1053bde6004342003178a0e → 6756d566c21f4e4b087fdff4f998d932} +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/68f987c6c8cac5655b3ee24985a584fc +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/6e520d29d8e0af4c5fdb3ce228619f9e +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/744c7370209ddecff0f0e7cb474bc4cf +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/7925f8f38f5165ad9d36a7d73dd00c06 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/79f92fe028aba3a0b3cc05f29b209da3 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/897fcee94209310a5d16db6b10c29dfa +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/8b9fc2be9ca39f6c79bfdad5364dc676 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/8d531fdb806de0724337e0b80e253914 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/8df98e9b5189ffce4cf77a33533416a6 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/91971e95dd0172705ab405c50732dce6 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/9221dd4a064b2d36adbdbce6a33a6f7e +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/927bf336b73c19a6d35362d3e8ec1541 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/9525e9603e466a87e595061d4af7fec7 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/{c190d0bdd188c43629f35b9f463b86af → 98f7a7f74c13a9f46cfbc7288fc95212} +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/99fe26a80e7e5ec06edf349306f40d5a +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/9a08c53fbaab11a94ed694fa4fc21bce +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/9c34afd1737e54e4eb06cc87ddf17b78 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/a031c4e726d60fef882757c0f39eb66f +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/{1c63cb75109171c505bf1b6b3f26513b → a09464fdd61b5bfb25f86f5c04283d1f} +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/a93ec74f5cd7f26f8c663d4c481fe689 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/a9b8decaa2942e8913458c9f35da2693 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/{47dcfb84d9a092ad939f512e1d3db43c → adb1525a6ffb2f6bde64edad42ff1843} +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/b22e7be4b7531ad92c824dcfd9adca27 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/beae69b8f0d0fdaef95ab96db9591086 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/c206fbd33f49ab785c6ddf4bcffd3b93 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/c24da6389dfcadaf699c9b4a4eea9964 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/c9ebc72dd9509bb10caa1dbedb55de2b +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/cc63d401339265551b27ac91974668cb +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/d1e4481ce50457c9250e4be77c3510a2 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/d4e555198f64c730192a65bdbcb8e27a +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/d71b8364b6c65852719d388c7d55976e +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/d82779125c814758e2311f37945d172e +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/df90022afc0d52f16bc498be20a5967d +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/e5290501d2ae519f0be938a3ad74e7e0 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/e540a9dc1aa001f8c4cba7a6b00f69d2 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/e6e78e14e8c962d31e6148ca56230af9 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/{74d0a68ec9399e1929715edba40caff4 → ea8966f9b9d68690ec2d1d8bdd59ffb5} +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/edd24c59de6c00e4e68dbbdf2775984a +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/f4bc04a453fa1e6b7454312a918fca27 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/f5016ef8a1200a0a022e1b2f8ac7edbb +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/f7cf86568d1c692cb0a565614f282572 +0 -0
- metadata +118 -166
- data/test/dummy/public/system/dragonfly/development/2015/02/17/1331xwucig_marte38_01.jpg +0 -0
- data/test/dummy/public/system/dragonfly/development/2015/02/17/1331xwucig_marte38_01.jpg.meta.yml +0 -4
- data/test/dummy/public/system/dragonfly/development/2015/02/17/1bkup9vlqk_unnamed.png +0 -0
- data/test/dummy/public/system/dragonfly/development/2015/02/17/1bkup9vlqk_unnamed.png.meta.yml +0 -4
- data/test/dummy/public/system/dragonfly/development/2015/02/17/3kbs5oyedu_unnamed.png +0 -0
- data/test/dummy/public/system/dragonfly/development/2015/02/17/3kbs5oyedu_unnamed.png.meta.yml +0 -4
- data/test/dummy/public/system/dragonfly/development/2015/02/17/51yeipq39k_unnamed.png +0 -0
- data/test/dummy/public/system/dragonfly/development/2015/02/17/51yeipq39k_unnamed.png.meta.yml +0 -4
- data/test/dummy/public/system/dragonfly/development/2015/02/17/57qpcjycnz_Screen_Shot_2015_02_09_at_12.12.46.png +0 -0
- data/test/dummy/public/system/dragonfly/development/2015/02/17/57qpcjycnz_Screen_Shot_2015_02_09_at_12.12.46.png.meta.yml +0 -4
- data/test/dummy/public/system/dragonfly/development/2015/02/17/5fwu19ku6u_stay_another_day.jpg +0 -0
- data/test/dummy/public/system/dragonfly/development/2015/02/17/5fwu19ku6u_stay_another_day.jpg.meta.yml +0 -4
- data/test/dummy/public/system/dragonfly/development/2015/02/17/6gy2twpcyv_marte38_01.jpg +0 -0
- data/test/dummy/public/system/dragonfly/development/2015/02/17/6gy2twpcyv_marte38_01.jpg.meta.yml +0 -4
- data/test/dummy/public/system/dragonfly/development/2015/02/17/6xzqa5lr5o_unnamed.png +0 -0
- data/test/dummy/public/system/dragonfly/development/2015/02/17/8e6bxhsc89_unnamed.png +0 -0
- data/test/dummy/public/system/dragonfly/development/2015/02/17/8e6bxhsc89_unnamed.png.meta.yml +0 -4
- data/test/dummy/public/system/dragonfly/development/2015/02/17/8kpk5uscyk_unnamed.png +0 -0
- data/test/dummy/public/system/dragonfly/development/2015/02/17/8kpk5uscyk_unnamed.png.meta.yml +0 -4
- data/test/dummy/public/system/dragonfly/development/2015/02/17/8upyxtsk3r_unnamed.png +0 -0
- data/test/dummy/public/system/dragonfly/development/2015/02/17/8upyxtsk3r_unnamed.png.meta.yml +0 -4
- data/test/dummy/public/system/dragonfly/development/2015/02/17/9carjg3q0n_unnamed.png +0 -0
- data/test/dummy/public/system/dragonfly/development/2015/02/17/9carjg3q0n_unnamed.png.meta.yml +0 -4
- data/test/dummy/public/system/dragonfly/development/2015/02/17/9sq8ly1z0r_marte38_01.jpg +0 -0
- data/test/dummy/public/system/dragonfly/development/2015/02/17/9sq8ly1z0r_marte38_01.jpg.meta.yml +0 -4
- data/test/dummy/public/system/dragonfly/development/2015/02/17/9swrm8bfl0_marte38_01.jpg +0 -0
- data/test/dummy/public/system/dragonfly/development/2015/02/17/9swrm8bfl0_marte38_01.jpg.meta.yml +0 -4
- data/test/dummy/public/system/dragonfly/development/2015/02/17/t9xke2lmz_unnamed.png +0 -0
- data/test/dummy/public/system/dragonfly/development/2015/02/17/t9xke2lmz_unnamed.png.meta.yml +0 -4
- data/test/dummy/tmp/cache/assets/development/sprockets/0448802b256c25a379824969bf01241e +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/0ac59c93a84a52aba800cb33372b8f96 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/2479bd5cbccdeac3ab4df62c2c12e8d3 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/25b238c2ec907a80d53955a0bb81073c +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/31c57ad31a65f9a951c6d7268cdedae5 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/36b405be9a5b7a40ad906728c9aeb94f +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/3d4f40cd6363f1841fa7c17dcbd281ce +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/4b8d83b7ae1317cf918d180b938ff565 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/4f422267ef34574e3b4422b4137c7dd8 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/55d58e1add1ca367e262464e83ad82cf +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/59992ed1702654aa166f8572af80a301 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/600202d00479f08d2e69019e34d12e65 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/6366afb9c2ba5987d78c050fbce75acc +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/75c5663a92b2003b794d5f5d184fde44 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/7a6cc81125937d35e5b984a3c7098c1a +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/8da458b8df4bfbd9fb0eed86c36442d4 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/8feb3d758b7824f15b301f9dc024c3f6 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/a010781c05d478892856f75c751d6ab4 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/a96494099d559bfd8cb5257e21cb196c +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/aaa6dc2bd59e21dd14b0c86a308a1d1f +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/c42a7aac68d827f88bcc25a41cdb5591 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/c5ef052e357af6829f6c522a38916fc7 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/d7f4e0230ca18ec1ef6cfa1460b096f6 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/ef166197fe2d31e69653c512a685ed9d +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/f02093872b151ddb0fd1074fe83ff846 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655 +0 -0
- data/test/dummy/tmp/cache/assets/development/sprockets/faf1bbb7beb1e6ddcf804de02c7b5c36 +0 -0
- data/test/dummy/tmp/pids/server.pid +0 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 75d3e9e740dd94e9573bfbf21e804fa75a875efd
|
4
|
+
data.tar.gz: 4a40a561aa5c8139ac8ffdf7d88be64944bc7e79
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9e0cdfa6fb94bfdfd60cd893272e81358d8c7f735618a7bfef07b1a01ee8ccc413d48df372bc15d5235a9644cb47d0cca5d8aed62a4eace47bea66ddf0e86478
|
7
|
+
data.tar.gz: 4abcb9999ea1431a4c44fbdf3b804e5337fc73cb906a272073d306b67c5aab7c44104de3cb2083f2825bfc80909d84512d559036203c4e7a146159af73a9e0c0
|
@@ -1,3 +1,6 @@
|
|
1
|
+
/**
|
2
|
+
* Override to add file upload UI
|
3
|
+
*/
|
1
4
|
$.Editable.prototype.fileUploadHTML = function () {
|
2
5
|
var html = '<div class="froala-popup froala-file-popup" style="display: none;"><h4><span data-text="true">Upload file</span><i title="Cancel" class="fa fa-times" id="f-file-close-' + this._id + '"></i></h4>';
|
3
6
|
|
@@ -12,9 +15,11 @@ $.Editable.prototype.fileUploadHTML = function () {
|
|
12
15
|
|
13
16
|
html += '</div>';
|
14
17
|
|
18
|
+
// PT BEGIN
|
15
19
|
if (this.options.fileLink) {
|
16
20
|
html += '<div class="f-popup-line"><label><span data-text="true">Enter URL</span>: </label><input id="f-file-url-' + this._id + '" type="text" placeholder="http://example.com"><button class="f-browse fr-p-bttn" id="f-browser-' + this._id + '"><i class="fa fa-search"></i></button><button data-text="true" class="f-ok fr-p-bttn" id="f-file-ok-' + this._id + '">OK</button></div>';
|
17
21
|
}
|
22
|
+
// PT END
|
18
23
|
|
19
24
|
html += '</div>';
|
20
25
|
html += '<p class="f-progress" id="f-file-progress-' + this._id + '"><span></span></p>';
|
@@ -25,7 +30,7 @@ $.Editable.prototype.fileUploadHTML = function () {
|
|
25
30
|
|
26
31
|
|
27
32
|
/**
|
28
|
-
*
|
33
|
+
* Override to integrate with media manager
|
29
34
|
*/
|
30
35
|
$.Editable.prototype.buildFileUpload = function () {
|
31
36
|
// Add file wrapper to editor.
|
@@ -89,6 +94,7 @@ $.Editable.prototype.buildFileUpload = function () {
|
|
89
94
|
$(this).val('');
|
90
95
|
});
|
91
96
|
|
97
|
+
// PT BEGIN
|
92
98
|
// Create a list with all the items from the popup.
|
93
99
|
this.$file_wrapper.on('click', '#f-file-ok-' + this._id, $.proxy(function () {
|
94
100
|
var file = this.$file_wrapper.find('#f-file-url-' + this._id).val();
|
@@ -96,9 +102,10 @@ $.Editable.prototype.buildFileUpload = function () {
|
|
96
102
|
this.writeFile(file, file);
|
97
103
|
}
|
98
104
|
}, this));
|
105
|
+
// PT END
|
99
106
|
|
100
107
|
// Wrap things in file wrapper.
|
101
|
-
this.$file_wrapper.on(this.mouseup, '#f-file-close-' + this._id, $.proxy(function () {
|
108
|
+
this.$file_wrapper.on(this.mouseup, '#f-file-close-' + this._id, $.proxy(function (e) {
|
102
109
|
e.stopPropagation();
|
103
110
|
e.preventDefault();
|
104
111
|
|
@@ -111,6 +118,7 @@ $.Editable.prototype.buildFileUpload = function () {
|
|
111
118
|
this.hide();
|
112
119
|
}, this))
|
113
120
|
|
121
|
+
// PT BEGIN
|
114
122
|
this.$file_wrapper
|
115
123
|
.on('click', '#f-browser-' + this._id, $.proxy(function () {
|
116
124
|
this.showMediaManager('file');
|
@@ -120,6 +128,7 @@ $.Editable.prototype.buildFileUpload = function () {
|
|
120
128
|
}, this));
|
121
129
|
|
122
130
|
this.$file_wrapper.find('#f-browser-' + this._id).show();
|
131
|
+
// PT END
|
123
132
|
|
124
133
|
this.$file_wrapper.on('click', function (e) {
|
125
134
|
e.stopPropagation();
|
@@ -2,23 +2,40 @@
|
|
2
2
|
* Override so the popup is never too bar below bottom of editor element
|
3
3
|
*/
|
4
4
|
$.Editable.prototype.showByCoordinates = function (x, y) {
|
5
|
-
|
6
|
-
|
7
|
-
bottom = this.$element.offset().top + this.$element.outerHeight();
|
5
|
+
x = x - 22;
|
6
|
+
y = y + 8;
|
8
7
|
|
9
|
-
|
8
|
+
var $container = this.$document.find(this.options.scrollableContainer);
|
9
|
+
|
10
|
+
if (this.options.scrollableContainer != 'body') {
|
11
|
+
x = x - $container.offset().left;
|
12
|
+
y = y - $container.offset().top;
|
10
13
|
|
11
|
-
|
12
|
-
|
14
|
+
if (!this.iPad()) {
|
15
|
+
y = y + $container.scrollTop();
|
16
|
+
x = x + $container.scrollLeft();
|
17
|
+
}
|
18
|
+
}
|
13
19
|
|
20
|
+
var editor_width = Math.max(this.$popup_editor.outerWidth(), 250);
|
14
21
|
|
15
|
-
|
22
|
+
// PT BEGIN
|
23
|
+
var bottom = $container.offset().top + $container.outerHeight() + 8;
|
24
|
+
y = Math.min(y, bottom);
|
25
|
+
// PT END
|
26
|
+
|
27
|
+
if (x + editor_width >= $container.outerWidth() - 50 && (x + 44) - editor_width > 0) {
|
16
28
|
this.$popup_editor.addClass('right-side');
|
17
|
-
x = $
|
29
|
+
x = $container.outerWidth() - (x + 44);
|
30
|
+
|
31
|
+
if ($container.css('position') == 'static') {
|
32
|
+
x = x + parseFloat($container.css('margin-left'), 10) + parseFloat($container.css('margin-right'), 10)
|
33
|
+
}
|
34
|
+
|
18
35
|
this.$popup_editor.css('top', y);
|
19
36
|
this.$popup_editor.css('right', x);
|
20
37
|
this.$popup_editor.css('left', 'auto');
|
21
|
-
} else if (x + editor_width < $
|
38
|
+
} else if (x + editor_width < $container.outerWidth() - 50) {
|
22
39
|
this.$popup_editor.removeClass('right-side');
|
23
40
|
this.$popup_editor.css('top', y);
|
24
41
|
this.$popup_editor.css('left', x);
|
@@ -26,29 +43,35 @@ $.Editable.prototype.showByCoordinates = function (x, y) {
|
|
26
43
|
} else {
|
27
44
|
this.$popup_editor.removeClass('right-side');
|
28
45
|
this.$popup_editor.css('top', y);
|
29
|
-
this.$popup_editor.css('left', Math.max(($
|
46
|
+
this.$popup_editor.css('left', Math.max(($container.outerWidth() - editor_width), 10) / 2);
|
30
47
|
this.$popup_editor.css('right', 'auto');
|
31
48
|
}
|
32
49
|
|
33
50
|
this.$popup_editor.show();
|
34
51
|
};
|
35
52
|
|
53
|
+
/**
|
54
|
+
* Override to fix IE9 bug
|
55
|
+
*/
|
36
56
|
$.Editable.prototype.parseImageResponse = function (response) {
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
this.throwImageError(4);
|
57
|
+
try {
|
58
|
+
var resp = $.parseJSON(response);
|
59
|
+
|
60
|
+
// PT BEGIN
|
61
|
+
// Is this IE9 being a wugger?
|
62
|
+
if (!resp) { return; }
|
63
|
+
// PT END
|
64
|
+
|
65
|
+
if (resp.link) {
|
66
|
+
this.writeImage(resp.link);
|
67
|
+
} else if (resp.error) {
|
68
|
+
this.throwImageErrorWithMessage(resp.error);
|
69
|
+
} else {
|
70
|
+
// No link in upload request.
|
71
|
+
this.throwImageError(2);
|
53
72
|
}
|
54
|
-
}
|
73
|
+
} catch (ex) {
|
74
|
+
// Bad response.
|
75
|
+
this.throwImageError(4);
|
76
|
+
}
|
77
|
+
};
|
@@ -1,41 +1,25 @@
|
|
1
1
|
/**
|
2
|
-
*
|
2
|
+
* Overide to add imageStyle UI
|
3
3
|
*/
|
4
4
|
$.Editable.prototype.initImagePopup = function () {
|
5
5
|
this.$image_editor = $('<div class="froala-popup froala-image-editor-popup" style="display: none">');
|
6
6
|
|
7
7
|
var $buttons = $('<div class="f-popup-line f-popup-toolbar">').appendTo(this.$image_editor);
|
8
|
-
|
9
|
-
var cmd = this.options.imageButtons[i];
|
10
|
-
if ($.Editable.image_commands[cmd] === undefined) {
|
11
|
-
continue;
|
12
|
-
}
|
13
|
-
var button = $.Editable.image_commands[cmd];
|
14
|
-
|
15
|
-
var btn = '<button class="fr-bttn" data-callback="' + cmd + '" data-cmd="' + cmd + '" title="' + button.title + '">';
|
16
|
-
|
17
|
-
if (this.options.icons[cmd] !== undefined) {
|
18
|
-
btn += this.prepareIcon(this.options.icons[cmd], button.title);
|
19
|
-
} else {
|
20
|
-
btn += this.prepareIcon(button.icon, button.title);
|
21
|
-
}
|
22
|
-
|
23
|
-
btn += '</button>';
|
24
|
-
|
25
|
-
$buttons.append(btn);
|
26
|
-
}
|
8
|
+
$buttons.append(this.buildImageButtons());
|
27
9
|
|
28
10
|
this.addListener('hidePopups', this.hideImageEditorPopup);
|
29
11
|
|
12
|
+
// PT BEGIN
|
30
13
|
if (this.options.imageStyle) {
|
31
14
|
$('<div class="f-popup-line f-image-style">').appendTo(this.$image_editor);
|
32
15
|
$('<div class="f-popup-line f-image-custom-style">').hide().appendTo(this.$image_editor);
|
33
16
|
}
|
17
|
+
// PT END
|
34
18
|
|
35
19
|
if (this.options.imageTitle) {
|
36
20
|
$('<div class="f-popup-line f-image-alt">')
|
37
21
|
.append('<label><span data-text="true">Title</span>: </label>')
|
38
|
-
.append($('<input type="text">').on('mouseup keydown', function (e) {
|
22
|
+
.append($('<input type="text">').on('mouseup keydown touchend', function (e) {
|
39
23
|
var keyCode = e.which;
|
40
24
|
if (!keyCode || keyCode !== 27) {
|
41
25
|
e.stopPropagation();
|
@@ -48,14 +32,16 @@ $.Editable.prototype.initImagePopup = function () {
|
|
48
32
|
this.$popup_editor.append(this.$image_editor);
|
49
33
|
|
50
34
|
this.bindCommandEvents(this.$image_editor);
|
35
|
+
this.bindDropdownEvents(this.$image_editor);
|
51
36
|
};
|
52
37
|
|
53
38
|
|
54
39
|
/**
|
55
|
-
*
|
40
|
+
* Override to control media styles
|
56
41
|
*/
|
57
42
|
$.Editable.prototype.showImageEditorPopup = function () {
|
58
43
|
if (this.$image_editor) {
|
44
|
+
// PT BEGIN
|
59
45
|
var _self = this;
|
60
46
|
setTimeout( function(){
|
61
47
|
_self.$image_editor.find('.f-image-style')
|
@@ -76,6 +62,7 @@ $.Editable.prototype.showImageEditorPopup = function () {
|
|
76
62
|
.append('<button class="fr-p-bttn f-ok" data-text="true" data-callback="setImageCustomStyle" data-cmd="setImageCustomStyle" title="OK">OK</button>');
|
77
63
|
$.inArray(currentStyle, _self.options.mediaStyles) === -1 ? $customRow.show() : $customRow.hide();
|
78
64
|
}, 0);
|
65
|
+
// PT END
|
79
66
|
this.$image_editor.show();
|
80
67
|
}
|
81
68
|
|
@@ -86,7 +73,7 @@ $.Editable.prototype.showImageEditorPopup = function () {
|
|
86
73
|
|
87
74
|
|
88
75
|
/**
|
89
|
-
* Media style options for select
|
76
|
+
* Media style options for select (new code)
|
90
77
|
*/
|
91
78
|
$.Editable.prototype.mediaStyleOptions = function() {
|
92
79
|
var currentStyle = this.currentMediaStyle();
|
@@ -102,7 +89,7 @@ $.Editable.prototype.mediaStyleOptions = function() {
|
|
102
89
|
|
103
90
|
|
104
91
|
/**
|
105
|
-
* Get the current media style
|
92
|
+
* Get the current media style (new code)
|
106
93
|
*/
|
107
94
|
$.Editable.prototype.currentMediaStyle = function() {
|
108
95
|
var $image_editor = this.$element.find('span.f-img-editor');
|
@@ -114,7 +101,7 @@ $.Editable.prototype.currentMediaStyle = function() {
|
|
114
101
|
|
115
102
|
|
116
103
|
/**
|
117
|
-
* Set image
|
104
|
+
* Set image style (new code)
|
118
105
|
*/
|
119
106
|
$.Editable.prototype.setImageStyle = function () {
|
120
107
|
var $image_editor = this.$element.find('span.f-img-editor'),
|
@@ -135,7 +122,7 @@ $.Editable.prototype.setImageStyle = function () {
|
|
135
122
|
|
136
123
|
|
137
124
|
/**
|
138
|
-
* Set image
|
125
|
+
* Set custom image style (new code)
|
139
126
|
*/
|
140
127
|
$.Editable.prototype.setImageCustomStyle = function () {
|
141
128
|
var $image_editor = this.$element.find('span.f-img-editor'),
|
@@ -152,12 +139,10 @@ $.Editable.prototype.setImageCustomStyle = function () {
|
|
152
139
|
|
153
140
|
|
154
141
|
/**
|
155
|
-
* Insert image command.
|
156
142
|
* Override so the image_link is manipulated to add default style
|
157
|
-
*
|
158
|
-
* @param image_link
|
143
|
+
* and image title is grabbed from $media_images
|
159
144
|
*/
|
160
|
-
$.Editable.prototype.writeImage = function (image_link, sanitize) {
|
145
|
+
$.Editable.prototype.writeImage = function (image_link, sanitize, response) {
|
161
146
|
if (sanitize) {
|
162
147
|
image_link = this.sanitizeURL(image_link);
|
163
148
|
if (image_link === '') {
|
@@ -165,12 +150,14 @@ $.Editable.prototype.writeImage = function (image_link, sanitize) {
|
|
165
150
|
}
|
166
151
|
}
|
167
152
|
|
153
|
+
// PT BEGIN
|
168
154
|
var image_data = this.$media_images.find('img[data-src="'+ image_link +'"]').data();
|
169
155
|
if ( typeof image_data != 'undefined' && 'title' in image_data ) {
|
170
156
|
image_title = image_data.title;
|
171
157
|
} else {
|
172
158
|
image_title = this.options.defaultImageTitle;
|
173
159
|
}
|
160
|
+
// PT END
|
174
161
|
|
175
162
|
var img = new Image();
|
176
163
|
img.onerror = $.proxy(function () {
|
@@ -181,10 +168,12 @@ $.Editable.prototype.writeImage = function (image_link, sanitize) {
|
|
181
168
|
if (this.imageMode) {
|
182
169
|
img.onload = $.proxy(function () {
|
183
170
|
var $img = this.$element.find('.f-img-editor > img');
|
171
|
+
// PT BEGIN
|
184
172
|
$img.attr({
|
185
173
|
src: image_link,
|
186
174
|
alt: image_title
|
187
175
|
}).removeAttr('title');
|
176
|
+
// PT END
|
188
177
|
|
189
178
|
this.hide();
|
190
179
|
this.hideImageLoader();
|
@@ -193,7 +182,7 @@ $.Editable.prototype.writeImage = function (image_link, sanitize) {
|
|
193
182
|
this.enable();
|
194
183
|
|
195
184
|
// call with (image HTML)
|
196
|
-
this.triggerEvent('imageReplaced', [$img]);
|
185
|
+
this.triggerEvent('imageReplaced', [$img, response]);
|
197
186
|
|
198
187
|
setTimeout(function () {
|
199
188
|
$img.trigger('click');
|
@@ -203,9 +192,11 @@ $.Editable.prototype.writeImage = function (image_link, sanitize) {
|
|
203
192
|
|
204
193
|
else {
|
205
194
|
img.onload = $.proxy(function () {
|
206
|
-
this.insertLoadedImage(image_link);
|
195
|
+
this.insertLoadedImage(image_link, response);
|
196
|
+
// PT BEGIN
|
207
197
|
var $img = this.$element.find('.f-img-editor > img');
|
208
198
|
$img.attr('alt', image_title);
|
199
|
+
// PT END
|
209
200
|
}, this);
|
210
201
|
}
|
211
202
|
|
@@ -1,12 +1,21 @@
|
|
1
|
+
/**
|
2
|
+
* Override to accept kind param which sets title of media manager
|
3
|
+
*/
|
4
|
+
// PT BEGIN
|
1
5
|
$.Editable.prototype.showMediaManager = function (kind) {
|
2
6
|
this.$image_modal.data('context', kind);
|
3
7
|
this.$image_modal.find('h4 span').text('Manage '+ kind +'s');
|
8
|
+
// PT END
|
4
9
|
this.$image_modal.show();
|
5
10
|
this.$overlay.show();
|
6
11
|
this.loadImages();
|
7
|
-
|
12
|
+
this.$document.find('body').css('overflow','hidden');
|
8
13
|
}
|
9
14
|
|
15
|
+
|
16
|
+
/**
|
17
|
+
* Override to add pagination UI
|
18
|
+
*/
|
10
19
|
$.Editable.prototype.mediaModalHTML = function () {
|
11
20
|
var html = '<div class="froala-modal"><div class="f-modal-wrapper"><h4><span data-text="true">Manage images</span><i title="Cancel" class="fa fa-times" id="f-modal-close-' + this._id + '"></i></h4>'
|
12
21
|
|
@@ -18,13 +27,19 @@ $.Editable.prototype.mediaModalHTML = function () {
|
|
18
27
|
html += '<div class="f-image-list" id="f-image-list-' + this._id + '"></div>';
|
19
28
|
}
|
20
29
|
|
30
|
+
// PT BEGIN
|
21
31
|
html += '<div class="pagination-centered" id="f-pagination-' + this._id + '"></div>';
|
32
|
+
// PT END
|
22
33
|
|
23
34
|
html += '</div></div>';
|
24
35
|
|
25
36
|
return html;
|
26
37
|
}
|
27
38
|
|
39
|
+
|
40
|
+
/**
|
41
|
+
* Override so media manage can be used for images and files
|
42
|
+
*/
|
28
43
|
$.Editable.prototype.buildMediaManager = function () {
|
29
44
|
this.$image_modal = $(this.mediaModalHTML()).appendTo('body');
|
30
45
|
this.$preloader = this.$image_modal.find('#f-preloader-' + this._id);
|
@@ -56,11 +71,13 @@ $.Editable.prototype.buildMediaManager = function () {
|
|
56
71
|
this.$media_images.on(this.mouseup, 'img', $.proxy(function (e) {
|
57
72
|
e.stopPropagation();
|
58
73
|
var img = e.currentTarget;
|
74
|
+
// PT BEGIN
|
59
75
|
if ( $(img).data('kind') == 'image' ) {
|
60
76
|
this.writeImage($(img).data('src'));
|
61
77
|
} else {
|
62
78
|
this.writeFile($(img).data('src'), $(img).data('title'));
|
63
79
|
}
|
80
|
+
// PT END
|
64
81
|
this.hideMediaManager();
|
65
82
|
}, this));
|
66
83
|
|
@@ -84,6 +101,7 @@ $.Editable.prototype.buildMediaManager = function () {
|
|
84
101
|
|
85
102
|
// Add button for media manager to image.
|
86
103
|
if (this.options.mediaManager) {
|
104
|
+
// PT BEGIN
|
87
105
|
this.$image_wrapper
|
88
106
|
.on('click', '#f-browser-' + this._id, $.proxy(function () {
|
89
107
|
this.showMediaManager('image');
|
@@ -91,6 +109,7 @@ $.Editable.prototype.buildMediaManager = function () {
|
|
91
109
|
.on('click', '#f-browser-' + this._id + ' i', $.proxy(function () {
|
92
110
|
this.showMediaManager('image');
|
93
111
|
}, this));
|
112
|
+
// PT END
|
94
113
|
|
95
114
|
this.$image_wrapper.find('#f-browser-' + this._id).show();
|
96
115
|
}
|
@@ -98,6 +117,10 @@ $.Editable.prototype.buildMediaManager = function () {
|
|
98
117
|
this.hideMediaManager();
|
99
118
|
};
|
100
119
|
|
120
|
+
|
121
|
+
/**
|
122
|
+
* Initilizes pagination control (new code)
|
123
|
+
*/
|
101
124
|
$.Editable.prototype.initPagination = function(data) {
|
102
125
|
var mm = this;
|
103
126
|
this.$image_modal.find('#f-pagination-' + this._id).pagination({
|
@@ -111,13 +134,19 @@ $.Editable.prototype.initPagination = function(data) {
|
|
111
134
|
});
|
112
135
|
}
|
113
136
|
|
114
|
-
|
137
|
+
|
138
|
+
/**
|
139
|
+
* Override so loads images and files
|
140
|
+
*/
|
141
|
+
// PT BEGIN
|
115
142
|
$.Editable.prototype.loadImages = function (page) {
|
116
143
|
var isPaginated = (typeof page !== 'undefined');
|
144
|
+
// PT END
|
117
145
|
|
118
146
|
this.$preloader.show();
|
119
147
|
this.$media_images.empty();
|
120
148
|
|
149
|
+
// PT BEGIN
|
121
150
|
if (this.$image_modal.data('context') == 'file') {
|
122
151
|
ajax = {
|
123
152
|
url: this.options.filesLoadURL,
|
@@ -132,16 +161,19 @@ $.Editable.prototype.loadImages = function (page) {
|
|
132
161
|
if (isPaginated) {
|
133
162
|
ajax.opts.page = page;
|
134
163
|
}
|
164
|
+
// PT END
|
135
165
|
|
136
|
-
if (ajax.url) {
|
166
|
+
if (ajax.url) { // PT EDIT
|
137
167
|
$.support.cors = true;
|
138
|
-
$.getJSON(ajax.url, ajax.opts, $.proxy(function (data) {
|
168
|
+
$.getJSON(ajax.url, ajax.opts, $.proxy(function (data) { // PT EDIT
|
139
169
|
// data
|
140
170
|
this.triggerEvent('imagesLoaded', [data], false);
|
171
|
+
// PT BEGIN
|
141
172
|
this.processLoadedImages(data.assets);
|
142
173
|
if (!isPaginated && data.meta.total_pages > 1) {
|
143
174
|
this.initPagination(data);
|
144
175
|
}
|
176
|
+
// PT END
|
145
177
|
this.$preloader.hide();
|
146
178
|
}, this))
|
147
179
|
.fail($.proxy(function () {
|
@@ -153,6 +185,10 @@ $.Editable.prototype.loadImages = function (page) {
|
|
153
185
|
}
|
154
186
|
};
|
155
187
|
|
188
|
+
|
189
|
+
/**
|
190
|
+
* Override to replace delete button with title element
|
191
|
+
*/
|
156
192
|
$.Editable.prototype.loadImage = function (src, info) {
|
157
193
|
var img = new Image();
|
158
194
|
var $li = $('<div>').addClass('f-empty');
|
@@ -167,7 +203,9 @@ $.Editable.prototype.loadImage = function (src, info) {
|
|
167
203
|
$img.attr('data-' + k, info[k]);
|
168
204
|
}
|
169
205
|
|
206
|
+
// PT BEGIN
|
170
207
|
$li.append($img).append('<span class="f-media-title">'+ info.title +'</span>');
|
208
|
+
// PT END
|
171
209
|
$li.removeClass('f-empty');
|
172
210
|
this.$media_images.hide();
|
173
211
|
this.$media_images.show();
|
@@ -12,9 +12,11 @@
|
|
12
12
|
#
|
13
13
|
#= require froala_editor.min
|
14
14
|
#= require plugins/lists.min
|
15
|
+
#= require plugins/tables.min
|
15
16
|
#= require plugins/file_upload.min
|
16
17
|
#= require plugins/media_manager.min
|
17
18
|
#= require plugins/video.min
|
19
|
+
#= require plugins/fullscreen.min
|
18
20
|
#= require jquery.simplePagination
|
19
21
|
#= require_self
|
20
22
|
#= require_tree .
|
@@ -24,11 +26,14 @@ $(document).on 'ready page:load', ->
|
|
24
26
|
|
25
27
|
$('textarea.froala', '.wysiwyg').editable
|
26
28
|
inlineMode: false
|
27
|
-
buttons: ['bold', 'italic', 'underline', 'sep', 'formatBlock', 'align', 'insertOrderedList', 'insertUnorderedList', 'sep', 'createLink', 'insertImage', 'uploadFile', 'insertVideo', '
|
29
|
+
buttons: ['bold', 'italic', 'underline', 'sep', 'formatBlock', 'align', 'insertOrderedList', 'insertUnorderedList', 'table', 'sep', 'createLink', 'insertImage', 'uploadFile', 'insertVideo', 'sep', 'undo', 'redo', 'removeFormat', 'fullscreen', 'sep', 'html']
|
28
30
|
blockTags:
|
29
31
|
n: 'Normal'
|
30
|
-
h1: 'Heading 1'
|
31
32
|
h2: 'Heading 2'
|
33
|
+
h3: 'Heading 3'
|
34
|
+
h4: 'Heading 4'
|
35
|
+
blockquote: 'Quote'
|
36
|
+
pre: 'Code'
|
32
37
|
height: 400
|
33
38
|
filesLoadURL: '/push_type/wysiwyg_media'
|
34
39
|
filesLoadParams: { filter: 'file' }
|
@@ -81,10 +81,12 @@
|
|
81
81
|
color: '#444';
|
82
82
|
}
|
83
83
|
.pt-theme.froala-box .froala-element.f-basic a {
|
84
|
-
color:
|
84
|
+
color: $primary-color;
|
85
|
+
text-decoration: underline;
|
85
86
|
}
|
86
87
|
.pt-theme.froala-box .froala-element table td {
|
87
88
|
border: solid 1px $input-border-color;
|
89
|
+
background: #fff;
|
88
90
|
}
|
89
91
|
.pt-theme.froala-box.f-html .froala-element {
|
90
92
|
background: #202020;
|
@@ -2,20 +2,4 @@ class ApplicationController < ActionController::Base
|
|
2
2
|
# Prevent CSRF attacks by raising an exception.
|
3
3
|
# For APIs, you may want to use :null_session instead.
|
4
4
|
protect_from_forgery with: :exception
|
5
|
-
|
6
|
-
protected
|
7
|
-
|
8
|
-
def before_node_load
|
9
|
-
logger.info 'before node load'
|
10
|
-
@foo = {}
|
11
|
-
end
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
def before_page_action
|
16
|
-
logger.info 'before page action'
|
17
|
-
@foo[:before_page] = true
|
18
|
-
end
|
19
|
-
|
20
|
-
|
21
5
|
end
|
@@ -28,6 +28,6 @@ PushType.setup do |config|
|
|
28
28
|
# secret_access_key: ENV['SECRET_ACCESS_KEY_ID']
|
29
29
|
# }
|
30
30
|
|
31
|
-
# config.dragonfly_secret = '
|
31
|
+
# config.dragonfly_secret = 'e9338844ff6bcfe49704ad6e0e8ed17de0cc4e60378f47922c9c649f4655e4e1'
|
32
32
|
|
33
33
|
end
|
@@ -11,10 +11,10 @@
|
|
11
11
|
# if you're sharing your code publicly.
|
12
12
|
|
13
13
|
development:
|
14
|
-
secret_key_base:
|
14
|
+
secret_key_base: 33dd7641312acab0296bfd17f923c5933b780a63e1373c8dba542665a94cc029a023b7f78008814fbf22a1a66eb6fd6ec81568361b661f049f218e0346f28244
|
15
15
|
|
16
16
|
test:
|
17
|
-
secret_key_base:
|
17
|
+
secret_key_base: 2e5822bd19c75f1829ed220d35fed0ee0bf13640c51d30b781f8a102265123fc34c58cf4f4930d61c9fefa5656a2f1fef9b74bfed32b1ad4c4b1a2d69ae8af12
|
18
18
|
|
19
19
|
# Do not keep production secrets in the repository,
|
20
20
|
# instead read values from the environment.
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
data/test/dummy/db/schema.rb
CHANGED
@@ -11,7 +11,7 @@
|
|
11
11
|
#
|
12
12
|
# It's strongly recommended that you check this file into your version control system.
|
13
13
|
|
14
|
-
ActiveRecord::Schema.define(version:
|
14
|
+
ActiveRecord::Schema.define(version: 20150222152516) do
|
15
15
|
|
16
16
|
# These are extensions that must be enabled in order to support this database
|
17
17
|
enable_extension "plpgsql"
|