Modified page header markup to not conflict with flash msgs

Increased width of textareas
tgaff · Mar 19, 2013 · 4ebce3d · 4ebce3d
1 parent ce9e565
commit 4ebce3d
Show file tree

Hide file tree

Showing 17 changed files with 36 additions and 51 deletions.
diff --git a/app/assets/stylesheets/_base.css.scss b/app/assets/stylesheets/_base.css.scss
@@ -7,7 +7,7 @@ h1, h2, h3, h4, h5 {
   font-weight: normal;
   line-height: 120%;
   padding: 0;
-  margin: 10px 0 0 0;
+  margin: 0;
 }
 
 h1 {
@@ -42,6 +42,10 @@ p {
   font-size: 15px;
 }
 
+textarea {
+  width: 500px;
+}
+
 a {
   color: #22444D;
 }
@@ -84,26 +88,20 @@ td.wide {
   z-index: 1031 !important;
 }
 
-.container {
+.header-container {
   margin-top: 80px;
+  width: 900px;
+
+  h1 {
+    margin-bottom: 20px;
+  }
 }
 
 .bridgetroll-content {
   width: 900px;
-  margin-left: auto;
-  margin-right: auto;
+  margin: 0 auto;
   background-color: $content-background-color;
-  padding-left: 20px;
-  padding-bottom: 20px;
-  padding-right: 20px;
-}
-
-.has-giant-header {
-  margin-top: 160px;
-  & h1 {
-    position: absolute;
-    top: 80px;
-  }
+  padding: 20px;
 }
 
 .session-display {

diff --git a/app/assets/stylesheets/events/_show.css.scss b/app/assets/stylesheets/events/_show.css.scss
@@ -6,9 +6,7 @@
   margin-bottom: 20px;
   font-size: 18px;
 
-  span {
-    display: block;
-
+  div {
     &:first-child {
       padding-bottom: 10px;
       font-size: 30px;

diff --git a/app/controllers/rsvps_controller.rb b/app/controllers/rsvps_controller.rb
@@ -4,7 +4,6 @@ class RsvpsController < ApplicationController
   before_filter :load_rsvp, except: [:new, :create]
 
   def new
-    flash[:notice] = "AWESOME - you're almost signed up"
     @rsvp = @event.rsvps.build
   end
 

diff --git a/app/helpers/locations_helper.rb b/app/helpers/locations_helper.rb
@@ -1,14 +1,8 @@
 module LocationsHelper
 
   def pretty_print_address location
-    loc = location_array(location)
-    pretty_address = ""
-
-    loc.each do |line|
-      pretty_address += content_tag( :span, line )
-    end
-
-    return pretty_address.html_safe
+    tags = location_array(location).map { |line| content_tag(:div, line) }
+    tags.join('').html_safe
   end
 
   private

diff --git a/app/views/checkins/index.html.erb b/app/views/checkins/index.html.erb
@@ -1,4 +1,4 @@
-<%= render 'events/header' %>
+<%= content_for(:header_text, @event.title) %>
 
 <h2>Check in volunteers to <%= @session.name %></h2>
 

diff --git a/app/views/events/_header.html.erb b/app/views/events/_header.html.erb
diff --git a/app/views/events/edit.html.erb b/app/views/events/edit.html.erb
@@ -1,4 +1,4 @@
-<%= render 'events/header' %>
+<%= content_for(:header_text, @event.title) %>
 
 <h1>Editing event</h1>
 

diff --git a/app/views/events/new.html.erb b/app/views/events/new.html.erb
@@ -1,8 +1,5 @@
-<div class="row-fluid has-giant-header">
-  <div class="span7">
-    <h1>Organize an Event</h1>
-  </div>
-</div>
+<%= content_for(:header_text, 'Organize an Event') %>
+
 <%= render 'form' %>
 
 <%= render 'shared/actions', links: [

diff --git a/app/views/events/organize.html.erb b/app/views/events/organize.html.erb
@@ -1,4 +1,4 @@
-<%= render 'header' %>
+<%= content_for(:header_text, @event.title) %>
 
 <h2>Super Secret Organizer Mission Control Console</h2>
 

diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
@@ -1,4 +1,4 @@
-<%= render 'header' %>
+<%= content_for(:header_text, @event.title) %>
 
 <div class="row-fluid">
   <div class="span8">

diff --git a/app/views/events/volunteer_emails.erb b/app/views/events/volunteer_emails.erb
@@ -1,4 +1,4 @@
-<%= render 'events/header' %>
+<%= content_for(:header_text, @event.title) %>
 
 <h2>Volunteer Emails</h2>
 

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -22,6 +22,11 @@
         </ul>
       </div>
     </div>
+    <div class='container header-container'>
+      <% if content_for(:header_text).present? %>
+        <h1><%= yield(:header_text) %></h1>
+      <% end %>
+    </div>
     <div class="container center bridgetroll-content">
       <% flash.each do |name, msg| %>
           <div class="alert alert-<%= name == :notice ? "success" : "error" %>">

diff --git a/app/views/organizers/index.html.erb b/app/views/organizers/index.html.erb
@@ -1,4 +1,4 @@
-<%= render 'events/header' %>
+<%= content_for(:header_text, @event.title) %>
 
 <h3>Organizer Assignments</h3>
 <br />

diff --git a/app/views/rsvps/_form.html.erb b/app/views/rsvps/_form.html.erb
@@ -13,18 +13,15 @@
 
   <div class="field">
     <%= f.label :subject_experience, "What's your experience with this workshop's subject matter?" %>
-    <%= f.text_area :subject_experience, rows: 5, cols: 80,
-          maxlength: Rsvp::MAX_EXPERIENCE_LENGTH %>
+    <%= f.text_area :subject_experience, rows: 3, maxlength: Rsvp::MAX_EXPERIENCE_LENGTH %>
   </div>
 
   <div class="field">
     <%= f.label :teaching_experience, "What's your experience with teaching?" %>
-    <%= f.text_area :teaching_experience, rows: 5, cols: 80, 
-          maxlength: Rsvp::MAX_EXPERIENCE_LENGTH %>
+    <%= f.text_area :teaching_experience, rows: 3, maxlength: Rsvp::MAX_EXPERIENCE_LENGTH %>
   </div>
 
   <strong>Teaching preference?</strong>
-  <p>If you're happy to do either, leave this section blank.</p>
   <div class="field">
     <%= f.label :teaching, class: 'checkbox' do %>
       <%= f.check_box :teaching %> Teaching

diff --git a/app/views/rsvps/edit.html.erb b/app/views/rsvps/edit.html.erb
@@ -1,4 +1,4 @@
-<%= render 'events/header' %>
+<%= content_for(:header_text, @event.title) %>
 
 <h2> Edit RSVP </h2>
 

diff --git a/app/views/rsvps/new.html.erb b/app/views/rsvps/new.html.erb
@@ -1,7 +1,9 @@
-<%= render 'events/header' %>
+<%= content_for(:header_text, @event.title) %>
 
 <h2>RSVP</h2>
 
+<h5>AWESOME - you're almost signed up!</h5>
+
 <%= render 'form' %>
 
 <%= render 'shared/actions', links: [

diff --git a/app/views/volunteers/index.html.erb b/app/views/volunteers/index.html.erb
@@ -1,4 +1,4 @@
-<%= render 'events/header' %>
+<%= content_for(:header_text, @event.title) %>
 
 <h2>Assign Volunteer Teaching Roles</h2>