bootstrapped-rails 2.0.6 → 2.0.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/lib/bootstrapped-rails/version.rb +1 -1
  2. data/lib/generators/bootstrapped/layout/layout_generator.rb +2 -0
  3. data/lib/generators/bootstrapped/layout/templates/_apple_icon.html.erb +5 -0
  4. data/lib/generators/bootstrapped/layout/templates/_sidebar.html.erb +8 -0
  5. data/lib/generators/bootstrapped/layout/templates/layout.html.erb +3 -23
  6. metadata +9 -7
data/lib/bootstrapped-rails/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bootstrapped
2
2
  module Rails
3
- VERSION = "2.0.6"
3
+ VERSION = "2.0.7"
4
4
  end
5
5
  end
data/lib/generators/bootstrapped/layout/layout_generator.rb CHANGED
@@ -18,6 +18,8 @@ module Bootstrapped
18
18
  ext = app.config.generators.options[:rails][:template_engine] || :erb
19
19
  template "layout.html.#{ext}", "app/views/layouts/#{layout_name}.html.#{ext}"
20
20
  template "_bootstrapped-navigation.html.#{ext}", "app/views/layouts/_bootstrapped-navigation.html.#{ext}"
21
+ template '_apple_icon.html.erb', "app/views/layouts/_apple_icon.html.#{ext}"
22
+ template '_sidebar.html.erb', "app/views/layouts/_sidebar.html.#{ext}"
21
23
  # Add our own require:
22
24
 
23
25
  end
data/lib/generators/bootstrapped/layout/templates/_apple_icon.html.erb ADDED
@@ -0,0 +1,5 @@
1
+ <link href="images/favicon.ico" rel="shortcut icon">
2
+ <link href="images/apple-touch-icon.png" rel="apple-touch-icon">
3
+ <link href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon" sizes="72x72">
4
+ <link href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon" sizes="114x114">
5
+ <style type="text/css">body { margin-top: 100px; }</style>
data/lib/generators/bootstrapped/layout/templates/_sidebar.html.erb ADDED
@@ -0,0 +1,8 @@
1
+ <div class="well sidebar-nav">
2
+ <ul class="nav nav-list">
3
+ <li class="nav-header">Sidebar</li>
4
+ <%- (1..3).each do |i| -%>
5
+ <li><%%= link_to "Link<%= i %>", "#" %></li>
6
+ <%- end -%>
7
+ </ul>
8
+ </div><!--/.well -->
data/lib/generators/bootstrapped/layout/templates/layout.html.erb CHANGED
@@ -13,13 +13,8 @@
13
13
 
14
14
  <!-- Le styles -->
15
15
  <%%= stylesheet_link_tag "application", :media => "all" %>
16
-
17
16
  <!-- Le fav and touch icons -->
18
- <link href="images/favicon.ico" rel="shortcut icon">
19
- <link href="images/apple-touch-icon.png" rel="apple-touch-icon">
20
- <link href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon" sizes="72x72">
21
- <link href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon" sizes="114x114">
22
- <style type="text/css">body { margin-top: 100px; }</style>
17
+ <%%= render partial: "layouts/apple_icon" %>
23
18
  </head>
24
19
  <body>
25
20
 
@@ -30,14 +25,7 @@
30
25
  <%- if layout_type == "fluid" -%>
31
26
  <div class="row-fluid">
32
27
  <div class="span3">
33
- <div class="well sidebar-nav">
34
- <ul class="nav nav-list">
35
- <li class="nav-header">Sidebar</li>
36
- <%- (1..3).each do |i| -%>
37
- <li><%%= link_to "Link<%= i %>", "#" %></li>
38
- <%- end -%>
39
- </ul>
40
- </div><!--/.well -->
28
+ <%%= render partial: "layouts/sidebar" %>
41
29
  </div><!--/span-->
42
30
  <div class="span9">
43
31
  <%%= yield %>
@@ -50,15 +38,7 @@
50
38
  <%%= yield %>
51
39
  </div>
52
40
  <div class="span3">
53
- <div class="well sidebar-nav">
54
- <h3>Sidebar</h3>
55
- <ul class="nav nav-list">
56
- <li class="nav-header">Sidebar</li>
57
- <%- (1..3).each do |i| -%>
58
- <li><%%= link_to "Link<%= i %>", "#" %></li>
59
- <%- end -%>
60
- </ul>
61
- </div><!--/.well -->
41
+ <%%= render partial: "layouts/sidebar" %>
62
42
  </div><!--/span-->
63
43
  </div><!--/row-->
64
44
  </div><!--/content-->
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bootstrapped-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.6
4
+ version: 2.0.7
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-03-08 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sass
16
- requirement: &70117657279980 !ruby/object:Gem::Requirement
16
+ requirement: &70352521893360 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.1.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70117657279980
24
+ version_requirements: *70352521893360
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: bundler
27
- requirement: &70117657279140 !ruby/object:Gem::Requirement
27
+ requirement: &70352521892860 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.0.0
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *70117657279140
35
+ version_requirements: *70352521892860
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rails
38
- requirement: &70117657278680 !ruby/object:Gem::Requirement
38
+ requirement: &70352521892300 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,7 +43,7 @@ dependencies:
43
43
  version: '3.1'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70117657278680
46
+ version_requirements: *70352521892300
47
47
  description: ! ' please see summary '
48
48
  email:
49
49
  - han@logicalprep.com
@@ -68,7 +68,9 @@ files:
68
68
  - lib/generators/bootstrapped/install/templates/application.js
69
69
  - lib/generators/bootstrapped/install/templates/bootstrap.coffee
70
70
  - lib/generators/bootstrapped/layout/layout_generator.rb
71
+ - lib/generators/bootstrapped/layout/templates/_apple_icon.html.erb
71
72
  - lib/generators/bootstrapped/layout/templates/_bootstrapped-navigation.html.erb
73
+ - lib/generators/bootstrapped/layout/templates/_sidebar.html.erb
72
74
  - lib/generators/bootstrapped/layout/templates/layout.html.erb
73
75
  - lib/generators/bootstrapped/layout/templates/layout.html.haml
74
76
  - lib/generators/bootstrapped/layout/templates/layout.html.slim