inline_forms 1.1.16 → 1.1.17
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/app/assets/images/add.png +0 -0
- data/lib/app/assets/javascripts/ckeditor/config.js +1 -15
- data/lib/app/assets/stylesheets/inline_forms.css +33 -31
- data/lib/app/controllers/inline_forms_controller.rb +1 -0
- data/lib/app/helpers/inline_forms_helper.rb +6 -1
- data/lib/app/views/inline_forms/_list.html.erb +6 -7
- data/lib/app/views/inline_forms/close.js.erb +4 -1
- data/lib/inline_forms/version.rb +1 -1
- metadata +4 -3
Binary file
|
@@ -55,6 +55,7 @@ CKEDITOR.editorConfig = function( config )
|
|
55
55
|
|
56
56
|
config.language = 'nl';
|
57
57
|
|
58
|
+
/* Toolbars */
|
58
59
|
|
59
60
|
config.toolbar = 'Minimal';
|
60
61
|
|
@@ -66,21 +67,6 @@ CKEDITOR.editorConfig = function( config )
|
|
66
67
|
['PasteFromWord','Source','Undo','Redo','RemoveFormat'],
|
67
68
|
];
|
68
69
|
|
69
|
-
/* Toolbars */
|
70
|
-
config.toolbar = 'Easy';
|
71
|
-
|
72
|
-
config.toolbar_Easy =
|
73
|
-
[
|
74
|
-
['Source','-','Preview'],
|
75
|
-
['Cut','Copy','Paste','PasteText','PasteFromWord',],
|
76
|
-
['Undo','Redo','-','SelectAll','RemoveFormat'],
|
77
|
-
['Styles','Format'], ['Subscript', 'Superscript', 'TextColor'], ['Maximize','-','About'], '/',
|
78
|
-
['Bold','Italic','Underline','Strike'], ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote'],
|
79
|
-
['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
|
80
|
-
['Link','Unlink','Anchor'], ['Image', 'Attachment', 'Flash', 'Embed'],
|
81
|
-
['Table','HorizontalRule','Smiley','SpecialChar','PageBreak']
|
82
|
-
];
|
83
|
-
|
84
70
|
config.toolbar_None =
|
85
71
|
[ '-' ];
|
86
72
|
|
@@ -23,7 +23,7 @@ body {
|
|
23
23
|
padding: 0;
|
24
24
|
margin: 0 auto;
|
25
25
|
font-family: sans-serif;
|
26
|
-
font-size:
|
26
|
+
font-size: 11pt;
|
27
27
|
max-width: 1200px;
|
28
28
|
}
|
29
29
|
|
@@ -34,8 +34,9 @@ a {
|
|
34
34
|
.inline_forms_list {
|
35
35
|
font-size: 100%;
|
36
36
|
font-weight: normal;
|
37
|
-
padding: 0
|
38
|
-
|
37
|
+
padding: 0;
|
38
|
+
padding-bottom: 8px;
|
39
|
+
margin: 0;
|
39
40
|
list-style-type: none;
|
40
41
|
-moz-border-radius: 10px;
|
41
42
|
-webkit-border-radius: 10px;
|
@@ -44,23 +45,29 @@ a {
|
|
44
45
|
background-color: #F9EBAE;
|
45
46
|
}
|
46
47
|
|
48
|
+
.inline_forms_list ul {
|
49
|
+
list-style-type: none;
|
50
|
+
padding-left: 0;
|
51
|
+
}
|
47
52
|
|
48
53
|
.inline_forms_list .new_record_link {
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
width:
|
54
|
+
background-color: transparent;
|
55
|
+
height: 25px;
|
56
|
+
padding-bottom: 0;
|
57
|
+
}
|
58
|
+
|
59
|
+
.inline_forms_list .new_record_link a {
|
60
|
+
float: right;
|
61
|
+
width: 24px;
|
62
|
+
height: 24px;
|
63
|
+
margin: 0;
|
64
|
+
padding: 0;
|
65
|
+
}
|
66
|
+
|
67
|
+
.inline_forms_list .new_record_link img {
|
68
|
+
width: 24px;
|
69
|
+
height: 24px;
|
70
|
+
border: 0;
|
64
71
|
}
|
65
72
|
|
66
73
|
.inline_forms_list li a {
|
@@ -78,7 +85,7 @@ a {
|
|
78
85
|
|
79
86
|
.inline_forms_list li.even {
|
80
87
|
background-color: #FFEDB0;
|
81
|
-
|
88
|
+
}
|
82
89
|
|
83
90
|
.inline_forms_list li table {
|
84
91
|
border: 1px solid #EFCA4B;
|
@@ -101,7 +108,7 @@ a {
|
|
101
108
|
}
|
102
109
|
|
103
110
|
.inline_forms_list div.attribute_value {
|
104
|
-
margin
|
111
|
+
margin: 0;
|
105
112
|
}
|
106
113
|
|
107
114
|
.inline_forms_list div.attribute_value a{
|
@@ -174,7 +181,7 @@ ul.checklist li {
|
|
174
181
|
-moz-box-shadow: 0 1px 3px rgba(0,0,0, .4);
|
175
182
|
/* border: 1px solid white;*/
|
176
183
|
padding: 0.4em;
|
177
|
-
margin: 0.4em
|
184
|
+
margin: 0.4em 0 0.3em 0;
|
178
185
|
}
|
179
186
|
|
180
187
|
#title {
|
@@ -198,12 +205,12 @@ ul.checklist li {
|
|
198
205
|
background-image: -moz-linear-gradient(100% 100% 90deg, #F9EBAE, #EFCA4B);
|
199
206
|
background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#F9EBAE), to(#F9EBAE));
|
200
207
|
padding: 0.4em;
|
201
|
-
margin: 0
|
208
|
+
margin: 0 0 0.4em 0;
|
202
209
|
font-size: 10pt;
|
203
210
|
}
|
204
211
|
|
205
212
|
#tabs li {
|
206
|
-
font-size:
|
213
|
+
font-size: 110%;
|
207
214
|
font-weight: bold;
|
208
215
|
display: inline-block;
|
209
216
|
background-color: #EFE06C;
|
@@ -242,14 +249,9 @@ ul.checklist li {
|
|
242
249
|
}
|
243
250
|
|
244
251
|
.pagination {
|
245
|
-
|
246
|
-
|
247
|
-
-
|
248
|
-
-moz-box-shadow: 0 1px 3px rgba(0,0,0, .4);
|
249
|
-
background-image: -moz-linear-gradient(100% 100% 90deg, #EFCA4B, #F9EBAE );
|
250
|
-
background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#EFCA4B), to(#F9EBAE));
|
251
|
-
padding: 0.7em;
|
252
|
-
margin: 0 1em 0.4em 1em;
|
252
|
+
padding: 0;
|
253
|
+
margin: 0;
|
254
|
+
margin-bottom: 5px;
|
253
255
|
}
|
254
256
|
|
255
257
|
.pagination a, .pagination span, .pagination em {
|
@@ -69,7 +69,12 @@ module InlineFormsHelper
|
|
69
69
|
def link_to_new_record(text, model, path_to_new, update_span, parent_class, parent_id)
|
70
70
|
out = ""
|
71
71
|
out << "<li class='new_record_link'>"
|
72
|
-
out << (link_to
|
72
|
+
out << (link_to image_tag( 'add.png',
|
73
|
+
:class => "new_record_icon",
|
74
|
+
:title => text ),
|
75
|
+
send(path_to_new, :update => update_span, :parent_class => parent_class, :parent_id => parent_id ),
|
76
|
+
:remote => true)
|
77
|
+
out << "<div style='clear: both;'></div>"
|
73
78
|
out << "</li>"
|
74
79
|
""
|
75
80
|
if cancan_enabled?
|
@@ -72,11 +72,10 @@ they are @object. We need this magic here to rewrite all the @variables to varia
|
|
72
72
|
</li>
|
73
73
|
<% end -%>
|
74
74
|
<!-- # pagination -->
|
75
|
-
|
76
|
-
<%
|
77
|
-
|
78
|
-
<%
|
79
|
-
|
80
|
-
|
81
|
-
</li>
|
75
|
+
<% if parent_id.nil? -%>
|
76
|
+
<% pagination = will_paginate objects -%>
|
77
|
+
<% else %>
|
78
|
+
<% pagination = will_paginate objects, :ajax => true, :params => {:controller => attribute, :action => :index, :id => nil, :parent_class => parent_class, :parent_id => parent_id, :update => "#{parent_class.to_s.underscore}_#{parent_id}_#{attribute}", :ul_needed => true } -%>
|
79
|
+
<% end %>
|
80
|
+
<%= raw "<li class=\"#{cycle('odd', 'even')}\">" + pagination + "</li>" if pagination -%>
|
82
81
|
<%= raw "</ul>" if ul_needed -%>
|
@@ -1 +1,4 @@
|
|
1
|
-
$('#<%= @update_span %>').
|
1
|
+
$('#<%= @update_span %>').fadeOut("slow", function() {
|
2
|
+
$(this).html('<%= escape_javascript(render(:partial => 'inline_forms/close' ))%>');
|
3
|
+
$(this).fadeIn("slow");
|
4
|
+
});
|
data/lib/inline_forms/version.rb
CHANGED
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: inline_forms
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 49
|
5
5
|
prerelease:
|
6
6
|
segments:
|
7
7
|
- 1
|
8
8
|
- 1
|
9
|
-
-
|
10
|
-
version: 1.1.
|
9
|
+
- 17
|
10
|
+
version: 1.1.17
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Ace Suares
|
@@ -110,6 +110,7 @@ files:
|
|
110
110
|
- Rakefile
|
111
111
|
- bin/inline_forms
|
112
112
|
- inline_forms.gemspec
|
113
|
+
- lib/app/assets/images/add.png
|
113
114
|
- lib/app/assets/images/close.png
|
114
115
|
- lib/app/assets/images/glass_plate.gif
|
115
116
|
- lib/app/assets/images/trash.png
|