From: Roman Bazalevsky Date: Thu, 29 Sep 2016 15:33:48 +0000 (+0300) Subject: Вычищение старых конструкций PHP + многочисленная доводка по мелочи. X-Git-Url: https://git.rvb.name/mpd-web.git/commitdiff_plain/refs/heads/master Вычищение старых конструкций PHP + многочисленная доводка по мелочи. --- diff --git a/ajax/editplaylist.php b/ajax/editplaylist.php index a4764c9..31c6697 100644 --- a/ajax/editplaylist.php +++ b/ajax/editplaylist.php @@ -18,7 +18,7 @@ $dir = $_REQUEST['dir'];
- +
@@ -26,7 +26,7 @@ $dir = $_REQUEST['dir'];
- + GetDir($dir); @@ -65,7 +65,7 @@ $dir = $_REQUEST['dir'];
НазваниеУправлениеTitleControls
- +
diff --git a/ajax/mpd.js b/ajax/mpd.js index 3717603..1be85a6 100644 --- a/ajax/mpd.js +++ b/ajax/mpd.js @@ -132,7 +132,7 @@ req.send(); function SavePlayList() { -var name=window.prompt('Имя списка',''); +var name=window.prompt('List name',''); var req = new XMLHttpRequest(); @@ -152,8 +152,6 @@ function DelPlayList(item) { var req = new XMLHttpRequest(); -//if (! window.alert("Удалить список "+item+"?")) return; - req.onreadystatechange = function () { if (this.readyState != 4 || this.status != 200) return; RefreshPageStatus(); diff --git a/ajax/mpd.php b/ajax/mpd.php index 86ea78e..dd4df8e 100644 --- a/ajax/mpd.php +++ b/ajax/mpd.php @@ -7,7 +7,7 @@ include('../system/helper.php'); $mpd = new mpd($mpd_host,$mpd_port,$mpd_password); if($mpd->connected != 1){ - echo "Нет соединения с сервером!"; + echo "Server not available!"; exit(1); } diff --git a/ajax/playlist.php b/ajax/playlist.php index 8050bba..09d06e1 100644 --- a/ajax/playlist.php +++ b/ajax/playlist.php @@ -9,7 +9,7 @@ $playlist= $mpd->playlist;
- +
НазваниеУправлениеTitleControls
- +
@@ -17,7 +17,7 @@ include('mpd.php'); НазваниеУправление -playlists; @@ -26,11 +26,13 @@ for($i=0;$i "> - - + + @@ -40,7 +42,7 @@ for($i=0;$i - +
diff --git a/ajax/trackinfo.php b/ajax/trackinfo.php index f1c4b36..ef86893 100644 --- a/ajax/trackinfo.php +++ b/ajax/trackinfo.php @@ -20,7 +20,7 @@ if($cur_track !=-1) { } else { echo "
#-/$playlist_count
"; - echo "
Трек не выбран
"; + echo "
No track selected
"; } ?> diff --git a/ajax/trackname.php b/ajax/trackname.php index 49cc01d..d12955b 100644 --- a/ajax/trackname.php +++ b/ajax/trackname.php @@ -18,7 +18,7 @@ if($cur_track !=-1) { } } else { - echo "Трек не выбран"; + echo "No track selected"; } ?> diff --git a/config/config.php b/config/config.php index fecc1f6..25f4c38 100644 --- a/config/config.php +++ b/config/config.php @@ -2,6 +2,6 @@ $mpd_host ="localhost"; $mpd_port = "6600"; -$mpd_password = "mypassword" +$mpd_password = "mypassword"; ?> diff --git a/index.php b/index.php index 7ed34f3..ddf52bf 100644 --- a/index.php +++ b/index.php @@ -6,7 +6,7 @@ include('system/helper.php'); $mpd = new mpd($mpd_host,$mpd_port,$mpd_password); if($mpd->connected != 1){ - echo "Нет соединения с сервером!"; + echo "Server not available!"; exit(1); } diff --git a/view/default/tmpl/playlistmenu.php b/view/default/tmpl/playlistmenu.php index 45c8857..fdf2157 100644 --- a/view/default/tmpl/playlistmenu.php +++ b/view/default/tmpl/playlistmenu.php @@ -4,7 +4,7 @@ - + diff --git a/view/player/tmpl/default.php b/view/player/tmpl/default.php index 2f0126b..6287a0a 100644 --- a/view/player/tmpl/default.php +++ b/view/player/tmpl/default.php @@ -2,7 +2,7 @@
- +
ПроигрываетсяNow playing