Commit 5f814cde

mo k <mo@mokhan.ca>
2012-09-20 13:33:00
move the social buttons into the messages partial.
master
1 parent 9c3a2a1
Changed files (2)
app
views
layouts
_messages.html.erb
application.html.erb
app/views/layouts/_messages.html.erb
@@ -1,33 +1,25 @@
 <% devise_flash -%>
-<% if(flash.any?) -%>
-  <div class="row">
-    <div class="span12">
-      <% flash.each do |key, value| -%>
-        <% Array(value).uniq.each do |message| -%>
-          <div class="alert alert-<%= key %>">
-            <a class="close" data-dismiss="alert" href="#">×</a>
-            <%= message %>
-          </div>
-        <% end -%>
-      <% end -%>
-    </div>
-  </div>
-<% end -%>
 <div class="row">
   <div class="span12">
     <div class="row">
-    <div class="span9">
-      <div class="alert alert-notice">
-        <a class="close" data-dismiss="alert" href="#">×</a>
-        whoa there...
+      <div class="span9">
+        <% if(flash.any?) -%>
+          <% flash.each do |key, value| -%>
+            <% Array(value).uniq.each do |message| -%>
+              <div class="alert alert-<%= key %>">
+                <a class="close" data-dismiss="alert" href="#">×</a>
+                <%= message %>
+              </div>
+            <% end -%>
+          <% end -%>
+        <% end -%>
+        &nbsp;
+      </div>
+      <div class="span3" style="text-align: right; padding-bottom: 8px">
+        <a href="https://www.facebook.com/pages/CakeSide/214607468615074" target="_blank" align="left"><img src="http://www.niftybuttons.com/rkc-social-set-1/facebook.png" border="0"></a>
+        <a href="http://twitter.com/cakeside" target="_blank" align="left"><img src="http://www.niftybuttons.com/rkc-social-set-1/twitter.png" border="0"></a>
+        <a href="http://pinterest.com/cakeside/" target="_blank" align="left" ><img src="http://www.niftybuttons.com/rkc-social-set-1/pinterest.png" border="0"></a>
       </div>
-      &nbsp;
-    </div>
-    <div class="span3" style="text-align: right; padding-bottom: 8px">
-      <a href="https://www.facebook.com/pages/CakeSide/214607468615074" target="_blank" align="left"><img src="http://www.niftybuttons.com/rkc-social-set-1/facebook.png" border="0"></a>
-      <a href="http://twitter.com/cakeside" target="_blank" align="left"><img src="http://www.niftybuttons.com/rkc-social-set-1/twitter.png" border="0"></a>
-      <a href="http://pinterest.com/cakeside/" target="_blank" align="left" ><img src="http://www.niftybuttons.com/rkc-social-set-1/pinterest.png" border="0"></a>
-    </div>
     </div>
   </div>
 </div>
app/views/layouts/application.html.erb
@@ -22,15 +22,6 @@
   </head>
   <body>
     <%= render "shared/header" %>
-    <div class="container">
-        <div class="row">
-            <div class="span4 offset8" style="text-align: right; padding-bottom: 8px">
-                <a href="https://www.facebook.com/pages/CakeSide/214607468615074" target="_blank" align="left"><img src="http://www.niftybuttons.com/rkc-social-set-1/facebook.png" border="0"></a>
-                <a href="http://twitter.com/cakeside" target="_blank" align="left"><img src="http://www.niftybuttons.com/rkc-social-set-1/twitter.png" border="0"></a>
-                <a href="http://pinterest.com/cakeside/" target="_blank" align="left" ><img src="http://www.niftybuttons.com/rkc-social-set-1/pinterest.png" border="0"></a>
-            </div>
-        </div>
-    </div>  
     <div class="container">
       <%= render "layouts/messages" %>
       <%= yield %>