Skip to content

Commit 570e99d

Browse files
author
Francesco Rigotti
committed
Compatibility update for newer RailsAdmin (0.6.7) that uses Bootstrap3
1 parent b565ac7 commit 570e99d

7 files changed

Lines changed: 50 additions & 4 deletions

File tree

CHANGELOG

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
== 2.0.0 ==
2+
3+
* Update to work with rails_admin >= 0.6.7 (https://github.com/janx/rails_admin_jcrop/pull/27)
4+
* Added translations for the italian language
5+
16
== 1.3.0 ==
27

38
* Update to work with latest rails_admin (https://github.com/janx/rails_admin_jcrop/pull/19)

app/assets/javascripts/rails_admin/ra.jcrop.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
var widget = this;
66
var dom_widget = widget.element;
77

8-
var thumbnailLink = dom_widget.find('img.img-polaroid').parent();
8+
var thumbnailLink = dom_widget.find('.toggle a[target="_blank"]');
99
thumbnailLink.unbind().bind("click", function(e){
1010
widget._bindModalOpening(e, dom_widget.find('a.jcrop_handle').data('link'));
1111
return false;
@@ -55,7 +55,7 @@
5555
dialog.find('img.jcrop-subject').Jcrop(jcrop_options)
5656

5757
form.attr("data-remote", true);
58-
dialog.find('.modal-header-title').text(form.data('title'));
58+
dialog.find('.modal-header .modal-title').text(form.data('title'));
5959
dialog.find('.cancel-action').unbind().click(function(){
6060
dialog.modal('hide');
6161
return false;
@@ -109,7 +109,8 @@
109109
_getModal: function() {
110110
var widget = this;
111111
if (!widget.dialog) {
112-
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>');
112+
//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>');
113+
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>')
113114
widget.dialog.modal({
114115
keyboard: true,
115116
backdrop: true,
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.ra-jcrop.modal-dialog {
2+
width: 800px;
3+
}

app/views/rails_admin/main/_form_jcrop.html.haml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
= stylesheet_link_tag 'rails_admin/jquery.Jcrop'
55
= javascript_include_tag 'rails_admin/jquery.Jcrop'
66
= javascript_include_tag 'rails_admin/ra.jcrop'
7+
= stylesheet_link_tag 'rails_admin/ra.jcrop'
78

89
- file = form.object.send(field.method_name).presence
910

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<div id="modal" class="modal fade">
2+
<div class="modal-dialog modal-lg">
3+
<div class="modal-content">
4+
<div class="modal-header"><a href="#" class="close" data-dismiss="modal">&times;</a>
5+
<h3 class="modal-header-title">...</h3></div>
6+
<div class="modal-body">...</div>
7+
<div class="modal-footer"><a href="#" class="btn cancel-action">...</a><a href="#"
8+
class="btn btn-primary save-action">...</a>
9+
</div>
10+
</div>
11+
</div>
12+
</div>
13+
14+
15+
<div class="modal fade" tabindex="-1" role="dialog">
16+
<div class="modal-dialog">
17+
<div class="modal-content">
18+
<div class="modal-header">
19+
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
20+
<h4 class="modal-title">...</h4>
21+
</div>
22+
<div class="modal-body">...</div>
23+
<div class="modal-footer">
24+
<button type="button" class="btn btn-primary save-action">...</button>
25+
<button type="button" class="btn btn-default cancel-action" data-dismiss="modal">...</button>
26+
</div>
27+
</div>
28+
</div>
29+
</div>

config/locales/it.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
it:
2+
admin:
3+
actions:
4+
crop:
5+
title: Crop
6+
menu: Crop
7+
breadcrumb: Crop

lib/rails_admin_jcrop/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module RailsAdminJcrop
2-
VERSION = "1.4.0"
2+
VERSION = "2.0.0"
33
end

0 commit comments

Comments
 (0)