# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1265032768 -3600
# Node ID 648b5995272acfc7cee60e6f3eddc0f8df8a647c
# Parent  f6c33b35f13276b643f631df54d37ab51bafd569# Parent  9c09db76cc8163b2639b36364f750ead8818658d
merge

diff -r f6c33b35f132 -r 648b5995272a .hgtags
--- a/.hgtags	Mon Feb 01 02:19:13 2010 +0100
+++ b/.hgtags	Mon Feb 01 14:59:28 2010 +0100
@@ -6,3 +6,4 @@
 146d86480e85d0c541da9a7730230d708a8453f9 V00.06
 6c2a8661203123023c6ba5cc2091f96684a06ada V00.07
 4834a1f12295f23488f4a965633fef9c453cd649 V00.08
+28c536d35d6e65cab08de22f5b1b9e7933ed54f1 V00.09
diff -r f6c33b35f132 -r 648b5995272a web/blinkster/__init__.py
--- a/web/blinkster/__init__.py	Mon Feb 01 02:19:13 2010 +0100
+++ b/web/blinkster/__init__.py	Mon Feb 01 14:59:28 2010 +0100
@@ -1,3 +1,3 @@
-VERSION = (0,8)
+VERSION = (0,9)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION)))
diff -r f6c33b35f132 -r 648b5995272a web/blinkster/templates/base.html
--- a/web/blinkster/templates/base.html	Mon Feb 01 02:19:13 2010 +0100
+++ b/web/blinkster/templates/base.html	Mon Feb 01 14:59:28 2010 +0100
@@ -15,7 +15,7 @@
 		{% block header %}
 		<table width="100%">
 		<tr>
-		<td id="header_left"></td>
+		<td id="header_left"><a href="http://www.blinkster.eu"><img style="margin-right: 10px;" src="{{MEDIA_URL}}/img/logo_blinkster.png" /></a><a href="http://www.blinkster.eu">Blinkster</a></td>
 		</tr>
 		</table>
 		<div >
diff -r f6c33b35f132 -r 648b5995272a web/blinkster/templates/segment_detail.html
--- a/web/blinkster/templates/segment_detail.html	Mon Feb 01 02:19:13 2010 +0100
+++ b/web/blinkster/templates/segment_detail.html	Mon Feb 01 14:59:28 2010 +0100
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
 
+{% block title %}Blinkster : Détail d'un segment{% endblock %}
+
 {% block content %}
 <div>
 
@@ -12,7 +14,7 @@
 <div>{{segment.abstract}}</div>
 
 <h2>Tags :</h2>
-<div>{{segment.tags}}</div>
+<div>{{segment_tags_list}}</div>
 
 <h2>Détails :</h2>
 
diff -r f6c33b35f132 -r 648b5995272a web/blinkster/views.py
--- a/web/blinkster/views.py	Mon Feb 01 02:19:13 2010 +0100
+++ b/web/blinkster/views.py	Mon Feb 01 14:59:28 2010 +0100
@@ -70,7 +70,10 @@
 def segment_detail(request, iri_id, ensemble_id, cutting_id, element_id, project_id = None):
     
     segment = get_object_or_404(Segment, project_id=project_id, iri_id=iri_id, ensemble_id=ensemble_id, cutting_id=cutting_id, element_id=element_id)
-    return render_to_response("segment_detail.html",{'segment':segment}, context_instance=RequestContext(request))
+    tags = segment.tags
+    tag_list = tags.split(",")
+    segment_tags_list = ", ".join([tag.strip() for tag in tag_list])
+    return render_to_response("segment_detail.html",{'segment':segment, 'segment_tags_list':segment_tags_list}, context_instance=RequestContext(request))
 
 def segment_search_post(request):
     query = request.POST["query"]
diff -r f6c33b35f132 -r 648b5995272a web/static/img/logo_blinkster.png
Binary file web/static/img/logo_blinkster.png has changed