Skip to content

Commit

Permalink
lightened hashtag bubble border; prettied html (non-semantic change)
Browse files Browse the repository at this point in the history
  • Loading branch information
RocketMan committed Oct 21, 2023
1 parent 478c643 commit d0f493a
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 44 deletions.
2 changes: 1 addition & 1 deletion css/zoostyle.css
Original file line number Diff line number Diff line change
Expand Up @@ -1512,7 +1512,7 @@ a:hover.copy {

.album-hashtag {
border-radius: 6px;
border: 1px solid #333;
border: 1px solid #666;
padding: 2px 8px;
margin-right: 2px;
line-height: 2;
Expand Down
90 changes: 47 additions & 43 deletions ui/templates/default/album/info.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,65 +16,69 @@
{% endif %}

<div class='album-info {{~ image_url ? " with-thumb" }}'>
<table>
<tr>
<td align=right>Album:</td>
<td><b><a href="?s=byAlbum&amp;n={{ album.album | e('url') }}&amp;action=search" class="nav">{{ album.album }}</a></b></td>
<td width=80>&nbsp;</td>
<td align=right>Collection:</td><td style='white-space: nowrap'><b>
<table>
<tr>
<td align=right>Album:</td>
<td><b><a href="?s=byAlbum&amp;n={{ album.album | e('url') }}&amp;action=search" class="nav">{{ album.album }}</a></b></td>
<td width=80>&nbsp;</td>
<td align=right>Collection:</td><td style='white-space: nowrap'><b>
{%- set showMissing = 'missing' -%}
{%- if album.location == 'G' -%}
<i>Deep Storage {{ album.bin }}</i>
<i>Deep Storage {{ album.bin }}</i>
{%- elseif album.location == 'M' -%}
<i>Missing</i>
<i>Missing</i>
{%- set showMissing = 'found' -%}
{%- elseif album.location == 'C' -%}
<i>A-File</i>
<i>A-File</i>
{%- elseif album.location == 'E' -%}
<i>Review Shelf</i>
<i>Review Shelf</i>
{%- elseif album.location == 'F' -%}
<i>Out for Review</i>
<i>Out for Review</i>
{%- elseif album.location == 'U' -%}
<i>Deaccessioned</i>
<i>Deaccessioned</i>
{%- set showMissing = false -%}
{%- elseif album.medium == 'D' -%}
<i>Digital</i>
<i>Digital</i>
{%- set showMissing = false -%}
{%- else -%}
{{ GENRES[album.category] }} {{ album.medium != 'C' ? MEDIA[album.medium] }}
{{ GENRES[album.category] }} {{ album.medium != 'C' ? MEDIA[album.medium] }}
{%- endif -%}
</b>
{% if app.session.isAuth('u') and showMissing %}
<a href="{{ report_missing_url }}" class="nav" style="margin-left: 5px" target="_blank">[report {{ showMissing }}...]</a>
{% endif -%}
</td></tr>
<tr><td align=right>Artist:</td><td><b>
{% if album.iscoll %}
{{ artist }}
{% else %}
<A HREF="?s=byArtist&amp;n={{ artist | e('url') }}&amp;action=search" class="nav">{{ artist }}</a>
{% endif %}
</b></td>
<td>&nbsp;</td>
<td align=right>Added:</td><td class='date'><b>{{ album.created | date('M Y') }}</b></td></tr>
<tr><td align=right>Label:</td><td><b>
{% if album.pubkey %}
<a href="?s=byLabelKey&amp;n={{ album.pubkey }}&amp;action=search" class="nav">{{ album.name }}</a>
{% else %}
(Unknown)
{% endif %}
</b></td><td colspan=2>&nbsp;</td><td>
{% if app.session.isAuth('u') %}
<a href="?action=searchReviewEdit&amp;tag={{ album.tag }}" class="nav"><b>Write a review of this album</b></a>
{% endif ~%}
</td></tr>
</table>
</b>
{%- if app.session.isAuth('u') and showMissing -%}
<a href="{{ report_missing_url }}" class="nav" style="margin-left: 5px" target="_blank">[report {{ showMissing }}...]</a>
{%- endif -%}
</td>
</tr>
<tr><td align=right>Artist:</td><td><b>
{%- if album.iscoll -%}
{{ artist }}
{%- else -%}
<a href="?s=byArtist&amp;n={{ artist | e('url') }}&amp;action=search" class="nav">{{ artist }}</a>
{%- endif -%}
</b></td>
<td>&nbsp;</td>
<td align=right>Added:</td><td class='date'><b>{{ album.created | date('M Y') }}</b></td>
</tr>
<tr><td align=right>Label:</td><td><b>
{%- if album.pubkey -%}
<a href="?s=byLabelKey&amp;n={{ album.pubkey }}&amp;action=search" class="nav">{{ album.name }}</a>
{%- else -%}
(Unknown)
{%- endif -%}
</b></td>
<td colspan=2>&nbsp;</td><td>
{%- if app.session.isAuth('u') -%}
<a href="?action=searchReviewEdit&amp;tag={{ album.tag }}" class="nav"><b>Write a review of this album</b></a>
{%- endif -%}
</td>
</tr>
</table>
{% if hashtags | length %}
<div class='album-hashtag-area'>
<div class='album-hashtag-area'>
{% for tag, index in hashtags %}
<span class='album-hashtag palette-{{ index }}'>{{ tag }}</span>
<span class='album-hashtag palette-{{ index }}'>{{ tag }}</span>
{% endfor %}
</div>
</div>
{% endif %}
</div>
<br>

0 comments on commit d0f493a

Please sign in to comment.