twitter-bootstrap-rails 2.0.4 → 2.0.5

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of twitter-bootstrap-rails might be problematic. Click here for more details.

Files changed (10) hide show
  1. data/README.md +3 -4
  2. data/lib/generators/bootstrap/themed/templates/_form.html.haml +14 -13
  3. data/lib/generators/bootstrap/themed/templates/edit.html.haml +1 -2
  4. data/lib/generators/bootstrap/themed/templates/index.html.haml +1 -1
  5. data/lib/generators/bootstrap/themed/templates/new.html.haml +1 -2
  6. data/lib/generators/bootstrap/themed/templates/show.html.haml +4 -2
  7. data/lib/generators/bootstrap/themed/themed_generator.rb +1 -1
  8. data/lib/twitter/bootstrap/rails/twitter-bootstrap-breadcrumbs.rb +1 -1
  9. data/lib/twitter/bootstrap/rails/version.rb +1 -1
  10. metadata +66 -66
data/README.md CHANGED
@@ -14,7 +14,7 @@ Screencasts provided by Railscasts (Ryan Bates)
14
14
  [Twitter Bootstrap Basics](http://railscasts.com/episodes/328-twitter-bootstrap-basics "Twitter Bootstrap Basics")
15
15
  in this episode you will learn how to include Twitter Bootstrap into Rails application with the twitter-bootstrap-rails gem.
16
16
 
17
- [More on Twitter Bootstrap](http://railscasts.com/episodes/329-more-on-twitter-bootstrap "More on Twitter Bootstrap")
17
+ [More on Twitter Bootstrap](http://railscasts.com/episodes/329-more-on-twitter-bootstrap "More on Twitter Bootstrap")
18
18
  in this episode continues on the Twitter Bootstrap project showing how to display flash messages, add form validations with SimpleForm, customize layout with variables, and switch to using Sass.
19
19
  (Note: This episode is pro episode)
20
20
 
@@ -27,7 +27,7 @@ Include Bootstrap in Gemfile;
27
27
 
28
28
  or you can install from latest build;
29
29
 
30
- gem 'twitter-bootstrap-rails', :git => 'http://github.com/seyhunak/twitter-bootstrap-rails.git'
30
+ gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootstrap-rails.git'
31
31
 
32
32
  You can run bundle from command line
33
33
 
@@ -77,7 +77,7 @@ Example:
77
77
 
78
78
  rails g scaffold post title:string description:text
79
79
  rake db:migrate
80
- rails g bootstrap:themed posts
80
+ rails g bootstrap:themed Posts
81
81
 
82
82
 
83
83
 
@@ -160,7 +160,6 @@ twitter-bootstrap-rails has seperate branch (w/o Less) that just serves latest s
160
160
  <li>Fixes and release 2.0.0</li>
161
161
  <li>Updated to v2.0.1, versioned v2.0.1.0</li>
162
162
  <li>Released gem v.2.0.3</li>
163
- <li>Released gem v.2.0.4</li>
164
163
  </ul>
165
164
 
166
165
 
data/lib/generators/bootstrap/themed/templates/_form.html.haml CHANGED
@@ -1,13 +1,14 @@
1
- %fieldset
2
- %legend
3
- = controller.action_name.capitalize
4
- <%= model_name.titleize %>
5
- <%- columns.each do |column| -%>
6
- .control-group
7
- = f.label :<%= column.name %>, :class => 'control-label'
8
- .controls
9
- = f.<%= column.field_type %> :<%= column.name %>, :class => '<%= column.field_type %>'
10
- <%- end -%>
11
- .form-actions
12
- = f.submit nil, :class => 'btn btn-primary'
13
- = link_to "Cancel", <%= controller_routing_path %>_path, :class => 'btn'
1
+ = form_for @<%= resource_name %>, :html => { :class => 'form-horizontal' } do |f|
2
+ %fieldset
3
+ %legend
4
+ = controller.action_name.capitalize
5
+ <%= model_name.titleize %>
6
+ <%- columns.each do |column| -%>
7
+ .control-group
8
+ = f.label :<%= column.name %>, :class => 'control-label'
9
+ .controls
10
+ = f.<%= column.field_type %> :<%= column.name %>, :class => '<%= column.field_type %>'
11
+ <%- end -%>
12
+ .form-actions
13
+ = f.submit nil, :class => 'btn btn-primary'
14
+ = link_to "Cancel", <%= controller_routing_path %>_path, :class => 'btn'
data/lib/generators/bootstrap/themed/templates/edit.html.haml CHANGED
@@ -1,2 +1 @@
1
- = form_for @<%= resource_name %>, :html => { :class => "edit_<%= resource_name %> form-horizontal", :id => "edit_<%= resource_name %>" } do |f|
2
- = render :partial => "form", :locals => {:f => f}
1
+ = render :partial => "form"
data/lib/generators/bootstrap/themed/templates/index.html.haml CHANGED
@@ -1,5 +1,5 @@
1
1
  %h1 <%= resource_name.titleize %>s
2
- %table{:class => "table table-striped"}
2
+ %table.table.table-striped
3
3
  %thead
4
4
  %tr
5
5
  %th ID
data/lib/generators/bootstrap/themed/templates/new.html.haml CHANGED
@@ -1,2 +1 @@
1
- = form_for @<%= resource_name %>, :html => { :class => 'form-horizontal' } do |f|
2
- = render :partial => "form", :locals => {:f => f}
1
+ = render :partial => "form"
data/lib/generators/bootstrap/themed/templates/show.html.haml CHANGED
@@ -1,6 +1,8 @@
1
1
  <%- columns.each do |column| -%>
2
- %label{:class => "label"}= t("activerecord.attributes.<%= singular_controller_routing_path %>.<%= column.name %>", :default => t("activerecord.labels.<%= column.name %>", :default => "<%= column.name.humanize %>")) + ":"
3
- %p= @<%= resource_name %>.<%= column.name %>
2
+ %p
3
+ %strong= t("activerecord.attributes.<%= singular_controller_routing_path %>.<%= column.name %>", :default => t("activerecord.labels.<%= column.name %>", :default => "<%= column.name.humanize %>")) + ":"
4
+ %br
5
+ = @<%= resource_name %>.<%= column.name %>
4
6
  <%- end -%>
5
7
 
6
8
  .form-actions
data/lib/generators/bootstrap/themed/themed_generator.rb CHANGED
@@ -24,7 +24,7 @@ module Bootstrap
24
24
  def initialize_views_variables
25
25
  @base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(controller_path)
26
26
  @controller_routing_path = @controller_file_path.gsub(/\//, '_')
27
- @model_name = @controller_class_nesting + "::#{@base_name.singularize}" unless @model_name
27
+ @model_name = @controller_class_nesting + "::#{@base_name.singularize.camelize}" unless @model_name
28
28
  @model_name = @model_name.camelize
29
29
  end
30
30
 
data/lib/twitter/bootstrap/rails/twitter-bootstrap-breadcrumbs.rb CHANGED
@@ -18,7 +18,7 @@ module Twitter
18
18
  def add_breadcrumb name, url = ''
19
19
  @breadcrumbs ||= []
20
20
  url = eval(url) if url =~ /_path|_url|@/
21
- @breadcrumbs << {name => name, url => url}
21
+ @breadcrumbs << {:name => name, :url => url}
22
22
  end
23
23
  end
24
24
  end
data/lib/twitter/bootstrap/rails/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Twitter
2
2
  module Bootstrap
3
3
  module Rails
4
- VERSION = "2.0.4"
4
+ VERSION = "2.0.5"
5
5
  end
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: twitter-bootstrap-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.4
4
+ version: 2.0.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-03-17 00:00:00.000000000 Z
12
+ date: 2012-03-30 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
16
- requirement: &73258230 !ruby/object:Gem::Requirement
16
+ requirement: &70143083112480 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '3.1'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *73258230
24
+ version_requirements: *70143083112480
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: actionpack
27
- requirement: &73257980 !ruby/object:Gem::Requirement
27
+ requirement: &70143083111980 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
32
32
  version: '3.1'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *73257980
35
+ version_requirements: *70143083111980
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: less-rails
38
- requirement: &73257730 !ruby/object:Gem::Requirement
38
+ requirement: &70143083111520 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
42
42
  - !ruby/object:Gem::Version
43
- version: 2.1.8
43
+ version: 2.2.0
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *73257730
46
+ version_requirements: *70143083111520
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rails
49
- requirement: &73257390 !ruby/object:Gem::Requirement
49
+ requirement: &70143083111060 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
54
54
  version: '3.1'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *73257390
57
+ version_requirements: *70143083111060
58
58
  description: twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for
59
59
  Rails 3.1 Asset Pipeline
60
60
  email:
@@ -63,88 +63,88 @@ executables: []
63
63
  extensions: []
64
64
  extra_rdoc_files: []
65
65
  files:
66
+ - lib/generators/bootstrap/install/install_generator.rb
67
+ - lib/generators/bootstrap/install/templates/application.css
68
+ - lib/generators/bootstrap/install/templates/application.js
69
+ - lib/generators/bootstrap/install/templates/bootstrap.coffee
70
+ - lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less
66
71
  - lib/generators/bootstrap/layout/layout_generator.rb
67
- - lib/generators/bootstrap/layout/templates/layout.html.slim
68
72
  - lib/generators/bootstrap/layout/templates/layout.html.erb
69
73
  - lib/generators/bootstrap/layout/templates/layout.html.haml
70
- - lib/generators/bootstrap/themed/themed_generator.rb
71
- - lib/generators/bootstrap/themed/templates/new.html.slim
72
- - lib/generators/bootstrap/themed/templates/show.html.erb
73
- - lib/generators/bootstrap/themed/templates/show.html.slim
74
- - lib/generators/bootstrap/themed/templates/new.html.erb
75
- - lib/generators/bootstrap/themed/templates/show.html.haml
76
- - lib/generators/bootstrap/themed/templates/edit.html.haml
74
+ - lib/generators/bootstrap/layout/templates/layout.html.slim
75
+ - lib/generators/bootstrap/themed/templates/_form.html.erb
77
76
  - lib/generators/bootstrap/themed/templates/_form.html.haml
78
77
  - lib/generators/bootstrap/themed/templates/_form.html.slim
78
+ - lib/generators/bootstrap/themed/templates/edit.html.erb
79
+ - lib/generators/bootstrap/themed/templates/edit.html.haml
79
80
  - lib/generators/bootstrap/themed/templates/edit.html.slim
80
- - lib/generators/bootstrap/themed/templates/new.html.haml
81
81
  - lib/generators/bootstrap/themed/templates/index.html.erb
82
- - lib/generators/bootstrap/themed/templates/_form.html.erb
83
- - lib/generators/bootstrap/themed/templates/edit.html.erb
84
82
  - lib/generators/bootstrap/themed/templates/index.html.haml
85
83
  - lib/generators/bootstrap/themed/templates/index.html.slim
86
- - lib/generators/bootstrap/install/templates/bootstrap.coffee
87
- - lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less
88
- - lib/generators/bootstrap/install/templates/application.js
89
- - lib/generators/bootstrap/install/templates/application.css
90
- - lib/generators/bootstrap/install/install_generator.rb
91
- - lib/twitter-bootstrap-rails.rb
84
+ - lib/generators/bootstrap/themed/templates/new.html.erb
85
+ - lib/generators/bootstrap/themed/templates/new.html.haml
86
+ - lib/generators/bootstrap/themed/templates/new.html.slim
87
+ - lib/generators/bootstrap/themed/templates/show.html.erb
88
+ - lib/generators/bootstrap/themed/templates/show.html.haml
89
+ - lib/generators/bootstrap/themed/templates/show.html.slim
90
+ - lib/generators/bootstrap/themed/themed_generator.rb
92
91
  - lib/twitter/bootstrap/rails/bootstrap.rb
93
- - lib/twitter/bootstrap/rails/version.rb
94
92
  - lib/twitter/bootstrap/rails/engine.rb
95
93
  - lib/twitter/bootstrap/rails/twitter-bootstrap-breadcrumbs.rb
94
+ - lib/twitter/bootstrap/rails/version.rb
95
+ - lib/twitter-bootstrap-rails.rb
96
96
  - vendor/assets/images/twitter/bootstrap/glyphicons-halflings-white.png
97
97
  - vendor/assets/images/twitter/bootstrap/glyphicons-halflings.png
98
- - vendor/assets/javascripts/twitter/bootstrap.js
99
- - vendor/assets/javascripts/twitter/bootstrap/bootstrap-modal.js
98
+ - vendor/assets/javascripts/twitter/bootstrap/bootstrap-alert.js
100
99
  - vendor/assets/javascripts/twitter/bootstrap/bootstrap-button.js
101
- - vendor/assets/javascripts/twitter/bootstrap/bootstrap-tab.js
102
- - vendor/assets/javascripts/twitter/bootstrap/bootstrap-typeahead.js
103
100
  - vendor/assets/javascripts/twitter/bootstrap/bootstrap-carousel.js
104
101
  - vendor/assets/javascripts/twitter/bootstrap/bootstrap-collapse.js
105
- - vendor/assets/javascripts/twitter/bootstrap/bootstrap-transition.js
106
102
  - vendor/assets/javascripts/twitter/bootstrap/bootstrap-dropdown.js
103
+ - vendor/assets/javascripts/twitter/bootstrap/bootstrap-modal.js
107
104
  - vendor/assets/javascripts/twitter/bootstrap/bootstrap-popover.js
108
- - vendor/assets/javascripts/twitter/bootstrap/bootstrap-tooltip.js
109
- - vendor/assets/javascripts/twitter/bootstrap/bootstrap-alert.js
110
105
  - vendor/assets/javascripts/twitter/bootstrap/bootstrap-scrollspy.js
111
- - vendor/toolkit/twitter/bootstrap_base.less
112
- - vendor/toolkit/twitter/bootstrap/thumbnails.less
113
- - vendor/toolkit/twitter/bootstrap/code.less
114
- - vendor/toolkit/twitter/bootstrap/navbar.less
115
- - vendor/toolkit/twitter/bootstrap/pagination.less
116
- - vendor/toolkit/twitter/bootstrap/close.less
117
- - vendor/toolkit/twitter/bootstrap/utilities.less
106
+ - vendor/assets/javascripts/twitter/bootstrap/bootstrap-tab.js
107
+ - vendor/assets/javascripts/twitter/bootstrap/bootstrap-tooltip.js
108
+ - vendor/assets/javascripts/twitter/bootstrap/bootstrap-transition.js
109
+ - vendor/assets/javascripts/twitter/bootstrap/bootstrap-typeahead.js
110
+ - vendor/assets/javascripts/twitter/bootstrap.js
111
+ - vendor/toolkit/twitter/bootstrap/accordion.less
112
+ - vendor/toolkit/twitter/bootstrap/alerts.less
113
+ - vendor/toolkit/twitter/bootstrap/badges.less
114
+ - vendor/toolkit/twitter/bootstrap/bootstrap.less
115
+ - vendor/toolkit/twitter/bootstrap/breadcrumbs.less
116
+ - vendor/toolkit/twitter/bootstrap/button-groups.less
117
+ - vendor/toolkit/twitter/bootstrap/buttons.less
118
118
  - vendor/toolkit/twitter/bootstrap/carousel.less
119
- - vendor/toolkit/twitter/bootstrap/tables.less
120
- - vendor/toolkit/twitter/bootstrap/grid.less
121
- - vendor/toolkit/twitter/bootstrap/labels.less
122
- - vendor/toolkit/twitter/bootstrap/tooltip.less
119
+ - vendor/toolkit/twitter/bootstrap/close.less
120
+ - vendor/toolkit/twitter/bootstrap/code.less
123
121
  - vendor/toolkit/twitter/bootstrap/component-animations.less
124
- - vendor/toolkit/twitter/bootstrap/responsive.less
125
- - vendor/toolkit/twitter/bootstrap/popovers.less
126
- - vendor/toolkit/twitter/bootstrap/badges.less
127
- - vendor/toolkit/twitter/bootstrap/alerts.less
128
- - vendor/toolkit/twitter/bootstrap/scaffolding.less
129
- - vendor/toolkit/twitter/bootstrap/navs.less
130
- - vendor/toolkit/twitter/bootstrap/hero-unit.less
131
- - vendor/toolkit/twitter/bootstrap/sprites.less
122
+ - vendor/toolkit/twitter/bootstrap/dropdowns.less
132
123
  - vendor/toolkit/twitter/bootstrap/forms.less
133
- - vendor/toolkit/twitter/bootstrap/button-groups.less
124
+ - vendor/toolkit/twitter/bootstrap/grid.less
125
+ - vendor/toolkit/twitter/bootstrap/hero-unit.less
126
+ - vendor/toolkit/twitter/bootstrap/labels.less
134
127
  - vendor/toolkit/twitter/bootstrap/layouts.less
135
- - vendor/toolkit/twitter/bootstrap/progress-bars.less
136
- - vendor/toolkit/twitter/bootstrap/breadcrumbs.less
137
- - vendor/toolkit/twitter/bootstrap/reset.less
138
- - vendor/toolkit/twitter/bootstrap/dropdowns.less
128
+ - vendor/toolkit/twitter/bootstrap/mixins.less
139
129
  - vendor/toolkit/twitter/bootstrap/modals.less
130
+ - vendor/toolkit/twitter/bootstrap/navbar.less
131
+ - vendor/toolkit/twitter/bootstrap/navs.less
140
132
  - vendor/toolkit/twitter/bootstrap/pager.less
141
- - vendor/toolkit/twitter/bootstrap/wells.less
142
- - vendor/toolkit/twitter/bootstrap/mixins.less
143
- - vendor/toolkit/twitter/bootstrap/accordion.less
133
+ - vendor/toolkit/twitter/bootstrap/pagination.less
134
+ - vendor/toolkit/twitter/bootstrap/popovers.less
135
+ - vendor/toolkit/twitter/bootstrap/progress-bars.less
136
+ - vendor/toolkit/twitter/bootstrap/reset.less
137
+ - vendor/toolkit/twitter/bootstrap/responsive.less
138
+ - vendor/toolkit/twitter/bootstrap/scaffolding.less
139
+ - vendor/toolkit/twitter/bootstrap/sprites.less
140
+ - vendor/toolkit/twitter/bootstrap/tables.less
141
+ - vendor/toolkit/twitter/bootstrap/thumbnails.less
142
+ - vendor/toolkit/twitter/bootstrap/tooltip.less
144
143
  - vendor/toolkit/twitter/bootstrap/type.less
145
- - vendor/toolkit/twitter/bootstrap/buttons.less
146
- - vendor/toolkit/twitter/bootstrap/bootstrap.less
144
+ - vendor/toolkit/twitter/bootstrap/utilities.less
147
145
  - vendor/toolkit/twitter/bootstrap/variables.less
146
+ - vendor/toolkit/twitter/bootstrap/wells.less
147
+ - vendor/toolkit/twitter/bootstrap_base.less
148
148
  - Rakefile
149
149
  - README.md
150
150
  homepage: https://github.com/seyhunak/twitter-bootstrap-rails
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
167
167
  version: '0'
168
168
  requirements: []
169
169
  rubyforge_project: twitter-bootstrap-rails
170
- rubygems_version: 1.8.11
170
+ rubygems_version: 1.8.17
171
171
  signing_key:
172
172
  specification_version: 3
173
173
  summary: Bootstrap CSS toolkit for Rails 3.1 Asset Pipeline