From: yomguy Date: Tue, 15 Mar 2011 17:21:46 +0000 (+0100) Subject: cleanup home, get current playlist for resource adding X-Git-Tag: 1.1~377 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8b182f0d23dc7e8c6cef491fc8f4e4f5b34b213c;p=telemeta.git cleanup home, get current playlist for resource adding --- diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css index 15072547..49dbcd21 100644 --- a/telemeta/htdocs/css/telemeta.css +++ b/telemeta/htdocs/css/telemeta.css @@ -75,8 +75,8 @@ a img { border: none; } } #content h2 { - background-color: #6a0307; - color: #FFF; + color: #6a0307; + border-bottom: 1px solid #6a0307; width: 75%; padding: 0.3em 0.3em 0.3em 0.5em; } diff --git a/telemeta/templates/telemeta_default/home.html b/telemeta/templates/telemeta_default/home.html index 474929ad..07cb55ba 100644 --- a/telemeta/templates/telemeta_default/home.html +++ b/telemeta/templates/telemeta_default/home.html @@ -9,7 +9,7 @@

Playlists

{% csrf_token %} {% for playlist in playlists %} -

{{ playlist.name }}

+

{{ playlist.name }} {% if playlist.is_current %}(current){% endif %}

@@ -22,7 +22,7 @@ {% for resource in playlist.resources %} - + {% for r in revisions %} - +
{% trans "Title" %}
{% if resource.type == "item" %} {{ resource.element }} @@ -75,7 +75,7 @@ User
{{ r.revision.time }} {{ r.revision.element_type }} diff --git a/telemeta/web/base.py b/telemeta/web/base.py index d151e82e..f555048f 100644 --- a/telemeta/web/base.py +++ b/telemeta/web/base.py @@ -832,7 +832,7 @@ class WebView(object): if isinstance(playlist_resource, dict): m = PlaylistResource() m.public_id = playlist_resource['public_id'] - m.playlist = Playlist.objects.get(public_id=playlist_resource['playlist_id']) + m.playlist = Playlist.objects.get(is_current=True, author=request.user) m.resource_type = playlist_resource['resource_type'] m.resource_id = playlist_resource['resource_id'] m.save()