From 323154ea8a5e59ec890abb40ceec770a00c078c8 Mon Sep 17 00:00:00 2001 From: lalka2018 <99399973+lalka2016@users.noreply.github.com> Date: Fri, 10 Nov 2023 22:16:22 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Долокализована админка (точно помню, что уже делал это, но ладно) - Удалён лишний пункт "audios" в getLeftMenuItemStatus (реально) - Если. У плеера есть параметр "hideButtons", то при наведении на него не пропадает время. - На странице редактирования/создания плейлиста если у песни длинное название, то оно да похуй короче. Ну в общем лучше стало - Там где нужно, добавлена строка в конце файла - Возвращена строка "photo" в английской локали (я её случайно удалил :+1: ) --- Web/Models/Entities/Audio.php | 2 +- Web/Models/Entities/Playlist.php | 2 +- Web/Models/Entities/Traits/TAudioStatuses.php | 2 +- Web/Models/Entities/User.php | 1 - Web/Models/shell/processAudio.ps1 | 2 +- Web/Presenters/AudioPresenter.php | 2 +- Web/Presenters/templates/Admin/@layout.xml | 2 +- .../templates/Admin/EditPlaylist.xml | 10 +- Web/Presenters/templates/Admin/Music.xml | 10 +- .../templates/Audio/EditPlaylist.xml | 6 +- Web/Presenters/templates/Audio/Embed.xml | 92 ++---------------- Web/Presenters/templates/Audio/List.xml | 2 +- .../templates/Audio/NewPlaylist.xml | 8 +- Web/Presenters/templates/Audio/player.xml | 8 +- Web/Presenters/templates/Audio/tabs.xml | 2 +- Web/static/css/audios.css | 22 ++++- Web/static/css/main.css | 2 +- Web/static/img/common.png | Bin 1890 -> 0 bytes Web/static/js/al_playlists.js | 6 +- locales/en.strings | 3 + locales/ru.strings | 2 + 21 files changed, 67 insertions(+), 119 deletions(-) delete mode 100644 Web/static/img/common.png diff --git a/Web/Models/Entities/Audio.php b/Web/Models/Entities/Audio.php index 05022b8c..c6e6838f 100644 --- a/Web/Models/Entities/Audio.php +++ b/Web/Models/Entities/Audio.php @@ -465,4 +465,4 @@ class Audio extends Media parent::delete($softly); } -} \ No newline at end of file +} diff --git a/Web/Models/Entities/Playlist.php b/Web/Models/Entities/Playlist.php index 89b4155b..c027a038 100644 --- a/Web/Models/Entities/Playlist.php +++ b/Web/Models/Entities/Playlist.php @@ -253,4 +253,4 @@ class Playlist extends MediaCollection return implode(" • ", $props); } -} \ No newline at end of file +} diff --git a/Web/Models/Entities/Traits/TAudioStatuses.php b/Web/Models/Entities/Traits/TAudioStatuses.php index 0d687b68..f957a104 100644 --- a/Web/Models/Entities/Traits/TAudioStatuses.php +++ b/Web/Models/Entities/Traits/TAudioStatuses.php @@ -35,4 +35,4 @@ trait TAudioStatuses return NULL; } -} \ No newline at end of file +} diff --git a/Web/Models/Entities/User.php b/Web/Models/Entities/User.php index 9152e64e..f72a0978 100644 --- a/Web/Models/Entities/User.php +++ b/Web/Models/Entities/User.php @@ -464,7 +464,6 @@ class User extends RowModel "links", "poster", "apps", - "audios", ], ])->get($id); } diff --git a/Web/Models/shell/processAudio.ps1 b/Web/Models/shell/processAudio.ps1 index 5404857a..206e11e1 100644 --- a/Web/Models/shell/processAudio.ps1 +++ b/Web/Models/shell/processAudio.ps1 @@ -36,4 +36,4 @@ Move-Item -Path ("$fileHash.mpd") -Destination "$storageDir/$hashPart" cd .. Remove-Item -Recurse $temp -Remove-Item $audioFile \ No newline at end of file +Remove-Item $audioFile diff --git a/Web/Presenters/AudioPresenter.php b/Web/Presenters/AudioPresenter.php index 9b9b20c8..3bae710c 100644 --- a/Web/Presenters/AudioPresenter.php +++ b/Web/Presenters/AudioPresenter.php @@ -693,4 +693,4 @@ final class AudioPresenter extends OpenVKPresenter $this->returnJson($resultArr); } -} \ No newline at end of file +} diff --git a/Web/Presenters/templates/Admin/@layout.xml b/Web/Presenters/templates/Admin/@layout.xml index c5a9a22a..055bd0a0 100644 --- a/Web/Presenters/templates/Admin/@layout.xml +++ b/Web/Presenters/templates/Admin/@layout.xml @@ -98,7 +98,7 @@ {_admin_banned_links}
  • - Музыка + {_admin_music}
  • diff --git a/Web/Presenters/templates/Admin/EditPlaylist.xml b/Web/Presenters/templates/Admin/EditPlaylist.xml index 7c6e21cd..b0bd823f 100644 --- a/Web/Presenters/templates/Admin/EditPlaylist.xml +++ b/Web/Presenters/templates/Admin/EditPlaylist.xml @@ -16,15 +16,15 @@
    - +
    - +
    - + @@ -35,11 +35,11 @@

    - +
    - + isDeleted()} checked {/if} />

    diff --git a/Web/Presenters/templates/Admin/Music.xml b/Web/Presenters/templates/Admin/Music.xml index cf96b1ad..448ee54d 100644 --- a/Web/Presenters/templates/Admin/Music.xml +++ b/Web/Presenters/templates/Admin/Music.xml @@ -37,7 +37,7 @@ ID {_admin_author} - Исполнитель + {_peformer} {_admin_title} {_genre} Explicit @@ -88,8 +88,8 @@ ID {_admin_author} {_name} - Создан - Действия + {_created_playlist} + {_actions} @@ -113,12 +113,12 @@ {$owner->getCanonicalName()} - {$playlist->getName()} + {ovk_proc_strtr($playlist->getName(), 30)} {$playlist->getCreationTime()} - Редактировать + {_edit} diff --git a/Web/Presenters/templates/Audio/EditPlaylist.xml b/Web/Presenters/templates/Audio/EditPlaylist.xml index 32690d50..32d43d92 100644 --- a/Web/Presenters/templates/Audio/EditPlaylist.xml +++ b/Web/Presenters/templates/Audio/EditPlaylist.xml @@ -37,12 +37,12 @@
    -
    +
    -
    +
    {include "player.xml", audio => $audio, hideButtons => true}
    -
    +
    {_remove_from_playlist}
    diff --git a/Web/Presenters/templates/Audio/Embed.xml b/Web/Presenters/templates/Audio/Embed.xml index 7f9e8714..b7540358 100644 --- a/Web/Presenters/templates/Audio/Embed.xml +++ b/Web/Presenters/templates/Audio/Embed.xml @@ -3,92 +3,18 @@ + {$audio->getName()} - {css "css/style.css"} + {css "css/main.css"} + {css "css/audios.css"} + {script "js/node_modules/dashjs/dist/dash.all.min.js"} + {script "js/node_modules/jquery/dist/jquery.min.js"} + {script "js/node_modules/umbrellajs/umbrella.min.js"} -
    {include "tabs.xml"}
    -{/block} \ No newline at end of file +{/block} diff --git a/Web/Presenters/templates/Audio/NewPlaylist.xml b/Web/Presenters/templates/Audio/NewPlaylist.xml index a55267c7..b7546749 100644 --- a/Web/Presenters/templates/Audio/NewPlaylist.xml +++ b/Web/Presenters/templates/Audio/NewPlaylist.xml @@ -49,12 +49,12 @@
    -
    +
    {include "player.xml", audio => $audio, hideButtons => true}
    -
    +
    {_add_to_playlist}
    @@ -66,9 +66,9 @@
    - + -