From 2e50d6dfe2a271a0f2f2cbbb5837744ddb0b42eb Mon Sep 17 00:00:00 2001
From: andrew
Date: Mon, 12 May 2014 21:38:53 -0700
Subject: [PATCH] Moved webchord.cgi from bin -> songbook
---
songbook/displayartist.php | 2 +-
songbook/news.html | 2 +-
songbook/search.php | 2 +-
songbook/songbook.html | 14 +++++++-------
songbook/songbook.php | 4 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/songbook/displayartist.php b/songbook/displayartist.php
index 627aa16..313908f 100644
--- a/songbook/displayartist.php
+++ b/songbook/displayartist.php
@@ -37,7 +37,7 @@ foreach ($songs as $song) {
print "";
foreach ($artistsSongs as $artistSong) {
- print "- ";
+ print "
- ";
print basename ($artistSong, ".pro");
print "
";
} // foreach
diff --git a/songbook/news.html b/songbook/news.html
index 7c6f562..89abc18 100644
--- a/songbook/news.html
+++ b/songbook/news.html
@@ -52,7 +52,7 @@ then their music will start playing automatically.
appear. You can play the song while you read the words and follow the
chords! Note: You can right click and save the song's mp3 file to
your computer. If the song does not have a corresponding .mp3 file then
- no .mp3 player is displayed. For example, Amie.
+ no .mp3 player is displayed. For example, Amie.
- Again, if the song has a corresponding .mp3 file I now re-write the .pro
file to include {musicpath:/sdcard/SongBook/Medai/<title>.mp3}.
diff --git a/songbook/search.php b/songbook/search.php
index edd23f2..840fdb0 100644
--- a/songbook/search.php
+++ b/songbook/search.php
@@ -69,7 +69,7 @@ if (count ($songmatches) > 0) {
foreach ($songmatches as $songmatch) {
$artist = getArtist ($songmatch);
$title = basename ($songmatch, ".pro");
- print "
- $title";
+ print "
- $title";
print " ($artist)
";
} // foreach
diff --git a/songbook/songbook.html b/songbook/songbook.html
index fd3faf8..071f02b 100644
--- a/songbook/songbook.html
+++ b/songbook/songbook.html
@@ -103,7 +103,7 @@ text between {soc} and {eoc} (start of chorus, end of chorus). So
given the above SongTitle="Brown Eyed Girl" we can formulate the URL
to render it thusly:
-http://defaria.com/bin/webchord.cgi?chordpro=/web/songbook/Songs/Brown Eyed Girl.pro
+http://defaria.com/songbook/webchord.cgi?chordpro=/web/songbook/Songs/Brown Eyed Girl.pro
You can do the same thing for the other songs there too.
@@ -112,10 +112,10 @@ in the directory songbook/Songs and then formulates a page of links
that have the webchord.cgi links to render them like:
@@ -130,14 +130,14 @@ http://defaria.com/songbook/Songs/webchord.cgi?chordpro=<SongTitle>.pro
to the title of the song you want to render:
-http://defaria.com/bin/webchord.cgi?chordpro=/web/songbook/Songs/Amie.pro
+http://defaria.com/songbook/webchord.cgi?chordpro=/web/songbook/Songs/Amie.pro
Note:
- URLs are case sensitive! ...chordpro=amie.pro is not the same as ...chordpro=Amie.pro
- - Browsers tend to change spaces in a URL to %20. %20 is the octal representation for a space character. So if you see %20 in a URL like http://defaria.com/bin/webchord.cgi?chordpro=/web/songbook/Songs/Back%20in%20the%20USSR.pro. Don't fear - they're merely spaces.
+ - Browsers tend to change spaces in a URL to %20. %20 is the octal representation for a space character. So if you see %20 in a URL like http://defaria.com/songbook/webchord.cgi?chordpro=/web/songbook/Songs/Back%20in%20the%20USSR.pro. Don't fear - they're merely spaces.
Songbook for PC
diff --git a/songbook/songbook.php b/songbook/songbook.php
index f3893b8..c4afcd9 100644
--- a/songbook/songbook.php
+++ b/songbook/songbook.php
@@ -4,7 +4,7 @@ $songs = glob ("/web/songbook/Songs/*.pro");
function songsDropdown () {
global $songs;
- print "