diff --git a/vrobbler/templates/_scrobblable_list.html b/vrobbler/templates/_scrobblable_list.html index 322b80d..c43d1a6 100644 --- a/vrobbler/templates/_scrobblable_list.html +++ b/vrobbler/templates/_scrobblable_list.html @@ -1,8 +1,10 @@ {% load urlreplace %} +{% load naturalduration %} + @@ -11,6 +13,7 @@ {% for obj in object_list %} + {% if request.user.is_authenticated %} diff --git a/vrobbler/templates/music/track_list.html b/vrobbler/templates/music/track_list.html index 4f4a3cf..90277da 100644 --- a/vrobbler/templates/music/track_list.html +++ b/vrobbler/templates/music/track_list.html @@ -20,40 +20,7 @@
-
-
Latest Title Scrobbles Start
{{obj.scrobble_set.last.local_timestamp}} {{obj}}{{obj.scrobble_count}}
- - - - - - - - - {% for track in object_list %} - - - - - - {% endfor %} - -
ScrobblesTrackArtist
{{track.scrobble_set.count}}{{track}}{{track.artist}}
- - - - {% endblock %} diff --git a/vrobbler/templates/scrobbles/_last_scrobbles.html b/vrobbler/templates/scrobbles/_last_scrobbles.html index 29a1e6a..285c0d2 100644 --- a/vrobbler/templates/scrobbles/_last_scrobbles.html +++ b/vrobbler/templates/scrobbles/_last_scrobbles.html @@ -81,11 +81,12 @@

No board games today

{% endif %} +

Beers

{% if Beer %} -

Beers

{% with scrobbles=Beer count=Beer_count time=Beer_time %} {% include "scrobbles/_scrobble_table.html" %} {% endwith %} +

No beer today

{% endif %}

Brick sets

diff --git a/vrobbler/templates/scrobbles/_row.html b/vrobbler/templates/scrobbles/_row.html index ce6e31b..dae6e10 100644 --- a/vrobbler/templates/scrobbles/_row.html +++ b/vrobbler/templates/scrobbles/_row.html @@ -1,7 +1,7 @@ {% load humanize %} {% load naturalduration %} - {% if scrobble.in_progress %}{{scrobble.media_obj.strings.verb}} now | Finish{% else %}{{scrobble.local_timestamp|naturaltime}}{% endif %} + {% if scrobble.in_progress %}{{scrobble.media_obj.strings.verb}} now | Finish{% else %}{{scrobble.local_timestamp|naturaltime}}{% endif %} {% if scrobble.media_type == "Task" %}

{{scrobble.media_obj.title|truncatechars_html:45}} - {% if scrobble.logdata %}{% if scrobble.logdata.title%}{{scrobble.logdata.title}}{% endif %}{% endif %}

diff --git a/vrobbler/templates/videos/movie_list.html b/vrobbler/templates/videos/movie_list.html index 8acde3b..301ccf2 100644 --- a/vrobbler/templates/videos/movie_list.html +++ b/vrobbler/templates/videos/movie_list.html @@ -1,28 +1,32 @@ {% extends "base_list.html" %} +{% block title %}Movies{% endblock %} +{% block head_extra %} + +{% endblock %} {% block lists %}
-
-
- - - - - - - - - - {% for obj in object_list %} - - - - - - {% endfor %} - -
TitleScrobblesAll time
{{obj}}{{obj.scrobble_set.count}}
-
-
+
+
{% include "_scrobblable_list.html" %}
+
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/vrobbler/templates/videos/series_list.html b/vrobbler/templates/videos/series_list.html index a05127f..368a1c0 100644 --- a/vrobbler/templates/videos/series_list.html +++ b/vrobbler/templates/videos/series_list.html @@ -1,32 +1,32 @@ {% extends "base_list.html" %} +{% block title %}Series{% endblock %} +{% block head_extra %} + +{% endblock %} {% block lists %}
-
-
- - - - - - - - - - - {% for obj in object_list %} - {% for video in obj.video_set.all %} - - - - - - - {% endfor %} - {% endfor %} - -
SeriesEpisodeScrobblesAll time
{{video}}{{obj}}{{video.scrobble_set.count}}
-
-
+
+
{% include "_scrobblable_list.html" %}
+
-{% endblock %} \ No newline at end of file +{% endblock %}