Skip to content

B
Backend Server
Commit e603867e authored by SeeBeyond's avatar SeeBeyond
Browse files
Options

Add charter links and fix repeats/commas in playlist detail

parent 48359116
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 14 deletions
public/assets/css/playlistdetail.css
View file @ e603867e
.section-playlist-detail .cover { .section-playlist-detail .cover {
width: 100%; width: 100%;
height: 300px; height: 300px;
background: rgba(255, 255, 255, 0.1);
background-size: cover; background-size: cover;
background-position: left center; background: rgba(255, 255, 255, 0.1) left center;
} }
.section-playlist-detail .cover .shade { .section-playlist-detail .cover .shade {
width: 100%; width: 100%;
...@@ -16,7 +15,7 @@ ...@@ -16,7 +15,7 @@
} }
.section-playlist-detail .cover .shade .content { .section-playlist-detail .cover .shade .content {
text-align: center; text-align: center;
text-shadow: 0px 4px 18px rgba(0, 0, 0, 0.6); text-shadow: 0 4px 18px rgba(0, 0, 0, 0.6);
} }
.section-playlist-detail .cover .shade .content .title { .section-playlist-detail .cover .shade .content .title {
font-size: 48px; font-size: 48px;
...@@ -32,7 +31,7 @@ ...@@ -32,7 +31,7 @@
border-radius: 4px; border-radius: 4px;
background: #fff; background: #fff;
color: #000; color: #000;
text-shadow: 0px 0px 0px transparent; text-shadow: 0 0 0 transparent;
margin-left: 10px; margin-left: 10px;
transform: translateY(-11px); transform: translateY(-11px);
} }
...@@ -84,6 +83,15 @@ ...@@ -84,6 +83,15 @@
line-height: 1.5em; line-height: 1.5em;
border-radius: 4px; border-radius: 4px;
} }
.section-playlist-detail .playlist-content .playlist-detail .playlist-charters .username {
opacity: 1;
color: #fff;
text-decoration: none;
transition: 0.2s ease-in-out opacity;
}
.section-playlist-detail .playlist-content .playlist-detail .playlist-charters .username:hover {
opacity: 0.6;
}
.section-playlist-detail .playlist-content .song-row-playlist .song-list { .section-playlist-detail .playlist-content .song-row-playlist .song-list {
grid-template-columns: repeat(5, 1fr); grid-template-columns: repeat(5, 1fr);
} }
......
public/assets/css/playlistdetail.css.map
View file @ e603867e
{"version":3,"sources":["playlistdetail.less"],"names":[],"mappings":"AACI,wBAAE;EACE,WAAA;EACA,aAAA;EACA,oCAAA;EACA,sBAAA;EACA,gCAAA;;AAEA,wBAPF,OAOI;EACE,WAAA;EACA,YAAA;EACA,8BAAA;EACA,yBAAA;EACA,aAAA;EACA,uBAAA;EACA,mBAAA;;AAEA,wBAhBN,OAOI,OASI;EACE,kBAAA;EACA,4CAAA;;AAEA,wBApBV,OAOI,OASI,SAII;EACE,eAAA;EACA,kBAAA;EACA,aAAa,oBAAb;;AAEA,wBAzBd,OAOI,OASI,SAII,OAKI;EACE,qBAAA;EACA,aAAa,uBAAb;EACA,iBAAA;EACA,eAAA;EACA,iBAAA;EACA,kBAAA;EACA,gBAAA;EACA,WAAA;EACA,oCAAA;EACA,iBAAA;EACA,WAAW,iBAAX;;AAIR,wBAxCV,OAOI,OASI,SAwBI;EACE,eAAA;EACA,YAAA;;AAKhB,wBAAE;EACE,aAAA;EACA,aAAA;EACA,gCAAA;EACA,cAAA;;AAGI,wBAPN,kBAMI,iBACI;EACE,mBAAA;EACA,kBAAA;EACA,kBAAA;EACA,aAAA;EACA,cAAA;EACA,aAAA;;AAEA,wBAfV,kBAMI,iBACI,sBAQI;EACE,kBAAA;EACA,YAAA;;AAGR,wBApBN,kBAMI,iBAcI;EACE,aAAA;EACA,+BAAA;EACA,cAAA;EACA,gBAAA;;AAEA,wBA1BV,kBAMI,iBAcI,mBAMI;EACE,kBAAA;EACA,YAAA;;AAGR,wBA/BN,kBAMI,iBAyBI;EACE,aAAA;EACA,4BAAA;EACA,aAAA;EACA,gBAAA;;AAEA,wBArCV,kBAMI,iBAyBI,mBAMI;EACE,kBAAA;EACA,YAAA;;AAEJ,wBAzCV,kBAMI,iBAyBI,mBAUI;EACE,mBAAA;EACA,aAAA;EACA,kBAAA;EACA,kBAAA;;AAKR,wBAlDN,kBAiDI,mBACI;EACE,uBAAuB,cAAvB","file":"playlistdetail.css"} {"version":3,"sources":["playlistdetail.less"],"names":[],"mappings":"AACI,wBAAE;EACE,WAAA;EACA,aAAA;EACA,sBAAA;EACA,gDAAA;;AAEA,wBANF,OAMI;EACE,WAAA;EACA,YAAA;EACA,8BAAA;EACA,yBAAA;EACA,aAAA;EACA,uBAAA;EACA,mBAAA;;AAEA,wBAfN,OAMI,OASI;EACE,kBAAA;EACA,0CAAA;;AAEA,wBAnBV,OAMI,OASI,SAII;EACE,eAAA;EACA,kBAAA;EACA,aAAa,oBAAb;;AAEA,wBAxBd,OAMI,OASI,SAII,OAKI;EACE,qBAAA;EACA,aAAa,uBAAb;EACA,iBAAA;EACA,eAAA;EACA,iBAAA;EACA,kBAAA;EACA,gBAAA;EACA,WAAA;EACA,8BAAA;EACA,iBAAA;EACA,WAAW,iBAAX;;AAIR,wBAvCV,OAMI,OASI,SAwBI;EACE,eAAA;EACA,YAAA;;AAKhB,wBAAE;EACE,aAAA;EACA,aAAA;EACA,gCAAA;EACA,cAAA;;AAGI,wBAPN,kBAMI,iBACI;EACE,mBAAA;EACA,kBAAA;EACA,kBAAA;EACA,aAAA;EACA,cAAA;EACA,aAAA;;AAEA,wBAfV,kBAMI,iBACI,sBAQI;EACE,kBAAA;EACA,YAAA;;AAGR,wBApBN,kBAMI,iBAcI;EACE,aAAA;EACA,+BAAA;EACA,cAAA;EACA,gBAAA;;AAEA,wBA1BV,kBAMI,iBAcI,mBAMI;EACE,kBAAA;EACA,YAAA;;AAGR,wBA/BN,kBAMI,iBAyBI;EACE,aAAA;EACA,4BAAA;EACA,aAAA;EACA,gBAAA;;AAEA,wBArCV,kBAMI,iBAyBI,mBAMI;EACE,kBAAA;EACA,YAAA;;AAEJ,wBAzCV,kBAMI,iBAyBI,mBAUI;EACE,mBAAA;EACA,aAAA;EACA,kBAAA;EACA,kBAAA;;AAEJ,wBA/CV,kBAMI,iBAyBI,mBAgBI;EACE,UAAA;EACA,WAAA;EACA,qBAAA;EACA,oCAAA;;AAEA,wBArDd,kBAMI,iBAyBI,mBAgBI,UAMG;EACG,YAAA;;AAMZ,wBA5DN,kBA2DI,mBACI;EACE,uBAAuB,cAAvB","file":"playlistdetail.css"}
\ No newline at end of file \ No newline at end of file
public/assets/css/playlistdetail.less
View file @ e603867e
...@@ -2,9 +2,8 @@ ...@@ -2,9 +2,8 @@
& .cover { & .cover {
width: 100%; width: 100%;
height: 300px; height: 300px;
background: rgba(255,255,255,0.1);
background-size: cover; background-size: cover;
background-position: left center; background: rgba(255, 255, 255, 0.1) left center;
& .shade { & .shade {
width: 100%; width: 100%;
...@@ -17,7 +16,7 @@ ...@@ -17,7 +16,7 @@
& .content { & .content {
text-align: center; text-align: center;
text-shadow: 0px 4px 18px rgba(0, 0, 0, 0.6); text-shadow: 0 4px 18px rgba(0, 0, 0, 0.6);
& .title { & .title {
font-size: 48px; font-size: 48px;
...@@ -33,7 +32,7 @@ ...@@ -33,7 +32,7 @@
border-radius: 4px; border-radius: 4px;
background: #fff; background: #fff;
color: #000; color: #000;
text-shadow: 0px 0px 0px transparent; text-shadow: 0 0 0 transparent;
margin-left: 10px; margin-left: 10px;
transform: translateY(-11px); transform: translateY(-11px);
} }
...@@ -93,6 +92,16 @@ ...@@ -93,6 +92,16 @@
line-height: 1.5em; line-height: 1.5em;
border-radius: 4px; border-radius: 4px;
} }
& .username {
opacity: 1;
color: #fff;
text-decoration: none;
transition: 0.2s ease-in-out opacity;
&:hover {
opacity: 0.6;
}
}
} }
} }
& .song-row-playlist { & .song-row-playlist {
......
src/Controller/PlaylistController.php
View file @ e603867e
...@@ -97,7 +97,6 @@ class PlaylistController extends AbstractController ...@@ -97,7 +97,6 @@ class PlaylistController extends AbstractController
$chartAuthors = []; $chartAuthors = [];
$resultPlaylist = $em->getRepository(SongPlaylist::class)->findOneBy(array('id' => $playlistId)); $resultPlaylist = $em->getRepository(SongPlaylist::class)->findOneBy(array('id' => $playlistId));
if(!$resultPlaylist) throw new NotFoundHttpException(); if(!$resultPlaylist) throw new NotFoundHttpException();
$resultUser = $em->getRepository(User::class)->findOneBy(array('id' => $resultPlaylist->getUser())); $resultUser = $em->getRepository(User::class)->findOneBy(array('id' => $resultPlaylist->getUser()));
......
templates/playlist/detail.html.twig
View file @ e603867e
...@@ -49,10 +49,11 @@ ...@@ -49,10 +49,11 @@
{% set charters = [] %} {% set charters = [] %}
{% for song in playlist.songs %} {% for song in playlist.songs %}
{% if song.charter not in charters %} {% if song.charter not in charters %}
{% if loop.index == 1 %} {% if loop.first %}
{{ song.charter }} <a class="username" href="{{ path('user.detail', {userId: song.uploader}) }}">{{ song.charter }}</a>,
{% else %}
<a class="username" href="{{ path('user.detail', {userId: song.uploader}) }}">{{ song.charter }}</a>
{% endif %} {% endif %}
,&#32{{ song.charter }}
{% set charters = charters|merge([song.charter]) %} {% set charters = charters|merge([song.charter]) %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
...@@ -78,5 +79,5 @@ ...@@ -78,5 +79,5 @@
{% endblock %} {% endblock %}
{% block styles %} {% block styles %}
<link rel="stylesheet" href="{{ asset('assets/css/playlistdetail.css?v=' ~ date().timestamp) }}" /> <link rel="stylesheet" href="{{ asset('assets/css/playlistdetail.css?v=' ~ date().timestamp) }}"/>
{% endblock %} {% endblock %}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment