# HG changeset patch
# User verrierj
# Date 1324653094 -3600
# Node ID 114244aacd4e8008f1f98ba530c463dbc50e1f62
# Parent  fc7870c3117bb50f8e10768d5b0b302d731edf4e# Parent  9ce9e92af978fd75e4b7efeb40bda0d028546c3c
Merge with 9ce9e92af978fd75e4b7efeb40bda0d028546c3c

diff -r fc7870c3117b -r 114244aacd4e .hgignore
--- a/.hgignore	Fri Dec 23 16:08:16 2011 +0100
+++ b/.hgignore	Fri Dec 23 16:11:34 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 fc7870c3117b -r 114244aacd4e .settings/org.eclipse.core.resources.prefs
--- a/.settings/org.eclipse.core.resources.prefs	Fri Dec 23 16:08:16 2011 +0100
+++ b/.settings/org.eclipse.core.resources.prefs	Fri Dec 23 16:11:34 2011 +0100
@@ -1,10 +1,15 @@
-#Thu Aug 25 11:38:23 CEST 2011
+#Thu Dec 15 18:08:14 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/0004_auto__add_field_project_description.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
+encoding//src/ldt/ldt/user/migrations/0004_fill_language.py=utf-8
+encoding//src/ldt/ldt/user/migrations/0005_add_permission_owner_group.py=utf-8
+encoding//virtualenv/web/env/guardianenv/Lib/site-packages/guardian/migrations/0001_initial.py=utf-8
diff -r fc7870c3117b -r 114244aacd4e 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 16:08:16 2011 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html	Fri Dec 23 16:11:34 2011 +0100
@@ -10,9 +10,22 @@
     <tr class="imageline {% cycle 'projectscontentsoddline' 'projectscontentsevenline'%}" >
         {% url ldt.ldt_utils.views.project_json_id project.ldt_id as json_url_id %}
         {% if is_gecko %}
-            <td class="cellimg"><div class="cellimgdiv"><a  href="{% url index_project_full project.ldt_id %}"><img src="{{LDT_MEDIA_PREFIX}}img/page_edit.png" alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/></a></div></td>
+            <td class="cellimg"><div class="cellimgdiv"><a  href="{% url index_project_full project.ldt_id %}">
+            {% if project.change and project.state != 2 %}
+                <img src="{{LDT_MEDIA_PREFIX}}img/page_edit.png" alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
+            {% else %}
+                <img src="{{LDT_MEDIA_PREFIX}}img/page_eye.png" alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
+            {% endif %}
+            </a></div></td>
         {% else %}
-            <td class="cellimg"><div class="cellimgdiv"><a href="{% url index_project project.ldt_id %}" class="ldt_link_open_ldt"><img src="{{LDT_MEDIA_PREFIX}}img/page_edit.png"  alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/></a></div></td>
+            <td class="cellimg"><div class="cellimgdiv"><a href="{% url index_project project.ldt_id %}" class="ldt_link_open_ldt">
+            {% if project.change and project.state != 2 %}
+                <img src="{{LDT_MEDIA_PREFIX}}img/page_edit.png" alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
+            {% else %}
+                <img src="{{LDT_MEDIA_PREFIX}}img/page_eye.png" alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
+            {% endif %}
+            
+            </a></div></td>
         {% endif %}
         
         <td class="cellimg"><div class="cellimgdiv"><img src="{{LDT_MEDIA_PREFIX}}img/page_copy.png" href="{% url ldt.ldt_utils.views.copy_project project.ldt_id group_id %}" class="ldt_link_copy_project" alt="{% trans 'copy project' %}" title="{% trans 'copy project' %}"/></div></td>
diff -r fc7870c3117b -r 114244aacd4e 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 16:08:16 2011 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html	Fri Dec 23 16:11:34 2011 +0100
@@ -9,9 +9,9 @@
     <tr class="imageline {% cycle 'projectscontentsoddline' 'projectscontentsevenline'%}" >
         {% url ldt.ldt_utils.views.project_json_id project.ldt_id as json_url_id %}
         {% if is_gecko %}
-            <td class="cellimg"><div class="cellimgdiv"><a  href="{% url index_project_full project.ldt_id %}"><img src="{{LDT_MEDIA_PREFIX}}img/page_edit.png" alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/></a></div></td>
+            <td class="cellimg"><div class="cellimgdiv"><a  href="{% url index_project_full project.ldt_id %}"><img src="{{LDT_MEDIA_PREFIX}}img/page_eye.png" alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/></a></div></td>
         {% else %}
-            <td class="cellimg"><div class="cellimgdiv"><a href="{% url index_project project.ldt_id %}" class="ldt_link_open_ldt"><img src="{{LDT_MEDIA_PREFIX}}img/page_edit.png"  alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/></a></div></td>
+            <td class="cellimg"><div class="cellimgdiv"><a href="{% url index_project project.ldt_id %}" class="ldt_link_open_ldt"><img src="{{LDT_MEDIA_PREFIX}}img/page_eye.png"  alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/></a></div></td>
         {% endif %}
         <td class="cellimg"><div class="cellimgdiv"><img src="{{LDT_MEDIA_PREFIX}}img/page_copy.png" href="{% url ldt.ldt_utils.views.copy_project project.ldt_id %}" class="ldt_link_copy_project" alt="{% trans 'copy the project' %}" title="{% trans 'copy the project' %}"/></div></td>
         <td class="cellimg"><div class="cellimgdiv"><img src="{{LDT_MEDIA_PREFIX}}img/plugin.png" href="{{WEB_URL}}{{json_url_id}}" id="player_project_{{project.ldt_id}}" class="ldt_link_embed" alt="{% trans 'link json by id' %}" title="{% trans 'link json by id' %}"/></div></td>
diff -r fc7870c3117b -r 114244aacd4e src/ldt/ldt/static/ldt/img/page_eye.png
Binary file src/ldt/ldt/static/ldt/img/page_eye.png has changed
diff -r fc7870c3117b -r 114244aacd4e web/ldtplatform/config.py.tmpl
--- a/web/ldtplatform/config.py.tmpl	Fri Dec 23 16:08:16 2011 +0100
+++ b/web/ldtplatform/config.py.tmpl	Fri Dec 23 16:11:34 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