Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kelnera/updates march 2017 #29

Merged
merged 10 commits into from
Mar 15, 2017
+59 −29
Merged

Kelnera/updates march 2017 #29

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
49e43d0
Update Lightning Talks phrasing and redirect FB link to BBC page
kelnera Mar 5, 2017
4578b19
Change wording and direct parking question to the About page
kelnera Mar 5, 2017
e01ee08
Add more directions
kelnera Mar 5, 2017
7cf2623
Turn email into real address
kelnera Mar 5, 2017
185d7c5
Update wi-fi information and remove hard link to about page
kelnera Mar 11, 2017
adbe167
Add link to KEC location on Google maps
kelnera Mar 11, 2017
4792f67
Update ideas to include a broader scope
kelnera Mar 11, 2017
c2f8428
Add information about lightning talk policy and direct front page lt …
kelnera Mar 11, 2017
07f888c
Trying to resolve the font size issue
kelnera Mar 11, 2017
e002cca
fix mis-spelling
Kennric Mar 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion barcamp-theme/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<h5>Want BBC updates? Follow us!</h5><br>
<a href="https://groups.google.com/forum/#!forum/beaverbarcamp"><img src='{{ SITEURL }}/theme/img/google-plus-icon.png'></a>
<a href="http://twitter.com/beaverbarcamp"><img src="{{ SITEURL }}/theme/img/twitter-icon.png" alt="Twitter Icon"></a>
<a href="http://facebook.com/OSUOSL"><img src="{{ SITEURL }}/theme/img/facebook-icon.png" alt="Facebook icon"></a>
<a href="http://facebook.com/beaverbarcamp"><img src="{{ SITEURL }}/theme/img/facebook-icon.png" alt="Facebook icon"></a>
</div>
<div id="footer-credits">
<hr />
Expand Down
2 changes: 1 addition & 1 deletion barcamp-theme/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<h2>Share Your Passion</h2>
<div id="beaver-small"><img src="{{ SITEURL }}/theme/img/beaver-small.gif" alt="Beaver Barcamp icon" /></div>
<h4>{{ SITENAME }}</h4>
<span class="tab--tiny">Now with <a href="lightning-talks.html">Lightning Talks!</a></span>
<span class="tab--tiny">With <a href="lightning-talks.html">Lightning Talks!</a></span>
<h5>April 8, 2017 from 9am-6pm<br />Kelley Engineering Center<br>
<p>Registration is free-- sign up today!</p>
<a href="http://beaverbarcamp.eventbrite.com" id="register-button">Register</a></h5><br><br>
Expand Down
9 changes: 5 additions & 4 deletions content/pages/FAQ.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ Lightning talks are five minute presentations on any topic. At barcamp,
the first session will include lightning talks in the barcamp style;
anyone can sign up beforehand and present on any topic for up to
five minutes instead of the full hour. We will still have full-length
barcamp talks available during that session, but lightning talks will
be an option.
barcamp talks available in other rooms at that time.

Who should present?
~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -57,7 +56,7 @@ RSVP is not required, but we would love if you registered for the event on
`EventBrite`_. This helps us plan for enough food and accommodate dietary
restrictions.

.. _EventBrite: https://beaverbarcamp.eventbrite.com
.. _EventBrite: https://beaverbarcamp.eventbrite.com


Who should I contact to receive accommodations related to a disability?
Expand Down Expand Up @@ -85,7 +84,9 @@ Where do I park?
Free parking is widely available on campus on Saturdays, with the
exception of reserved and metered stalls. There is a large parking lot
to the north of Kelly Engineering that should have enough room for
everyone.
everyone. A detailed map can be found on the `About page`_.

.. _About page: http://beaverbarcamp.org/pages/about.html
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wouldn't hard link the website here, I'd just change this to /pages/about.html so it would work locally or in production.



What will the session topics be?
Expand Down
34 changes: 25 additions & 9 deletions content/pages/about.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,24 +60,36 @@ Directions
~~~~~~~~~~
`Coming from I5 south`_

1. Take exit 228 for OR-34 towards Lebanon/Corvallis.
2. At the end of the off-ramp, turn right onto OR-34 W/Corvallis-Lebanon Hwy 210.
1. Take exit 228 for OR-34 towards Lebanon/Corvallis
2. At the end of the off-ramp, turn right onto OR-34 W/Corvallis-Lebanon Hwy 210

`Coming from I5 north`_

1. Take exit 228 for OR-34 toward Lebanon/Corvallis.
2. At the end of the off-ramp, turn left onto OR-34 W/Corvallis-Lebanon Hwy 210.
1. Take exit 228 for OR-34 toward Lebanon/Corvallis
2. At the end of the off-ramp, turn left onto OR-34 W/Corvallis-Lebanon Hwy 210

**From there:**

3. Drive for 9.6 miles, then turn left onto OR-34 Bypass W/Corvallis-Newport Hwy.
4. Drive for 1.3 miles, then turn right onto SW 15th st.
3. Drive for 9.6 miles, then turn left onto OR-34 Bypass W/Corvallis-Newport Hwy
4. Drive for 1.3 miles, then turn right onto SW 15th St
5. Turn left onto SW Washington Way
6. Turn right onto SW 26th.
7. Turn right onto SW Campus Way.
6. Turn right onto SW 26th
7. Turn right onto SW Campus Way

Arrive at Kelley Engineering Center! Hope you enjoy your visit.
`From OR-99W S/Pacific Hwy W`_

1. Turn right onto NW Harrison Blvd
2. Turn left on NW 25th St
3. Continue straight onto SW Park Terrace Pl

`From OR-99W N/Pacific Hwy W`_

1. Turn left onto SW Western Blvd
2. Turn right onto SW 15th St
3. Turn left onto NW Monroe Ave
4. Turn left onto SW Park Terrace Pl

Arrive at Kelley Engineering Center! Enjoy your visit!

Parking
~~~~~~~
Expand All @@ -98,3 +110,7 @@ visiting the `university calendar`_ to check for possible conflicts.
.. _Kelley Engineering Center: https://maps.google.com/maps?q=kelley+engineering+center&oe=utf-8&aq=t&client=firefox-a&ie=UTF8&hl=en&hq=&hnear=Kelley+Engineering+Center,+2500+NW+Monroe+Ave,+Corvallis,+Benton,+Oregon+97331&t=h&z=16&vpsrc=0&iwloc=A

.. _university calendar: http://calendar.oregonstate.edu/

.. _From OR-99W S/Pacific Hwy W: https://www.google.com/maps/dir/OR-99W,+Portland,+OR/Kelley+Engineering+Center,+Northwest+Monroe+Avenue,+Corvallis,+OR/@44.5980445,-123.2975416,13z/am=t/data=!4m14!4m13!1m5!1m1!1s0x54c0078908a8251f:0xa81eaf81484471d0!2m2!1d-123.2414648!2d44.6287827!1m5!1m1!1s0x54c040bc6e8da8b9:0xe18e3f794a561546!2m2!1d-123.2786573!2d44.5671949!3e0

.. _From OR-99W N/Pacific Hwy W: https://www.google.com/maps/dir/44.5483878,-123.2655407/Kelley+Engineering+Center,+Northwest+Monroe+Avenue,+Corvallis,+OR/@44.5586016,-123.2799854,15z/am=t/data=!3m1!4b1!4m14!4m13!1m5!3m4!1m2!1d-123.2742592!2d44.5611443!3s0x54c040c742f29eed:0x7a25dac43fe39b75!1m5!1m1!1s0x54c040bc6e8da8b9:0xe18e3f794a561546!2m2!1d-123.2786573!2d44.5671949!3e0
2 changes: 1 addition & 1 deletion content/pages/sponsor.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ Sponsor
Interested in Sponsoring Beaver Barcamp?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Please email us at *info < at > beaverbarcamp.org*.
Please email us at **info@beaverbarcamp.org**.