active_scaffold 3.1.17 → 3.1.18
Sign up to get free protection for your applications and to get access to all the features.
- data/app/assets/images/{add.gif → active_scaffold/add.gif} +0 -0
- data/app/assets/images/{arrow_down.gif → active_scaffold/arrow_down.gif} +0 -0
- data/app/assets/images/{arrow_up.gif → active_scaffold/arrow_up.gif} +0 -0
- data/app/assets/images/{close.gif → active_scaffold/close.gif} +0 -0
- data/app/assets/images/{close_touch.png → active_scaffold/close_touch.png} +0 -0
- data/app/assets/images/{config.png → active_scaffold/config.png} +0 -0
- data/app/assets/images/{cross.png → active_scaffold/cross.png} +0 -0
- data/app/assets/images/{gears.png → active_scaffold/gears.png} +0 -0
- data/app/assets/images/{indicator-small.gif → active_scaffold/indicator-small.gif} +0 -0
- data/app/assets/images/{indicator.gif → active_scaffold/indicator.gif} +0 -0
- data/app/assets/images/{magnifier.png → active_scaffold/magnifier.png} +0 -0
- data/app/assets/javascripts/jquery/active_scaffold.js +125 -125
- data/app/assets/javascripts/jquery/date_picker_bridge.js.erb +5 -5
- data/app/assets/javascripts/jquery/draggable_lists.js +9 -9
- data/app/assets/javascripts/jquery/tiny_mce_bridge.js +2 -2
- data/app/assets/stylesheets/active_scaffold.css.erb +166 -147
- data/app/assets/stylesheets/active_scaffold.css.erb~ +182 -147
- data/app/assets/stylesheets/blue-theme.css +74 -0
- data/app/assets/stylesheets/blue-theme.css~ +1150 -0
- data/frontends/default/views/_search.html.erb +3 -3
- data/lib/active_scaffold/actions/nested.rb +2 -2
- data/lib/active_scaffold/actions/nested.rb~ +3 -3
- data/lib/active_scaffold/data_structures/nested_info.rb +6 -2
- data/lib/active_scaffold/data_structures/nested_info.rb~ +7 -3
- data/lib/active_scaffold/helpers/search_column_helpers.rb +3 -1
- data/lib/active_scaffold/helpers/view_helpers.rb +1 -1
- data/lib/active_scaffold/version.rb +1 -1
- data/lib/active_scaffold.rb +2 -1
- data/lib/active_scaffold.rb~ +14 -4
- metadata +21 -19
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
<%= ActiveScaffold::Bridges[:date_picker].localization %>
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
var date_picker =
|
|
3
|
+
jQuery(document).ready(function() {
|
|
4
|
+
jQuery('input.date_picker').live('focus', function(event) {
|
|
5
|
+
var date_picker = jQuery(this);
|
|
6
6
|
if (typeof(date_picker.datepicker) == 'function') {
|
|
7
7
|
if (!date_picker.hasClass('hasDatepicker')) {
|
|
8
8
|
date_picker.datepicker();
|
|
@@ -11,8 +11,8 @@ $(document).ready(function() {
|
|
|
11
11
|
}
|
|
12
12
|
return true;
|
|
13
13
|
});
|
|
14
|
-
|
|
15
|
-
var date_picker =
|
|
14
|
+
jQuery('input.datetime_picker').live('focus', function(event) {
|
|
15
|
+
var date_picker = jQuery(this);
|
|
16
16
|
if (typeof(date_picker.datetimepicker) == 'function') {
|
|
17
17
|
if (!date_picker.hasClass('hasDatepicker')) {
|
|
18
18
|
date_picker.datetimepicker();
|
|
@@ -1,24 +1,24 @@
|
|
|
1
1
|
jQuery.fn.draggable_lists = function() {
|
|
2
2
|
this.addClass('draggable-list');
|
|
3
|
-
var list_selected =
|
|
3
|
+
var list_selected = jQuery(this.get(0).cloneNode(false)).addClass('selected');
|
|
4
4
|
list_selected.attr('id', list_selected.attr('id') + '_selected').insertAfter(this);
|
|
5
5
|
this.find('input:checkbox').each(function(index, item) {
|
|
6
|
-
var li =
|
|
6
|
+
var li = jQuery(item).closest('li').addClass('draggable-item');
|
|
7
7
|
li.children('label').removeAttr('for');
|
|
8
|
-
if (
|
|
8
|
+
if (jQuery(item).is(':checked')) li.appendTo(list_selected);
|
|
9
9
|
li.draggable({appendTo: 'body', helper: 'clone'});
|
|
10
10
|
});
|
|
11
|
-
|
|
11
|
+
jQuery([this, list_selected]).droppable({
|
|
12
12
|
hoverClass: 'hover',
|
|
13
13
|
accept: function(draggable) {
|
|
14
|
-
var parent_id = draggable.parent().attr('id'), id =
|
|
15
|
-
requested_id =
|
|
14
|
+
var parent_id = draggable.parent().attr('id'), id = jQuery(this).attr('id'),
|
|
15
|
+
requested_id = jQuery(this).hasClass('selected') ? id.replace('_selected', '') : id + '_selected';
|
|
16
16
|
return parent_id == requested_id;
|
|
17
17
|
},
|
|
18
18
|
drop: function(event, ui) {
|
|
19
|
-
|
|
20
|
-
var input =
|
|
21
|
-
if (
|
|
19
|
+
jQuery(this).append(ui.draggable);
|
|
20
|
+
var input = jQuery('input:checkbox', ui.draggable);
|
|
21
|
+
if (jQuery(this).hasClass('selected')) input.attr('checked', 'checked');
|
|
22
22
|
else input.removeAttr('checked');
|
|
23
23
|
ui.draggable.css({left: '0px', top: '0px'});
|
|
24
24
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
var action_link_close = ActiveScaffold.ActionLink.Abstract.prototype.close;
|
|
2
2
|
ActiveScaffold.ActionLink.Abstract.prototype.close = function() {
|
|
3
|
-
|
|
4
|
-
tinyMCE.execCommand('mceRemoveControl', false,
|
|
3
|
+
jQuery(this.adapter).find('textarea.mceEditor').each(function(index, elem) {
|
|
4
|
+
tinyMCE.execCommand('mceRemoveControl', false, jQuery(elem).attr('id'));
|
|
5
5
|
});
|
|
6
6
|
action_link_close.apply(this);
|
|
7
7
|
};
|