# HG changeset patch # User ymh # Date 1353362232 -3600 # Node ID 1b68d4acab0d3be10a9cc496f72dedaac7170647 # Parent 3290774ebb5cfb149c733a4379a7007ecf9e6ffe back to multisegment. new version diff -r 3290774ebb5c -r 1b68d4acab0d src/hp/__init__.py --- a/src/hp/__init__.py Sat Nov 17 18:30:15 2012 +0100 +++ b/src/hp/__init__.py Mon Nov 19 22:57:12 2012 +0100 @@ -1,4 +1,4 @@ -VERSION = (0, 5, 0, "alpha", 0) +VERSION = (0, 6, 0, "alpha", 0) VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2]))) diff -r 3290774ebb5c -r 1b68d4acab0d src/hp/templates/hp/partial/embed_player.html --- a/src/hp/templates/hp/partial/embed_player.html Sat Nov 17 18:30:15 2012 +0100 +++ b/src/hp/templates/hp/partial/embed_player.html Mon Nov 19 22:57:12 2012 +0100 @@ -44,12 +44,7 @@ { type: "Slider" }, { type: "Controller" }, { type: "Polemic" }, - { type: "Segments" }, - { - type: "Annotation", - search_on_tag_click: false, - start_minimized: false - }, + { type: "MultiSegments" }, { type: "Tweet" }, { type: "KnowledgeConcierge", diff -r 3290774ebb5c -r 1b68d4acab0d src/hp/views.py --- a/src/hp/views.py Sat Nov 17 18:30:15 2012 +0100 +++ b/src/hp/views.py Mon Nov 19 22:57:12 2012 +0100 @@ -67,6 +67,8 @@ topic_id = kc_relation_list[0].topic_id project_id = kc_relation_list[0].project_id + logger.debug("%s : %s : %s" % (kc_id, topic_id, repr(project_id))) + if not project_id: project_url = content['front_project'] project_path = urlparse.urlparse(project_url).path @@ -75,6 +77,8 @@ project_path_parts = project_path.split("/") project_id = project_path_parts[-1] if project_path_parts[-1] else project_path_parts[-2] + logger.debug("%s : %s : %s" % (kc_id, topic_id, repr(project_id))) + return render_to_response( 'hp/video_player.html', {'content':content, 'project_id': project_id, 'kc_id': kc_id, 'topic_id': topic_id}, diff -r 3290774ebb5c -r 1b68d4acab0d virtualenv/res/src/ldt-1.31.tar.gz Binary file virtualenv/res/src/ldt-1.31.tar.gz has changed