Commit db0ab6ca
Changed files (1)
app
views
layouts
app/views/layouts/application.html.erb
@@ -30,20 +30,20 @@
<li><a href="<%= url_for home_index_path %>">Home</a></li>
<li><%= link_to "Share", new_creation_path, :style => "color:#48ce62;" %></li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle">Categories</a>
- <ul class="dropdown-menu">
- <% Category.all.each do |category| %>
- <li><a href="/categories/<%= category.slug %>"><%= category.name %></a></li>
- <% end %>
- </ul>
+ <a href="#" class="dropdown-toggle">Categories</a>
+ <ul class="dropdown-menu">
+ <% Category.all.each do |category| %>
+ <li><a href="/categories/<%= category.slug %>"><%= category.name %></a></li>
+ <% end %>
+ </ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle">Help</a>
- <ul class="dropdown-menu">
- <li><a href="/privacy.html">Privacy Policy</a></li>
- <li class="divider"></li>
- <li><a href="/terms.html">Terms and Conditions</a></li>
- </ul>
+ <a href="#" class="dropdown-toggle">Help</a>
+ <ul class="dropdown-menu">
+ <li><a href="/privacy.html">Privacy Policy</a></li>
+ <li class="divider"></li>
+ <li><a href="/terms.html">Terms and Conditions</a></li>
+ </ul>
</li>
</ul>
<%= form_tag(search_index_path, :method => "get", :name => "search", :class => "pull-left") do %>
@@ -54,83 +54,65 @@
<p class="pull-right">Logged in as <%= link_to current_user.name, profiles_mine_path %> | <%= link_to "sign out", destroy_user_session_path %></p>
<% else %>
<p class="pull-right">
- <a href="<%= url_for new_user_session_path %>">sign in</a>
- <!--
- or <a href="<%= url_for new_user_registration_path %>">sign up</a>
- -->
+ <a href="<%= url_for new_user_session_path %>">sign in</a> <!-- or <a href="<%= url_for new_user_registration_path %>">sign up</a> -->
</p>
<% end %>
</div>
</div><!-- /topbar-inner -->
</div><!-- /topbar -->
-
<div class="container">
<div class="content">
<% if notice %><p class="alert-message success"><%= notice %></p> <% end %>
<% if alert %><p class="alert-message error"><%= alert %></p><% end %>
<%= yield %>
</div>
-
-
-
</div> <!-- /container -->
<footer>
- <div class="container">
- <div class="row">
- <div class="span4">
- <h3>CakeSide</h3>
- <ul class="unstyled">
- <li>
- <a href="/">Home</a>
- </li>
- <li>
- <a href="<%= url_for new_user_session_path %>">Sign-Up</a>
- </li>
- <li>
- <a href="<%= url_for new_user_session_path %>">About Us</a>
- </li>
- <li>
- <a href="<%= url_for new_user_session_path %>">Why CakeSide?</a>
- </li>
- </ul>
- </div>
- <div class="span4">
- <h3>Contact Us</h3>
- <ul class="unstyled">
- <li>
- <a href="http://cakeside.wufoo.com/forms/z7x3k1/" target="_blank">Send Feedback</a>
- </li>
- <li>
- <a href="http://twitter.com/cakeside">Twitter</a>
- </li>
- <li>
- <a href="https://www.facebook.com/pages/CakeSide/214607468615074">Facebook</a>
- </li>
- <li>
- <a href="/"></a>
- </li>
- </ul>
- </div>
- <div class="span8"></div>
- </div>
- </div>
-
-
-<div id="footer-floor">
- <div class="container">
- <div class="row">
- <div class="span12">
- <p>Copyright © 2012 CakeSide Inc. | <a href="/terms.html"> Terms</a> & <a href="/privacy.html"> Privacy</a> | Contact Us <a href="http://twitter.com/cakeside">@cakeside</a> | <a href="https://www.facebook.com/pages/CakeSide/214607468615074">facebook</a></p>
- </div>
- <div class="span4">
- </div>
+ <div class="container">
+ <div class="row">
+ <div class="span4">
+ <h3>CakeSide</h3>
+ <ul class="unstyled">
+ <li> <a href="/">Home</a> </li>
+ <% unless user_signed_in? %>
+ <li> <a href="<%= url_for new_user_session_path %>">Sign-Up</a> </li>
+ <% end %>
+ <li> <a href="<%= url_for new_user_session_path %>">About Us</a> </li>
+ <li> <a href="<%= url_for new_user_session_path %>">Why CakeSide?</a> </li>
+ </ul>
+ </div>
+ <div class="span4">
+ <h3>Contact Us</h3>
+ <ul class="unstyled">
+ <li>
+ <a href="http://cakeside.wufoo.com/forms/z7x3k1/" target="_blank">Send Feedback</a>
+ </li>
+ <li>
+ <a href="http://twitter.com/cakeside">Twitter</a>
+ </li>
+ <li>
+ <a href="https://www.facebook.com/pages/CakeSide/214607468615074">Facebook</a>
+ </li>
+ <li>
+ <a href="/"></a>
+ </li>
+ </ul>
+ </div>
+ <div class="span8"></div>
+ </div>
+ </div>
+ <div id="footer-floor">
+ <div class="container">
+ <div class="row">
+ <div class="span12">
+ <p>Copyright © 2012 CakeSide Inc. | <a href="/terms.html"> Terms</a> & <a href="/privacy.html"> Privacy</a> | Contact Us <a href="http://twitter.com/cakeside">@cakeside</a> | <a href="https://www.facebook.com/pages/CakeSide/214607468615074">facebook</a></p>
+ </div>
+ <div class="span4">
</div>
</div>
-</div>
-
- </footer>
-
-
+ </div>
+ </div>
+ </footer>
<%= render "shared/google_analytics" %>
</body>
</html>