Skip to content

Commit

Permalink
Remove as many references to RailsBridge as possible
Browse files Browse the repository at this point in the history
- Update cookbook links to point at the shared cookbook in the Bridge Foundry repo
- Rewrite the about page to explain that Bridge Troll is for all the Bridges
- Rewrite copy where it didn't need to specify which Bridge the event was for
- Emails are now coming from Bridge Troll, not RailsBridge
- Remaining references are in URLs that they should be, and email addresses that don't currently have a substitute, i.e. bridgetroll@railsbridge.org, board@railsbridge.org
- Fiddly README updates
  • Loading branch information
lilliealbert committed Nov 23, 2015
1 parent 71d11ed commit 7d060a1
Show file tree
Hide file tree
Showing 16 changed files with 42 additions and 63 deletions.
7 changes: 4 additions & 3 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

[![Build Status](https://travis-ci.org/railsbridge/bridge_troll.svg?branch=master)](http://travis-ci.org/railsbridge/bridge_troll)

Bridge Troll is a Rails app that helps RailsBridge workshop organizers plan their events.
Bridge Troll is a Rails app that helps workshop organizers plan their events.

Bridge Troll aims to provide a single site for Students and Volunteers to register for workshops, so that Organizers have as much information as possible in one place to help them plan their workshop. Organizers will be able to easily contact attendees before a workshop, sort students and volunteers into classes on the workshop day, and provide follow-up surveys afterward.
Bridge Troll aims to provide a single site for students and volunteers to RSVP for workshops, so that organizers have as much information as possible in one place to help them plan their workshop. Organizers can easily contact attendees before a workshop, sort students and volunteers into classes on the workshop day, and provide follow-up surveys afterward.

Prospective organizers and attendees can sign up right now at [www.bridgetroll.org](http://www.bridgetroll.org). If you would really like roll your own, Bridge Troll is open source and you are free to fork, hack to your heart's content and deploy it to your favorite server or PaaS.

We have something of a roadmap [here](https://github.com/railsbridge/bridge_troll/wiki/Roadmap).
# Contributing

New? Keep reading this, and then head to the wiki to read the [contributor guidelines](https://github.com/railsbridge/bridge_troll/wiki/Contributor-Guidelines).

Expand All @@ -29,6 +29,7 @@ Join the [google group](https://groups.google.com/forum/?fromgroups#!forum/bridg

Then, have a look at our [GitHub Issues](https://github.com/railsbridge/bridge_troll/issues?state=open). Pick a feature to work on, fork the project, code some code, and send a [really good pull request](http://railsbridge.github.com/bridge_troll/). Not sure what to do? Ask the [google group](https://groups.google.com/forum/?fromgroups#!forum/bridge-troll) for advice!

Curious about the longer-term? We have something of a roadmap [here](https://github.com/railsbridge/bridge_troll/wiki/Roadmap).

## Setting up for your local development environment

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/surveys_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def new
@survey = Survey.where(rsvp_id: @rsvp.id).first_or_initialize

if @survey.persisted?
flash[:error] = "It looks like you've already taken this survey! Email workshops@railsbridge.org with any other feedback you have."
flash[:error] = "It looks like you've already taken this survey! Email your workshop organizer with any other feedback you have."
end
end

Expand Down
9 changes: 2 additions & 7 deletions app/views/devise/mailer/confirmation_instructions.html.erb
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
<div style="font-family: sans-serif;">
<h2>Welcome to Bridge Troll, <%= @resource.first_name %>!</h2>

<p>Click the link below to begin a magical journey to a RailsBridge workshop.</p>
<p>Click the link below to begin a magical journey to an amazing, welcoming technology workshop.</p>

<p>
<%= link_to confirmation_url(@resource, confirmation_token: @token) do %>
<img alt='Confirm your account!' src="http://<%= Rails.configuration.action_mailer.default_url_options[:host] %>/email_images/confirm_account.gif">
<% end %>
</p>

<p>
P.S. Once you're confirmed, go to the Account page to link to your Meetup account (if you have one).
This will import your RailsBridge attendance history.
</p>
</div>
</div>
2 changes: 1 addition & 1 deletion app/views/event_mailer/new_event.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<p>Howdy, RailsBridge fan!</p>
<p>Howdy!</p>

<p>A new event, "<%= @event.title %>", has been posted to Bridge Troll!</p>

Expand Down
4 changes: 2 additions & 2 deletions app/views/events/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,10 @@
<h2>Ready to create your Event? Hold on a second...</h2>

<p>If you're organizing a workshop, make sure you've read over the
<a href="https://github.com/railsbridge/docs/wiki/Cookbook">Organizer's Cookbook</a> so you know what you're getting into.</p>
<a href="https://github.com/bridgefoundry/WorkshopCookbook/wiki/Cookbook">Organizer Cookbook</a> so you know what you're getting into.</p>

<p>Pay particular attention to the
<a href="https://github.com/railsbridge/docs/wiki/Workshop-Planning-Tasks">Workshop Planning Tasks</a> page. You're already posting an event on Bridge Troll, which is a thing on that page!</p>
<a href="https://github.com/bridgefoundry/WorkshopCookbook/wiki/Workshop-Planning-Tasks">Workshop Planning Tasks</a> page. You're already posting an event on Bridge Troll, which is a thing on that page!</p>

<div class="field">
<%= label_tag :coc, class: 'question' do %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/events/_organizer_preworkshop_buttons.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
'Dietary Needs',
"All your attendees' food needs are aggregated here for your food-ordering convenience."
],
["https://github.com/railsbridge/docs/wiki/Workshop-Planning-Timeline",
["https://github.com/bridgefoundry/WorkshopCookbook/wiki/Cookbook",
'fa fa-book',
'Workshop Cookbook',
"Organizing events is a lot of work! RailsBridge has put together a detailed
"Organizing events is a lot of work! Bridge Foundry has put together a detailed
guide to running a workshop (easily used for other events, too)."
]
] %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/events/emails/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@

<div class="row">
<div class="col-md-8">
<%= f.input :subject, label: "Subject", placeholder: 'A message from your RailsBridge organizer' %>
<%= f.input :subject, label: "Subject", placeholder: 'A message from your organizer' %>
<%= f.input :body, as: :text, label: "Body", placeholder: "Here's some important information about the upcoming workshop..." %>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/events/feed.atom.builder
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
atom_feed do |feed|
feed.title("RailsBridge")
feed.title("Bridge Troll Events")
feed.link root_url
feed.updated @events.last.updated_at
feed.id root_url
Expand Down
2 changes: 1 addition & 1 deletion app/views/events/feed.rss.builder
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
xml.instruct! :xml, :version => "1.0"
xml.rss :version => "2.0" do
xml.channel do
xml.title "RailsBridge"
xml.title "Bridge Troll Events"
xml.link root_url
xml.language "en"

Expand Down
2 changes: 1 addition & 1 deletion app/views/rsvps/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
<div class="form-group boolean optional affiliate_with_chapter">
<div class="checkbox">
<%= label_tag :affiliate_with_chapter do %>
<%= check_box_tag :affiliate_with_chapter, 1, current_user.chapters.include?(@event.chapter) %> I want to be notified of future RailsBridge events in the "<%= @event.chapter.name %>" chapter.
<%= check_box_tag :affiliate_with_chapter, 1, current_user.chapters.include?(@event.chapter) %> I want to be notified of future events in the "<%= @event.chapter.name %>" chapter.
<% end %>
<div>
<small>(Full email preferences are available <%= link_to 'on your User Account', edit_user_registration_path %>)</small>
Expand Down
53 changes: 18 additions & 35 deletions app/views/static_pages/about.html.erb
Original file line number Diff line number Diff line change
@@ -1,56 +1,39 @@
<div class="row about">
<div class="col-md-8 col-md-offset-2">
<h1>Bridge Troll: Software by RailsBridge</h1>
<h2>About RailsBridge</h2>
<p>RailsBridge is an organization that helps people put on free workshops
to teach Ruby, Rails, and other technologies to people who are
under-represented in technology. A typical workshop is 1.5 days, beginning with a Friday evening “Installfest” where we get all the necessary technologies installed on the students’ laptops, and a Saturday workshop focused on demystifying the topic at hand and building something the student can share, be it a static website, a simple Rails app, or a Ruby script that prints “100 Bottles of Beer on the Wall.” </p>
<h1>Bridge Troll</h1>
<h2>Software by RailsBridge, for all Bridges!</h2>

<p>
Workshops range from 20 &ndash; 100 students and volunteers,
and since we provide free food and childcare, they have quite a
few moving parts to manage. In the past, workshops were organized
through a combination of Meetup or Eventbrite and Google Docs
spreadsheets. This was okay, but we wanted to make organizing simpler,
and we wanted to make studying our efficacy possible. So we built
Bridge Troll!</p>
This software helps all of the Bridges under the <a href="http://bridgefoundry.org/">Bridge Foundry</a> umbrella plan workshops, including RailsBridge, MobileBridge, and GoBridge.
Learn more about Bridge Foundry at <a href="http://bridgefoundry.org/">bridgefoundry.org</a>.
</p>


<h2>Bridge Troll's Features</h2>
<h2>Bridge Troll's Features for Organizers</h2>

<h3>Planning</h3>
<h3>Planning Your Workshop</h3>

<ul>
<li>Manages RSVPs for students and volunteers, including student RSVP limits and automatic waitlist logic.</li>
<li>Manages RSVPs for students and volunteers, including RSVP limits, automatic waitlist logic, and the ability to close RSVPs at any time.</li>
<li>Built-in student and volunteer surveys at the time of RSVP for their dietary needs, class level preference, and volunteers' technical and teaching backgrounds.</li>
<li>Aggregate dietary restrictions view for easy catering ordering.</li>
<li>Bridge Troll automatically reminds students and volunteers via email three days before the event.</li>
<li>Organizers can email all attendees or various subgroups (i.e. confirmed students, waitlisted students, just volunteers, etc.).</li>
<li>Organizers can email all attendees, various subgroups (i.e. confirmed students, waitlisted students, just volunteers, etc.), or specific attendees.</li>
</ul>

<h3>At the Workshop</h3>
<h3>Managing Your Workshop</h3>

<ul>
<li>Easy check-in page to keep track of who actually shows.</li>
<li>Organizers can designate “checkin-ers”, so anyone with a Bridge Troll
account can help check people in.</li>
<li>Organizers can designate “checkin-ers”, so anyone with a Bridge Troll account can help check people in.</li>
<li>Automatic small-group sorting with drag & drop interface so organizers can tweak class divisions based on their needs</li>
<li>Bridge Troll will email your attendees a short survey about how the workshop went.</li>
</ul>

<p>Want to learn more about planning a RailsBridge workshop? We've got a
<a href="https://github.com/railsbridge/docs/wiki/Cookbook">cookbook for
organizers</a> with best practices, email templates,
and lots of lists. Since it's a wiki, if you have something to add,
all you need is a GitHub account to edit it! </p>


<h2>How Using Bridge Troll Helps RailsBridge</h2>
<p>When every organizer uses a different set of spreadsheets, it’s really hard to take a bird's eye look at RailsBridge workshops. We want to study our attendance rates, how often students come back as volunteers, and how often new people are getting involved, and those things are pretty difficult to do without a centralized source of truth.</p>
<p>Bridge Troll can be that centralized repository of workshop data, and the more organizers who use it, the more we can learn about RailsBridge.</p>
<p>Want to learn more about planning a workshop? We've got a <a href="https://github.com/bridgefoundry/WorkshopCookbook/wiki/Cookbook">cookbook for organizers</a> with best practices, email templates,
and lots of lists. Since it's a wiki, if you have something to add, all you need is a GitHub account to edit it! </p>

<h2>What’s Next for Bridge Troll</h2>
<p>We’ve got more features to add: workshops should have comments,
there should be an automatic survey after the workshop,
and it’d be cool to have a forecast of the likely attendance rate based
on past attendance. If that sounds fun,
please join us in <a href= "https://github.com/railsbridge/bridge_troll">building this software</a>.</p>
<h2>Wanna help?</h2>
<p>This project is open source! Head over to <a href="https://github.com/railsbridge/bridge_troll">our GitHub repo</a> to get started contributing. We love contributions from new and experienced programmers alike!</p>
</div>
</div>
2 changes: 1 addition & 1 deletion app/views/surveys/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<%= f.input :other_comments, label: "Any other comments?" %>
<%= f.label :recommendation_likelihood, "How likely are you to recommend a Railsbridge workshop to a friend or colleague? (10 is very likely, 1 is unlikely)" %>
<%= f.label :recommendation_likelihood, "How likely are you to recommend this workshop to a friend or colleague? (10 is very likely, 1 is unlikely)" %>
<%= f.select :recommendation_likelihood, (1..10).to_a.reverse, {}, {class: 'form-control'} %>
<% unless @survey.persisted? %>
Expand Down
2 changes: 1 addition & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class Application < Rails::Application
config.active_record.raise_in_transactional_callbacks = true

# set default from address across
ActionMailer::Base.default :from => 'RailsBridge <troll@bridgetroll.org>'
ActionMailer::Base.default :from => 'Bridge Troll <troll@railsbridge.org>'

# Devise emails use our layout
config.to_prepare do
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/devise.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# Configure the e-mail address which will be shown in Devise::Mailer,
# note that it will be overwritten if you use your own mailer class
# with default "from" parameter.
config.mailer_sender = '"RailsBridge" <troll@railsbridge.org>'
config.mailer_sender = '"Bridge Troll" <troll@railsbridge.org>'

# Configure the class responsible to send e-mails.
# config.mailer = 'Devise::Mailer'
Expand Down
4 changes: 2 additions & 2 deletions spec/controllers/events_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ def make_request
end

it "includes the website title" do
expect(response.body).to include ('RailsBridge')
expect(response.body).to include ('Bridge Troll Events')
end

it "includes all events" do
Expand All @@ -532,7 +532,7 @@ def make_request
end

it "includes the website title" do
expect(response.body).to include ('RailsBridge')
expect(response.body).to include ('Bridge Troll Events')
end

it "includes all events" do
Expand Down
6 changes: 3 additions & 3 deletions spec/features/sign_in_menu_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
expect(page).to have_content('sign in')
end
visit "/about"
expect(page).to have_content('About RailsBridge')
expect(page).to have_content("Bridge Troll's Features for Organizers")
end

context "with password auth" do
Expand All @@ -39,7 +39,7 @@
sign_in_with_modal(@user)

expect(page).to have_content('Signed in successfully')
expect(page).to have_content('About RailsBridge')
expect(page).to have_content("Bridge Troll's Features for Organizers")
end
end

Expand All @@ -62,7 +62,7 @@
end

expect(page).to have_content('Facebook login successful')
expect(page).to have_content('About RailsBridge')
expect(page).to have_content("Bridge Troll's Features for Organizers")
end
end
end
Expand Down

0 comments on commit 7d060a1

Please sign in to comment.