Commit 1456b0d3

mo khan <mo@mokhan.ca>
2013-06-18 01:44:11
remove page_header section
master
1 parent 9ebbe82
Changed files (18)
app
views
categories
show.html.erb
creations
edit.html.erb
index.html.erb
new.html.erb
show.html.erb
favorites
index.html.erb
layouts
_messages.html.erb
photos
new.html.erb
profiles
favorites.html.erb
index.html.erb
show.html.erb
registrations
edit.html.erb
search
index.html.erb
tags
show.html.erb
tutorials
_form.html.erb
edit.html.erb
index.html.erb
new.html.erb
app/views/categories/show.html.erb
@@ -1,9 +1,7 @@
 <% provide(:title, "#{@category.name} Cakes") -%>
-<% content_for :page_header do -%>
-  <h1>Category <em><%= @category.name %></em></h1>
-<% end -%>
 <div class="row">
   <div class="span3">
+    <h1>Categories</h1>
     <ul class="well nav nav-pills nav-stacked">
       <% Category.all.each do |category| %>
         <% if(category == @category) -%>
app/views/creations/edit.html.erb
@@ -1,7 +1,4 @@
 <% provide(:title, "Editing creation #{@creation.name}") %>
-<% content_for :page_header do -%>
-  <h1><small>Edit</small> <%= @creation.name %> <small>(Step 1 of 2)</small></h1>
-<% end -%>
 <div class="row">
   <div class="span3">
     <div class="thumbnail">
@@ -12,6 +9,8 @@
     </div>
   </div>
   <div class="span9">
+    <h1><small>Edit</small> <%= @creation.name %> <small>(Step 1 of 2)</small></h1>
+    <hr />
     <%= render 'form' %>
   </div>
 </div>
app/views/creations/index.html.erb
@@ -48,7 +48,6 @@
     </div>
   </div>
 <% end -%>
-<%= render "shared/paging" %>
 <div class="row">
   <div class="span12">
     <div id="creations-div" class="row">
app/views/creations/new.html.erb
@@ -1,12 +1,11 @@
 <% provide(:title, "Share my creation") -%>
-<% content_for :page_header do -%>
-  <h1>Share a new creation <small>(Step 1 of 2)</small></h1>
-<% end -%>
 <div class="row">
   <div class="span3">
     <%= render "profiles/me_box" %>
   </div>
   <div class="span9">
+    <h1>Share a new creation <small>(Step 1 of 2)</small></h1>
+    <hr />
     <%= render 'form' %>
   </div>
 </div>
app/views/creations/show.html.erb
@@ -5,9 +5,6 @@
     $(function() { Creations.Show.initialize(); });
   </script>
 <% end -%>
-<% content_for :page_header do -%>
-  <%= image_tag "ratedr.jpg", :class => "span1 pull-right" if @creation.is_restricted %>
-<% end -%>
 <% if @creation.user == current_user %>
   <div class="row">
     <div class="span12">
app/views/favorites/index.html.erb
@@ -1,12 +1,10 @@
 <% provide(:title, "#{@creation.name} by #{@creation.user.name} - fanclub") -%>
-<% content_for :page_header do -%>
-  <h1> fans of  <%= link_to @creation.name, creation_path(@creation) %> <small> submitted by <%= link_to @creation.user.name, profile_path(@creation.user) %> </small> </h1>
-<% end -%>
 <div class="row">
   <div class="span3">
     <a class="thumbnail" href="<%= url_for creation_path(@creation) %>"><img src="<%= @creation.primary_image.image.thumb.url %>" alt="<%= @creation.name %>" /></a>
   </div>
   <div class="span9">
+    <h1> fans of  <%= link_to @creation.name, creation_path(@creation) %> <small> submitted by <%= link_to @creation.user.name, profile_path(@creation.user) %> </small> </h1>
     <ul class="thumbnails">
       <% @creation.favorites.each do |favorite| %>
         <li class="span3">
app/views/layouts/_messages.html.erb
@@ -1,26 +1,16 @@
 <% devise_flash -%>
+<% if(flash.any?) -%>
 <div class="row">
   <div class="span12">
-    <div class="row">
-      <div class="span10">
-        <% 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 -%>
-        <%= yield(:page_header) -%>
-        &nbsp;
-      </div>
-      <div class="span2 hidden-phone pull-right" style="text-align: right; padding-bottom: 8px">
-        <a href="https://www.facebook.com/pages/CakeSide/214607468615074" target="_blank" align="left"><%= image_tag "facebook.png", :border => 0 %></a>
-        <a href="http://twitter.com/cakeside" target="_blank" align="left"><%= image_tag "twitter.png", :border => 0  %></a>
-        <a href="http://pinterest.com/cakeside/" target="_blank" align="left" ><%= image_tag "pinterest.png", :border => 0 %></a>
-      </div>
-    </div>
+    <% 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 -%>
+    &nbsp;
   </div>
 </div>
+<% end %>
app/views/photos/new.html.erb
@@ -1,15 +1,8 @@
 <% provide(:title, "Upload images for this creation") -%>
-<% content_for :page_header do -%>
-  <% if(@creation.is_restricted) -%>
-    <div style="float:right;">
-      <%= image_tag "ratedr.jpg", :class => "span1" %>
-    </div>
-  <% end -%>
-  <h1><small>Upload images for </small> <%= @creation.name %> <small> (Step 2 of 2)</small></h1>
- <hr>
-<% end -%>
 <div class="row">
   <div class="span12">
+    <h1><small>Upload images for </small> <%= @creation.name %> <small> (Step 2 of 2)</small></h1>
+    <hr>
     <%= render 'form' %>
   </div>
 </div>
app/views/profiles/favorites.html.erb
@@ -1,12 +1,10 @@
 <% provide(:title, "My Favorites") -%>
-<% content_for :page_header do -%>
-  <h1>My Favorites</h1>
-<% end -%>
 <div class="row">
   <div class="span3">
     <%= render :partial => "me_box"  %>
   </div>
   <div class="span9">
+    <h1>My Favorites</h1>
     <ul class="thumbnails">
       <% @creations.each do |creation| %>
         <li><a href="<%= url_for creation %>"><img class="thumbnail" src="<%= creation.primary_image.image.thumb.url %>" alt="<%= creation.name %>"></a></li>
app/views/profiles/index.html.erb
@@ -1,10 +1,4 @@
 <% provide(:title, "Cake Artists") -%>
-<% content_for :page_header do -%>
-  <h1>Cake Artists</h1>
-<% end -%>
-<div class="row">
-  <div class="span12 text-center"> <%= paginate @profiles %> </div>
-</div>
 <div class="row">
   <div class="span12">
     <ul class="thumbnails">
app/views/profiles/show.html.erb
@@ -1,12 +1,10 @@
 <% provide(:title, "#{@user.name}") -%>
-<% content_for :page_header do -%>
-  <h1><%= @user.name %> <small>A member since <%= @user.created_at.to_s :foomat %>, with <%= @user.creations.length %> creations.</small> </h1>
-<% end -%>
 <div class="row">
   <div class="span3">
     <%= render "me_box" %>
   </div>
   <div class="span9">
+    <h1><%= @user.name %> <small>A member since <%= @user.created_at.to_s :foomat %>, with <%= @user.creations.length %> creations.</small> </h1>
     <%= render "shared/creation_image_gallery" %>
   </div>
 </div>
app/views/registrations/edit.html.erb
@@ -6,14 +6,12 @@ $(function(){
 });
 </script>
 <% end %>
-<% content_for :page_header do -%>
-  <h1>My Settings</h1>
-<% end -%>
   <div class="row">
     <div class="span3">
       <%= render "profiles/me_box" %>
     </div>
     <div class="span7">
+      <h1>My Settings</h1>
       <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put, :class=> "form-horizontal" }) do |f| %>
         <fieldset>
           <div class="control-group">
app/views/search/index.html.erb
@@ -1,7 +1,5 @@
 <% provide(:title, "#{@search}") -%>
-<% content_for :page_header do -%>
-  <h1>Search Results for <em><%= @search %></em></h1>
-<% end -%>
+<h1>Search Results for <em><%= @search %></em></h1>
 <h3>Creations</h3>
 <hr />
 <div class="row">
app/views/tags/show.html.erb
@@ -9,14 +9,13 @@
   });
 </script>
 <% end -%>
-<% content_for :page_header do -%>
-  <h1><%= @total_creations %> creations tagged <em><%= @tag %></em></h1>
-<% end -%>
-<div class="row">
-  <p class="pull-right"><a href="/tutorials?tag=<%= @tag %>"><%= @total_tutorials %> tutorials</a> &raquo;</p>
-</div>
 <div class="row">
-  <div class="span12 text-center"> <%= paginate @creations %> </div>
+  <div class="span9">
+    <h1><%= @total_creations %> creations tagged <em><%= @tag %></em></h1>
+  </div>
+  <div class="span3">
+    <p class="pull-right"><a href="/tutorials?tag=<%= @tag %>"><%= @total_tutorials %> tutorials</a> &raquo;</p>
+  </div>
 </div>
 <div id="tutorials-div" class="row">
   <div class="span12">
app/views/tutorials/_form.html.erb
@@ -2,7 +2,6 @@
 <script type="text/javascript" charset="utf-8">
 $(function(){
   new TutorialForm().initialize($);
-
   var all_tags = [ <% ActsAsTaggableOn::Tag.all.map(&:name).each { |item| %> '<%= item %>', <% } %> ];
   $('#tags').tagit({ availableTags: all_tags });
 });
app/views/tutorials/edit.html.erb
@@ -1,7 +1,5 @@
 <% provide(:title, "Edit tutorial") -%>
-<% content_for :page_header do -%>
-  <h1>Editing tutorial</h1>
-<% end -%>
 <div class="row">
-    <%= render 'form' %>
+  <h1>Editing tutorial</h1>
+  <%= render 'form' %>
 </div>
app/views/tutorials/index.html.erb
@@ -12,12 +12,6 @@
   });
 </script>
 <% end -%>
-<% content_for :page_header do -%>
-  <%= link_to 'Add Tutorial', new_tutorial_path, :class => "btn btn-primary" %>
-<% end -%>
-<div class="row">
-  <div class="span12 text-center"> <%= paginate @tutorials %> </div>
-</div>
 <div id="tutorials-div" class="row">
   <div class="span12">
   <ul class="thumbnails">
app/views/tutorials/new.html.erb
@@ -1,7 +1,9 @@
 <% provide(:title, "Share a tutorial link") -%>
-<% content_for :page_header do -%>
-  <h1>Share a tutorial link</h1>
-<% end -%>
+<div class="row">
+  <div class="span12">
+    <h1>Share a tutorial link</h1>
+  </div>
+</div>
 <div class="row">
   <div class="span3">
     <%= render "profiles/me_box" %>