Commit 250aa085
Changed files (2)
app
views
devise
sessions
layouts
app/views/devise/sessions/new.html.erb
@@ -21,11 +21,13 @@
<div class="row"> <div class="span16"> </div> </div>
<div class="row">
<div class="span10">
+ <% if notice %><p class="alert-message success"><%= notice %></p> <% end %>
+ <% if alert %><p class="alert-message error"><%= alert %></p><% end %>
<%= devise_error_messages! %>
<h2>Why CakeSide?</h2>
<p>Instant updates from your friends, industry experts, and what’s happening around the world.</p>
- <h2>About Us</h2>
- <p>Instant updates from your friends, industry experts, and what’s happening around the world.</p>
+ <h2>About Us</h2>
+ <p>Instant updates from your friends, industry experts, and what’s happening around the world.</p>
</div>
<div class="span5 offset1">
<h3>New to CakeSide? <em>Join Today!</em></h3>
app/views/layouts/blank.html.erb
@@ -2,80 +2,58 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <title></title>
+ <title>CakeSide - Sign In</title>
<link rel="shortcut icon" href="/favicon.ico">
<%= stylesheet_link_tag "application" %>
- <%= csrf_meta_tags %>
<%= javascript_include_tag "application" %>
+ <%= csrf_meta_tags %>
</head>
- <%# <body style="background: url(/assets/sunset.png) no-repeat center 20px #FBE47E;">%>
- <body style="background: #FFFFFF;">
- <div style="background: url(/assets/sunset.png) no-repeat center 0px;">
- <div class="container">
- <div class="content">
- <div style="height:625px;">
- <%= yield %>
- </div>
+ <body style="background: #FFFFFF;">
+ <div style="background: url(/assets/sunset.png) no-repeat center 0px;">
+ <div class="container">
+ <div class="content">
+ <div style="height:625px;">
+ <%= yield %>
+ </div>
+ </div>
+ </div> <!-- /container -->
+ </div>
+ <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="/">Sign-Up</a> </li>
+ <li> <a href="/">About Us</a> </li>
+ <li> <a href="/">Why CakeSide?</a> </li>
+ </ul>
+ </div>
+ <div class="span4">
+ <h3>Contact</h3>
+ <ul class="unstyled">
+ <li> <a href="http://cakeside.wufoo.com/forms/z7x3k1/" target="_blank">Send Feedback</a> </li>
+ <li> <a href="/">Twitter</a> </li>
+ <li> <a href="/">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="span10">
+ <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="span6">
</div>
- </div> <!-- /container -->
+ </div>
</div>
- <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="/">Sign-Up</a>
- </li>
- <li>
- <a href="/">About Us</a>
- </li>
- <li>
- <a href="/">Why CakeSide?</a>
- </li>
- </ul>
- </div>
- <div class="span4">
- <h3>Contact</h3>
- <ul class="unstyled">
- <li>
- <a href="http://cakeside.wufoo.com/forms/z7x3k1/" target="_blank">Send Feedback</a>
- </li>
- <li>
- <a href="/">Twitter</a>
- </li>
- <li>
- <a href="/">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="span10">
- <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="span6">
- </div>
- </div>
- </div>
- </div>
-
- </footer>
-
-
- <%= render "shared/google_analytics" %>
- </body>
- </html>
+ </div>
+ </footer>
+ <%= render "shared/google_analytics" %>
+ </body>
+</html>