inline_forms 1.6.40 → 1.6.41
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/lib/app/assets/stylesheets/inline_forms.css +0 -15
- data/lib/app/helpers/inline_forms_helper.rb +4 -4
- data/lib/app/views/inline_forms/_header.html.erb +3 -3
- data/lib/app/views/inline_forms/_list.html.erb +2 -6
- data/lib/app/views/layouts/inline_forms.html.erb +1 -2
- data/lib/inline_forms/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
MWFjNjRiMmNjMzA0MjkwYTFmNTFlZDcwYzc4NjA1OTczODYzYTdiYQ==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
MGFmYWRjNzg0NjYwNWViY2ViMTUxOWU2NWVmM2I4NDNmMTU0YjcwNA==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
OTgzNzVlZTQxY2I0YmVmNzJhYjBhMGM1NDlkMmZmOWEzM2UzODNiOGUxNGRh
|
10
|
+
YmZlMTgyZjg0Y2I1YTdhZjQyNmM3Y2E3ODJkNzdkOGZiM2EzYzgwNjkwMGRi
|
11
|
+
ZmFiODM5MTY3NDQ1ZTk4ZGEyYWI4YTA4MzJkMzU1ZGYxMGIyN2M=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
NWVlN2Q3ODQ5Yjc3MGJmYTI1MTNkZGQzZTQ2MjJlMTY3ZWUwNjNkNTBjM2Jl
|
14
|
+
ZDkyY2I3YzI4NGE1Y2I3NjBlNzg2OGJlYzRjNTM2MWMxM2M1OTZhOTdmYTRj
|
15
|
+
ZTc4NjllN2ZkNWE4ZGQ1ZjNjYjFiYjg4MmJhNWVlZTBlMjgyNzg=
|
@@ -135,18 +135,3 @@
|
|
135
135
|
|
136
136
|
|
137
137
|
|
138
|
-
#inline_forms_application_header {
|
139
|
-
background-color: #A3381E;
|
140
|
-
color: #FFFFFF;
|
141
|
-
}
|
142
|
-
|
143
|
-
#logout, #logout a {
|
144
|
-
background-color: #A3381E;
|
145
|
-
color: #FFFFFF;
|
146
|
-
}
|
147
|
-
|
148
|
-
|
149
|
-
#inline_forms_menu h1 {
|
150
|
-
color: #FFFFFF;
|
151
|
-
}
|
152
|
-
|
@@ -19,13 +19,14 @@ module InlineFormsHelper
|
|
19
19
|
end
|
20
20
|
|
21
21
|
# close link
|
22
|
-
def close_link( object, update_span )
|
22
|
+
def close_link( object, update_span, html_class = 'button close_button' )
|
23
23
|
link_to "<i class='fi-x'></i>".html_safe,
|
24
24
|
send( object.class.to_s.underscore + '_path',
|
25
25
|
object,
|
26
26
|
:update => update_span,
|
27
27
|
:close => true ),
|
28
28
|
:remote => true,
|
29
|
+
:class => html_class,
|
29
30
|
:title => t('inline_forms.view.close')
|
30
31
|
end
|
31
32
|
|
@@ -43,17 +44,16 @@ module InlineFormsHelper
|
|
43
44
|
end
|
44
45
|
|
45
46
|
# new link
|
46
|
-
def link_to_new_record(model, path_to_new, update_span, parent_class, parent_id)
|
47
|
+
def link_to_new_record(model, path_to_new, update_span, parent_class = nil, parent_id = nil, html_class = 'button new_button')
|
47
48
|
out = ""
|
48
|
-
out << "<div class='new_record_link'>"
|
49
49
|
out << (link_to "<i class='fi-plus'></i>".html_safe,
|
50
50
|
send(path_to_new, :update => update_span,
|
51
51
|
:parent_class => parent_class,
|
52
52
|
:parent_id => parent_id,
|
53
53
|
),
|
54
54
|
:remote => true,
|
55
|
+
:class => html_class,
|
55
56
|
:title => t('inline_forms.view.add_new', :model => model.model_name.human ) )
|
56
|
-
out << "</div>"
|
57
57
|
if cancan_enabled?
|
58
58
|
if can? :create, model.to_s.pluralize.underscore.to_sym
|
59
59
|
if parent_class.nil?
|
@@ -1,14 +1,14 @@
|
|
1
1
|
<div class="contain-to-grid fixed">
|
2
|
-
<nav id='
|
2
|
+
<nav id='inline_forms_application_top_bar' class="top-bar" data-topbar>
|
3
3
|
<ul class="title-area">
|
4
4
|
<li class="name">
|
5
|
-
<h1><a href="
|
5
|
+
<h1><a href="/"><%= application_title %> v<%= inline_forms_version %> - <em><%= t(controller_name) %></em></a></h1>
|
6
6
|
</li>
|
7
7
|
<li class="toggle-topbar menu-icon">
|
8
8
|
<a href="#"><span></span></a>
|
9
9
|
</li>
|
10
10
|
</ul>
|
11
|
-
<section class="top-bar-section"
|
11
|
+
<section class="top-bar-section">
|
12
12
|
<ul class="right">
|
13
13
|
<li class="has-dropdown">
|
14
14
|
<a href="#"><%= current_user.name %></a>
|
@@ -5,11 +5,7 @@
|
|
5
5
|
<%#*</script>%>
|
6
6
|
<% end %>
|
7
7
|
|
8
|
-
|
9
|
-
If we come here for the 'first' time, we dont' have parents; its just a list of objects.
|
10
|
-
But if we come here because we are called from the show partial, then we have to deal wits some parent object.
|
11
|
-
Unfortaunatlly, the way :locals work, these are local variables, like object, but if we come from a controller,
|
12
|
-
they are @object. We need this magic here to rewrite all the @variables to variables. Ugh. -->
|
8
|
+
<% "purpose: list objects. we come here from #index and from #new. If we come here for the 'first' time, we dont' have parents; its just a list of objects. But if we come here because we are called from the show partial, then we have to deal wits some parent object. Unfortaunatlly, the way :locals work, these are local variables, like object, but if we come from a controller, they are @object. We need this magic here to rewrite all the @variables to variables. Ugh." %>
|
13
9
|
|
14
10
|
<% ul_needed = true %>
|
15
11
|
<% if not defined?(parent_class) %>
|
@@ -47,7 +43,7 @@ they are @object. We need this magic here to rewrite all the @variables to varia
|
|
47
43
|
<% objects = objects.paginate :page => params[:page], :per_page => @PER_PAGE || 5, :conditions => conditions %>
|
48
44
|
<% end %>
|
49
45
|
|
50
|
-
<%= raw "<div id=\"#{update_span}\"
|
46
|
+
<%= raw "<div id=\"#{update_span}\">" if ul_needed -%>
|
51
47
|
<!-- # list of objects -->
|
52
48
|
<% for object in objects %>
|
53
49
|
<% if parent_class.nil? %>
|
@@ -3,6 +3,7 @@
|
|
3
3
|
<head>
|
4
4
|
<meta charset="utf-8" />
|
5
5
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
6
|
+
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,400italic' rel='stylesheet' type='text/css' />
|
6
7
|
|
7
8
|
<title><%= t('application_name') + " v" + InlineForms::VERSION -%></title>
|
8
9
|
|
@@ -15,9 +16,7 @@
|
|
15
16
|
|
16
17
|
<%= render "inline_forms/header" %>
|
17
18
|
<%= render "/inline_forms_tabs" %>
|
18
|
-
<div id="inline_forms_main_list">
|
19
19
|
<%= yield %>
|
20
|
-
</div>
|
21
20
|
<%= javascript_include_tag 'application', 'inline_forms_application' %>
|
22
21
|
</body>
|
23
22
|
</html>
|
data/lib/inline_forms/version.rb
CHANGED