Skip to content

Commit

Permalink
Remove playlist in nav, update player and streampad language
Browse files Browse the repository at this point in the history
  • Loading branch information
marineb committed Apr 10, 2017
1 parent 671808f commit e9cb825
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
data-tracking-label='{{streamName}}'>SCHEDULE</a>
{{#if streamPlaylistUrl}}
<a href={{streamPlaylistUrl}}
title='Music Playlist'
title='Recently Played'
data-tracking-category='Persistent Player'
data-tracking-action='Click Through to Music Playlist'
data-tracking-label='{{stream.name}}'>MUSIC PLAYLIST</a>
data-tracking-label='{{stream.name}}'>RECENTLY PLAYED</a>
{{/if}}
{{#link-to 'stream' (query-params modal='null') title='All Streams'}}ALL STREAMS{{/link-to}}
</span>
2 changes: 1 addition & 1 deletion app/components/site-chrome/site-footer/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
</h2>
<ul class="list list--noborder">
<li class="list-item list-item--tiny">
<a href="/playlist-daily" title="Playlists" data-tracking-category="WQXR Menu" data-tracking-action="Clicked Playlists">Playlists</a>
<a href="/playlist-daily" title="Playlists" data-tracking-category="WQXR Menu" data-tracking-action="Clicked Playlists">Music Playlists</a>
</li>
<li class="list-item list-item--tiny">
<a href="/schedule/" title="Schedule" data-tracking-category="WQXR Menu" data-tracking-action="Clicked Schedule">Schedule</a>
Expand Down
6 changes: 3 additions & 3 deletions app/components/site-chrome/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@
{{link-to 'All Streams' 'stream' class="inherit" preventDefault=false}}
{{/link-to}}

{{#link-to 'playlist-daily' current-when="playlist-daily" tagName='li' href=false class="list-item list-item--nav"}}
{{link-to 'Playlists' 'playlist-daily' class="inherit" preventDefault=false}}
{{/link-to}}
{{! #link-to 'playlist-daily' current-when="playlist-daily" tagName='li' href=false class="list-item list-item--nav"}}
{{! link-to 'Playlists' 'playlist-daily' class="inherit" preventDefault=false}}
{{! /link-to}}

{{#link-to 'schedule' current-when="schedule.date" tagName='li' href=false class="list-item list-item--nav"}}
{{link-to 'Schedule' 'schedule' class="inherit" preventDefault=false}}
Expand Down
4 changes: 2 additions & 2 deletions app/templates/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{#stream-banner audio=audio streams=streams as |currentStream|}}
<h3>{{currentStream.currentComposer.name}}, {{currentStream.currentPiece}}</h3>
{{#link-to 'playlist' currentStream.slug class='text--small text--white'}}
Music Playlist &raquo;
Recently played &raquo;
{{/link-to}}
{{/stream-banner}}
{{else}}
Expand All @@ -19,7 +19,7 @@
Listen Live
{{/listen-button}}
{{#link-to 'playlist' stream.slug (query-params scheduleStation=stream.slug) class="text--small text--white"}}
Music playlist &raquo;
Recently played &raquo;
{{/link-to}}
{{/stream-carousel}}
{{/if}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ test('it shows streamPlaylistUrl if provided', function(assert) {
this.set('streamPlaylistUrl', 'http://streamsplaylist/');
this.render(hbs`{{nypr-player-integration/stream-info streamPlaylistUrl=streamPlaylistUrl}}`);

assert.equal(this.$('a[title="Music Playlist"]')[0].href, "http://streamsplaylist/");
assert.equal(this.$('a[title="Recently Played"]')[0].href, "http://streamsplaylist/");

this.set('streamPlaylistUrl', false);
assert.equal(this.$('a[title="Music Playlist"]').length, 0);
assert.equal(this.$('a[title="Recently Played"]').length, 0);
});

test('it shows streamScheduleUrl', function(assert) {
Expand Down

0 comments on commit e9cb825

Please sign in to comment.