beef-layout 0.2.2 → 0.2.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/VERSION +1 -1
  2. data/beef-layout.gemspec +3 -3
  3. data/generators/layout_files/layout_files_generator.rb +4 -5
  4. data/generators/layout_files/templates/application_layout.html.erb +41 -46
  5. data/lib/layout.rb +5 -1
  6. metadata +12 -5
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.2.2
1
+ 0.2.4
data/beef-layout.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{beef-layout}
8
- s.version = "0.2.2"
8
+ s.version = "0.2.4"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Steve England"]
12
- s.date = %q{2010-02-18}
12
+ s.date = %q{2010-02-24}
13
13
  s.email = %q{steve@wearebeef.co.uk}
14
14
  s.extra_rdoc_files = [
15
15
  "LICENSE",
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
48
48
  s.homepage = %q{http://github.com/beef/Layout}
49
49
  s.rdoc_options = ["--charset=UTF-8"]
50
50
  s.require_paths = ["lib"]
51
- s.rubygems_version = %q{1.3.5}
51
+ s.rubygems_version = %q{1.3.6}
52
52
  s.summary = %q{Generates basic beef layout}
53
53
  s.test_files = [
54
54
  "test/layout_test.rb",
data/generators/layout_files/layout_files_generator.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  class LayoutFilesGenerator < Rails::Generator::Base
2
-
2
+
3
3
  def manifest
4
4
  record do |m|
5
5
  ["public/javascripts/application.js",
@@ -11,15 +11,14 @@ class LayoutFilesGenerator < Rails::Generator::Base
11
11
  "public/stylesheets/layout.css",
12
12
  "public/stylesheets/mobile.css",
13
13
  "public/stylesheets/print.css",
14
- "public/stylesheets/screen.css",
15
14
  "public/stylesheets/reset.css",
16
15
  "public/stylesheets/skin.css",
17
16
  "public/stylesheets/typography.css"].each do |file|
18
17
  m.file file, file
19
18
  end
20
-
21
- m.file( 'application_layout.html.erb', File.join('app/views/layouts', 'application.html.erb'))
19
+
20
+ m.file( 'application_layout.html.erb', File.join('app/views/layouts', 'application.html.erb'))
22
21
  end
23
22
  end
24
-
23
+
25
24
  end
data/generators/layout_files/templates/application_layout.html.erb CHANGED
@@ -34,7 +34,7 @@
34
34
 
35
35
  <script src="http://www.google.com/jsapi" type="text/javascript"></script>
36
36
  <script type="text/javascript">
37
- google.load("jquery", "1.4.1");
37
+ google.load("jquery", "1.4");
38
38
  // google.load("swfobject", "2.2");
39
39
  </script>
40
40
  <%= javascript_include_tag 'cufon-yui', 'Gotham_Medium_500.font', 'application', :cache => 'global' %>
@@ -44,54 +44,50 @@
44
44
  <%= yield :header %>
45
45
 
46
46
  </head>
47
- <body id="<%= page_id %>" class="<%= page_class %> <%= "comment-#{@comment.commentable.category.permalink}" unless @comment.nil? || @comment.commentable.nil? || @comment.commentable.category.nil? %>">
47
+ <body id="<%= page_id %>" class="<%= page_class %>">
48
48
 
49
49
  <!-- so:wrap-->
50
- <div id="wrap">
51
-
52
- <!-- so:header -->
53
- <div id="header">
54
- <h1 id="site-name"><%= link_to h(Settings.site_name), '/', :id => "logo", :rel => "home" %></h1>
55
-
56
- <!-- so:navigation -->
57
- <ul id="nav">
58
- <% for page in Page.top.published %>
59
- <li id="nav-<%= page.permalink %>"><%= link_to page.title, page_path(page.permalink) %></li>
60
- <% end %>
61
- <li id="nav-article"><%= link_to 'Articles', articles_path() %></li>
62
- </ul>
63
- <!-- so:navigation -->
64
-
65
- </div>
66
- <!-- eo:header -->
67
-
68
- <!-- so:content -->
69
- <div id="content">
70
-
71
- <% unless @page.nil? %>
72
- <div id="breadcrumbs">
73
- <%= link_to 'Home', root_path %> <%= "/ " unless @page.ancestors.empty? %><%= @page.ancestors.collect{ |a| link_to a.title, page_path(a) }.join(' / ') %> / <strong><%= page_title %></strong>
74
- </div>
75
- <% end -%>
76
-
77
- <%= flash_messages %>
78
- <%= yield %>
79
- </div>
80
- <!-- eo:content -->
81
-
82
- <!-- so:footer -->
83
- <div id="footer">
84
- <%= yield :footer %>
85
- <p>
86
- <%= Settings.telephone %><br />
87
- <a href="mailto:<%= Settings.default_email %>"><%= Settings.default_email %></a>
88
- </p>
89
- </div>
90
- <!-- eo:footer -->
91
-
50
+ <div id="wrap">
51
+
52
+ <!-- so:header -->
53
+ <div id="header">
54
+ <h1 id="site-name"><%= link_to h(Settings.site_name), '/', :id => "logo", :rel => "home" %></h1>
55
+
56
+ <!-- so:navigation -->
57
+ <ul id="nav">
58
+ <li id="nav-one"><%= link_to "Page One" %></li>
59
+ <li id="nav-two"><%= link_to "Page Two" %></li>
60
+ </ul>
61
+ <!-- so:navigation -->
62
+
92
63
  </div>
64
+ <!-- eo:header -->
65
+
66
+ <!-- so:content -->
67
+ <div id="content">
68
+
69
+ <div id="breadcrumbs">
70
+ <%= link_to 'Home', root_path %> / <strong><%= page_title %></strong>
71
+ </div>
72
+
73
+ <%= flash_messages %>
74
+ <%= yield %>
75
+ </div>
76
+ <!-- eo:content -->
77
+
78
+ <!-- so:footer -->
79
+ <div id="footer">
80
+ <%= yield :footer %>
81
+ <p>
82
+ <%= Settings.telephone %><br />
83
+ <a href="mailto:<%= Settings.default_email %>"><%= Settings.default_email %></a>
84
+ </p>
85
+ </div>
86
+ <!-- eo:footer -->
87
+
88
+ </div>
93
89
  <!-- en:wrap -->
94
-
90
+
95
91
  <!-- so:javascript -->
96
92
  <script type="text/javascript">
97
93
  var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
@@ -103,6 +99,5 @@ var pageTracker = _gat._getTracker("<%= Settings.google_analytics_web_property_i
103
99
  pageTracker._trackPageview();
104
100
  } catch(err) {}</script>
105
101
  <!-- eo:javascript -->
106
-
107
102
  </body>
108
103
  </html>
data/lib/layout.rb CHANGED
@@ -10,7 +10,11 @@ module Beef
10
10
  end
11
11
 
12
12
  def page_title
13
- @page_title ||= controller.controller_name.titleize + (controller.action_name == 'index' ? " #{controller.action_name.titleize}" : ' ' )
13
+ if controller.controller_name != 'home'
14
+ @page_title ||= controller.controller_name.titleize + (controller.action_name == 'index' ? " #{controller.action_name.titleize}" : ' ' )
15
+ else
16
+ Settings.home_page_title
17
+ end
14
18
  end
15
19
 
16
20
  def page_description
metadata CHANGED
@@ -1,7 +1,12 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: beef-layout
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.2
4
+ prerelease: false
5
+ segments:
6
+ - 0
7
+ - 2
8
+ - 4
9
+ version: 0.2.4
5
10
  platform: ruby
6
11
  authors:
7
12
  - Steve England
@@ -9,7 +14,7 @@ autorequire:
9
14
  bindir: bin
10
15
  cert_chain: []
11
16
 
12
- date: 2010-02-18 00:00:00 +00:00
17
+ date: 2010-02-24 00:00:00 +00:00
13
18
  default_executable:
14
19
  dependencies: []
15
20
 
@@ -64,18 +69,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
64
69
  requirements:
65
70
  - - ">="
66
71
  - !ruby/object:Gem::Version
72
+ segments:
73
+ - 0
67
74
  version: "0"
68
- version:
69
75
  required_rubygems_version: !ruby/object:Gem::Requirement
70
76
  requirements:
71
77
  - - ">="
72
78
  - !ruby/object:Gem::Version
79
+ segments:
80
+ - 0
73
81
  version: "0"
74
- version:
75
82
  requirements: []
76
83
 
77
84
  rubyforge_project:
78
- rubygems_version: 1.3.5
85
+ rubygems_version: 1.3.6
79
86
  signing_key:
80
87
  specification_version: 3
81
88
  summary: Generates basic beef layout