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 @@
- Название
+ {_name}
- Описание
+ {_description}
-
Обложка (ID фото)
+
{_admin_cover_id}
@@ -35,11 +35,11 @@
- Владелец
+ {_owner}
- Удален
+ {_deleted}
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 @@
- {$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"}
-
-
-
-
-
-
-
-
- {$audio->getPerformer()}
-
- -
-
- {$audio->getTitle()}
-
-
-
-
-
-
-
-
- {$audio->getFormattedLength()}
-
-
-
-
- {script "js/node_modules/umbrellajs/umbrella.min.js"}
- {script "js/node_modules/dashjs/dist/dash.all.min.js"}
-
+ {include "player.xml", audio => $audio}
+
+ {script "js/al_music.js"}
diff --git a/Web/Presenters/templates/Audio/List.xml b/Web/Presenters/templates/Audio/List.xml
index 7ab978b3..f270bdf6 100644
--- a/Web/Presenters/templates/Audio/List.xml
+++ b/Web/Presenters/templates/Audio/List.xml
@@ -123,4 +123,4 @@
{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}
-
@@ -66,9 +66,9 @@
{/if}
-
\ No newline at end of file
+
diff --git a/Web/static/css/audios.css b/Web/static/css/audios.css
index e998f856..5decbb89 100644
--- a/Web/static/css/audios.css
+++ b/Web/static/css/audios.css
@@ -312,7 +312,7 @@
display: block;
}
-.audioEntry:hover .volume span {
+.audioEntry:hover .volume .hideOnHover {
display: none;
}
@@ -640,4 +640,22 @@
.friendsAudiosList #used .elem:hover {
background: #787878;
cursor: pointer;
-}
\ No newline at end of file
+}
+
+.editContainer {
+ display:table;
+ clear:both;
+ width:100%;
+ margin-top: 10px;
+}
+
+.editContainer .playerContainer {
+ width: 78%;
+ float: left;
+ max-width: 78%;
+ min-width: 68%;
+}
+
+.addToPlaylist {
+ width: 22%;
+}
diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index 5d02b17d..4dd38356 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -2999,4 +2999,4 @@ hr {
background-repeat: repeat !important;
background-repeat: no-repeat !important;
background-position: 50% !important;
-}
\ No newline at end of file
+}
diff --git a/Web/static/img/common.png b/Web/static/img/common.png
deleted file mode 100644
index 0c54bf0f1e0e96151356c2dfb4cdd8278ee9cf42..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1890
zcmV-o2c7tdP)
2Cy=84QK-*K(Uo8UPEI#
zp~-Zfi>2(Jh>7}$o7Nwd-vCvJ8xjG5L5gvV*x*JQ*~_97A-g{YqtKfo>?H|@o=1726$
zrp!EF$JV`86!3F`UYc-mQJ
zXlP6aB(no^x9%&rAg)D3w`Pk=+Oj>*;JR&p@nz2dt`S2Uau~&nH{13V|7qLz)%Lb*
z;RO9W0^%Amv>_+4zwl<{2GBbQ5Jw?`o(DLFHsm1J-~f6Fp|W7MaD_%C1LE2
z6+^r}zl=0ABygnn$43qoN(YF;Ag&P;6d$~NuuyXSJX9=Q5;1|^mPLyt3xY@chvpqB
z4%JO~Sx1#QeR53B=IGZU91Hl{jnf^W$?Kpf8^1GY~91P!Z!Z5EKlGix>b^;!*~}
zkhKUy7|0tM8q@t;F-~EIc|O~@V!TeM=W7t&`^bJYma>1q2cnY>o$pTS_p$cw=WnH!
zrW7}=3&_Lclm>8(4>95?yS25q_s*~e;-=k3u|XV=Qi-D;T0VBBexDgAqEjuV^Ry8H
zBvkSrlB-D^P%Ndtsdo)E9FkLuSDym4fmq5}S#1hbCW7KM89+g*r$BAMGeI?UhQxpM
z#KS^egklITLk*4F3U934>w?;VHXtY#o^>~%Yd{;2HK3s(3>;>A9skTmyb9tPF?L~`
zq{5-K@wZVa>x)LyK8kC^(1sk&<6PVE=7S#B`j73Ek9Vb=b!bBli+EG|__K|s^>5s?
zS66v=^geQs%X75bw9i+2+m*?jx(g?3k;^gszu<*K-{HDYMv6;C@ak>L55nRiu08*(_sZ$gNAJP=P?udK;9b3wY*`YOdwq76C7
zjeOY0d){tsz+Xhc4;aYQ1>zNNBqE&-%&*t;$;8o)M{gwXoX8BI$nc^V_G;qz899}o
zOOY8srQ=00-_^tsM-F0m4x0hBxK}U7AF9MhSf-$wIDi%5O+n;Ehytr7jsiuYdPT^x
z46)QE6UP$uFGIGC2qWR&h;WUbGi*c*TQU1DBMl7>xUTyo@fh)bMcc!~9PvR;1HDAx
z6ifuf&k=zR7V)5vXF?T2uAm9ExR?oUad`vsQy^c2^2<iOU<1pMvRMgjixBmZ8PH5m{4iL>d~L
zc$dBcWM#5zQ$sR$c10q0r6G~auS!}kqAi~4evD!t5(g>X*O2^j9X?5qRGfr|RwTOI
z2~6hxqIe^T{{H{AuG6iV+&z&PAd!s$fl$PVMPdNGsl@=ME1D5VbdA(#;A&J;@LdfC
zP$L787+96ezg1HWZ0mZ>03xb`Bezz7x%OyJ(R7}ISd;#&YZ+F}wDZY?60%0GoNr^8ajzToR0}|qkiPsh4S>jA?@g>9?3h`aU8QkK_
ziDL@!43YgUSqx$dniAqmiCc^&(S2z!XLDh1Y45#MYG;$&rc%_goVZZL##u3};@
cahbIEe}r>P {
document.querySelector(".playlistAudiosContainer").insertAdjacentHTML("beforeend", `
-
+
${el.outerHTML}
-
+
${isAttached ? tr("remove_from_playlist") : tr("add_to_playlist")}
@@ -110,4 +110,4 @@ $(document).on("change", "input#playlist_query", async (e) => {
searcher.movePage(1)
return;
}
-})
\ No newline at end of file
+})
diff --git a/locales/en.strings b/locales/en.strings
index e3615fd6..be6ec594 100644
--- a/locales/en.strings
+++ b/locales/en.strings
@@ -347,6 +347,7 @@
"albums" = "Albums";
"album" = "Album";
"photos" = "photos";
+"photo" = "Photo";
"create_album" = "Create album";
"edit_album" = "Edit album";
"edit_photo" = "Edit photo";
@@ -1530,6 +1531,8 @@
"admin_gift_moved_to_recycle" = "This gift will now be in
Recycle Bin .";
"admin_original_file" = "Original file";
"admin_audio_length" = "Length";
+"admin_cover_id" = "Cover (photo ID)";
+"admin_music" = "Music";
"logs" = "Logs";
"logs_anything" = "Anything";
diff --git a/locales/ru.strings b/locales/ru.strings
index 282d8d3f..4a9d13c0 100644
--- a/locales/ru.strings
+++ b/locales/ru.strings
@@ -1415,6 +1415,8 @@
"admin_gift_moved_to_recycle" = "Теперь подарок находится в
корзине .";
"admin_original_file" = "Оригинальный файл";
"admin_audio_length" = "Длина";
+"admin_cover_id" = "Обложка (ID фото)";
+"admin_music" = "Музыка";
"logs" = "Логи";
"logs_anything" = "Любое";