From 254cfdb0a866da9411b88671cad4629e4fbbe066 Mon Sep 17 00:00:00 2001
From: mrjabba <mrjabba@gmail.com>
Date: Fri, 11 Oct 2013 16:47:29 -0500
Subject: [PATCH] Create header title content helper so we dont have to go
 through changing markup everywhere again for this section

---
 app/helpers/application_helper.rb            | 4 ++++
 app/views/devise/registrations/edit.html.erb | 2 +-
 app/views/devise/registrations/new.html.erb  | 2 +-
 app/views/devise/sessions/new.html.erb       | 2 +-
 app/views/leagues/edit.html.erb              | 2 +-
 app/views/leagues/index.html.erb             | 2 +-
 app/views/leagues/new.html.erb               | 2 +-
 app/views/leaguezones/edit.html.erb          | 2 +-
 app/views/leaguezones/index.html.erb         | 2 +-
 app/views/leaguezones/new.html.erb           | 2 +-
 app/views/organizations/edit.html.erb        | 2 +-
 app/views/organizations/index.html.erb       | 2 +-
 app/views/organizations/new.html.erb         | 2 +-
 app/views/people/edit.html.erb               | 2 +-
 app/views/people/index.html.erb              | 2 +-
 app/views/people/new.html.erb                | 2 +-
 app/views/playinglocations/new.html.erb      | 2 +-
 app/views/teams/edit.html.erb                | 2 +-
 app/views/teams/index.html.erb               | 2 +-
 app/views/teams/new.html.erb                 | 2 +-
 app/views/teamstats/edit.html.erb            | 2 +-
 app/views/technicalstaffs/new.html.erb       | 2 +-
 app/views/users/edit.html.erb                | 2 +-
 app/views/users/index.html.erb               | 2 +-
 app/views/users/show.html.erb                | 2 +-
 app/views/venues/edit.html.erb               | 2 +-
 app/views/venues/index.html.erb              | 2 +-
 app/views/venues/new.html.erb                | 2 +-
 app/views/venues/show.html.erb               | 2 +-
 spec/requests/people_spec.rb                 | 2 +-
 30 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8c60729..317c4f6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -23,6 +23,10 @@ def title
     end
   end
 
+  def header_title(content)
+    content_tag(:header, content_tag(:h1, content))
+  end
+
   def zone_cell_at_position(zones, position)
     zone = Leaguezone.find_zone_by_position(zones, position)
     zone.nil? ? content_tag(:td, position) : content_tag(:td, position, {:class => zone.style, :title => zone.name})
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index 3cd36b5..d313992 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,4 +1,4 @@
-<header><h1>Edit Profile</h1></header>
+<%=header_title("Edit Profile")%>
 
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => {:method => :put, :class => "well form-horizontal"}) do |f| %>
   <%= devise_error_messages! %>
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index 4820a31..b152935 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -1,4 +1,4 @@
-<header><h1>Sign up</h1></header>
+<%=header_title("Sign up")%>
 
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => {:class => "well form-horizontal"}) do |f| %>
   <%= devise_error_messages! %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index d9ea8f5..45939d2 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,4 +1,4 @@
-<header><h1>Sign in</h1></header>
+<%=header_title("Sign in")%>
 
 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => "well form-horizontal"}) do |f| %>
   <div class="control-group">
diff --git a/app/views/leagues/edit.html.erb b/app/views/leagues/edit.html.erb
index 09292c5..03203ab 100644
--- a/app/views/leagues/edit.html.erb
+++ b/app/views/leagues/edit.html.erb
@@ -1,4 +1,4 @@
-<header><h1>Edit League</h1></header>
+<%=header_title("Edit League")%>
 <%= render :partial => "form", :locals => {:model => [@league], :league => @league, :save_label => "Update"} %>
 
 <div class="modal hide" id="gameWarning">
diff --git a/app/views/leagues/index.html.erb b/app/views/leagues/index.html.erb
index 1b8aa07..1be6bd1 100644
--- a/app/views/leagues/index.html.erb
+++ b/app/views/leagues/index.html.erb
@@ -1,4 +1,4 @@
-<header><h1>League Management</h1></header>
+<%=header_title("League Management")%>
 <div class="alert">Leagues contain teams and matches and may be long (season) or short (tournaments/cups). Teams have rosters within a league season. Manage the season lifecycle here.</div>
 
 <%= form_tag leagues_path, :method => 'get', :remote => true, :id => "leagues_search", :class => "form-search" do %>
diff --git a/app/views/leagues/new.html.erb b/app/views/leagues/new.html.erb
index c7107ef..b163cb2 100644
--- a/app/views/leagues/new.html.erb
+++ b/app/views/leagues/new.html.erb
@@ -1,2 +1,2 @@
-<h2>New League</h2>
+<%=header_title("New League")%>
 <%= render :partial => "form", :locals => {:model => [@league.organization, @league], :league => @league, :save_label => "Create"} %>
diff --git a/app/views/leaguezones/edit.html.erb b/app/views/leaguezones/edit.html.erb
index f08b637..a2f044b 100644
--- a/app/views/leaguezones/edit.html.erb
+++ b/app/views/leaguezones/edit.html.erb
@@ -1,2 +1,2 @@
-<header><h1><%=t :zone_edit  %></h1></header>
+<%=header_title(t :zone_edit)%>
 <%= render :partial => "form", :locals => {:model => [@leaguezone], :leaguezone => @leaguezone, :save_label => "Update"} %>
diff --git a/app/views/leaguezones/index.html.erb b/app/views/leaguezones/index.html.erb
index 4d213b3..be5d535 100644
--- a/app/views/leaguezones/index.html.erb
+++ b/app/views/leaguezones/index.html.erb
@@ -1,4 +1,4 @@
-<header><h1>League Zone Management</h1></header>
+<%=header_title("League Zone Management")%>
 <div class="alert">Leagues may participate in promotion/relegation or may have qualifiers for tournaments based on table rank. Use League Zones to define those ranks.</div>
 
 <ul class="breadcrumb">
diff --git a/app/views/leaguezones/new.html.erb b/app/views/leaguezones/new.html.erb
index def7e58..87476aa 100644
--- a/app/views/leaguezones/new.html.erb
+++ b/app/views/leaguezones/new.html.erb
@@ -1,2 +1,2 @@
-<header><h1><%=t :zone_new  %></h1></header>
+<%=header_title(t :zone_new)%>
 <%= render :partial => "form", :locals => {:model => [@leaguezone.league, @leaguezone], :leaguezone => @leaguezone, :save_label => "Create"} %>
diff --git a/app/views/organizations/edit.html.erb b/app/views/organizations/edit.html.erb
index c9bb166..d600778 100644
--- a/app/views/organizations/edit.html.erb
+++ b/app/views/organizations/edit.html.erb
@@ -1,2 +1,2 @@
-<header><h1>Edit organization</h1></header>
+<%=header_title("Edit Organization")%>
 <%= render :partial => "form", :locals => {:model => @organization, :organization => @organization, :save_label => "Update"} %>
diff --git a/app/views/organizations/index.html.erb b/app/views/organizations/index.html.erb
index 98fd50f..07cbd2d 100644
--- a/app/views/organizations/index.html.erb
+++ b/app/views/organizations/index.html.erb
@@ -1,4 +1,4 @@
-<header><h1>Organization Management</h1></header>
+<%=header_title("Organization Management")%>
 <div class="alert">Organizations (also Associations) manage leagues. These can be as large as national/continental confederations or local city associations.</div>
 
 <div class="btn-toolbar">
diff --git a/app/views/organizations/new.html.erb b/app/views/organizations/new.html.erb
index 7121316..ac70487 100644
--- a/app/views/organizations/new.html.erb
+++ b/app/views/organizations/new.html.erb
@@ -1,2 +1,2 @@
-<h2>New Organization</h2>
+<%=header_title("New Organization")%>
 <%= render :partial => "form", :locals => {:model => @organization, :organization => @organization, :save_label => "Create"} %>
diff --git a/app/views/people/edit.html.erb b/app/views/people/edit.html.erb
index 5ff1991..ac6aace 100644
--- a/app/views/people/edit.html.erb
+++ b/app/views/people/edit.html.erb
@@ -1,2 +1,2 @@
-<header><h1><%= @title %></h1></header>
+<%=header_title(@title)%>
 <%= render :partial => "form", :locals => {:model => @person, :person => @person, :save_label => "Update"} %>
diff --git a/app/views/people/index.html.erb b/app/views/people/index.html.erb
index b191ec8..b077345 100644
--- a/app/views/people/index.html.erb
+++ b/app/views/people/index.html.erb
@@ -1,4 +1,4 @@
-<header><h1>Person Repository</h1></header>
+<%=header_title("Person Repository")%>
 <div class="alert">People careers span often span multiple teams and leagues. Manage basic person profile information here.</div>
 
 <div class="btn-toolbar">
diff --git a/app/views/people/new.html.erb b/app/views/people/new.html.erb
index 8e6e141..e2150bc 100644
--- a/app/views/people/new.html.erb
+++ b/app/views/people/new.html.erb
@@ -1,2 +1,2 @@
-<h2><%= @title %></h2>
+<%=header_title(@title)%>
 <%= render :partial => "form", :locals => {:model => @person, :person => @person, :save_label => "Create"} %>
diff --git a/app/views/playinglocations/new.html.erb b/app/views/playinglocations/new.html.erb
index f51f0bb..0c65fbc 100644
--- a/app/views/playinglocations/new.html.erb
+++ b/app/views/playinglocations/new.html.erb
@@ -1,4 +1,4 @@
-<header><h1>New Playing Location</h1></header>
+<%=header_title("New Playing Location")%>
 
 <%= form_for [@playinglocation.teamstat, @playinglocation], :html => {:class => "well form-horizontal"} do |f| %>
   <%= render :partial => "shared/error_messages", :locals => {:model => f.object} %>
diff --git a/app/views/teams/edit.html.erb b/app/views/teams/edit.html.erb
index ff75ab5..3a31837 100644
--- a/app/views/teams/edit.html.erb
+++ b/app/views/teams/edit.html.erb
@@ -1,2 +1,2 @@
-<header><h1>Edit Team</h1></header>
+<%=header_title("Edit Team")%>
 <%= render :partial => "form", :locals => {:save_label => "Update"} %>
diff --git a/app/views/teams/index.html.erb b/app/views/teams/index.html.erb
index ac6076f..cbbfe44 100644
--- a/app/views/teams/index.html.erb
+++ b/app/views/teams/index.html.erb
@@ -1,4 +1,4 @@
-<header><h1>Team Repository</h1></header>
+<%=header_title("Team Repository")%>
 <div class="alert">Teams play in different leagues over various seasons. And, they also play in tournaments and cups. 
 Manage basic team profile information here.</div>
 
diff --git a/app/views/teams/new.html.erb b/app/views/teams/new.html.erb
index 0c6d8c6..9f17a86 100644
--- a/app/views/teams/new.html.erb
+++ b/app/views/teams/new.html.erb
@@ -1,2 +1,2 @@
-<header><h1><%=t :team_new  %></h1></header>
+<%=header_title(t :team_new)%>
 <%= render :partial => "form", :locals => {:save_label => "Create"} %>
diff --git a/app/views/teamstats/edit.html.erb b/app/views/teamstats/edit.html.erb
index a8f81c8..bdab5a0 100644
--- a/app/views/teamstats/edit.html.erb
+++ b/app/views/teamstats/edit.html.erb
@@ -3,7 +3,7 @@
   <li><%= link_to "#{@teamstat.team_name} Roster", teamstat_path(@teamstat.id) %></li>
 </ul>
 
-<header><h1>Edit Roster</h1></header>
+<%=header_title("Edit Roster")%>
 <p>
   <%= form_for(@teamstat, :html => {:class => "well form-horizontal"}) do |f| %>
   <% unless @teamstat.rosters.empty? %>
diff --git a/app/views/technicalstaffs/new.html.erb b/app/views/technicalstaffs/new.html.erb
index 4e99791..15be411 100644
--- a/app/views/technicalstaffs/new.html.erb
+++ b/app/views/technicalstaffs/new.html.erb
@@ -1,4 +1,4 @@
-<header><h1>New Technical Staff</h1></header>
+<%=header_title("New Technical Staff")%>
 
 <%= form_for [@technicalstaff.teamstat, @technicalstaff], :html => {:class => "well form-horizontal"} do |f| %>
   <%= render :partial => "shared/error_messages", :locals => {:model => f.object} %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 2ea36f5..9a75941 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -1,4 +1,4 @@
-<header><h1>Edit user</h1></header>
+<%=header_title("Edit User")%>
 
 <%= form_for(@user, :html => {:class => "well form-horizontal"}) do |f| %>
   <%= render :partial => "shared/error_messages", :locals => {:model => f.object} %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index b54a8d9..8529f24 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,4 +1,4 @@
-<header><h1>All users</h1></header>
+<%=header_title("All Users")%>
 <% if can? :new, @user %>
 <div class="alert">Filter Users By Role</div>
 <div class="btn-toolbar">
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index b918e4a..75163cc 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -3,7 +3,7 @@
     <%= link_to "Edit Profile", "#{@user.id}/edit", :class => "btn" %>
   </div>
 <% end %>
-<header><h1>User Information</h1></header>
+<%=header_title("User Information")%>
 
 <div class="hero-unit">
   <div class="row">
diff --git a/app/views/venues/edit.html.erb b/app/views/venues/edit.html.erb
index 2733af2..fa5214c 100644
--- a/app/views/venues/edit.html.erb
+++ b/app/views/venues/edit.html.erb
@@ -1,3 +1,3 @@
-<header><h1>Edit Venue</h1></header>
+<%=header_title("Edit Venue")%>
 <%= render :partial => "form", :locals => {:save_label => "Update"} %>
 
diff --git a/app/views/venues/index.html.erb b/app/views/venues/index.html.erb
index 761b3d5..293703f 100644
--- a/app/views/venues/index.html.erb
+++ b/app/views/venues/index.html.erb
@@ -1,4 +1,4 @@
-<header><h1>Venue Repository</h1></header>
+<%=header_title("Venue Repository")%>
 <div class="alert">Teams play in different venues over various seasons, sometimes sharing venues with other teams.
     Manage basic venue information for fields and stadia here.</div>
 
diff --git a/app/views/venues/new.html.erb b/app/views/venues/new.html.erb
index 6876db7..cbbd97b 100644
--- a/app/views/venues/new.html.erb
+++ b/app/views/venues/new.html.erb
@@ -1,2 +1,2 @@
-<header><h1>New Venue</h1></header>
+<%=header_title("New Venue")%>
 <%= render :partial => "form", :locals => {:save_label => "Create"} %>
diff --git a/app/views/venues/show.html.erb b/app/views/venues/show.html.erb
index fb58309..b87f0fe 100644
--- a/app/views/venues/show.html.erb
+++ b/app/views/venues/show.html.erb
@@ -1,4 +1,4 @@
-<header><h1>Venue: <%= @venue.name %></h1></header>
+<%=header_title("Venue: #{@venue.name}")%>
 
 <div class="btn-toolbar">
     <% if can? :new, @venue %>
diff --git a/spec/requests/people_spec.rb b/spec/requests/people_spec.rb
index d651547..112c0c8 100644
--- a/spec/requests/people_spec.rb
+++ b/spec/requests/people_spec.rb
@@ -18,7 +18,7 @@
         lambda do
           visit new_person_path
           response.should have_selector('title', :content => "New Person")
-          response.should have_selector('h2', :content => "New Person")
+          response.should have_selector('h1', :content => "New Person")
           response.should contain("Cancel")
           fill_in "Firstname", :with => ""
           fill_in "LastName", :with => ""