lib/generators/bootstrap/layout/templates/layout.html.erb in twitter-bootstrap-rails-2.0rc0 vs lib/generators/bootstrap/layout/templates/layout.html.erb in twitter-bootstrap-rails-2.0
- old
+ new
@@ -1,104 +1,57 @@
<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title><%= app_name %></title>
- <%%= csrf_meta_tags %>
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le styles -->
- <%%= stylesheet_link_tag "application" %>
- <style>
- body {
- padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
- }
- </style>
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="images/favicon.ico">
- <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
- <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
- <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
- </head>
- <body>
-
- <div class="navbar navbar-fixed-top">
- <div class="navbar-inner">
- <%- if layout_type == "fluid" -%>
- <div class="container-fluid">
- <%- else -%>
- <div class="container">
+<html>
+<head>
+ <title><%= app_name %></title>
+ <%%= stylesheet_link_tag "application" %>
+ <%%= javascript_include_tag "application" %>
+ <%%= csrf_meta_tags %>
+</head>
+<body style="padding-top: 60px">
+ <div class="topbar">
+ <div class="topbar-inner">
+ <div class="<%= container_class %>">
+ <h3><%%= link_to "<%= app_name %>", "/" %></h3>
+ <ul class="nav">
+ <%- (1..3).each do |i| -%>
+ <li><%%= link_to "Link<%= i %>", "/path<%= i %>" %></li>
<%- end -%>
- <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
- <span class="i-bar"></span>
- <span class="i-bar"></span>
- <span class="i-bar"></span>
- </a>
- <a class="brand" href="#"><%= app_name %></a>
- <div class="<%= container_class %> nav-collapse">
- <ul class="nav">
- <%- (1..3).each do |i| -%>
- <li><%%= link_to "Link<%= i %>", "/path<%= i %>" %></li>
- <%- end -%>
- </ul>
- </div><!--/.nav-collapse -->
- </div>
+ </ul>
</div>
</div>
-
- <div class="<%= container_class %>">
- <%- if layout_type == "fluid" -%>
- <div class="row-fluid">
- <div class="span3">
- <div class="well sidebar-nav">
- <ul class="nav nav-list">
- <li class="nav-header">Sidebar</li>
- <%- (1..3).each do |i| -%>
- <li><%%= link_to "Link<%= i %>", "/path<%= i %>" %></li>
- <%- end -%>
- </ul>
- </div><!--/.well -->
- </div><!--/span-->
- <div class="span9">
+ </div>
+ <div class="<%= container_class %>">
+ <%- if layout_type == "fluid" -%>
+ <div class="sidebar">
+ <div class="well">
+ <h5>Sidebar</h5>
+ <ul>
+ <%- (1..3).each do |i| -%>
+ <li><%%= link_to "Link<%= i %>", "/path<%= i %>" %></li>
+ <%- end -%>
+ </ul>
+ </div>
+ </div>
+ <div class="content">
+ <%%= yield %>
+ </div>
+ <%- else -%>
+ <div class="content">
+ <div class="row">
+ <div class="span11">
<%%= yield %>
</div>
- </div><!--/row-->
- <%- else -%>
- <div class="content">
- <div class="row">
- <div class="span9">
- <%%= yield %>
- </div>
- <div class="span1"> </div>
- <div class="span3">
- <div class="well sidebar-nav">
- <h3>Sidebar</h3>
- <ul class="nav nav-list">
- <li class="nav-header">Sidebar</li>
- <%- (1..3).each do |i| -%>
- <li><%%= link_to "Link<%= i %>", "/path<%= i %>" %></li>
- <%- end -%>
- </ul>
- </div>
- </div>
- </div>
+ <div class="span1"> </div>
+ <div class="span4">
+ <h3>Sidebar</h3>
+ <ul>
+ <%- (1..3).each do |i| -%>
+ <li><%%= link_to "Link<%= i %>", "/path<%= i %>" %></li>
+ <%- end -%>
+ </ul>
</div>
- <%- end -%>
-
- <footer>
- <p>© Company 2012</p>
- </footer>
-
- </div> <!-- /container -->
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <%%= javascript_include_tag "application" %>
-
- </body>
-</html>
\ No newline at end of file
+ </div>
+ </div>
+ <%- end -%>
+ </div>
+</body>
+</html>