Merge branch 'master' of https://github.com/Polyrhythm/bridge_troll i…

…nto Polyrhythm-master

app/views/events/index.html.erb

@@ -57,7 +57,7 @@
 
 <% if user_signed_in? %>
   <%= render 'shared/actions', links: [
-    ['New Event', new_event_path],
+    ['Organize Event', new_event_path],
     ['Manage Locations', locations_path]
   ] %>
 <% end %>

app/views/profiles/show.html.erb

@@ -9,7 +9,7 @@
   <% end %>
 </ul>
 
-<strong>Other</strong>
+<strong>Other skills</strong>
 <div>
   <%= @profile.other %>
 </div>

app/views/rsvps/_form.html.erb

@@ -16,7 +16,7 @@
     <%= f.text_area :about_you, rows: 5, cols: 80 %>
   </div>
 
-  <strong>Preferences</strong>
+  <strong>Teaching preference?</strong>
   <div class="field">
     <%= f.label :teaching, class: 'checkbox' do %>
       <%= f.check_box :teaching %> Teaching
@@ -26,7 +26,7 @@
     <% end %>
   </div>
 
-  <strong>Attendances</strong>
+  <strong>Sessions you're attending</strong>
   <% @rsvp.event.event_sessions.order('starts_at ASC').each do |session| %>
     <%= label_tag do %>
       <%= check_box_tag 'rsvp_sessions[]', session.id, @rsvp.rsvp_sessions.where(event_session_id: session.id).any? %>

spec/requests/event_listing_request_spec.rb

@@ -28,14 +28,14 @@
   end
 
   context 'as a logged in user' do
-    before(:each) do 
+    before(:each) do
       @user = create(:user)
       sign_in_as(@user)
     end
 
     it "allows user to create a new event", js: true do
       visit events_path
-      click_link "New Event"
+      click_link "Organize Event"
 
       fill_in "Title", with: "February Event"
 
@@ -106,10 +106,10 @@
         rsvp.rsvp_sessions.length.should == 1
         rsvp.rsvp_sessions.first.event_session.should == @session1
       end
-     
+
       context 'given a volunteered user' do
-        before(:each) do 
-          @rsvp = create(:rsvp, event: @event, user: @user) 
+        before(:each) do
+          @rsvp = create(:rsvp, event: @event, user: @user)
           visit events_path
         end
 
@@ -138,4 +138,4 @@
       end
     end
   end
-end
+end