From 72e372157a4c28b685ce79b714f13684cdd37aba Mon Sep 17 00:00:00 2001 From: jvoisin Date: Tue, 2 Apr 2019 19:48:17 +0200 Subject: [PATCH] Remove WAP-related stuff WAP (https://en.wikipedia.org/wiki/Wireless_Application_Protocol) is a thing from the past that nobody is using anymore. This should close #960 --- .../player/theme/ripserver.properties | 1 - .../main/webapp/WEB-INF/jsp/wap/browse.jsp | 56 ---------------- .../src/main/webapp/WEB-INF/jsp/wap/head.jsp | 10 --- .../src/main/webapp/WEB-INF/jsp/wap/index.jsp | 62 ------------------ .../webapp/WEB-INF/jsp/wap/loadPlaylist.jsp | 23 ------- .../main/webapp/WEB-INF/jsp/wap/playlist.jsp | 56 ---------------- .../main/webapp/WEB-INF/jsp/wap/search.jsp | 19 ------ .../webapp/WEB-INF/jsp/wap/searchResult.jsp | 30 --------- .../main/webapp/WEB-INF/jsp/wap/settings.jsp | 47 ------------- .../src/main/webapp/icons/buuftheme/wap.png | Bin 744 -> 0 bytes .../src/main/webapp/icons/ripserver/wap.png | Bin 699 -> 0 bytes 11 files changed, 304 deletions(-) delete mode 100644 airsonic-main/src/main/webapp/WEB-INF/jsp/wap/browse.jsp delete mode 100644 airsonic-main/src/main/webapp/WEB-INF/jsp/wap/head.jsp delete mode 100644 airsonic-main/src/main/webapp/WEB-INF/jsp/wap/index.jsp delete mode 100644 airsonic-main/src/main/webapp/WEB-INF/jsp/wap/loadPlaylist.jsp delete mode 100644 airsonic-main/src/main/webapp/WEB-INF/jsp/wap/playlist.jsp delete mode 100644 airsonic-main/src/main/webapp/WEB-INF/jsp/wap/search.jsp delete mode 100644 airsonic-main/src/main/webapp/WEB-INF/jsp/wap/searchResult.jsp delete mode 100644 airsonic-main/src/main/webapp/WEB-INF/jsp/wap/settings.jsp delete mode 100644 airsonic-main/src/main/webapp/icons/buuftheme/wap.png delete mode 100644 airsonic-main/src/main/webapp/icons/ripserver/wap.png diff --git a/airsonic-main/src/main/resources/org/airsonic/player/theme/ripserver.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/ripserver.properties index e8bdaeda..2bc96166 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/theme/ripserver.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/theme/ripserver.properties @@ -35,7 +35,6 @@ statusImage = icons/ripserver/status.png upImage = icons/ripserver/up.gif uploadImage = icons/ripserver/upload.gif volumeImage = icons/ripserver/current.gif -wapImage = icons/ripserver/wap.png diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/browse.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/browse.jsp deleted file mode 100644 index 260e3871..00000000 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/browse.jsp +++ /dev/null @@ -1,56 +0,0 @@ - - - -<%@ page language="java" contentType="text/vnd.wap.wml; charset=utf-8" pageEncoding="iso-8859-1"%> - - - - <%@ include file="head.jsp" %> - - - -

- - - - - - - - - - - - - - []
- []
- - []
- - - - []
- []
- - []
- - - - - ">[]
-

- -

- - - - - - ${fn:escapeXml(child.title)}
- - -

- - - diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/head.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/head.jsp deleted file mode 100644 index 230b15b0..00000000 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/head.jsp +++ /dev/null @@ -1,10 +0,0 @@ -<%@ include file="../include.jsp" %> - - - - - - - diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/index.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/index.jsp deleted file mode 100644 index 9199cd16..00000000 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/index.jsp +++ /dev/null @@ -1,62 +0,0 @@ - - - -<%@ page language="java" contentType="text/vnd.wap.wml; charset=utf-8" pageEncoding="iso-8859-1" %> - - - - <%@ include file="head.jsp" %> - - -

- - - - - - - ">[] - -
- - ">[] - -
- - ">[] - -
- -

-

- - - - - - ${index.index} - - - - - - - - - - ${fn:escapeXml(mediaFile.title)} -
- - - - - - - - - - -

- - - diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/loadPlaylist.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/loadPlaylist.jsp deleted file mode 100644 index e7b49be0..00000000 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/loadPlaylist.jsp +++ /dev/null @@ -1,23 +0,0 @@ - - - -<%@ page language="java" contentType="text/vnd.wap.wml; charset=utf-8" pageEncoding="iso-8859-1"%> - - - - <%@ include file="head.jsp" %> - - -

- - - - - - ${fn:escapeXml(playlist.name)}
- -

- - - - diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/playlist.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/playlist.jsp deleted file mode 100644 index 0d6e99cf..00000000 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/playlist.jsp +++ /dev/null @@ -1,56 +0,0 @@ - - - -<%@ page language="java" contentType="text/vnd.wap.wml; charset=utf-8" pageEncoding="iso-8859-1"%> - - - - <%@ include file="head.jsp" %> - - - - - - - - - - - - - - -

${playerName}

-

- - - - - - - ">[]
- ">[]
- ">[]
- - - - - ">[]
- ">[]
-

-

- - - - ${isCurrent ? "" : ""} - ">${fn:escapeXml(file.title)} - ${isCurrent ? "" : ""} -
- - - - -

- - - diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/search.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/search.jsp deleted file mode 100644 index 47b07329..00000000 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/search.jsp +++ /dev/null @@ -1,19 +0,0 @@ - - - -<%@ page language="java" contentType="text/vnd.wap.wml; charset=utf-8" pageEncoding="iso-8859-1"%> - - - <%@ include file="head.jsp" %> - -

- - - " method="get"> - - - -

- - - diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/searchResult.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/searchResult.jsp deleted file mode 100644 index 7e5dd569..00000000 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/searchResult.jsp +++ /dev/null @@ -1,30 +0,0 @@ - - - -<%@ page language="java" contentType="text/vnd.wap.wml; charset=utf-8" pageEncoding="iso-8859-1"%> - - - - <%@ include file="head.jsp" %> - -

- - - - - - - - - - - - ${fn:escapeXml(hit.title)}
- - - -

- - - - diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/settings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/settings.jsp deleted file mode 100644 index 1cac84c5..00000000 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/settings.jsp +++ /dev/null @@ -1,47 +0,0 @@ - - - -<%@ page language="java" contentType="text/vnd.wap.wml; charset=utf-8" pageEncoding="iso-8859-1"%> - - - - <%@ include file="head.jsp" %> - -

- ">[]
 - [] -

- - - -

- - ">[]
 -

- - - - - - - "> - - -
- - - - - ${player} - - - ">${player} - - -
- -

- - - - diff --git a/airsonic-main/src/main/webapp/icons/buuftheme/wap.png b/airsonic-main/src/main/webapp/icons/buuftheme/wap.png deleted file mode 100644 index b7f8af1e0d554e2ee145ec99608f02b8f12b4522..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 744 zcmVP){~-=t69#J1h0ifyS(9oy2Cj=9!k$~f=0JJM&m^N#!Q%BwH! zShse~p_FL|l~~Lf(}+kX;w%;kO;6AFKl=F7H?F+$8XJFsZoKIl?UD;Gyz0=wz2_@P z;vn!voFoc_!Z>Fz41;an*zC62?P&n-{!PG&^;m&s%vlomZsKmA%)6#kXe ztijM#l*%R;6ac``vhdPNZ=v33fQV~Ch>c+wf^#k{i!RhO?QII9sNwh?ViC%wqgDtY z07$6_!v;73XHOnP7(@_^K|mmuLcag;H#G zhH=_7%<&^TiOd`#g@J2?_F@A|^_C03rLVvI{IQ>Y`0fXpE}J-!G!L?|I7vd^_r?0v z%dh+Hm-f*@$wMZsLnmM`v|!uz0Dwcc-+I>+fGPX~GDv(yt#n=xxko*_hkh%B2o=CA z!1KH=0FUq=$ehOyKYV}N>bH@IG~AI5O@wGk3mn&5kmo+(f3RJDIM?YR<%dud0E&vP z6ks{-0s#E40MGN=bBi6J@vb6E8*Z$?8TH{hu6<4d0^k2^>es2S7~^Y*cpOI&2_Tfz a0pNGJ98Y61(5g)U0000n z1FSAb6o9`oJG+1Pnze1)jB3TaQO&SYSW96eHK=Xd*0b%!?BKM0o;j98Re?K&&tJWc zqPPZQ_D0$2MKqg0(h3kDq-k{i2~IliF}Pbr|2(~5{_3YG%PGo!Ac01}fB@Yxbg%nJ z%YP-SUj!+kuApw7VVAxuZTxfD&Dp@f6lM^rhNuT4dt8FJe-~nGj=fFoW1^}W3pOCHs4@d$r{GV%a3atV_2O5A*5eH-f07)TPNCFN}fDL(; zF0meAJ(mblt%bSXk-ies%TQ5N5~j#7Wk2dYv;y9MO97L&CT?Rp znxr%lssvrwFnaO`2@!?p(NH5EXapRpPF?7k&dd+-Ba9a`i%0<)Fk^dQhIW9k4q}B2 z?|>QKn;4g%Qlr6yMpK+sRX>=we_wt3(%|O=8?sdPf-dP?`+6cs9W;(&&%$~fceYThMz`Dw(IZDhw|lf`s4g(MHhbx)f`we4W0Hp z;kyTsl|SLqH hPkglEGgX}j@GsVIbY-vQp}GJ7002ovPDHLkV1nOdHDdq(