From 5cdcf73a8ee8e3caad74565f14c3e1cf57c4370c Mon Sep 17 00:00:00 2001
From: Martin Markech <martin.markech@matho.sk>
Date: Fri, 13 Jan 2017 15:56:45 +0100
Subject: [PATCH 1/2] fix Could not find ar_paperclip_image.rb

---
 lib/generators/mercury/install/images/images_generator.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/generators/mercury/install/images/images_generator.rb b/lib/generators/mercury/install/images/images_generator.rb
index dea76077..cfb785f7 100644
--- a/lib/generators/mercury/install/images/images_generator.rb
+++ b/lib/generators/mercury/install/images/images_generator.rb
@@ -15,7 +15,7 @@ def copy_models
           if options[:orm] == 'mongoid'
             copy_file 'mongoid_paperclip_image.rb', 'app/models/mercury/image.rb'
           else
-            copy_file 'ar_paperclip_image.rb', 'app/models/mercury/image.rb'
+            copy_file 'ar_paperclip_image.rb.erb', 'app/models/mercury/image.rb'
             template 'ar_paperclip_image.rb.erb', 'app/models/mercury/image.rb'
             migration_template 'ar_paperclip_image_migration.rb', 'db/migrate/create_mercury_images.rb'
           end

From 33ab00b5c2aede5bb645d3e86af38c01e295d58b Mon Sep 17 00:00:00 2001
From: Martin Markech <martin.markech@matho.sk>
Date: Sun, 15 Jan 2017 15:46:53 +0100
Subject: [PATCH 2/2] trigger mediaModalReady event when media modal is
 initialized

---
 .gitignore                                                  | 2 ++
 app/assets/javascripts/mercury/modals/insertmedia.js.coffee | 2 ++
 app/assets/stylesheets/_mercury-sass.scss                   | 1 +
 app/assets/stylesheets/mercury.css                          | 1 +
 app/assets/stylesheets/mercury/modal.css                    | 4 ++++
 5 files changed, 10 insertions(+)

diff --git a/.gitignore b/.gitignore
index 22aa0751..93b14b6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,5 @@ capybara*
 .sass-cache
 public/system
 public/assets
+
+.idea/
diff --git a/app/assets/javascripts/mercury/modals/insertmedia.js.coffee b/app/assets/javascripts/mercury/modals/insertmedia.js.coffee
index b743d324..a54b1ab2 100644
--- a/app/assets/javascripts/mercury/modals/insertmedia.js.coffee
+++ b/app/assets/javascripts/mercury/modals/insertmedia.js.coffee
@@ -7,6 +7,8 @@
     @focus('#media_image_url')
     @initializeForm()
 
+    Mercury.trigger('mediaModalReady')
+
     # build the image or embed/iframe on form submission
     @element.find('form').on 'submit', (event) =>
       event.preventDefault()
diff --git a/app/assets/stylesheets/_mercury-sass.scss b/app/assets/stylesheets/_mercury-sass.scss
index f2b3035c..0182e68f 100644
--- a/app/assets/stylesheets/_mercury-sass.scss
+++ b/app/assets/stylesheets/_mercury-sass.scss
@@ -31,3 +31,4 @@ $linkColorHover: darken($linkColor, 15%) !default;
   background-color: $linkColor;
   border: 1px solid $linkColorHover;
 }
+
diff --git a/app/assets/stylesheets/mercury.css b/app/assets/stylesheets/mercury.css
index 89007671..74a8194a 100644
--- a/app/assets/stylesheets/mercury.css
+++ b/app/assets/stylesheets/mercury.css
@@ -22,3 +22,4 @@
  *= require mercury/mercury
  */
 
+
diff --git a/app/assets/stylesheets/mercury/modal.css b/app/assets/stylesheets/mercury/modal.css
index 3476e828..66c9425f 100644
--- a/app/assets/stylesheets/mercury/modal.css
+++ b/app/assets/stylesheets/mercury/modal.css
@@ -1,6 +1,10 @@
 /*
  * Modal
  *----------------------------------------------------------------------------*/
+.img-border {
+    border: 3px solid blue !important;
+}
+
 .mercury-modal-overlay {
   position: fixed;
   z-index: 10040;