spud_core 0.5.2 → 0.5.5
Sign up to get free protection for your applications and to get access to all the features.
- data/app/helpers/spud/admin/application_helper.rb +15 -0
- data/app/views/layouts/spud/admin/application.html.erb +1 -9
- data/app/views/spud/admin/users/_form.html.erb +8 -6
- data/app/views/spud/user_sessions/new.html.erb +3 -3
- data/app/views/spud/users/_form.html.erb +7 -6
- data/lib/spud_core/engine.rb +1 -1
- metadata +14 -31
- data/app/helpers/spud/admin/settings_helper.rb +0 -2
- data/app/helpers/spud/admin/users_helper.rb +0 -2
- data/app/helpers/spud/setup_helper.rb +0 -2
- data/app/helpers/spud/sitemaps_helper.rb +0 -2
- data/app/helpers/spud/user_sessions_helper.rb +0 -2
- data/app/helpers/spud/users_helper.rb +0 -2
@@ -15,4 +15,19 @@ module Spud::Admin::ApplicationHelper
|
|
15
15
|
end
|
16
16
|
link_to_function(name, "add_fields(this, \"#{association}\", \"#{escape_javascript(fields)}\")")
|
17
17
|
end
|
18
|
+
|
19
|
+
def error_messages_for(object)
|
20
|
+
content = ""
|
21
|
+
if object.errors.any?
|
22
|
+
content += "<div class='spud_admin_form_error_list'>"
|
23
|
+
content += "<h4>#{pluralize(object.errors.count, "error")} prohibited you from saving:</h4>"
|
24
|
+
content +="<ul>"
|
25
|
+
object.errors.full_messages.each do |msg|
|
26
|
+
content+="<li>#{msg}</li>"
|
27
|
+
end
|
28
|
+
content +="</ul></div>"
|
29
|
+
end
|
30
|
+
return content.html_safe
|
31
|
+
|
32
|
+
end
|
18
33
|
end
|
@@ -24,17 +24,9 @@
|
|
24
24
|
<% if flash[:warning] %>
|
25
25
|
<div class="flash warning"><%= flash[:warning] %></div>
|
26
26
|
<% end %>
|
27
|
-
<% if flash[:error]
|
27
|
+
<% if flash[:error]%>
|
28
28
|
<div class="flash error">
|
29
29
|
<%= flash[:error] %>
|
30
|
-
<%-unless @error_object_name.nil?%>
|
31
|
-
<%-if @error_object_name.is_a?(Array)%>
|
32
|
-
<%=error_messages_for @error_object_name[0], :header_message => @error_object_name[1], :message => @error_object_name[2]%>
|
33
|
-
<%-else%>
|
34
|
-
<%=error_messages_for @error_object_name%>
|
35
|
-
<%-end%>
|
36
|
-
|
37
|
-
<%-end%>
|
38
30
|
</div>
|
39
31
|
<%-end%>
|
40
32
|
<%= content_for?(:content) ? yield(:content) : yield %>
|
@@ -1,21 +1,23 @@
|
|
1
|
+
<%= error_messages_for(f.object) %>
|
2
|
+
|
1
3
|
<fieldset>
|
2
4
|
<legend>User Details</legend>
|
3
5
|
<ol>
|
4
6
|
<li><%=f.label :login, :required=>true%>
|
5
7
|
<%=f.text_field :login,:title => "",:size=>25%>
|
6
|
-
|
8
|
+
|
7
9
|
</li>
|
8
10
|
<li><%=f.label :email%>
|
9
11
|
<%=f.text_field :email, :title => "",:size => 25%>
|
10
|
-
|
12
|
+
|
11
13
|
</li>
|
12
14
|
<li><%=f.label :first_name%>
|
13
15
|
<%=f.text_field :first_name, :title => "",:size => 25%>
|
14
|
-
|
16
|
+
|
15
17
|
</li>
|
16
18
|
<li><%=f.label :last_name%>
|
17
19
|
<%=f.text_field :last_name, :title => "",:size => 25%>
|
18
|
-
|
20
|
+
|
19
21
|
</li>
|
20
22
|
|
21
23
|
</ol>
|
@@ -25,11 +27,11 @@
|
|
25
27
|
<ol>
|
26
28
|
<li><%=f.label :password%>
|
27
29
|
<%=f.password_field :password, :title => "",:size => 25%>
|
28
|
-
|
30
|
+
|
29
31
|
</li>
|
30
32
|
<li><%=f.label :password_confirmation,"Confirm"%>
|
31
33
|
<%=f.password_field :password_confirmation, :title => "",:size => 25%>
|
32
|
-
|
34
|
+
|
33
35
|
</li>
|
34
36
|
<li><%=f.label :super_admin,"Super Admin"%>
|
35
37
|
<%=f.check_box :super_admin, :title => ""%>
|
@@ -1,9 +1,9 @@
|
|
1
1
|
<div class="login-form">
|
2
2
|
<h1>Spud CMS Admin</h1>
|
3
3
|
<%= form_for @user_session, url: spud_user_session_path do |f| %>
|
4
|
-
|
5
|
-
|
6
|
-
|
4
|
+
|
5
|
+
<%= error_messages_for(f.object) %>
|
6
|
+
|
7
7
|
<div class="field-group">
|
8
8
|
<%= f.label :login %>
|
9
9
|
<%= f.text_field :login %>
|
@@ -1,21 +1,22 @@
|
|
1
|
+
<%=error_messages_for f.object%>
|
1
2
|
<fieldset>
|
2
3
|
<legend>User Details</legend>
|
3
4
|
<ol>
|
4
5
|
<li><%=f.label :login, :required=>true%>
|
5
6
|
<%=f.text_field :login,:title => "",:size=>25%>
|
6
|
-
|
7
|
+
|
7
8
|
</li>
|
8
9
|
<li><%=f.label :email%>
|
9
10
|
<%=f.text_field :email, :title => "",:size => 25%>
|
10
|
-
|
11
|
+
|
11
12
|
</li>
|
12
13
|
<li><%=f.label :first_name%>
|
13
14
|
<%=f.text_field :first_name, :title => "",:size => 25%>
|
14
|
-
|
15
|
+
|
15
16
|
</li>
|
16
17
|
<li><%=f.label :last_name%>
|
17
18
|
<%=f.text_field :last_name, :title => "",:size => 25%>
|
18
|
-
|
19
|
+
|
19
20
|
</li>
|
20
21
|
|
21
22
|
</ol>
|
@@ -25,11 +26,11 @@
|
|
25
26
|
<ol>
|
26
27
|
<li><%=f.label :password%>
|
27
28
|
<%=f.password_field :password, :title => "",:size => 25%>
|
28
|
-
|
29
|
+
|
29
30
|
</li>
|
30
31
|
<li><%=f.label :password_confirmation,"Confirm"%>
|
31
32
|
<%=f.password_field :password_confirmation, :title => "",:size => 25%>
|
32
|
-
|
33
|
+
|
33
34
|
</li>
|
34
35
|
</ol>
|
35
36
|
</fieldset>
|
data/lib/spud_core/engine.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: spud_core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.5
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-02-
|
12
|
+
date: 2012-02-19 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: activesupport
|
16
|
-
requirement: &
|
16
|
+
requirement: &70244174346920 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: 3.2.0
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *70244174346920
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: rails
|
27
|
-
requirement: &
|
27
|
+
requirement: &70244174346440 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: 3.2.0
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *70244174346440
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: authlogic
|
38
|
-
requirement: &
|
38
|
+
requirement: &70244174345960 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ! '>='
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: '0'
|
44
44
|
type: :runtime
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *70244174345960
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: jquery-rails
|
49
|
-
requirement: &
|
49
|
+
requirement: &70244174345480 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ! '>='
|
@@ -54,21 +54,10 @@ dependencies:
|
|
54
54
|
version: '0'
|
55
55
|
type: :runtime
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
58
|
-
- !ruby/object:Gem::Dependency
|
59
|
-
name: dynamic_form
|
60
|
-
requirement: &70245147051660 !ruby/object:Gem::Requirement
|
61
|
-
none: false
|
62
|
-
requirements:
|
63
|
-
- - ! '>='
|
64
|
-
- !ruby/object:Gem::Version
|
65
|
-
version: '0'
|
66
|
-
type: :runtime
|
67
|
-
prerelease: false
|
68
|
-
version_requirements: *70245147051660
|
57
|
+
version_requirements: *70244174345480
|
69
58
|
- !ruby/object:Gem::Dependency
|
70
59
|
name: breadcrumbs_on_rails
|
71
|
-
requirement: &
|
60
|
+
requirement: &70244174345000 !ruby/object:Gem::Requirement
|
72
61
|
none: false
|
73
62
|
requirements:
|
74
63
|
- - ! '>='
|
@@ -76,10 +65,10 @@ dependencies:
|
|
76
65
|
version: '0'
|
77
66
|
type: :runtime
|
78
67
|
prerelease: false
|
79
|
-
version_requirements: *
|
68
|
+
version_requirements: *70244174345000
|
80
69
|
- !ruby/object:Gem::Dependency
|
81
70
|
name: will_paginate
|
82
|
-
requirement: &
|
71
|
+
requirement: &70244174344520 !ruby/object:Gem::Requirement
|
83
72
|
none: false
|
84
73
|
requirements:
|
85
74
|
- - ! '>='
|
@@ -87,7 +76,7 @@ dependencies:
|
|
87
76
|
version: '0'
|
88
77
|
type: :runtime
|
89
78
|
prerelease: false
|
90
|
-
version_requirements: *
|
79
|
+
version_requirements: *70244174344520
|
91
80
|
description:
|
92
81
|
email: destes@redwindsw.com
|
93
82
|
executables: []
|
@@ -249,12 +238,6 @@ files:
|
|
249
238
|
- app/controllers/spud/user_sessions_controller.rb
|
250
239
|
- app/controllers/spud/users_controller.rb
|
251
240
|
- app/helpers/spud/admin/application_helper.rb
|
252
|
-
- app/helpers/spud/admin/settings_helper.rb
|
253
|
-
- app/helpers/spud/admin/users_helper.rb
|
254
|
-
- app/helpers/spud/setup_helper.rb
|
255
|
-
- app/helpers/spud/sitemaps_helper.rb
|
256
|
-
- app/helpers/spud/user_sessions_helper.rb
|
257
|
-
- app/helpers/spud/users_helper.rb
|
258
241
|
- app/models/spud_admin_permission.rb
|
259
242
|
- app/models/spud_user.rb
|
260
243
|
- app/models/spud_user_session.rb
|