application.html.erb in social_stream-2.0.0.beta1

- old
+ new

@@ -4,11 +4,11 @@
   <head>
     <meta charset="utf-8">
     <title><%= yield(:title).empty? ? t('site.name') : yield(:title)%></title>
     <meta name="keywords" content="<%= t('profile.tags.default') %><%= yield(:keywords) %>" >
     <meta name="description" content= "<%= yield(:description).empty? ? t('frontpage.main_title') : yield(:description) %>" >
-    <meta name="generator" content="SocialStream" />
+    <meta name="generator" content="Social Stream" />
     <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no" />
 
     <%= stylesheet_link_tag    "application" %>
     <%= javascript_include_tag "application" %>
 
@@ -29,37 +29,20 @@
       $(document).ready(function() {
         <%= yield :javascript %>
       })
     </script>
   </head>
+  
   <body>
-    <div id="wrapper">
-      <header><%= render :partial => "layouts/header" %></header>
-      <div id="wrapper_body">
-        <nav id="toolbar">
-          <div id="toolbarContent" class="block">
-            <div class="space_center">
-            </div>
-            <%= yield :toolbar %>
-          </div>
-        </nav>
-        <div id= "center_body">
-          <div id="map_location">
-            <%= yield :location %>
-          </div>
-          <div id="flash">
-            <%= render :partial => "layouts/flash", :locals => {:flash => flash} %>
-          </div>
-          <section id="content">
-            <%= yield %>
-          </section>
-        </div>
-        <aside id="sidebar">
-          <div id="sidebarContent">
-            <%= yield :sidebar %>
-          </div>
-        </aside>
-      </div>
-      <footer><%= render :partial => "layouts/footer" %></footer>
+    <div class="wrapper container-fluid">
+      <%= render :partial => "layouts/header" %>
+
+      <%= flashy %>
+
+      <%= yield %>
+  
     </div>
+    
+    <%= render :partial => "layouts/footer" %>
+
   </body>
 </html>