Skip to content

Commit

Permalink
Merge pull request #862 from AF-1/public/8.4
Browse files Browse the repository at this point in the history
make lyrics on Default skin songinfo page collapsible
  • Loading branch information
mherger committed Feb 15, 2023
2 parents 0f9e161 + e2a0f38 commit 25269aa
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 1 deletion.
1 change: 1 addition & 0 deletions Changelog8.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ <h2><a name="v8.4.0" id="v8.4.0"></a>Version 8.4.0</h2>
<li><a href="https://github.com/Logitech/slimserver/pull/846">#846</a> - Improve display of multiline lyrics and comments in the web UI (thanks mw9!)</li>
<li>Move persist.db out of the cache folder - it's music data which can't be restored from the music files.</li>
<li>Log warning if the server's time seems to be off (only if MySqueezebox integration is enabled).</li>
<li><a href="https://github.com/Logitech/slimserver/pull/846">#862</a> - Make lyrics on Default skin songinfo page collapsible</li>
</ul>
<br />

Expand Down
2 changes: 1 addition & 1 deletion HTML/Default/skin.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions HTML/Default/slimserver.css
Original file line number Diff line number Diff line change
Expand Up @@ -1616,3 +1616,25 @@ td.sort-asc .x-grid3-hd-inner, td.x-grid3-hd-menu-open .x-grid3-hd-inner {
.x-grid3-cell-inner {
white-space:normal!important;
}

/* song info lyrics */
#songinfo_lyrics details > summary {
list-style: none;
cursor: pointer;
outline: none;
}
#songinfo_lyrics summary::-webkit-details-marker {
display: none;
}

#songinfo_lyrics summary::after {
content: ' ▸';
}

#songinfo_lyrics details[open] summary:after {
content: " ▾";
}

#songinfo_lyrics p {
padding: 8px 0px 8px 10px;
}
4 changes: 4 additions & 0 deletions HTML/Default/xmlbrowser.html
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,10 @@
[% PROCESS $item.web.value %]
[% ELSE %]
[% IF item.label %]
[% IF item.label == "LYRICS" %]<span id="songinfo_lyrics"><details><summary>[% END %]
[% item.label | string %]
[%- stringCOLON %]
[% IF item.label == "LYRICS" %]</summary>[% END %]
[% END %]
[% WRAPPER weblink %]
[% title = item.web.value;
Expand Down Expand Up @@ -466,7 +468,9 @@
<a href="[% UNLESS item.image.match("^(\/|http)") %][% webroot %][% END %][% item.image %]" target="_blank" [% slideshowHelpers %]>
[% END %]

[% IF item.label == "LYRICS" %]<p>[% END %]
[% content %]
[% IF item.label == "LYRICS" %]</p></details></span>[% END %]

[% IF item.type == 'playlist' || item.weblink || item.link || !item.type.match('^text') %]
</a>
Expand Down

0 comments on commit 25269aa

Please sign in to comment.