# HG changeset patch # User cavaliet # Date 1324641432 -3600 # Node ID 9ce9e92af978fd75e4b7efeb40bda0d028546c3c # Parent 953e2d423db1151a4c03d11e5a360824b7473b99 Update icon and templates for read-only projects. Add forbidden stream url. diff -r 953e2d423db1 -r 9ce9e92af978 .hgignore --- a/.hgignore Fri Dec 23 10:56:21 2011 +0100 +++ b/.hgignore Fri Dec 23 12:57:12 2011 +0100 @@ -45,4 +45,6 @@ ^src/ldt/MANIFEST\.in$ syntax: regexp -^src/ldt/MANIFEST$ \ No newline at end of file +^src/ldt/MANIFEST$ +syntax: regexp +^\.pydevproject$ \ No newline at end of file diff -r 953e2d423db1 -r 9ce9e92af978 .settings/org.eclipse.core.resources.prefs --- a/.settings/org.eclipse.core.resources.prefs Fri Dec 23 10:56:21 2011 +0100 +++ b/.settings/org.eclipse.core.resources.prefs Fri Dec 23 12:57:12 2011 +0100 @@ -1,10 +1,11 @@ -#Thu Aug 25 11:38:23 CEST 2011 -eclipse.preferences.version=1 -encoding//src/ldt/ldt/core/migrations/0001_initial.py=utf-8 -encoding//src/ldt/ldt/core/migrations/0002_auto__del_owner.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0001_initial.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0002_auto__add_field_media_mimetype_field__chg_field_media_external_src_url.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0003_auto__chg_field_project_owner.py=utf-8 -encoding//src/ldt/ldt/text/migrations/0001_initial.py=utf-8 -encoding//src/ldt/ldt/user/migrations/0001_initial.py=utf-8 -encoding//src/ldt/ldt/user/migrations/0002_auto__del_irigroup.py=utf-8 +#Thu Dec 15 17:09:17 CET 2011 +eclipse.preferences.version=1 +encoding//src/ldt/ldt/core/migrations/0001_initial.py=utf-8 +encoding//src/ldt/ldt/core/migrations/0002_auto__del_owner.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0001_initial.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0002_auto__add_field_media_mimetype_field__chg_field_media_external_src_url.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0003_auto__chg_field_project_owner.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0005_add_permissions.py=utf-8 +encoding//src/ldt/ldt/text/migrations/0001_initial.py=utf-8 +encoding//src/ldt/ldt/user/migrations/0001_initial.py=utf-8 +encoding//src/ldt/ldt/user/migrations/0002_auto__del_irigroup.py=utf-8 diff -r 953e2d423db1 -r 9ce9e92af978 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html Fri Dec 23 10:56:21 2011 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html Fri Dec 23 12:57:12 2011 +0100 @@ -10,9 +10,22 @@ {% url ldt.ldt_utils.views.project_json_id project.ldt_id as json_url_id %} {% if is_gecko %} -
{% trans 'open ldt' %}
+
+ {% if project.change and project.state != 2 %} + {% trans 'open ldt' %} + {% else %} + {% trans 'open ldt' %} + {% endif %} +
{% else %} -
{% trans 'open ldt' %}
+
+ {% if project.change and project.state != 2 %} + {% trans 'open ldt' %} + {% else %} + {% trans 'open ldt' %} + {% endif %} + +
{% endif %}
{% trans 'copy project' %}
diff -r 953e2d423db1 -r 9ce9e92af978 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html Fri Dec 23 10:56:21 2011 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html Fri Dec 23 12:57:12 2011 +0100 @@ -9,9 +9,9 @@ {% url ldt.ldt_utils.views.project_json_id project.ldt_id as json_url_id %} {% if is_gecko %} -
{% trans 'open ldt' %}
+
{% trans 'open ldt' %}
{% else %} -
{% trans 'open ldt' %}
+
{% trans 'open ldt' %}
{% endif %}
{% trans 'copy the project' %}
{% trans 'link json by id' %}
diff -r 953e2d423db1 -r 9ce9e92af978 src/ldt/ldt/static/ldt/img/page_eye.png Binary file src/ldt/ldt/static/ldt/img/page_eye.png has changed diff -r 953e2d423db1 -r 9ce9e92af978 web/ldtplatform/config.py.tmpl --- a/web/ldtplatform/config.py.tmpl Fri Dec 23 10:56:21 2011 +0100 +++ b/web/ldtplatform/config.py.tmpl Fri Dec 23 12:57:12 2011 +0100 @@ -90,6 +90,6 @@ AUTO_INDEX_AFTER_SAVE = True USE_GROUP_PERMISSIONS = ['Project', 'Content', 'Media'] -FORBIDDEN_STREAM_URL = "empty-video" +FORBIDDEN_STREAM_URL = "rtmp://media.iri.centrepompidou.fr/ddc_player/mp4:video/forbidden_stream.mp4?old_path=" PUBLIC_GROUP_NAME = 'everyone' MAX_USERS_SEARCH = 20 \ No newline at end of file