templates/default/layout/html/layout.erb in yard-nowpunk-0.2.16 vs templates/default/layout/html/layout.erb in yard-nowpunk-0.2.17
- old
+ new
@@ -1,25 +1,41 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
- <link href="http://twitter.github.com/bootstrap/assets/css/bootstrap.css" rel="stylesheet">
- <link href="http://twitter.github.com/bootstrap/assets/css/bootstrap-responsive.css" rel="stylesheet">
+ <link href="http://twitter.github.com/bootstrap/assets/css/bootstrap.css" rel="stylesheet" />
+ <link href="http://twitter.github.com/bootstrap/assets/css/bootstrap-responsive.css" rel="stylesheet" />
+
+ <meta http-equiv="Content-Type" content="text/html; charset=<%= charset %>" />
+ <title>
+ <%= h @page_title %>
+ <% if options.title && @page_title != options.title %>
+ — <%= h options.title %>
+ <% end %>
+ </title>
+ <% stylesheets.each do |stylesheet| %>
+ <link rel="stylesheet" href="<%= url_for(stylesheet) %>" type="text/css" media="screen" charset="utf-8" />
+ <% end %>
+
+ <%= erb :script_setup %>
</head>
+
<body>
<div id="header">
<%= erb(:breadcrumb) %>
<%= erb(:search) %>
<div class="clear"></div>
</div>
<iframe id="search_frame"></iframe>
<div id="content" class="container">
- <div class="hero-unit">
- <%= yieldall %>
- </div>
+ <%= yieldall %>
</div>
<%= erb(:footer) %>
+
+ <% javascripts.each do |javascript| %>
+ <script type="text/javascript" charset="utf-8" src="<%= url_for(javascript) %>"></script>
+ <% end %>
</body>
</html>