Skip to content

Commit

Permalink
add asterisks to wg
Browse files Browse the repository at this point in the history
  • Loading branch information
louisscruz committed Dec 19, 2015
1 parent 1cadf19 commit 9c4db20
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 9 deletions.
4 changes: 2 additions & 2 deletions client/app/sweet-tommy/sweet-tommy.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="sweet-tommy container">
<h1 class="center">Sweet Tommy</h1>
<div class="col-lg-6 col-lg-offset-0 col-lg-push-6 col-md-8 col-md-offset-2 col-sm-12 info">
<div class="col-lg-7 col-lg-offset-0 col-lg-push-5 col-md-8 col-md-offset-2 col-sm-12 info">
<p>Sweet Tommy was a five piece folk, rock, punk, party band that climbed up the San Francisco club scene between 1979 and 1981. We played with bands like the Dead Kennedys, The Mutants and Flipper, and had a huge following, eventually becoming the last house band at The Palms, where The Tubes several other major bands made their debut. We performed one hundred sixty original tunes in over two hundred fifty gigs in and around San Francisco. We had many props, an exploding robot, a foam dinosaur and a cardboard car with a mannequin passenger. Our lead singer, Tommy Cullenin, was a prolific songwriter and wild performer. Our bass players, Ezra Palmer-Person, and later Ruben Sequenza, along with drummer Barry Mickinley, were talented musicians and song writers as well. With Dan Christy adding his writing, arranging and incredible guitar work, we produced many recordings, including an eight song, double EP record, creating a thousand custom painted covers, all different, and made a Science fiction film which we often showed before performances. It was a blast.</p>
</div>
<div class="col-lg-6 col-lg-offset-0 col-lg-pull-6 col-md-8 col-md-offset-2 col-sm-12">
<div class="col-lg-5 col-lg-offset-0 col-lg-pull-7 col-md-8 col-md-offset-2 col-sm-12">
<ul>
<li ng-repeat="track in sweetTommyTracks track by $index">
<div ng-if="track.url" class="btn-group btn-block">
Expand Down
2 changes: 2 additions & 0 deletions client/app/sweet-tommy/sweet-tommy.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
$border-radius: 6px;
.info p {
text-indent: 25px;
font-size: 18px;
font-weight: 300;
}
// Buttons
.button-icon {
Expand Down
7 changes: 7 additions & 0 deletions client/app/woodwards-gardens/woodwards-gardens.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,11 @@

angular.module('lorenjonesApp')
.controller('WoodwardsGardensCtrl', function ($scope) {
$scope.rossThompson = [9, 10, 11];
$scope.notLoren = function(index) {
if (_.indexOf($scope.rossThompson, index) !== -1) {
return true
}
return false
}
});
13 changes: 6 additions & 7 deletions client/app/woodwards-gardens/woodwards-gardens.html
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
<div class="woodwards-garden container">
<div class="col-md-8 col-md-offset-2 col-sm-12">
<h1 class="center">Woodward's Gardens</h1>
</div>
<div class="col-xs-12">
<div class="col-md-12">
<picture class="cover" picturefill>
<!--[if IE 9]<video style="display: none;"><![endif]-->
<!--source srcset="/assets/images/dbw/dbw_poster/dbw_poster.jpg" media="(min-width: 1600px)" /-->
<!--[if IE 9]></video><![endif]-->
<img srcset="/assets/images/woodwards_garden/woodwards_garden.jpg 1x, /assets/images/woodwards_garden/woodwards_garden_2x.jpg 2x" />
</picture>
<h1 class="center">Woodward's Gardens</h1>
</div>
<div class="col-md-8 col-md-offset-2 col-sm-12 text">
<div class="col-lg-7 col-lg-offset-0 col-lg-push-5 col-md-8 col-md-offset-2 col-sm-12 text">
<p>Woodward’s Gardens was an attraction from San Francisco’s past that’s been mostly forgotten. Located between Mission & Guerrero and Duboce & 15th streets, it was a combination of zoo, aquarium, museum and amusement park in a beautiful garden setting. During its years of operation (1866-1891) thousands of people came to the gardens to enjoy the surroundings and learn more about their world.</p>
<p>With the introduction of Golden Gate Park and the death of Mr. Woodward, by the end of the century Woodward’s Gardens was abandoned. The 1906 earthquake and fire destroyed all that remained.</p>
<p>From 1945 to 2000, my father owned a motorcycle warehouse located on a portion of the old Woodward’s Gardens site, and I spent many years working there.</p>
<p>The Woodward’s Gardens Suite (cuts 3 through 6) is, a memorial to the original Park, but it’s also a tribute to the time that I spent there, and to the experiences and adventures that formed so much of my life growing up in that part of San Francisco.</p>
<p>The music was first performed at the original San Francisco Conservatory of Music in 2005. The CD, created after the concert, includes a guitar duet, a quartet for guitar and winds, a piano four hand piece, three pieces for solo guitar, trios for flute, cello and piano, two pieces for harp, cello and oboe, ending with an ensemble piece for all seven players.</p>
<small><i class="fa fa-fw fa-asterisk"></i> = works for solo guitar by <a href="http:https://rossthompson.com/" target="_blank">Ross Thompson</a>, from his CD "Dreaming", copyright 2002.</small>
</div>
<div class="col-md-8 col-md-offset-2 col-sm-12">
<div class="col-lg-5 col-lg-offset-0 col-lg-pull-7 col-md-8 col-md-offset-2 col-sm-12">
<ul>
<li ng-repeat="track in wgTracks track by $index">
<div ng-if="track.url" class="btn-group btn-block">
<button class="col-xs-2 btn btn-lg btn-default playpause" ng-click="player.playPause(player.trackIndex(track.url))" angular-ripple>
<span ng-if="player.playing.permalink_url !== cleanUrl(track.url)" class="fa fa-play"></span>
<span ng-if="player.playing.permalink_url === cleanUrl(track.url)" class="fa fa-pause"></span>
</button>
<button class="col-xs-10 btn btn-lg btn-default">{{$index + 1}}. {{::track.title}}</button>
<button class="col-xs-10 btn btn-lg btn-default">{{$index + 1}}. {{::track.title}}<i ng-if="notLoren($index + 1)" class="fa fa-fw fa-asterisk"></i></button>
</div>
</li>
</ul>
Expand Down
10 changes: 10 additions & 0 deletions client/app/woodwards-gardens/woodwards-gardens.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,23 @@
p {
text-indent: 25px;
padding-top: 12px;
font-size: 18px;
font-weight: 300;
}
small {
font-size: 14px;
text-align: center;
}
ul {
-webkit-padding-start: 0px;
}
li {
list-style: none;
}
i {
font-size: 12px;
vertical-align: top;
}
.button-icon {
font-family: inherit;
font-weight: 600;
Expand Down

0 comments on commit 9c4db20

Please sign in to comment.