Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: corvallisswing/swingandblues.org
base: 1d2c06ffbd
...
head fork: corvallisswing/swingandblues.org
compare: 5d2b17beb2
  • 4 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
Commits on Jan 24, 2014
@exclsr exclsr Event: Close registration 80b9d89
@exclsr exclsr Event: Home: Remove reservation link
and highlight the guests link.
445b8ad
@exclsr exclsr Event: Home: Add band info
Add the band promo info to the home page, move
what was there to the About page.
5c32682
@exclsr exclsr Home: UX: No highlight on weekend guests link
Making the weekend guests link have a yellow
color makes it less visible.
5d2b17b
View
2  _app/config.js
@@ -1,7 +1,7 @@
//----------------------------------------------------
// config.js
//
-var isSoldOut = false;
+var isSoldOut = true;
var isFollowsSoldOut = false;
var isHousingWaitlistActive = true;
var paypalWeekendItemNumbers = ['wknd2014', 'wknd2014s'];
View
163 about/default.aspx
@@ -2,38 +2,171 @@
<html lang="en">
<head>
<title>About: <!--#include virtual = "/inc/event-name.aspx" --></title>
- <meta name="description" content="Three nights of swing and blues dancing in Corvallis, Oregon. January 25-27."/>
+ <meta name="description" content="Three nights of swing and blues dancing in Corvallis, Oregon. January 24-26."/>
<!--#include virtual = "/inc/head-common.html" -->
+<style>
+ h4 {
+ font-weight: normal;
+ }
- <script src="/js/home1.1.js"></script>
+ h2.home {
+ margin-top: 0;
+ font-family: 'Petit Formal Script', sans-serif;
+ font-size: 14pt;
+ font-weight: normal;
+
+ text-align: center;
+ }
+
+ .date {
+ font-size: 14pt;
+ }
+
+ .live-music img {
+
+ }
+
+ .text, .band {
+ float: left;
+ margin-left: 20px;
+
+ max-width: 460px;
+ min-height: 1px;
+ }
+
+ .band {
+ padding-top: 10px;
+ padding-left: 18px;
+ padding-right: 17px;
+ background: #bbb;
+ margin-bottom: 2.5em;
+ border: 0;
+
+ text-align: center;
+ }
+ .band img {
+ margin: auto;
+ text-align: center;
+ }
+
+ .name {
+ color: #222;
+ margin-top: 0.8em;
+ margin-bottom: 1.4em;
+
+ font-family: 'Petit Formal Script', sans-serif;
+ font-size: 14pt;
+ font-weight: normal;
+
+ text-align: center;
+ }
+ .row {
+
+ }
+ .container {
+ max-width: 940px;
+ width: auto;
+ }
+
+ ol, li, p {
+ color: #333;
+ }
+ p {
+ margin-top: 1.4em;
+ line-height: 1.25em;
+ }
+</style>
<!--#include virtual = "/inc/head-analytics.aspx" -->
</head>
<body>
<!--#include virtual = "/inc/header.html" -->
- <div class="container">
- <div class="span12">
- <h1>About the weekend</h1>
-
- <p>Hi and welcome to <span class="eventName">Corvallis Swing and Blues Weekend</span>, three nights of dancing to live and DJ music in the heart of the Willamette Valley.</p>
+ <div class="container">
+ <div class="live-music" style="margin: auto">
+ <div class="row">
+ <div class="text">
+ <h2 class="home">Three nights of social dancing</h2>
+ <p>You are invited to join us for a weekend of live music and social dancing
+ in Corvallis, the heart of Oregon's Willamette Valley.</p>
- <p>Friday and Saturday nights will feature a combination of swing bands, blues bands, and DJ sets centered around each style of dance. The weekend culminates in a fusion dance Sunday evening, where DJs will mix both swing and blues, pushing the limits of what defines each style, and how much fun it is possible to have.</p>
+ <p>The weekend, in its second year, is a celebration of our shared love of
+ community, dance, jazz and the blues. It is six events across three days,
+ with four musical performances, over 15 DJs, and community activities in
+ between.</p>
+<!-- <p>A weekend pass is $50, and can be purchased by <a href="/rsvp/">making a reservation</a>.</p>
+ -->
+ <p>Please see <a href="/schedule/">our schedule page</a> for complete details of each event, including start times, venues and maps, and cover at the door for individual dances.</p>
+ </div>
+ <div class="band">
+ <img src="/img/home/walker.jpg"/>
+ <div class="name">Walker T Ryan</div>
+ </div>
+ </div>
<div class="row">
- <div class="span4">
+ <div class="band">
+ <img src="/img/home/gumbo.jpg"/>
+ <div class="name">Gumbo</div>
+ </div>
+ <div class="text">
+ <h2 class="home">Oregon musicians, live and in person</h2>
+
+ <p>The weekend is our signature event, and features
+ some of the finest mucisians from Eugene, Corvallis,
+ and Portland.</p>
+
+ <p>Kevin Selfe &amp; The Tornadoes, winner of 15 Muddy Awards, including both traditional- and contempory-blues act of the year in 2013.</p>
- <p>The weekend will showcase our favorite venues and local musical talent, introducing you to the Corvallis dance community.</p>
+ <p>Eugene's Breakers Yard, delta-blues ragtime jug-band music from strings and suitcases, just released a new album, Raise Some Bacon.</p>
- <p><span class="eventName">Corvallis Swing and Blues Weekend</span> is a collaborative adventure of the <a class="swing" href="http://corvallisswing.com">Corvallis Swing Dance Society</a> and <a class="blues" href="http://blogs.oregonstate.edu/osublues/">OSU Blues</a>. This event will mark the third aniversary of joint swing and blues dances hosted by the two groups and is a celebration of that partnership.</p>
+ <p>Gumbo, local heroes, known from the Corvallis Saturday Markets,
+ jam sessions around town, our family picnic, and last year's weekend.</p>
- <p>The weekend is about great music and dancing, and it is also about collaboration and community. Our goal is to create an opportunity for the swing and blues groups of the Willamette Valley to gather as a larger community, and promote this incredible area to the rest of the country.</p>
+ <p>Walker T Ryan, blues icon.</p>
+ </div>
</div>
- <div class="span8">
- <img class="img-polaroid" src="/img/weekendSundayDance2x1.jpg"/>
+
+ <div class="row">
+ <div class="text">
+ <h2 class="home">Welcome travelers, near and far</h2>
+ <p>The entire neighborhood is invited, from San Francisco, California to Vancouver, British Columbia.</p>
+
+ <p>We take pride in the community we've built here, and we want to share it with you. You've invited us to dance in your scene, now please allow us to give back.</p>
+
+ <p>Would you like to carpool, but you're not sure who is coming from your city? Let us know when making your reservation. Need to be picked up from the train station? Let us know.</p>
+
+ <p>Need a couch to crash upon? That's what the weekend is about.</p>
+ </div>
+ <div class="band">
+ <img src="/img/home/breakersYard.jpg"/>
+ <div class="name">Breakers Yard</div>
+ </div>
</div>
+ <div class="row">
+ <div class="band">
+ <img src="/img/home/kevinSelfe.jpg"/>
+ <div class="name">Kevin Selfe &amp; The Tornadoes</div>
+ </div>
+ <div class="text">
+ <h2 class="home">Anniversary Celebration</h2>
+ <p>The weekend marks the 4th anniversary and 100th dance of the Corvallis Swing Dance
+ Society, a fine social club for dancing the Lindy hop and other street dances
+ of the proletariat.</p>
+
+ <p>The Corvallis Swing and OSU Blues partnership is in its third year.</p>
+
+ <p>When celebrating, please keep the following rules in mind:
+ <ol>
+ <li>Have fun.</li>
+ <li>Dance with everyone.</li>
+ <li>Have fun!</li>
+ </ol>
+ </p>
+ <p>Thank you.</p>
+ </div>
</div>
- </div>
</div>
+</div>
<!--#include virtual = "/inc/footer.html" -->
</body>
</html>
View
78 default.aspx
@@ -188,9 +188,9 @@
<body>
<div style="margin-top: 2em; margin-bottom: 1em">
<h1 class="fancyEventName" style="color: #aaa">Corvallis Swing &amp; Blues Weekend</h1>
- <h2 class="date" style="color: #777; z-index: 11; position: relative">
- January 24&ndash;26th<!--.
- <a href="/rsvp/" style="color: #772">R.S.V.P.</a></h2> -->
+ <!-- <h2 class="date" style="color: #777; z-index: 11; position: relative">
+ January 24&ndash;26th
+ Friday, Saturday &amp; Sunday</h2> -->
</div>
<!--#include virtual = "/inc/header.html" -->
@@ -201,18 +201,12 @@
<div class="row">
<div class="text">
- <h2 class="home">Three nights of social dancing</h2>
- <p>You are invited to join us for a weekend of live music and social dancing
- in Corvallis, the heart of Oregon's Willamette Valley.</p>
+ <h2 class="home">Friday evening, January 24th</h2>
+ <p>Our first dance begins at 8:30 p.m., with doors opening at 8:00. We'll be at the Women's Building on OSU campus, at <a href="http://goo.gl/0Ge3w">160 SW 26th St</a>. We suggest parking in the lots at Monroe Ave and 25th St, and walking down 26th until you reach the building, on the right. If you get to Jefferson Ave, you've walked too far. Here's a <a href="http://goo.gl/maps/EQvlY">parking map</a>.</p>
- <p>The weekend, in its second year, is a celebration of our shared love of
- community, dance, jazz and the blues. It is six events across three days,
- with four musical performances, over 15 DJs, and community activities in
- between.</p>
+ <p><a href="http://walkertryan.com">Walker T Ryan</a> started out playing, at 13, as a folk music guy in the Kingston Trio era, and came of age with the music of Pete Seeger, Woody Guthrie, Leadbelly and Greenwich Village folk scene of the very early 1960s. While folk music taught him that songs mattered, it was the blues sounds in the folk music that always attracted him, whatever their form, from Sonny Terry and Brownie McGhee to the high, lonesome Appalachian ballads. That's where his road went until 1965, when he saw Son House live, and started down the Delta Road.</p>
- <p>A weekend pass is $50, and can be purchased by <a href="/rsvp/">making a reservation</a>.</p>
-
- <p>Please see <a href="/schedule/">our schedule page</a> for complete details of each event, including start times, venues and maps, and cover at the door for individual dances.</p>
+ <p>Walker joins us around 10 p.m.</p>
</div>
<div class="band">
<img src="/img/home/walker.jpg"/>
@@ -221,42 +215,36 @@
</div>
<div class="row">
<div class="band">
- <img src="/img/home/gumbo.jpg"/>
- <div class="name">Gumbo</div>
+ <img src="/img/home/breakersYard.jpg"/>
+ <div class="name">Breakers Yard</div>
</div>
<div class="text">
- <h2 class="home">Oregon musicians, live and in person</h2>
+ <h2 class="home">Friday late night</h2>
- <p>The weekend is our signature event, and features
- some of the finest mucisians from Eugene, Corvallis,
- and Portland.</p>
-
- <p>Kevin Selfe &amp; The Tornadoes, winner of 15 Muddy Awards, including both traditional- and contempory-blues act of the year in 2013.</p>
+ <p>Our second dance begins at midnight, in the dance studios of the Majestic Theatre. It's about a <a href="http://goo.gl/maps/7YfnX">25-minute walk</a> from our evening venue, or catch a ride with other guests by using the carpool chalkboard, to <a href="http://goo.gl/maps/OZEIT">115 SW 2nd St</a>. We're using the side entrance.</p>
- <p>Eugene's Breakers Yard, delta-blues ragtime jug-band music from strings and suitcases, just released a new album, Raise Some Bacon.</p>
+ <p><a href="http://www.reverbnation.com/breakersyard">Breakers Yard</a> is none other than Jordan 'Hot Coppa' Cogburn, 'Washrag' Joe Davey, Brandon 'Greazy' Olszewski, and Steven 'Grandpa' Weeks. You may also know them from bands like the Blair Street Mugwumps, the Crow Quill Night Owls, Molasses, Dirty Spoon, and Free Bananas.</p>
- <p>Gumbo, local heroes, known from the Corvallis Saturday Markets,
- jam sessions around town, our family picnic, and last year's weekend.</p>
+ <p>They have spent a lot of time playing traditional American music across the genre, and enjoy playing tunes from the jug band, ragtime, country blues, delta stomp, and cowboy traditions.</p>
- <p>Walker T Ryan, blues icon.</p>
+ <p>Breakers Yard takes the floor around 1 a.m., and we can stay until 3.</p>
</div>
</div>
<div class="row">
<div class="text">
- <h2 class="home">Welcome travelers, near and far</h2>
- <p>The entire neighborhood is invited, from San Francisco, California to Vancouver, British Columbia.</p>
-
- <p>We take pride in the community we've built here, and we want to share it with you. You've invited us to dance in your scene, now please allow us to give back.</p>
+ <h2 class="home">Saturday evening, January 25th</h2>
+ <p>Our largest event of the weekend is a double feature in the Odd Fellows Hall south ballroom, at <a href="http://goo.gl/maps/y21Y3">223 SW 2nd St</a>. Doors open at 7 p.m. with a dance lesson from Portland instructors Rachael Ries &amp; David D.</p>
- <p>Would you like to carpool, but you're not sure who is coming from your city? Let us know when making your reservation. Need to be picked up from the train station? Let us know.</p>
+ <p><a href="http://www.reverbnation.com/gumbo2">Gumbo</a> is well-known in the Corvallis scene. Saturday markets and cofee houses have been their stomping grounds since 2005. Sid Beam and Joe Casprowiak are joined by bassist David Fournier, with Dave Fienberg on piano. Gumbo synthesizes the roots of music heard in the American South in the first half of the 20th century, drawing from the heart and soul of that musical time and place.</p>
- <p>Need a couch to crash upon? That's what the weekend is about.</p>
+ <p><a href="http://kevinselfe.com">Kevin Selfe &amp; the Tornadoes</a> is a six-time winner of the Muddy Award for blues act of the year. In 2012, they were inducted into Cascade Blues Association Hall of Fame. Kevin is now a leading light in the Pacific Northwest's robust blues revival, effortlessly combining the guitar traditions of the legends and the modern masters into his own unique approach.</p>
</div>
<div class="band">
- <img src="/img/home/breakersYard.jpg"/>
- <div class="name">Breakers Yard</div>
+ <img src="/img/home/gumbo.jpg"/>
+ <div class="name">Gumbo</div>
</div>
+
</div>
<div class="row">
<div class="band">
@@ -264,21 +252,13 @@
<div class="name">Kevin Selfe &amp; The Tornadoes</div>
</div>
<div class="text">
- <h2 class="home">Anniversary Celebration</h2>
- <p>The weekend marks the 4th anniversary and 100th dance of the Corvallis Swing Dance
- Society, a fine social club for dancing the Lindy hop and other street dances
- of the proletariat.</p>
-
- <p>The Corvallis Swing and OSU Blues partnership is in its third year.</p>
-
- <p>When celebrating, please keep the following rules in mind:
- <ol>
- <li>Have fun.</li>
- <li>Dance with everyone.</li>
- <li>Have fun!</li>
- </ol>
- </p>
- <p>Thank you.</p>
+ <h2 class="home">Saturday late night</h2>
+ <p>At midnight, we walk two blocks to the Majestic, to dance until 3 in the morning. We'll have a swing room and a blues room, and light fare will be provided.</p>
+
+ <h2 class="home">Sunday, January 26th</h2>
+ <p>Stop by Old World Deli, <a href="https://maps.google.com/maps?q=341+SW+2nd+St,+Corvallis,+OR&hl=en&ll=44.561312,-123.261248&spn=0.006666,0.0103&sll=44.562602,-123.260602&sspn=0.006666,0.0103&hnear=341+SW+2nd+St,+Corvallis,+Oregon+97333&t=m&z=17">341 SW 2nd St.</a>, from 1 until 4 p.m. for a casual gathering of friends and a bit of dancing.</p>
+
+ <p>At 8 p.m., we will be on the main stage at the Majestic for our final night in town. We depart around midnight.</p>
</div>
</div>
</div>
@@ -296,7 +276,7 @@
<div class="fin">
<!-- <p>Photography, courtesy Martin &amp; Renee Norred, Leslie Lucir.</p> -->
<div id="attendance">
- <div id="label"><a href="/rsvp/" style="font-weight: normal">Reservations remaining</a>: <span id="available"></span></div>
+ <!-- <div id="label"><a href="/rsvp/" style="font-weight: normal">Reservations remaining</a>: <span id="available"></span></div> -->
</div>
</div>
</div>
View
4 inc/header.html
@@ -2,9 +2,9 @@
<div class="navbar-inner square">
<ul class="nav">
<li><a class="brand" href="/">&#9834;</a></li>
- <li><a href="/">About</a></li>
+ <li><a href="/about/">About</a></li>
<li><a href="/schedule/">Schedule</a></li>
- <li><a id="rsvpLink" href="/rsvp/">R.S.V.P.</a></li>
+<!-- <li><a id="rsvpLink" href="/rsvp/">R.S.V.P.</a></li> -->
<li><a href="/contact/">Contact</a></li>
</ul>
<ul class="nav pull-right">
View
7 rsvp/default.aspx
@@ -14,7 +14,12 @@
<script src="client-1.3.1.js"></script>
<script src="clientJquery.js"></script>
-
+ <style>
+ .container {
+ width: auto;
+ max-width: 940px;
+ }
+ </style>
<!--#include virtual = "/inc/head-analytics.aspx" -->
</head>
<body>
View
5 rsvp/full.html
@@ -1,7 +1,6 @@
-<div class="span12">
+<div class="max12">
<h3>Hello,</h3>
-<p>We're sold out of pre-event registration spots. This means over {{limit}} people
-are going to be swing &amp; blues dancing in Corvallis the weekend of January 24th.</p>
+<p>Reservations for weekend passes are no longer available.</p>
<p>We'll have additional tickets available at the door, based on venue size. Our Saturday evening dance at Odd Fellows Hall will have the most room, followed by the Friday evening dance at the OSU Women's Building. Please see <a href="/schedule/">our schedule</a> for details.</p>

No commit comments for this range

Something went wrong with that request. Please try again.