flexible_admin 0.1.3 → 0.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. data/lib/flexible_admin/version.rb +1 -1
  2. data/lib/generators/flexible_admin/templates/forms/datepicker_text_field.html.erb +19 -15
  3. data/lib/generators/flexible_admin/templates/forms/email_field.html.erb +4 -4
  4. data/lib/generators/flexible_admin/templates/forms/error_messages.html.erb +2 -2
  5. data/lib/generators/flexible_admin/templates/forms/file_field.html.erb +7 -4
  6. data/lib/generators/flexible_admin/templates/forms/password_field.html.erb +6 -3
  7. data/lib/generators/flexible_admin/templates/forms/text_area_field.html.erb +9 -6
  8. data/lib/generators/flexible_admin/templates/forms/text_field.html.erb +8 -6
  9. data/lib/generators/flexible_admin/templates/navigation.html.erb +20 -14
  10. metadata +63 -23
data/lib/flexible_admin/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module FlexibleAdmin
2
- VERSION = "0.1.3"
2
+ VERSION = "0.2.0"
3
3
  end
data/lib/generators/flexible_admin/templates/forms/datepicker_text_field.html.erb CHANGED
@@ -1,22 +1,26 @@
1
+ <link type="text/css" href="/assets/ui-lightness/jquery-ui-1.8.17.custom.css" rel="stylesheet" />
2
+ <script type="text/javascript" src="/assets/admin/jquery-ui-1.8.17.custom.min.js"></script>
3
+
1
4
  <%% label ||= nil %>
2
5
 
3
- <div class="clearfix">
4
- <%%= optional_label(f, what, label) %>
5
- <div class="input">
6
- <%%= f.text_field what, :class => 'span6 datepicker' %>
7
- <%%= content_tag(:span, help, :class => 'help-block') if help_text_present?(local_variables) %>
6
+ <div class="control-group">
7
+ <%%= optional_label(f, what, label, 'control-label') %>
8
+ <div class="controls">
9
+ <%%= f.text_field what, :class => 'datepicker' %>
10
+ <%%= content_tag(:p, help, :class => 'help-block') if help_text_present?(local_variables) %>
8
11
  </div>
9
- </div><!-- /clearfix -->
12
+ </div>
10
13
 
11
- <link type="text/css" href="/assets/ui-lightness/jquery-ui-1.8.17.custom.css" rel="stylesheet" />
12
- <script type="text/javascript" src="/assets/admin/jquery-ui-1.8.17.custom.min.js"></script>
13
- <script type="text/javascript">
14
- $(function(){
15
- // Datepicker
16
- $('.datepicker').datepicker({
17
- inline: true,
14
+ <script type="text/javascript" charset="utf-8">
15
+ $(document).ready(function() {
16
+ // Datepicker
17
+ $('.datepicker').datepicker({
18
+ dateFormat: 'yy-mm-dd',
19
+ showOn: "both",
20
+ inline: true,
18
21
  changeYear: true,
19
22
  yearRange: '1990:2030'
20
- });
21
- });
23
+ });
24
+
25
+ });
22
26
  </script>
data/lib/generators/flexible_admin/templates/forms/email_field.html.erb CHANGED
@@ -1,8 +1,8 @@
1
1
  <%% label ||= nil %>
2
2
 
3
- <div class="clearfix">
4
- <%%= optional_label(f, what, label) %>
5
- <div class="input">
3
+ <div class="control-group">
4
+ <%%= optional_label(f, what, label, 'control-label') %>
5
+ <div class="controls">
6
6
  <%%= f.email_field what %>
7
7
  </div>
8
- </div><!-- /clearfix -->
8
+ </div>
data/lib/generators/flexible_admin/templates/forms/error_messages.html.erb CHANGED
@@ -1,6 +1,6 @@
1
1
  <%% if item.errors.any? %>
2
- <div class="alert-message block-message error">
3
- <p><strong>You got an error!</strong></p>
2
+ <div class="alert alert-block alert-error">
3
+ <h4 class="alert-heading">You got an error!</h4>
4
4
  <ul>
5
5
  <%% item.errors.full_messages.each do |msg| %>
6
6
  <li><%%= msg %></li>
data/lib/generators/flexible_admin/templates/forms/file_field.html.erb CHANGED
@@ -1,8 +1,11 @@
1
+ <%% image_url ||= nil %>
1
2
  <%% label ||= nil %>
2
3
 
3
- <div class="clearfix">
4
- <%%= optional_label(f, what, label) %>
5
- <div class="input">
4
+ <div class="control-group file-field">
5
+ <%%= optional_label(f, what, label, 'control-label') %>
6
+ <div class="controls">
6
7
  <%%= f.file_field what %>
8
+ <%%= content_tag(:p, help, :class => 'help-block') if help_text_present?(local_variables) %>
9
+ <%%= image_tag(image_url) if image_url.present? %>
7
10
  </div>
8
- </div><!-- /clearfix -->
11
+ </div>
data/lib/generators/flexible_admin/templates/forms/password_field.html.erb CHANGED
@@ -1,6 +1,9 @@
1
- <div class="clearfix">
2
- <%%= f.label what %>
3
- <div class="input">
1
+ <%% label ||= nil %>
2
+
3
+ <div class="control-group">
4
+ <%%= optional_label(f, what, label, 'control-label') %>
5
+
6
+ <div class="controls">
4
7
  <%%= f.password_field what %>
5
8
  </div>
6
9
  </div><!-- /clearfix -->
data/lib/generators/flexible_admin/templates/forms/text_area_field.html.erb CHANGED
@@ -1,9 +1,12 @@
1
+
1
2
  <%% label ||= nil %>
2
3
 
3
- <div class="clearfix">
4
- <%%= optional_label(f, what, label) %>
5
- <div class="input">
6
- <%%= f.text_area what, :class => 'span6', :rows => 10 %>
7
- <%%= content_tag(:span, help, :class => 'help-block') if help_text_present?(local_variables) %>
4
+ <div class="control-group">
5
+ <%%= optional_label(f, what, label, 'control-label') %>
6
+ <div class="controls">
7
+ <%%= f.text_area what %>
8
+ <%% if help_text_present?(local_variables) %>
9
+ <p class='help-block'><%%= help.html_safe %></p>
10
+ <%% end %>
8
11
  </div>
9
- </div><!-- /clearfix -->
12
+ </div>
data/lib/generators/flexible_admin/templates/forms/text_field.html.erb CHANGED
@@ -1,9 +1,11 @@
1
1
  <%% label ||= nil %>
2
2
 
3
- <div class="clearfix">
4
- <%%= optional_label(f, what, label) %>
5
- <div class="input">
6
- <%%= f.text_field what, :class => 'span6' %>
7
- <%%= content_tag(:span, help, :class => 'help-block') if help_text_present?(local_variables) %>
3
+ <div class="control-group">
4
+ <%%= optional_label(f, what, label, 'control-label') %>
5
+ <div class="controls">
6
+ <%%= f.text_field what %>
7
+ <%% if help_text_present?(local_variables) %>
8
+ <p class='help-block'><%%= help.html_safe %></p>
9
+ <%% end %>
8
10
  </div>
9
- </div><!-- /clearfix -->
11
+ </div>
data/lib/generators/flexible_admin/templates/navigation.html.erb CHANGED
@@ -1,22 +1,28 @@
1
1
  <%% models = %w() %>
2
2
 
3
- <div class="topbar-wrapper" style="z-index: 5;">
4
- <div class="topbar" data-dropdown="dropdown" id="navigation">
5
- <div class="topbar-inner">
6
- <div class="container">
7
- <h3><a href="/admin">Home</a></h3>
3
+ <div class="navbar">
4
+ <%% if admin_user_signed_in? %>
5
+ <div class="navbar-inner">
6
+ <div class="container">
7
+ <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
8
+ <span class="icon-bar"></span>
9
+ <span class="icon-bar"></span>
10
+ <span class="icon-bar"></span>
11
+ </a>
12
+ <a class="brand" href="/admin">Admin</a>
13
+ <div class="nav-collapse">
8
14
  <ul class="nav">
9
15
  <%% models.each do |item| %>
10
16
  <%%= admin_nav_item(item) %>
11
17
  <%% end %>
12
18
  </ul>
13
- <div class="signin">
14
- <%% if current_admin_user.present? %>
15
- <%%= link_to "Sign out", destroy_admin_user_session_path %>
16
- <%% end %>
17
-
18
- </div><!-- .signin -->
19
+ <ul class='nav pull-right'>
20
+ <li><%%= link_to "Sign out", destroy_admin_user_session_path %></li>
21
+ </ul>
19
22
  </div>
20
- </div><!-- /topbar-inner -->
21
- </div><!-- /topbar -->
22
- </div><!-- /topbar-wrapper -->
23
+ </div>
24
+ </div>
25
+ <%% else %>
26
+
27
+ <%% end %>
28
+ </div>
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: flexible_admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.3
4
+ version: 0.2.0
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-01-23 00:00:00.000000000Z
12
+ date: 2012-04-23 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70234023454400 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
21
21
  version: 3.1.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70234023454400
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ! '>='
28
+ - !ruby/object:Gem::Version
29
+ version: 3.1.0
25
30
  - !ruby/object:Gem::Dependency
26
31
  name: devise
27
- requirement: &70234023453980 !ruby/object:Gem::Requirement
32
+ requirement: !ruby/object:Gem::Requirement
28
33
  none: false
29
34
  requirements:
30
35
  - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
32
37
  version: '0'
33
38
  type: :runtime
34
39
  prerelease: false
35
- version_requirements: *70234023453980
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ! '>='
44
+ - !ruby/object:Gem::Version
45
+ version: '0'
36
46
  - !ruby/object:Gem::Dependency
37
47
  name: inherited_resources
38
- requirement: &70234023453380 !ruby/object:Gem::Requirement
48
+ requirement: !ruby/object:Gem::Requirement
39
49
  none: false
40
50
  requirements:
41
51
  - - ! '>='
@@ -43,21 +53,31 @@ dependencies:
43
53
  version: '0'
44
54
  type: :runtime
45
55
  prerelease: false
46
- version_requirements: *70234023453380
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
58
+ requirements:
59
+ - - ! '>='
60
+ - !ruby/object:Gem::Version
61
+ version: '0'
47
62
  - !ruby/object:Gem::Dependency
48
63
  name: ckeditor
49
- requirement: &70234023452580 !ruby/object:Gem::Requirement
64
+ requirement: !ruby/object:Gem::Requirement
50
65
  none: false
51
66
  requirements:
52
- - - ~>
67
+ - - ! '>='
53
68
  - !ruby/object:Gem::Version
54
69
  version: 3.6.3
55
70
  type: :runtime
56
71
  prerelease: false
57
- version_requirements: *70234023452580
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - ! '>='
76
+ - !ruby/object:Gem::Version
77
+ version: 3.6.3
58
78
  - !ruby/object:Gem::Dependency
59
79
  name: sqlite3
60
- requirement: &70234023452060 !ruby/object:Gem::Requirement
80
+ requirement: !ruby/object:Gem::Requirement
61
81
  none: false
62
82
  requirements:
63
83
  - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
65
85
  version: '0'
66
86
  type: :development
67
87
  prerelease: false
68
- version_requirements: *70234023452060
88
+ version_requirements: !ruby/object:Gem::Requirement
89
+ none: false
90
+ requirements:
91
+ - - ! '>='
92
+ - !ruby/object:Gem::Version
93
+ version: '0'
69
94
  - !ruby/object:Gem::Dependency
70
95
  name: rspec
71
- requirement: &70234023451580 !ruby/object:Gem::Requirement
96
+ requirement: !ruby/object:Gem::Requirement
72
97
  none: false
73
98
  requirements:
74
99
  - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
76
101
  version: '0'
77
102
  type: :development
78
103
  prerelease: false
79
- version_requirements: *70234023451580
104
+ version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
106
+ requirements:
107
+ - - ! '>='
108
+ - !ruby/object:Gem::Version
109
+ version: '0'
80
110
  - !ruby/object:Gem::Dependency
81
111
  name: generator_spec
82
- requirement: &70234023451120 !ruby/object:Gem::Requirement
112
+ requirement: !ruby/object:Gem::Requirement
83
113
  none: false
84
114
  requirements:
85
115
  - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
87
117
  version: '0'
88
118
  type: :development
89
119
  prerelease: false
90
- version_requirements: *70234023451120
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ none: false
122
+ requirements:
123
+ - - ! '>='
124
+ - !ruby/object:Gem::Version
125
+ version: '0'
91
126
  - !ruby/object:Gem::Dependency
92
127
  name: pry
93
- requirement: &70234023450680 !ruby/object:Gem::Requirement
128
+ requirement: !ruby/object:Gem::Requirement
94
129
  none: false
95
130
  requirements:
96
131
  - - ! '>='
@@ -98,7 +133,12 @@ dependencies:
98
133
  version: '0'
99
134
  type: :development
100
135
  prerelease: false
101
- version_requirements: *70234023450680
136
+ version_requirements: !ruby/object:Gem::Requirement
137
+ none: false
138
+ requirements:
139
+ - - ! '>='
140
+ - !ruby/object:Gem::Version
141
+ version: '0'
102
142
  description: Rails 3.1+ admin generator
103
143
  email:
104
144
  - josh@joshcrews.com
@@ -189,7 +229,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
189
229
  version: '0'
190
230
  segments:
191
231
  - 0
192
- hash: 274584011816710758
232
+ hash: 3067430963127445317
193
233
  required_rubygems_version: !ruby/object:Gem::Requirement
194
234
  none: false
195
235
  requirements:
@@ -198,11 +238,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
198
238
  version: '0'
199
239
  segments:
200
240
  - 0
201
- hash: 274584011816710758
241
+ hash: 3067430963127445317
202
242
  requirements: []
203
243
  rubyforge_project:
204
- rubygems_version: 1.8.11
244
+ rubygems_version: 1.8.21
205
245
  signing_key:
206
246
  specification_version: 3
207
- summary: Admin for Rails 3.1 apps
247
+ summary: Rails 3.1+ admin generator
208
248
  test_files: []