From bfd8672d693aa242b46a67d69450926fb21af6db Mon Sep 17 00:00:00 2001 From: lukeIam Date: Sat, 26 Oct 2013 11:19:39 +0200 Subject: [PATCH] Webserver: Add wikipedia (artist) links to the song details pages --- Vocaluxe/Vocaluxe.csproj | 3 +++ Vocaluxe/Website/img/wikipedia.png | Bin 0 -> 2070 bytes Vocaluxe/Website/index.html | 1 + Vocaluxe/Website/js/main.js | 12 ++++++++++++ 4 files changed, 16 insertions(+) create mode 100644 Vocaluxe/Website/img/wikipedia.png 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 0000000000000000000000000000000000000000..52f873931af83e6f8d8201d9f305a4233862b4bc GIT binary patch literal 2070 zcmV+x2PT|jjb&G>ExE-dFN=%G6wg+x)r>VZ zVr6Z^)t8%YZEf9c@9en!{e5?EaF9rWZF_sit*x)ShG&L7nqR89W&g0dyK73nfB!c5 z_3Kw6Wq)tqZEbIP1C|}^(ah|eTUlwgS-H2jmso)hX)ZS$?9p^}#z$b;{rvgU27dhb zVT!yaQDi`)QFpML0gXl@9*_Y^lr{tEfdO^@pztKs^I-&Ft;>MQbk)^;Ym$}Uzkg3G zJZ$2G8Fn*(-Wn<;S;SfU*MMoaaqX*hXyr?%g{Zd;a{n>84UC+XR5Qxw&`^#s>!n-Q?t?fub`!JZxj3ynp}R=3#{3 zVG}3JuzLfh+=mYz+LR=pKYupQVgzuPE?sh$FJE^3{rxs)b#>K!{rc6d`^(k%__%xW z_>#jdyHov;I*!F z^eRr)fjuht|7K=p+6)Lq6X_O&mQAPyfaoOZR){=}4n}6PSu=8MY|Ngi3t)+WJj*!y zlUfLCU?5{e;wXzyVe7(p?UMtGR~ zCOV8US4NDEj+z0aQZAQkgOeU9NVMo~bTB#-QPf&T_trcFX4s?g@w}Uwnrib(Cs8Em z**9W2s!;h4s=wzhU!FWzy?N5{#>)wC~7v*vjmWR4nu}LS`~5ps_ai$!JRZY zT!bjlX}CH(e*D<-8PCwEC@@8cmP#to<7uft(rxnjeB7Ndi1cA?-go0fm|>5y-jiGt zG{^#{383_Jt`tN84-*l-o_HPFpMp$@qS6kf*= z4khYA*8;*#QR_a04y_lX(9w^r-R>(+n9YE6I%~NcD)l1dId^>OfR@R@L|fENlQnr} zLku9@s2k?#D&5Pz;)EIYD3!|C$tnfB(u=SdorG4&p@e5i8(sdiDR&{FLn?92plGGj z%YNd78TKeOiUH&H6*~iTmu?qB7XUg7c@3C)J%DPfiWE0lqD8loj@IdRzm@?_V}?B% zO{M*jOwKOHO1%hkND*$Sv`n2R7{+NE>JSACVT{g0E=#AE{a}R|b~7NC8}oy$h4kG| zFQSFjrxnSgI*J(GOR4iGd%+5`889-MYBK;&{fQBpcl7l*z0-6~+9Nao_Goxy)E8dX ze&Z2t@Ta10-u_mnleCPf8#CCA%xD*ylh07*qoM6N<$f+!m9 AyZ`_I literal 0 HcmV?d00001 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