padrino-admin 0.8.4 → 0.8.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION +1 -1
- data/lib/padrino-admin/generators/app/app.rb.tt +1 -1
- data/lib/padrino-admin/generators/app/views/accounts/_form.haml +20 -22
- data/lib/padrino-admin/generators/templates/page/views/_form.haml.tt +8 -9
- data/lib/padrino-admin/helpers/view_helpers.rb +2 -2
- data/padrino-admin.gemspec +10 -10
- metadata +4 -4
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.8.
|
|
1
|
+
0.8.5
|
|
@@ -9,7 +9,7 @@ class Admin < Padrino::Application
|
|
|
9
9
|
# set :reload, false # Reload application files (default in development)
|
|
10
10
|
# set :default_builder, "foo" # Set a custom form builder (default 'StandardFormBuilder')
|
|
11
11
|
# set :locale_path, "bar" # Set path for I18n translations (default your_app/locales)
|
|
12
|
-
# enable :
|
|
12
|
+
# enable :auto_locale # Auto Set locale if url match /:locale/foo/bar (disabled by default)
|
|
13
13
|
# disable :padrino_helpers # Disables padrino markup helpers (enabled by default if present)
|
|
14
14
|
# disable :padrino_mailer # Disables padrino mailer (enabled by default if present)
|
|
15
15
|
# disable :flash # Disables rack-flash (enabled by default)
|
|
@@ -1,26 +1,24 @@
|
|
|
1
1
|
-tab :general do
|
|
2
|
-
|
|
3
|
-
%
|
|
4
|
-
%
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
%
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
%
|
|
11
|
-
|
|
12
|
-
%td=f.select :role, :options => access_control.roles
|
|
2
|
+
%table
|
|
3
|
+
%tr
|
|
4
|
+
%td=f.label :name
|
|
5
|
+
%td=f.text_field :name
|
|
6
|
+
%tr
|
|
7
|
+
%td=f.label :surname
|
|
8
|
+
%td=f.text_field :surname
|
|
9
|
+
%tr
|
|
10
|
+
%td=f.label :role
|
|
11
|
+
%td=f.select :role, :options => access_control.roles
|
|
13
12
|
|
|
14
13
|
-tab :login do
|
|
15
|
-
|
|
16
|
-
%
|
|
17
|
-
%
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
%
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
%
|
|
24
|
-
|
|
25
|
-
%td=f.password_field :password_confirmation
|
|
14
|
+
%table
|
|
15
|
+
%tr
|
|
16
|
+
%td=f.label :email
|
|
17
|
+
%td=f.text_field :email
|
|
18
|
+
%tr
|
|
19
|
+
%td=f.label :password
|
|
20
|
+
%td=f.password_field :password
|
|
21
|
+
%tr
|
|
22
|
+
%td=f.label :password_confirmation
|
|
23
|
+
%td=f.password_field :password_confirmation
|
|
26
24
|
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
-tab :general do
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
%
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
<%- end -%>
|
|
2
|
+
%table
|
|
3
|
+
<%- @model_klass.properties.each do |property| -%>
|
|
4
|
+
<%- unless property.name.to_sym == :id -%>
|
|
5
|
+
%tr
|
|
6
|
+
%td=f.label :<%= property.name %>
|
|
7
|
+
%td=f.text_field :<%= property.name %>
|
|
8
|
+
<%- end -%>
|
|
9
|
+
<%- end -%>
|
|
@@ -177,12 +177,12 @@ module Padrino
|
|
|
177
177
|
# ...
|
|
178
178
|
#
|
|
179
179
|
def box(title=nil, options={}, &block)
|
|
180
|
-
title = I18n.t("admin.
|
|
180
|
+
title = I18n.t("admin.boxes.#{title}", :default => title.to_s.humanize) if title.is_a?(Symbol)
|
|
181
181
|
subtitle = options.delete(:subtitle)
|
|
182
182
|
options[:style] ||= "width:100%;"
|
|
183
183
|
options[:start] ||= :open
|
|
184
184
|
concat_content (<<-HTML).gsub(/ {10}/, '')
|
|
185
|
-
<div class="#{options[:class]}" style="options[:style]">
|
|
185
|
+
<div class="#{options[:class]}" style="#{options[:style]}">
|
|
186
186
|
<div class="x-box">
|
|
187
187
|
<div class="x-box-tl">
|
|
188
188
|
<div class="x-box-tr">
|
data/padrino-admin.gemspec
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
|
|
6
6
|
Gem::Specification.new do |s|
|
|
7
7
|
s.name = %q{padrino-admin}
|
|
8
|
-
s.version = "0.8.
|
|
8
|
+
s.version = "0.8.5"
|
|
9
9
|
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
|
11
11
|
s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
|
|
@@ -367,9 +367,9 @@ Gem::Specification.new do |s|
|
|
|
367
367
|
|
|
368
368
|
if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
|
|
369
369
|
s.add_runtime_dependency(%q<json_pure>, [">= 1.2.0"])
|
|
370
|
-
s.add_runtime_dependency(%q<padrino-core>, ["= 0.8.
|
|
371
|
-
s.add_runtime_dependency(%q<padrino-gen>, ["= 0.8.
|
|
372
|
-
s.add_runtime_dependency(%q<padrino-helpers>, ["= 0.8.
|
|
370
|
+
s.add_runtime_dependency(%q<padrino-core>, ["= 0.8.5"])
|
|
371
|
+
s.add_runtime_dependency(%q<padrino-gen>, ["= 0.8.5"])
|
|
372
|
+
s.add_runtime_dependency(%q<padrino-helpers>, ["= 0.8.5"])
|
|
373
373
|
s.add_development_dependency(%q<haml>, [">= 2.2.1"])
|
|
374
374
|
s.add_development_dependency(%q<shoulda>, [">= 0"])
|
|
375
375
|
s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
|
|
@@ -377,9 +377,9 @@ Gem::Specification.new do |s|
|
|
|
377
377
|
s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
|
|
378
378
|
else
|
|
379
379
|
s.add_dependency(%q<json_pure>, [">= 1.2.0"])
|
|
380
|
-
s.add_dependency(%q<padrino-core>, ["= 0.8.
|
|
381
|
-
s.add_dependency(%q<padrino-gen>, ["= 0.8.
|
|
382
|
-
s.add_dependency(%q<padrino-helpers>, ["= 0.8.
|
|
380
|
+
s.add_dependency(%q<padrino-core>, ["= 0.8.5"])
|
|
381
|
+
s.add_dependency(%q<padrino-gen>, ["= 0.8.5"])
|
|
382
|
+
s.add_dependency(%q<padrino-helpers>, ["= 0.8.5"])
|
|
383
383
|
s.add_dependency(%q<haml>, [">= 2.2.1"])
|
|
384
384
|
s.add_dependency(%q<shoulda>, [">= 0"])
|
|
385
385
|
s.add_dependency(%q<mocha>, [">= 0.9.7"])
|
|
@@ -388,9 +388,9 @@ Gem::Specification.new do |s|
|
|
|
388
388
|
end
|
|
389
389
|
else
|
|
390
390
|
s.add_dependency(%q<json_pure>, [">= 1.2.0"])
|
|
391
|
-
s.add_dependency(%q<padrino-core>, ["= 0.8.
|
|
392
|
-
s.add_dependency(%q<padrino-gen>, ["= 0.8.
|
|
393
|
-
s.add_dependency(%q<padrino-helpers>, ["= 0.8.
|
|
391
|
+
s.add_dependency(%q<padrino-core>, ["= 0.8.5"])
|
|
392
|
+
s.add_dependency(%q<padrino-gen>, ["= 0.8.5"])
|
|
393
|
+
s.add_dependency(%q<padrino-helpers>, ["= 0.8.5"])
|
|
394
394
|
s.add_dependency(%q<haml>, [">= 2.2.1"])
|
|
395
395
|
s.add_dependency(%q<shoulda>, [">= 0"])
|
|
396
396
|
s.add_dependency(%q<mocha>, [">= 0.9.7"])
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: padrino-admin
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.8.
|
|
4
|
+
version: 0.8.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Padrino Team
|
|
@@ -33,7 +33,7 @@ dependencies:
|
|
|
33
33
|
requirements:
|
|
34
34
|
- - "="
|
|
35
35
|
- !ruby/object:Gem::Version
|
|
36
|
-
version: 0.8.
|
|
36
|
+
version: 0.8.5
|
|
37
37
|
version:
|
|
38
38
|
- !ruby/object:Gem::Dependency
|
|
39
39
|
name: padrino-gen
|
|
@@ -43,7 +43,7 @@ dependencies:
|
|
|
43
43
|
requirements:
|
|
44
44
|
- - "="
|
|
45
45
|
- !ruby/object:Gem::Version
|
|
46
|
-
version: 0.8.
|
|
46
|
+
version: 0.8.5
|
|
47
47
|
version:
|
|
48
48
|
- !ruby/object:Gem::Dependency
|
|
49
49
|
name: padrino-helpers
|
|
@@ -53,7 +53,7 @@ dependencies:
|
|
|
53
53
|
requirements:
|
|
54
54
|
- - "="
|
|
55
55
|
- !ruby/object:Gem::Version
|
|
56
|
-
version: 0.8.
|
|
56
|
+
version: 0.8.5
|
|
57
57
|
version:
|
|
58
58
|
- !ruby/object:Gem::Dependency
|
|
59
59
|
name: haml
|