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: 7f03bd6516
...
head fork: corvallisswing/swingandblues.org
compare: 1bdfdf0596
  • 4 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
Commits on Jan 22, 2014
@exclsr exclsr Guests: Remove container restrictions
Make the width of the container and the .max12
stuff be 100%, so it's a little cleaner on
large screens.
0607280
Commits on Jan 23, 2014
@exclsr exclsr Guests: Add 'details' page
... with all the event details, including floor types.
45f0167
@exclsr exclsr Schedule: Add map for Sunday afternoon efc5075
@exclsr exclsr Guests: Add closing to 'details' page 1bdfdf0
View
1  guests/client-1.3.js → guests/client-1.4.js
@@ -9,6 +9,7 @@ projectModule.config(function($routeProvider) {
when('/volunteers/:who', {controller:VolunteersCtrl, templateUrl: 'volunteers.html'}).
when('/volunteers/:who/:exactly', {controller:VolunteersCtrl, templateUrl: 'volunteers.html'}).
when('/carpool', {controller:MainCtrl, templateUrl: 'carpool.html'}).
+ when('/details', {controller:MainCtrl, templateUrl: 'details.html'}).
otherwise({redirectTo:'/'});
});
View
10 guests/default.aspx
@@ -7,8 +7,6 @@
<!--#include virtual = "/inc/head-common.html" -->
-<!-- <link href="/css/bootstrap-responsive.min.css" rel="stylesheet">
- -->
<link rel="stylesheet" type="text/css" href="/rsvp/css/style.css"/>
<link rel="stylesheet" type="text/css" href="/rsvp/css/payment.css"/>
<link rel="stylesheet" type="text/css" href="/css/guests.css"/>
@@ -17,7 +15,7 @@
<script src="/rsvp/bootstrap/js/bootstrap.min.js"></script>
<script src="/rsvp/modernizr/modernizr.custom.28216.js"></script>
- <script src="client-1.3.js"></script>
+ <script src="client-1.4.js"></script>
<script src="clientJquery.js"></script>
<style>
@@ -25,9 +23,12 @@
margin: 0 !important;
margin-top: 1ex !important;
padding: 3ex;
- max-width: 940px;
width: auto;
}
+.max12 {
+ width: 100%;
+ max-width: none;
+}
h5 {
margin-bottom: 0;
@@ -50,6 +51,7 @@ ul {
<li><a href="/guests/#/food">Food</a></li>
<li><a href="/guests/#/volunteers">Volunteers</a></li>
<li><a href="/guests/#/carpool">Travelers</a></li>
+ <li><a href="/guests/#/details">Details</a></li>
</ul>
</div>
</div>
View
128 guests/details.html
@@ -0,0 +1,128 @@
+<h5>Details.</h5>
+<p class="question-section">For the detailed individual.</p>
+
+<h5>Friday evening</h5>
+<ul>
+ <li>OSU Women's Building</li>
+ <li><a href="http://goo.gl/maps/EQvlY">160 SW 26th St</a></li>
+ <li>Swing at 8:30 p.m.</li>
+ <li>Walker T Ryan around 10</li>
+ <li>Floor: Fast</li>
+ <li>Expected Temp: Moderate</li>
+ <li>DJs, blues: <ul><li>Jeff Anderson</li></ul></li>
+ <li>DJs, swing: <ul><li>Phil Manijak</li></ul></li>
+ <li>Cover: $12</li>
+</ul>
+
+<h5>Friday late</h5>
+<ul>
+ <li>Majestic Theatre</li>
+ <li><a href="http://goo.gl/maps/OZEIT">115 SW 2nd St</a>
+ <li>Swing &amp; blues at midnight</li>
+ <li>Breakers Yard around 1 a.m.</li>
+ <li>Floor: Slower</li>
+ </li>Expected Temp: Hot</li>
+ <li>DJs, blues:
+ <ul>
+ <li>Gretchen Metzenberg at midnight</li>
+ <li>Kristin Pugmire at 1 a.m.</li>
+ <li>Shawn Kahl at 2 a.m.</li>
+ </ul>
+ </li>
+ <li>DJs, swing:
+ <ul>
+ <li>Avery Cotton at midnight</li>
+ <li>Nick Davis at midnight</li>
+ </ul>
+ </li>
+ <li>Cover: $15</li>
+</ul>
+
+<h5>Saturday evening</h5>
+<ul>
+ <li>Odd Fellows Hall</li>
+ <li><a href="http://goo.gl/maps/y21Y3">223 SW 2nd St</a></li>
+ <li>Lesson at 7 p.m. by Rachael Ries and David D</li>
+ <li>Gumbo around 8</li>
+ <li>Kevin Selfe &amp; the Tornadoes around 10</li>
+ <li>Swing room opens at 10</li>
+ <li>Floor: Good</li>
+ <li>Expected Temp: Warmer</li>
+ <li>DJs, blues:
+ <ul>
+ <li>Catherine Liggett</li>
+ </ul>
+ </li>
+ <li>DJs, swing:
+ <ul>
+ <li>Rachael Ries at 10</li>
+ <li>Richard Basi at 10</li>
+ </ul>
+ </li>
+ <li>Cover: $15</li>
+</ul>
+
+<h5>Saturday late</h5>
+<ul>
+ <li>Majestic Theatre</li>
+ <li><a href="http://goo.gl/maps/OZEIT">115 SW 2nd St</a>
+ <li>Swing &amp; blues at midnight</li>
+ <li>Floor: Slower</li>
+ <li>Expected Temp: Hot</li>
+ <li>DJs, blues:
+ <ul>
+ <li>Ruth Kaplan at midnight</li>
+ <li>Dustin Henwood at 1 a.m.</li>
+ <li>Christopher Moorefield at 2 a.m.</li>
+ </ul>
+ </li>
+ <li>DJs, swing:
+ <ul>
+ <li>Michelle Jordan at midnight</li>
+ <li>Rian Pfund at 12:30 a.m.</li>
+ <li>Phil Manijak at 1:30 a.m.</li>
+ <li>Richard Basi at 2 a.m.</li>
+ </ul>
+ </li>
+ <li>Cover: $12</li>
+</ul>
+
+<h5>Sunday afternoon</h5>
+<ul>
+ <li>Old World Deli</li>
+ <li><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></li>
+ <li>Swing &amp; blues at 1-4 p.m.</li>
+ <li>Floor: Yes</li>
+ <li>Expected Temp: Moderate</li>
+ <li>DJs:
+ <ul>
+ <li>Martin &amp; Renee Norred at 1 p.m.</li>
+ <li>Richard Basi at 2 p.m.</li>
+ <li>Avery Cotton &amp; Friends at 3 p.m.</li>
+ </ul>
+ </li>
+ <li>Cover: None</li>
+</ul>
+
+<h5>Sunday evening</h5>
+<ul>
+ <li>Majestic Theatre</li>
+ <li><a href="http://goo.gl/maps/OZEIT">115 SW 2nd St</a>
+ <li>Swing &amp; blues at 8 p.m.</li>
+ <li>Floor: Slower</li>
+ <li>Expected Temp: Moderate</li>
+ <li>DJs, alphabetically:
+ <ul>
+ <li>Catherine Liggett</li>
+ <li>Jeff Anderson</li>
+ <li>Kristin Pugmire</li>
+ <li>Martin Norred</li>
+ <li>Phil Manijak</li>
+ <li>Renee Norred</li>
+ <li>Rian Pfund</li>
+ </ul>
+ </li>
+ <li>Cover: $10</li>
+</ul>
+
+<p style="margin-top: 1.4em">And that's it!</p>
View
2  schedule/default.aspx
@@ -190,7 +190,7 @@
<div class="span4">
<div><span class="info">Dance:</span> 1 - 4 p.m.</div>
<div><span class="info">Venue:</span> Old World Deli</div>
- <div><span class="info">Address:</span> 341 SW 2nd St, Corvallis</div>
+ <div><span class="info">Address:</span> 341 SW 2nd St, Corvallis | <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">Map</a></div>
<div><span class="info">Cover:</span> None</div>
</div>
</div>

No commit comments for this range

Something went wrong with that request. Please try again.