Skip to content

Commit

Permalink
2012-2013
Browse files Browse the repository at this point in the history
  • Loading branch information
scrozier committed Sep 1, 2012
1 parent f74afdf commit 1588a6b
Show file tree
Hide file tree
Showing 13 changed files with 75 additions and 68 deletions.
2 changes: 1 addition & 1 deletion .rvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rvm ruby-1.9.2-p290@clearing
rvm ruby-1.9.2-p290
4 changes: 4 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ gem 'pry', :group => :development
gem 'less', :group => :development
gem 'activemerchant', :require => 'active_merchant'

group :development do
gem 'therubyracer'
end

# Use unicorn as the web server
# gem 'unicorn'

Expand Down
64 changes: 35 additions & 29 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,17 @@ GEM
rack-mount (~> 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
activemerchant (1.17.0)
active_utils (1.0.4)
activesupport (>= 2.3.11)
i18n
activemerchant (1.28.0)
active_utils (>= 1.0.2)
activesupport (>= 2.3.11)
braintree (>= 2.0.0)
builder (>= 2.0.0)
i18n
json (>= 1.5.1)
money
nokogiri
activemodel (3.0.10)
activesupport (= 3.0.10)
builder (~> 2.1.2)
Expand All @@ -34,33 +40,34 @@ GEM
activesupport (= 3.0.10)
activesupport (3.0.10)
arel (2.0.10)
braintree (2.11.0)
builder (>= 2.0.0)
builder (2.1.2)
coderay (0.9.8)
coderay (1.0.7)
commonjs (0.2.6)
erubis (2.6.6)
abstract (>= 1.0.0)
haml (3.1.3)
haml (3.1.7)
i18n (0.5.0)
json (1.6.1)
less (2.0.6)
therubyracer (~> 0.9.2)
libv8 (3.3.10.2)
json (1.7.5)
less (2.2.1)
commonjs (~> 0.2.6)
libv8 (3.3.10.4)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.6.5)
ruby_parser (>= 2.0.5)
mime-types (1.16)
polyglot (0.3.2)
pry (0.9.5)
coderay (>= 0.9.8)
method_source (>= 0.6.5)
ruby_parser (>= 2.0.5)
slop (~> 2.1.0)
rack (1.2.4)
method_source (0.8)
mime-types (1.19)
money (5.0.0)
i18n (~> 0.4)
json
nokogiri (1.5.5)
polyglot (0.3.3)
pry (0.9.10)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.3.1)
rack (1.2.5)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
Expand All @@ -79,20 +86,18 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.4)
rake (0.9.2)
rdoc (3.9.4)
ruby_parser (2.3.0)
sexp_processor (~> 3.0)
sexp_processor (3.0.6)
slop (2.1.0)
sqlite3 (1.3.4)
therubyracer (0.9.4)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
slop (3.3.3)
sqlite3 (1.3.6)
therubyracer (0.10.2)
libv8 (~> 3.3.10)
thor (0.14.6)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.29)
tzinfo (0.3.33)

PLATFORMS
ruby
Expand All @@ -104,3 +109,4 @@ DEPENDENCIES
pry
rails (= 3.0.10)
sqlite3
therubyracer
70 changes: 33 additions & 37 deletions app/views/main/home.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -13,56 +13,52 @@
.row
.span4.columns
.home-concert
%h2 Saturday, October 15, 2011<br />8:00pm
%h3 singer/songwriter
%h1 Peter Mayer
%h2 Saturday, October 27, 2012<br />7:00pm
.tickets
- if todays_date :is_between => '2011-09-15', :and => '2011-10-16'
= link_to '<span class="label success">RESERVE TICKETS</span>'.html_safe, show_ticket_form_path(:ident_string => 'mayer_2011')
- if todays_date :is_between => '2012-09-01', :and => '2012-10-27'
= link_to '<span class="label success">RESERVE TICKETS</span>'.html_safe, show_ticket_form_path(:ident_string => 'concert1')
- else
= link_to '<span class="label success">CHECK OUT OUR OTHER CONCERTS</span>'.html_safe, root_path
%p "Peter does nothing less than address the very nature of our existence." &mdash;Dale Connelly, Minnesota Public Radio
%p "If I rocked half as hard as Peter does, I'd own the world by now." &mdash;Janis Ian
= image_tag 'mayer-graphic-home-page-white.jpg', :class => 'artist-graphic'
%h3 young artists
%h1 Rising Stars
%p Some call these young people child prodigies. We call them rising stars.
%p Come be awed by their gifts and early achievements, and inspired by their compelling musicianship.
= image_tag 'concert1-graphic-home-page-white.jpg', :class => 'artist-graphic'
.span4.columns
.home-concert
%h2 Sunday, November 13, 2011<br />7:00pm
%h3 choir and orchestra
%h1 Masterworks
%h2 Sunday, November 18, 2012<br />7:00pm
.tickets
- if todays_date :is_between => '2011-10-14', :and => '2011-11-13'
= link_to '<span class="label success">RESERVE TICKETS</span>'.html_safe, show_ticket_form_path(:ident_string => 'memorial_2011')
- if todays_date :is_between => '2012-09-01', :and => '2012-11-18'
= link_to '<span class="label success">RESERVE TICKETS</span>'.html_safe, show_ticket_form_path(:ident_string => 'concert2')
- else
= link_to '<span class="label success">CHECK OUT OUR OTHER CONCERTS</span>'.html_safe, root_path
%p The evening opens with Beethoven's joyful String Quartet, Opus 18, No. 2.
%p Then, the choir joins the orchestra in Maurice Durufl&eacute;'s lush, dramatic <i>Requiem</i>, a 20th century masterpiece.
= image_tag 'masterworks-graphic-home-page-white.jpg', :class => 'artist-graphic'
%h3 jazz vocals
%h1 UNT Jazz Singers
%p Twelve superb singers, a four-piece rhythm section, and director and well known vocalist Jennifer Barnes come together for an exciting and stimulating program.
= image_tag 'concert2-graphic-home-page-white.jpg', :class => 'artist-graphic'
.span4.columns
.home-concert
%h2 Saturday, March 3, 2012<br />8:00pm
%h3 flute, marimba, and more
%h1 Helen Blackburn
%h2 Sunday, February 24, 2013<br />7:00pm
.tickets
- if todays_date :is_between => '2011-11-14', :and => '2012-03-03'
= link_to '<span class="label success">RESERVE TICKETS</span>'.html_safe, show_ticket_form_path(:ident_string => 'helen_2011')
- if todays_date :is_between => '2012-09-01', :and => '2013-02-24'
= link_to '<span class="label success">RESERVE TICKETS</span>'.html_safe, show_ticket_form_path(:ident_string => 'concert3')
- else
= link_to '<span class="label success">CHECK OUT OUR OTHER CONCERTS</span>'.html_safe, root_path
%p An eclectic, exciting performance by flute virtuoso Helen Blackburn, her husband, marimbist Drew Lang, and perhaps some other great musical surprises.
%p You'll just have to come and see.
= image_tag 'helen-graphic-home-page-white.jpg', :class => 'artist-graphic'
%h3 choir and orchestra
%h1 Masterworks
%p A program which will be both joyful and exuberant, calm and serene.
%p Morten Lauridsen’s “Lux Aeterna” for choir and orchestra will be featured, as will “Exsultate Jubilate,” Mozart’s cantata for soprano and orchestra.
= image_tag 'concert3-graphic-home-page-white.jpg', :class => 'artist-graphic'
.span4.columns
.home-concert.current
%h2 Saturday, April 14, 2012<br />8:00pm
%h3 big band and percussion
%h1 UNT Latin Jazz
.home-concert
%h2 Sunday, April 21, 2013<br />7:00pm
.tickets
- if todays_date :is_between => '2012-03-04', :and => '2012-04-14'
= link_to '<span class="label success">RESERVE TICKETS</span>'.html_safe, show_ticket_form_path(:ident_string => 'latin_2011')
- if todays_date :is_between => '2012-09-01', :and => '2013-04-21'
= link_to '<span class="label success">RESERVE TICKETS</span>'.html_safe, show_ticket_form_path(:ident_string => 'concert4')
- else
- if Date.today > Date.new(2012, 4, 14)
= link_to '<span class="label success">CHECK OUT OUR OTHER CONCERTS</span>'.html_safe, root_path
- else
<span class='label success'>TICKETS AVAILABLE MARCH 4</span>
%p End the season with exciting music from south of the border with University of North Texas' Latin Jazz Ensemble.
%p A "mini big band" with an exciting, expanded percussion section, this group will have the whole family salsa dancing.
= image_tag 'latin-graphic-home-page.jpg', :class => 'artist-graphic'
= link_to '<span class="label success">CHECK OUT OUR OTHER CONCERTS</span>'.html_safe, root_path
%h3 world music
%h1 Meadows World Music Ensemble
%p This ensemble explores and performs music from cultures and continents around the world.
%p Get ready for hot drumming and imaginative improvisation!
= image_tag 'concert4-graphic-home-page-white.jpg', :class => 'artist-graphic'
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/concert1-graphic-home-page.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/concert2-graphic-home-page.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/concert4-graphic-home-page.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion public/stylesheets/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -2405,6 +2405,7 @@ ul.pills.concert-nav li span.concert-date {
.home-concert h1 {
font-size: 1.8em;
line-height: 1.0em;
margin-bottom: 5px;
}
.home-concert h2 {
font-size: 1.0em;
Expand All @@ -2420,7 +2421,7 @@ ul.pills.concert-nav li span.concert-date {
top: 300px;
}
.home-concert .tickets {
margin: -10px 0 7px 0;
margin: -5px 0 0 0;
}
.current {
background-color: #ffc40d;
Expand Down

0 comments on commit 1588a6b

Please sign in to comment.