Compatibility update for newer RailsAdmin (0.6.7) that uses Bootstrap3

janx · Mar 17, 2016 · 570e99d · 570e99d
1 parent b565ac7
commit 570e99d
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+== 2.0.0 ==
+
+* Update to work with rails_admin >= 0.6.7 (https://github.com/janx/rails_admin_jcrop/pull/27)
+* Added translations for the italian language
+
 == 1.3.0 ==
 
 * Update to work with latest rails_admin (https://github.com/janx/rails_admin_jcrop/pull/19)

diff --git a/app/assets/javascripts/rails_admin/ra.jcrop.js b/app/assets/javascripts/rails_admin/ra.jcrop.js
@@ -5,7 +5,7 @@
       var widget = this;
       var dom_widget = widget.element;
 
-      var thumbnailLink = dom_widget.find('img.img-polaroid').parent();
+      var thumbnailLink = dom_widget.find('.toggle a[target="_blank"]');
       thumbnailLink.unbind().bind("click", function(e){
         widget._bindModalOpening(e, dom_widget.find('a.jcrop_handle').data('link'));
         return false;
@@ -55,7 +55,7 @@
       dialog.find('img.jcrop-subject').Jcrop(jcrop_options)
 
       form.attr("data-remote", true);
-      dialog.find('.modal-header-title').text(form.data('title'));
+      dialog.find('.modal-header .modal-title').text(form.data('title'));
       dialog.find('.cancel-action').unbind().click(function(){
         dialog.modal('hide');
         return false;
@@ -109,7 +109,8 @@
     _getModal: function() {
       var widget = this;
       if (!widget.dialog) {
-          widget.dialog = $('<div id="modal" class="modal fade"><div class="modal-dialog modal-lg"><div class="modal-content"><div class="modal-header"><a href="#" class="close" data-dismiss="modal">&times;</a><h3 class="modal-header-title">...</h3></div><div class="modal-body">...</div><div class="modal-footer"><a href="#" class="btn cancel-action">...</a><a href="#" class="btn btn-primary save-action">...</a></div></div></div></div>');
+          //widget.dialog = $('<div id="modal" class="modal fade"><div class="modal-dialog modal-lg"><div class="modal-content"><div class="modal-header"><a href="#" class="close" data-dismiss="modal">&times;</a><h3 class="modal-header-title">...</h3></div><div class="modal-body">...</div><div class="modal-footer"><a href="#" class="btn cancel-action">...</a><a href="#" class="btn btn-primary save-action">...</a></div></div></div></div>');
+          widget.dialog = $('<div class="modal fade" tabindex="-1" role="dialog"> <div class="modal-dialog ra-jcrop"> <div class="modal-content"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <h4 class="modal-title">...</h4> </div><div class="modal-body">...</div><div class="modal-footer"> <button type="button" class="btn btn-primary save-action">...</button> <button type="button" class="btn btn-default cancel-action" data-dismiss="modal">...</button> </div></div></div></div>')
           widget.dialog.modal({
             keyboard: true,
             backdrop: true,

diff --git a/app/assets/stylesheets/rails_admin/ra.jcrop.css b/app/assets/stylesheets/rails_admin/ra.jcrop.css
@@ -0,0 +1,3 @@
+.ra-jcrop.modal-dialog {
+    width: 800px;
+}
diff --git a/app/views/rails_admin/main/_form_jcrop.html.haml b/app/views/rails_admin/main/_form_jcrop.html.haml
@@ -4,6 +4,7 @@
 = stylesheet_link_tag 'rails_admin/jquery.Jcrop'
 = javascript_include_tag 'rails_admin/jquery.Jcrop'
 = javascript_include_tag 'rails_admin/ra.jcrop'
+= stylesheet_link_tag 'rails_admin/ra.jcrop'
 
 - file = form.object.send(field.method_name).presence
 

diff --git a/app/views/rails_admin/main/prova.html b/app/views/rails_admin/main/prova.html
@@ -0,0 +1,29 @@
+<div id="modal" class="modal fade">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header"><a href="#" class="close" data-dismiss="modal">&times;</a>
+                <h3 class="modal-header-title">...</h3></div>
+            <div class="modal-body">...</div>
+            <div class="modal-footer"><a href="#" class="btn cancel-action">...</a><a href="#"
+                                                                                      class="btn btn-primary save-action">...</a>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<div class="modal fade" tabindex="-1" role="dialog">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title">...</h4>
+            </div>
+            <div class="modal-body">...</div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary save-action">...</button>
+                <button type="button" class="btn btn-default cancel-action" data-dismiss="modal">...</button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/config/locales/it.yml b/config/locales/it.yml
@@ -0,0 +1,7 @@
+it:
+  admin:
+    actions:
+      crop:
+        title: Crop
+        menu: Crop
+        breadcrumb: Crop
diff --git a/lib/rails_admin_jcrop/version.rb b/lib/rails_admin_jcrop/version.rb
@@ -1,3 +1,3 @@
 module RailsAdminJcrop
-  VERSION = "1.4.0"
+  VERSION = "2.0.0"
 end