Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix FAQ section #34

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix FAQ section #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
<div id="jumbo-dialog">
<h1 id='ttitle' >Sort Your Music</h1>
<p id='ttext'>
Sort your Spotify playlists by any of
a wide range of musical attributes such as tempo, loudness,
Sort your Spotify playlists by any of
a wide range of musical attributes such as tempo, loudness,
valence, energy, danceability, popularity and more. Now with
<b>Filters</b>!
</p>
Expand All @@ -64,7 +64,7 @@ <h2 class="text-center">Get your playlists in order</h2>
follow these steps:
</p>
<ol>
<li> <b> Login </b> with your Spotify credentials
<li> <b> Login </b> with your Spotify credentials
<li> <b> Pick </b> your playlist
<li> <b> Sort </b> the playlist by clicking on the column headings in
the playlist table
Expand Down Expand Up @@ -110,7 +110,7 @@ <h2 class="text-center">FAQ</h2>
<li> <b> Where can I learn more about the Echo Nest song
attributes?</b> See <a
href="http://developer.echonest.com/acoustic-attributes.html">
Acoustic Attributes Overview </a>
Acoustic Attributes Overview</a>.
<li> <b> Can you add more attributes to the app? </b>
Yes, but it is a tradeoff between display space,
complexity and utility. Let me know which attributes
Expand All @@ -122,24 +122,24 @@ <h2 class="text-center">FAQ</h2>
<li> Manual reordering, addition, and deletion.
</ul>
If you have any ideas for new feature, let me know.
<li> <b> Is the source available</b> - Yes, you can find
it on <a href="https://github.com/plamere/SortYourMusic">github</a>
<li> <b> Is the source available?</b> - Yes, you can find
it on <a href="https://github.com/plamere/SortYourMusic">GitHub</a>.
<li> <b> Does Sort Your Music overwrite my playlist when
I save?</b> -
I save?</b> -
Only if you chose the 'Overwrite playlist option' otherwise
it creates a copy of the playlist. The new
playlist is called 'Old playlist name sorted by
increasing X', where X is what you sorted the
playlist on.
playlist on.
</ol>
</div>
</div>
</div>
</div>

<div class="top jumbotron container-fluid">
<p id='info' class="text-center"></p>

<div class="worker" id='playlists'>
<div class="worker" id='playlists'>
<h2 class="prompt" > Pick a playlist: </h2>
<img class='spinner' width='100' alt='spinner' src='images/ajaxSpinner.gif'>

Expand All @@ -157,7 +157,7 @@ <h2 class="prompt" > Pick a playlist: </h2>
</div>
</div>

<div class="worker" id='single-playlist'>
<div class="worker" id='single-playlist'>
<h2> <a id='playlist-title'></a> </h2>
<img class='spinner2' width='100' alt='spinner' src='images/ajaxSpinner.gif'>
<div id='single-playlist-contents'>
Expand Down Expand Up @@ -199,13 +199,13 @@ <h2> <a id='playlist-title'></a> </h2>
<input id="include-double" type="checkbox" checked="checked">
</div>
<!--
<button id="shuffle-button" class="pull-right btn btn-primary btn-sm">Shuffle</button>
<button id="shuffle-button" class="pull-right btn btn-primary btn-sm">Shuffle</button>
-->
</div>
</div>
</div>

<table id='song-table' class="hover table table-condensed table-bordered table-striped">
<table id='song-table' class="hover table table-condensed table-bordered table-striped">
<thead>
<tr>
<th> # </th>
Expand Down Expand Up @@ -362,7 +362,7 @@ <h2> <a id='playlist-title'></a> </h2>
reject(textStatus);
}
}
});
});
});
}

Expand Down Expand Up @@ -509,8 +509,8 @@ <h2> <a id='playlist-title'></a> </h2>
relDate = albumDates[track.album.id];
}
table.row.add([
track.which + 1,
track.name,
track.which + 1,
track.name,
track.artists[0].name,
relDate,
Math.round(track.enInfo.tempo),
Expand All @@ -527,8 +527,8 @@ <h2> <a id='playlist-title'></a> </h2>
]);
} else {
table.row.add([
track.which + 1,
track.name,
track.which + 1,
track.name,
track.artists[0].name,
'',
'',
Expand Down Expand Up @@ -619,7 +619,7 @@ <h2> <a id='playlist-title'></a> </h2>
return fetchLoop(tracks.next);
}
})

}

// Spotify API defect? specifying limit will actually return up to 100 items anyway.
Expand Down Expand Up @@ -717,7 +717,7 @@ <h2> <a id='playlist-title'></a> </h2>
var includeDouble = $('#include-double').is(':checked');
var bpm = parseFloat( data[4] ) || 0;

return inRange(bpm, minBpm, maxBpm) ||
return inRange(bpm, minBpm, maxBpm) ||
(includeDouble && inRange(bpm*2, minBpm, maxBpm));
}

Expand Down Expand Up @@ -777,7 +777,7 @@ <h2> <a id='playlist-title'></a> </h2>
var sliceLength = 100;
var this_tids = tids.slice(0, sliceLength);
var remaining = tids.slice(sliceLength);
var url = "https://api.spotify.com/v1/users/" + playlist.owner.id +
var url = "https://api.spotify.com/v1/users/" + playlist.owner.id +
"/playlists/" + playlist.id + '/tracks';
var type;
var json;
Expand All @@ -794,7 +794,7 @@ <h2> <a id='playlist-title'></a> </h2>
.then(function() {
if (remaining.length > 0) {
return saveTidsToPlaylist(playlist, remaining, false);
}
}
})
.catch(function() {
return Q.reject("Trouble saving tracks to the playlist");
Expand Down Expand Up @@ -843,7 +843,7 @@ <h2> <a id='playlist-title'></a> </h2>
firstOrder = _.clone(selectedTableOrder[0]); // object is reused by datatable!
}

return {
return {
minBpm: parseInt( $('#min-bpm').val(), 10 ),
maxBpm: parseInt( $('#max-bpm').val(), 10 ),
includeDouble: $('#include-double').is(':checked'),
Expand Down