diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj index c008aef3..622735f7 100644 --- a/Vocaluxe/Vocaluxe.csproj +++ b/Vocaluxe/Vocaluxe.csproj @@ -358,6 +358,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/Vocaluxe/Website/img/wikipedia.png b/Vocaluxe/Website/img/wikipedia.png new file mode 100644 index 00000000..52f87393 Binary files /dev/null and b/Vocaluxe/Website/img/wikipedia.png differ diff --git a/Vocaluxe/Website/index.html b/Vocaluxe/Website/index.html index 6e828e0e..06aed5fd 100644 --- a/Vocaluxe/Website/index.html +++ b/Vocaluxe/Website/index.html @@ -178,6 +178,7 @@ diff --git a/Vocaluxe/Website/js/main.js b/Vocaluxe/Website/js/main.js index e2418430..c14d452f 100644 --- a/Vocaluxe/Website/js/main.js +++ b/Vocaluxe/Website/js/main.js @@ -246,6 +246,10 @@ function initPageLoadHandler() { $('#displaySongLinkSpotify').unbind('click').click(function () { showSpotify(result.Artist, result.Title); }); + + $('#displaySongLinkWikipedia').unbind('click').click(function () { + showWikipedia(result.Artist); + }); } else { $('#displaySongLinks').hide(); } @@ -739,4 +743,12 @@ function showSpotify(artist, title) { $("#popupVideo").popup("open"); } }); +} + +function showWikipedia(artist) { + popupVideoHeight = 800; + popupVideoWidth = 600; + + $("#popupVideo iframe").attr("src", "http://m.wikipedia.org/wiki/Special:Search/" + artist); + $("#popupVideo").popup("open"); } \ No newline at end of file