# HG changeset patch # User Nicolas DURAND # Date 1409826749 -7200 # Node ID 7b1c3253250c956d7622191efa80903c885ddf22 # Parent 1cf1c20e44962691d9d1b34b2331020c07b7d321 Added content_creation_date to ChapterSearch template diff -r 1cf1c20e4496 -r 7b1c3253250c .hgignore --- a/.hgignore Tue Jul 15 17:33:23 2014 +0200 +++ b/.hgignore Thu Sep 04 12:32:29 2014 +0200 @@ -1,17 +1,19 @@ - -syntax: regexp -^virtualenv/web/project-boot\.py$ -^virtualenv/web/env$ -^src/spel/config\.py$ -^run$ -^web/static/site$ -^\.pydevproject$ -^\.settings/org\.eclipse\.core\.resources\.prefs$ -^web/\.htaccess$ -^web/static/media/ldt$ -\.mp4$ -\.pyc$ -^sbin/sync/config.py$ - -syntax: regexp -^web/static/media/cache$ \ No newline at end of file + +syntax: regexp +^virtualenv/web/project-boot\.py$ +^virtualenv/web/env$ +^src/spel/config\.py$ +^run$ +^web/static/site$ +^\.pydevproject$ +^\.settings/org\.eclipse\.core\.resources\.prefs$ +^web/\.htaccess$ +^web/static/media/ldt$ +\.mp4$ +\.pyc$ +^sbin/sync/config.py$ + +syntax: regexp +^web/static/media/cache$ +syntax: glob +.vagrant/ \ No newline at end of file diff -r 1cf1c20e4496 -r 7b1c3253250c src/spel/static/spel/js/spectacle.js --- a/src/spel/static/spel/js/spectacle.js Tue Jul 15 17:33:23 2014 +0200 +++ b/src/spel/static/spel/js/spectacle.js Thu Sep 04 12:32:29 2014 +0200 @@ -141,7 +141,7 @@ zebra : ["even", "odd"], filter_reset : ".reset" }, - headers: { 3: { sorter: false } } + headers: { 4: { sorter: false } } }); } diff -r 1cf1c20e4496 -r 7b1c3253250c src/spel/templates/partial/spel_chapters.html --- a/src/spel/templates/partial/spel_chapters.html Tue Jul 15 17:33:23 2014 +0200 +++ b/src/spel/templates/partial/spel_chapters.html Thu Sep 04 12:32:29 2014 +0200 @@ -26,7 +26,7 @@ - + {% for s in segments %} @@ -34,6 +34,7 @@ +
TypeRef texteTitre de la vidéo 
TypeRef texteTitre de la vidéoDate de tournage de la vidéo 
{{ s.cutting_id|slice:":1"|upper }} {{ s.tags|get_tags:"ref_text"|join:', ' }} {% if annot_chapters %}{{ s.ct }}{% else %}{{ s.content.title }}{% endif %}{{ s.content.content_creation_date | date:"Y-m-d" }} diff -r 1cf1c20e4496 -r 7b1c3253250c virtualenv/res/lib/lib_create_env.py --- a/virtualenv/res/lib/lib_create_env.py Tue Jul 15 17:33:23 2014 +0200 +++ b/virtualenv/res/lib/lib_create_env.py Thu Sep 04 12:32:29 2014 +0200 @@ -21,7 +21,7 @@ 'DJANGO-EXTENSIONS': { 'setup': 'django-extensions', 'url':'https://github.com/django-extensions/django-extensions/archive/1.1.1.tar.gz', 'local':"django-extensions-1.1.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'DJANGO-REGISTRATION': { 'setup': 'django-registration', 'url':'https://bitbucket.org/IRI/django-registration/get/tip.tar.gz', 'local':"IRI-django-registration-e23626c256c0.tar.gz", 'install': {'method': 'easy_install', 'option_str': '-Z', 'dict_extra_env': None}}, 'DJANGO-TAGGIT': { 'setup': 'django-taggit', 'url':'https://github.com/alex/django-taggit/archive/0.11.2.tar.gz', 'local':"django-taggit-0.11.2.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'DJANGO-TAGGIT-TEMPLATETAGS': { 'setup': 'django-taggit-templatetags', 'url':'https://github.com/feuervogel/django-taggit-templatetags/archive/d2216c9d1888e0739a04899a36e5149b5cbb3381.zip', 'local':"django-taggit-a38ee9d8913e05b1993f90c358be5f5397f529eb.zip", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'DJANGO-TAGGIT-TEMPLATETAGS': { 'setup': 'django-taggit-templatetags', 'url':'https://github.com/feuervogel/django-taggit-templatetags/archive/d2216c9d1888e0739a04899a36e5149b5cbb3381.zip', 'local':"django-taggit-templatetags-d2216c9d1888e0739a04899a36e5149b5cbb3381.zip", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'OAUTH2': { 'setup': 'python-oauth2', 'url':"https://github.com/simplegeo/python-oauth2/tarball/hudson-python-oauth2-211", 'local':"oauth2-1.5.211.tar.gz", 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}}, 'HTTPLIB2': { 'setup': 'python-httplib2', 'url':'https://httplib2.googlecode.com/files/httplib2-0.8.tar.gz', 'local':"httplib2-0.8.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'DJANGO-OAUTH-PLUS': { 'setup': 'django-oauth-plus', 'url':'https://pypi.python.org/packages/source/d/django-oauth-plus/django-oauth-plus-2.1.0.tar.gz', 'local':"django-oauth-plus-2.1.0.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},