Merge with upstream.
Binary file crea/.DS_Store has changed
--- a/src/ldt/ldt/api/ldt/handlers.py Tue Jan 24 10:25:28 2012 +0100
+++ b/src/ldt/ldt/api/ldt/handlers.py Tue Jan 24 10:25:44 2012 +0100
@@ -4,7 +4,7 @@
from piston.utils import rc, require_extended
from ldt.ldt_utils.utils import LdtAnnotation
from ldt.ldt_utils.stat import add_annotation_to_stat
-from ldt.security.utils import protect_instance, unprotect_instance
+from ldt.security import protect_models, unprotect_models
from ldt.ldt_utils.segmentserializer import SegmentSerializer
import logging #@UnresolvedImport
@@ -157,7 +157,8 @@
adder = LdtAnnotation(project)
logging.debug("request json " + repr(request.data))
- unprotect_instance(project) # allows anonymous user to save project
+
+ unprotect_models() # Allows anonymous user to modify models in this request only
meta = request.data['meta']
author = meta['creator']
@@ -169,14 +170,12 @@
begin = str(a['begin'])
type_id, new_id = adder.add(a['media'], a['type'], a['type_title'], a['content']['data'], '', a['tags'], begin, dur, author, date)
if not new_id:
- protect_instance(project)
+ protect_models()
return rc.BAD_REQUEST
content = project.contents.get(iri_id=a['media'])
- unprotect_instance(content)
add_annotation_to_stat(content, project, a['begin'], a['end'])
- protect_instance(content)
# We update the ids
a['type'] = type_id
@@ -186,7 +185,7 @@
if len(new_annotations)>0 :
adder.save()
- protect_instance(project)
+ protect_models()
return request.data
@@ -204,9 +203,9 @@
project.ldt = ldt_str
- unprotect_instance(project)
+ unprotect_models()
project.save()
- protect_instance(project)
+ protect_models()
return rc.ALL_OK
@@ -235,12 +234,12 @@
def read(self, request, iri_id, begin, end):
"""
- returns a single Segment
+ returns segments about content iri_id between timecodes begin and end
"""
content = Content.objects.get(iri_id=iri_id)
segments = Segment.objects.filter(content=content).filter(
- Q(start_ts__gt=begin, start_ts__lt=end) | # segment start between begin and end
+ Q(start_ts__gt=begin, start_ts__lt=end) | # segment starts between begin and end
Q(start_ts__gt=begin-F('duration'), start_ts__lt=end-F('duration')) |# segment ends between begin and end
Q(start_ts__lt=begin, start_ts__gt=end-F('duration')) # period [begin:end] is included in the segment
)
--- a/src/ldt/ldt/ldt_utils/models.py Tue Jan 24 10:25:28 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/models.py Tue Jan 24 10:25:44 2012 +0100
@@ -219,7 +219,7 @@
if not self.nb_annotation:
self.nb_annotation = 0
if not self.stat_annotation:
- self.stat_annotation = '0,0'
+ self.stat_annotation = ('0,' * settings.DIVISIONS_FOR_STAT_ANNOTATION)[:-1]
super(Content, self).save(*args, **kwargs)
--- a/src/ldt/ldt/ldt_utils/projectserializer.py Tue Jan 24 10:25:28 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/projectserializer.py Tue Jan 24 10:25:44 2012 +0100
@@ -228,6 +228,8 @@
}
self.tags[tag_title] = new_tag
self.tags_dict[tag_id] = new_tag
+ else:
+ tag_id = self.tags[tag_title]["id"]
element_tags.append({"id-ref":tag_id})
if not element_tags:
@@ -354,7 +356,7 @@
href = ""
meta_item_value = ""
- if content not in self.viewable_contents:
+ if "Content" in settings.USE_GROUP_PERMISSIONS and content not in self.viewable_contents:
href = settings.FORBIDDEN_STREAM_URL
elif content.videopath:
href = content.videopath.rstrip('/') + "/" + content.src
--- a/src/ldt/ldt/ldt_utils/segmentserializer.py Tue Jan 24 10:25:28 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/segmentserializer.py Tue Jan 24 10:25:44 2012 +0100
@@ -23,7 +23,9 @@
self.views = None
self.annotation_types = None
self.medias = None
- self.annotations = None
+ self.annotations = None
+ self.tags = {}
+
self.xml_docs = {}
def __get_cutting_title(self, project_id, content_id, ensemble_id, cutting_id):
@@ -35,7 +37,11 @@
else:
doc = self.xml_docs[project_id]
- cutting = doc.xpath('/iri/annotations/content[@id=\'%s\']/ensemble[@id=\'%s\']/decoupage[@id=\'%s\']/title' % (content_id, ensemble_id, cutting_id))[0]
+ cutting = doc.xpath('/iri/annotations/content[@id=\'%s\']/ensemble[@id=\'%s\']/decoupage[@id=\'%s\']/title' % (content_id, ensemble_id, cutting_id))
+ if not cutting:
+ return None
+
+ cutting = cutting[0]
return cutting.text
@@ -49,6 +55,16 @@
"annotation_types": [ ],
}
+ stat = {
+ "id": "stat",
+ "contents": [
+ self.content.iri_id
+ ],
+ "meta": {
+ "stat": self.content.stat_annotation
+ }
+ }
+
self.annotation_types = []
annotation_types = []
@@ -57,6 +73,7 @@
annotation_types.append({'id': seg.cutting_id, 'title': title})
for a in annotation_types:
+
view['annotation_types'].append(a['id'])
self.annotation_types.append({
"dc:contributor": "undefined",
@@ -69,16 +86,17 @@
})
- self.views = [view]
+ self.views = [view, stat]
def __parse_content(self):
href = ""
meta_item_value = ""
-
- if self.content not in self.viewable_contents:
- href = settings.FORBIDDEN_STREAM_URL
+
+ if "Content" in settings.USE_GROUP_PERMISSIONS and self.content:
+ if self.content not in self.viewable_contents:
+ href = settings.FORBIDDEN_STREAM_URL
elif self.content.videopath:
href = self.content.videopath.rstrip('/') + "/" + self.content.src
meta_item_value = self.content.videopath.rstrip('/') + "/"
@@ -116,11 +134,27 @@
for seg in self.segments:
+ segment_tags = []
+ for tag in seg.tags.split(';'):
+ if not self.tags.has_key(tag):
+ new_tag = {
+ "meta": {
+ "dc:contributor": "IRI",
+ "dc:created": seg.date,
+ "dc:title": tag,
+ "dc:modified": seg.date,
+ "dc:creator": "IRI"
+ },
+ "id": unicode(uuid.uuid1())
+ }
+ self.tags[tag] = new_tag
+ segment_tags.append({'id-ref': self.tags[tag]['id']})
+
segment = {
'begin': seg.start_ts,
'end': seg.start_ts + seg.duration,
'tags': seg.tags,
- 'id': "s_%s" % unicode(uuid.uuid1()),
+ 'id': seg.element_id,
'color': "%s" % self.default_color,
'media': self.content.iri_id,
'content': {
@@ -130,7 +164,7 @@
'src': ''
},
'title': seg.title,
- 'color': '2194379',
+ 'color': self.default_color,
'polemics': [ ],
'audio': {
'mimetype': 'audio/mp3',
@@ -144,22 +178,26 @@
"dc:contributor": seg.author,
"dc:created": seg.date,
"dc:modified": seg.date,
- "id-ref": seg.iri_id,
+ "id-ref": seg.cutting_id,
"project": seg.project_id
- }
+ },
+ 'tags': segment_tags
}
self.annotations.append(segment)
def serialize_to_cinelab(self):
+ if not self.segments:
+ return None
+
self.__parse_content()
self.__parse_segments()
self.__parse_views()
res = {}
res['views'] = self.views
- res['tags'] = None
+ res['tags'] = self.tags.values() if len(self.tags) > 0 else None
res['lists'] = None
res['medias'] = self.medias
res['annotations'] = self.annotations
--- a/src/ldt/ldt/ldt_utils/stat.py Tue Jan 24 10:25:28 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/stat.py Tue Jan 24 10:25:44 2012 +0100
@@ -1,5 +1,5 @@
from django.conf import settings
-from ldt.ldt_utils.models import AnnotationStat, Project, Segment
+from ldt.ldt_utils.models import AnnotationStat, Project
from django.db.models.signals import pre_delete
import lxml.etree
import datetime
@@ -19,7 +19,7 @@
for content_node in doc.xpath('/iri/annotations/content'):
content_name = content_node.get('id')
content = filter_list(contents, 'iri_id', content_name)
- print content_name
+
# if the content referenced in the xml belongs to the
# fields contents of the project
if len(content) != 0:
@@ -35,6 +35,10 @@
for ann in content_node.xpath('ensemble/decoupage/elements/element'):
begin = int(ann.get('begin'))
end = int(ann.get('dur')) + begin
+
+ text = ann.xpath('abstract')[0].text
+ if is_polemic(text):
+ pass
buckets = find_buckets(buckets, limits, begin, end)
nb_annotation += 1
@@ -80,7 +84,25 @@
buckets[i] += 1
return buckets
-
+
+def is_polemic(text):
+ if text:
+ polemic_tags = ['++', '--', '==', '??']
+ for tag in polemic_tags:
+ if tag in text:
+ return True
+ return False
+
+
+
+def filter_list(list, criteria, value):
+ new_list = []
+ for l in list:
+ if getattr(l, criteria) == value:
+ new_list.append(l)
+
+ return new_list
+
def delete_stat_project(sender, instance, **kwargs):
@@ -149,10 +171,3 @@
contribution_project.save()
-def filter_list(list, criteria, value):
- new_list = []
- for l in list:
- if getattr(l, criteria) == value:
- new_list.append(l)
-
- return new_list
\ No newline at end of file
--- a/src/ldt/ldt/ldt_utils/templates/front/front_all_contents.html Tue Jan 24 10:25:28 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_all_contents.html Tue Jan 24 10:25:44 2012 +0100
@@ -71,9 +71,9 @@
</li>
{% for content in content_list %}
<li class="li_media">
- <a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}">{% thumbnail content.image "294x165" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}">{% endthumbnail %}
+ <a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}">{% thumbnail content.image "294x165" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{% trans 'open this media' %}" title="{% trans 'open this media' %}">{% endthumbnail %}
<span class="graph_annotation"></span></a>
- <div class="bulle_annot">{{ content.nb_annotation }}</div>
+ <div class="bulle_annot" title="{% blocktrans count nb=content.nb_annotation %}{{nb}} annotation on this media{% plural %}{{nb}} annotations on this media{% endblocktrans %}">{{ content.nb_annotation }}</div>
<p><a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}"><b>{% if content.title|length > 69 %}{{content.title|slice:":69"}}...{% else %}{{content.title}}{% endif %}</b></a></p>
<p>{% trans 'by' %} IRI | {{content.duration|str_duration:"h"}}</p>
</li>
--- a/src/ldt/ldt/ldt_utils/templates/front/front_base.html Tue Jan 24 10:25:28 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_base.html Tue Jan 24 10:25:44 2012 +0100
@@ -13,6 +13,7 @@
{% block js_import %}{% endblock %}
{% block css_declaration %}{% endblock %}
{% block css_import %}
+ <link href='http://fonts.googleapis.com/css?family=PT+Sans:400,700' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/front_common.css" type="text/css"/>
{% endblock %}
{% block js_declaration %}{% endblock %}
@@ -22,7 +23,7 @@
<div id="general_container">
<ul class="floatlist" id="title_bar">
<li id="li_h1">
- <h1><a href="{% url ldt.ldt_utils.views.front.front_home %}"><b>Lignes</b> de temps</a></h1>
+ <h1><a href="{% url ldt.ldt_utils.views.front.front_home %}" title="{% trans 'homepage' %}">{% trans '<b>Lignes</b> de temps' %}</a></h1>
</li>
<li id="li_search">
<form id="form_search" action="{% url ldt.ldt_utils.views.front.search_index %}" method="POST">
@@ -35,14 +36,14 @@
<li id="li_annotation">
<div class="fl">
<!-- a href="#"><img src="{{LDT_MEDIA_PREFIX}}img/annot_icon.png" id="annot_icon" /></a -->
- <a href="http://www.iri.centrepompidou.fr" target="_blank">IRI</a>
+ <a href="http://www.iri.centrepompidou.fr" target="_blank" title="{% trans 'link IRI' %}">IRI</a>
</div>
<div class="fl">
<!-- a href="{% url root-view %}">{% trans 'Annotate' %}</a -->
</div>
</li>
<li id="li_connexion">
- <a href="#">Connexion</a>
+ <a href="#" title="{% trans 'connection' %}">{% trans "connection" %}</a>
</li>
</ul>
{% block body %}
@@ -50,10 +51,10 @@
<!-- FOOTER COMMUN -->
<ul id="footer">
- <li>V.00.00</li>
+ <li>{% blocktrans %}{{WEB_VERSION}} | {{ VERSION }}{% endblocktrans %}</li>
<li>©2011 IRI</li>
<li>
- <a target="_blank" href="http://www.iri.centrepompidou.fr">À propos</a>
+ <a target="_blank" href="http://www.iri.centrepompidou.fr" title="{% trans 'link IRI'%}">{% trans "about" %}</a>
</li>
</ul>
<div class="clear"></div>
--- a/src/ldt/ldt/ldt_utils/templates/front/front_group.html Tue Jan 24 10:25:28 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_group.html Tue Jan 24 10:25:44 2012 +0100
@@ -19,9 +19,9 @@
</li>
{% for content in content_list %}
<li class="li_media">
- <a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}">{% thumbnail content.image "134x75" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}">{% endthumbnail %}</a>
- <div class="bulle_annot">{{content.nb_annotation}}</div>
- <p><a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}"><b>{% if content.title|length > 69 %}{{content.title|slice:":69"}}...{% else %}{{content.title}}{% endif %}</b></a></p>
+ <a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}">{% thumbnail content.image "134x75" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{% trans 'open this media' %}" title="{% trans 'open this media' %}">{% endthumbnail %}</a>
+ <div class="bulle_annot" title="{% blocktrans count nb=content.nb_annotation %}{{nb}} annotation on this media{% plural %}{{nb}} annotations on this media{% endblocktrans %}">{{content.nb_annotation}}</div>
+ <p><a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}" title="{% trans 'open this media' %}"><b>{% if content.title|length > 69 %}{{content.title|slice:":69"}}...{% else %}{{content.title}}{% endif %}</b></a></p>
<p class="font_11">{% trans 'by' %} IRI | {{content.duration|str_duration:"h"}}</p>
</li>
{% endfor %}
@@ -34,9 +34,9 @@
<h2>{% trans 'About the group' %}</h2>
</div>
<p class="bigmargin">
- {{group.profile.description|safe}}
+ {{group.get_profile.description|safe}}
</p>
- {% thumbnail group.profile.image "54x40" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{{content.title}}">{% endthumbnail %}
+ {% thumbnail group.get_profile.image "54x40" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{{content.title}}" title="{{group.name}}" alt="{{group.name}}">{% endthumbnail %}
<p class="clear"> </p>
<!-- MEMBERS -->
<div class="li_h2">
@@ -45,7 +45,7 @@
<ul class="floatlist" id="membres_groupes">
{% for user in users %}
<li class="li_membre_groupe">
- {% thumbnail user.get_profile.image "36x36" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}">{% endthumbnail %}
+ {% thumbnail user.get_profile.image "36x36" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" title="{{user.username}}" alt="{{user.username}}">{% endthumbnail %}
<p><b>{{user.username}}</b></p>
<p class="font_11">{% trans 'active since' %} {{user.date_joined|date:"Y/m/d"}}</p>
</li>
--- a/src/ldt/ldt/ldt_utils/templates/front/front_home.html Tue Jan 24 10:25:28 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_home.html Tue Jan 24 10:25:44 2012 +0100
@@ -4,7 +4,7 @@
{% load front_tags %}
-{% block title %}Lignes de temps : Home{% endblock %}
+{% block title %}{% trans "front.home" %}{% endblock %}
{% block css_import %}
{{block.super}}
@@ -20,16 +20,17 @@
<ul class="title_ul">
<li><h2>{% trans 'Last annotated medias' %}</h2></li>
<li class="li_right">
- <a class="blue" href="{% url ldt.ldt_utils.views.front.all_contents %}"><img src="{{LDT_MEDIA_PREFIX}}img/little_plus.png" alt="" /> {% trans 'All medias' %}</a>
+ <a class="blue" href="{% url ldt.ldt_utils.views.front.all_contents %}" title="{% trans 'view all medias' %}"><img src="{{LDT_MEDIA_PREFIX}}img/little_plus.png" alt="{% trans 'view all medias' %}" /> {% trans 'All medias' %}</a>
</li>
</ul>
</li>
{% for content in last_contents %}
<li class="li_media">
- <a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}">{% thumbnail content.image "294x165" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}">{% endthumbnail %}</a>
- <div class="bulle_annot">{{ content.nb_annotation }}</div>
- <p><a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}"><b>{{content.title}}</b></a></p>
+ <a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}">{% thumbnail content.image "294x165" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{% trans 'open this media' %}" title="{% trans 'open this media' %}">{% endthumbnail %}</a>
+ <div class="bulle_annot" title="{% blocktrans count nb=content.nb_annotation %}{{nb}} annotation on this media{% plural %}{{nb}} annotations on this media{% endblocktrans %}">{{ content.nb_annotation }}</div>
+ <p><a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}" title="{% trans 'open this media' %}"><b>{{content.title}}</b></a></p>
<p>{% trans 'by' %} IRI | {{content.duration|str_duration:"h"}}</p>
+
</li>
{% endfor %}
</ul>
@@ -39,15 +40,15 @@
<ul class="title_ul">
<li><h2>{% trans 'Most annotated medias' %}</h2></li>
<li class="li_right">
- <a class="blue" href="{% url ldt.ldt_utils.views.front.all_contents %}"><img src="{{LDT_MEDIA_PREFIX}}img/little_plus.png" alt="" /> {% trans 'All medias' %}</a>
+ <a class="blue" href="{% url ldt.ldt_utils.views.front.all_contents %}" title="{% trans 'view all medias' %}"><img src="{{LDT_MEDIA_PREFIX}}img/little_plus.png" alt="{% trans 'view all medias' %}" /> {% trans 'All medias' %}</a>
</li>
</ul>
</li>
{% for content in most_contents %}
<li class="li_media">
- <a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}">{% thumbnail content.image "134x75" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}">{% endthumbnail %}</a>
- <div class="bulle_annot">{{ content.nb_annotation }}</div>
- <p><a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}"><b>{% if content.title|length > 69 %}{{content.title|slice:":69"}}...{% else %}{{content.title}}{% endif %}</b></a></p>
+ <a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}">{% thumbnail content.image "134x75" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{% trans 'open this media' %}" title="{% trans 'open this media' %}">{% endthumbnail %}</a>
+ <div class="bulle_annot" title="{% blocktrans count nb=content.nb_annotation %}{{nb}} annotation on this media{% plural %}{{nb}} annotations on this media{% endblocktrans %}">{{ content.nb_annotation }}</div>
+ <p><a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}" title="{% trans 'open this media' %}"><b>{% if content.title|length > 69 %}{{content.title|slice:":69"}}...{% else %}{{content.title}}{% endif %}</b></a></p>
<p class="font_11">{% trans 'by' %} IRI | {{content.duration|str_duration:"h"}}</p>
</li>
{% endfor %}
@@ -60,13 +61,12 @@
{% for group in active_groups %}
<li class="li_media">
<div class="img_groupes_actifs">
- <a href="{% url ldt.ldt_utils.views.front.group_info group.id %}">{% thumbnail group.profile.image "54x40" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}">{% endthumbnail %}</a>
+ <a href="{% url ldt.ldt_utils.views.front.group_info group.id %}">{% thumbnail group.get_profile.image "54x40" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{% trans 'group picture' %}" title="{% trans 'view more infos on this group'%}">{% endthumbnail %}</a>
</div>
<div class="txt_groupes_actifs">
- <div class="bulle_people">{{ group.user_set.count }}</div>
- <div class="bulle_annot">32</div>
- <p><a href="{% url ldt.ldt_utils.views.front.group_info group.id %}" class="under"><b>{{group.name}}</b></a></p>
- <p>{% if group.profile.description|length > 69 %}{{group.profile.description|safe|slice:":69"}}...{% else %}{{group.profile.description|safe}}{% endif %}</p>
+ <div class="bulle_people" title="{% blocktrans count nb=group.user_set.count %}{{nb}} user in this group{% plural %}{{nb}} users in this group{% endblocktrans %}">{{ group.user_set.count }}</div>
+ <p><a href="{% url ldt.ldt_utils.views.front.group_info group.id %}" class="under" title="{% trans 'view more infos on this group'%}"><b>{{group.name}}</b></a></p>
+ <p>{% if group.get_profile.description|length > 69 %}{{group.get_profile.description|safe|slice:":69"}}...{% else %}{{group.get_profile.description|safe}}{% endif %}</p>
</div>
</li>
{% endfor %}
--- a/src/ldt/ldt/ldt_utils/templates/front/front_search_results.html Tue Jan 24 10:25:28 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_search_results.html Tue Jan 24 10:25:44 2012 +0100
@@ -110,7 +110,7 @@
<li id="title_resultats">
<h2>{% trans "Search results for " %} <b> {{ search }}</b></h2>
</li>
- <li>
+ <li id="li_nb_resultats">
<p id="p_nb_resultats">{{ nb_results }} {% trans "Result" %}{{ nb_results|pluralize }}</p>
</li>
<!--li id="resultats_options">options</li-->
@@ -130,7 +130,7 @@
<p>{{res.content.duration|str_duration:"::"}}</p>
</div>
<div class="graphe_result_media">
- <span id="{{ res.content.iri_id }}" class="graph_annotation">
+ <span id="{{ res.content.iri_id }}" class="graph_annotation" title="{% trans 'annotation distribution' %}">
{{ res.content.stat_annotation }}
</span>
</div>
@@ -142,10 +142,10 @@
<li class="li_segment" id="li_{{segment.element_id}}">
<div class="left_segment">
<div class="color_zone" style="background: #f49af5;"></div>
- <a href="{% url ldt.ldt_utils.views.front.annot_content segment.iri_id segment.project_id segment.decoupage_id %}#id={{segment.element_id}}"><img src="{{LDT_MEDIA_PREFIX}}img/annot_icon_80x45.png" width="80" height="45" /></a>
+ <a href="{% url ldt.ldt_utils.views.front.annot_content segment.iri_id segment.project_id segment.decoupage_id %}#id={{segment.element_id}}"><img src="{{LDT_MEDIA_PREFIX}}img/annot_icon_80x45.png" width="80" height="45" alt="" /></a>
<!--p class="duree_segment">{{ segment.duration|str_duration:"::" }}</p-->
</div>
- <h4 class="title_segment"><a class="blue under" href="{% url ldt.ldt_utils.views.front.annot_content segment.iri_id segment.project_id segment.decoupage_id %}#id={{segment.element_id}}">
+ <h4 class="title_segment"><a class="blue under" href="{% url ldt.ldt_utils.views.front.annot_content segment.iri_id segment.project_id segment.decoupage_id %}#id={{segment.element_id}}" title="{% trans 'view this annotation in the player' %}">
{% if segment.title %}{{ segment.title }}{% else %}{% trans "No title" %}{% endif %}</a></h4>
<p class="text_segment">{% if segment.context %}{{ segment.context }}{% endif %}<br/>{% trans "Begin" %} : {{ segment.begin|str_duration:"::" }} - {% trans "duration" %} : {{ segment.duration|str_duration:"::" }}</h4>
</li>
@@ -159,7 +159,7 @@
<li id="result_pagination">
<p>
{% if results.has_previous %}
- <a class="blue under" href="{% url ldt.ldt_utils.views.front.search_listing %}?page={{ results.previous_page_number }}">{% trans "previous" %}</a>
+ <a class="blue under" href="{% url ldt.ldt_utils.views.front.search_listing %}?page={{ results.previous_page_number }}" title="{% trans 'previous' %}">{% trans "previous" %}</a>
.
{% endif %}
{% if results.paginator.num_pages > 1 %}
@@ -180,7 +180,7 @@
{% endif %}
{% if results.has_next %}
.
- <a class="blue under" href="{% url ldt.ldt_utils.views.front.search_listing %}?page={{ results.next_page_number }}">{% trans "next" %}</a>
+ <a class="blue under" href="{% url ldt.ldt_utils.views.front.search_listing %}?page={{ results.next_page_number }}" title="{% trans 'next' %}">{% trans "next" %}</a>
{% endif %}
</p>
</li>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html Tue Jan 24 10:25:28 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html Tue Jan 24 10:25:44 2012 +0100
@@ -30,12 +30,6 @@
<script type="text/javascript">
window.__admin_media_prefix__ = "{% filter escapejs %}{% admin_media_prefix %}{% endfilter %}";
- function public_checkbox (checkbox) {
- if (checkbox.is(":checked") && ($("input[name=share]").val() == 'True')) {
- $("#shareproject").trigger("click");
- }
- }
-
$(document).ready(function() {
// url_upload, media_prefix, post_added_params, btn_label, success_label, wait_label, cancel_label, remove_url, get_dur_url
post_added_params = {"csrfmiddlewaretoken" : "{{csrf_token}}",
@@ -51,15 +45,19 @@
"{% url ldt.ldt_utils.views.content.remove_temp_file %}",
"{% url ldt.ldt_utils.views.content.get_duration %}");
- $("#public input").change(function () {
- public_checkbox($(this));
+ $("#moreoptions").click(function () {
+ var container = $("#moreoptionscontainer");
+
+ if (container.is(':visible')) {
+ $("#moreoptionscontainer").hide();
+ $("#moreoptions").html("{% trans 'more options' %}");
+ resize_modal_window($("#add_content"));
+ } else {
+ $("#moreoptionscontainer").show();
+ $("#moreoptions").html("{% trans 'hide' %}");
+ resize_modal_window($("#add_content"));
+ }
});
-
- public_checkbox($("#public input"));
-
- if ('{{form_status}}' == 'empty') {
- resize_modal_window($("#add_content"));
- }
});
@@ -102,13 +100,6 @@
<div>{{ content_form.description.errors }}{{ content_form.description.label_tag }}{{content_form.description}}</div>
<div>{{ media_form.external_id.errors }}{{ media_form.external_id.label_tag }}{{media_form.external_id}}</div>
<div>{{ media_form.external_publication_url.errors }}{{ media_form.external_publication_url.label_tag }}{{media_form.external_publication_url}}</div>
- <div id="public">{{ content_form.is_public }}<label>{% trans "publish for everyone" %}</label></div>
-
- <div>
- {% if iri_id and user.is_staff %}
- {{ content_form.front_project.label_tag }}{{ content_form.front_project }}
- {% endif %}
- </div>
</div>
<div id="contentright" class="span-9 last" >
<div>{{ content_form.external_id.errors }}{{ content_form.external_id.label_tag }}{{content_form.external_id}}</div>
@@ -131,10 +122,17 @@
</div>
</div>
+ <div id="moreoptions">{% trans 'More options' %}</div>
+ <div id="moreoptionscontainer" style="display: none;">
+ <div>
+ {% if iri_id and user.is_staff %}
+ {{ content_form.front_project.label_tag }}{{ content_form.front_project }}
+ {% endif %}
+ </div>
{% include "ldt/ldt_utils/partial/picture.html"%}
{% include "ldt/ldt_utils/partial/permissions.html" %}
+ </div>
- </div>
<div id="submitcontent" class="span-18 last">
<div id="submitcontent-loader" class="span-10">
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html Tue Jan 24 10:25:28 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html Tue Jan 24 10:25:44 2012 +0100
@@ -64,7 +64,8 @@
var search_url = "{% url ldt.ldt_utils.views.workspace.share_filter filter='__FILTER__' use_groups='false' %}";
-
+ resize_modal_window($("#add_group"));
+
});
</script>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_ldt.html Tue Jan 24 10:25:28 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_ldt.html Tue Jan 24 10:25:44 2012 +0100
@@ -37,7 +37,22 @@
$("#close_button").click(function (e) {
e.preventDefault();
parent.$.nmTop().close();
- });
+ });
+
+ $("#moreoptions").click(function () {
+ var container = $("#moreoptionscontainer");
+
+ if (container.is(':visible')) {
+ $("#moreoptionscontainer").hide();
+ $("#moreoptions").html("{% trans 'more options' %}");
+ resize_modal_window($("#add_contribution"));
+ } else {
+ $("#moreoptionscontainer").show();
+ $("#moreoptions").html("{% trans 'hide' %}");
+ resize_modal_window($("#add_contribution"));
+ }
+ });
+
});
tinyMCE.init({
@@ -54,6 +69,8 @@
height: "150",
entity_encoding : "raw"
});
+
+
</script>
@@ -107,9 +124,12 @@
</div>
</div>
+ <div id="moreoptions">{% trans 'More options' %}</div>
+ <div id="moreoptionscontainer">
+ {% include "ldt/ldt_utils/partial/picture.html" %}
{% include "ldt/ldt_utils/partial/permissions.html" %}
- {% include "ldt/ldt_utils/partial/picture.html" %}
-
+ </div>
+
<div id="submitcontent" class="span-18 last">
<div id="submitcontent-buttons" class="span-18 last">
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html Tue Jan 24 10:25:28 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html Tue Jan 24 10:25:44 2012 +0100
@@ -14,54 +14,37 @@
}
});
});
- }
-
+ }
+
$(document).ready(function() {
+ var can_edit = '{{LDT_MEDIA_PREFIX}}img/pencil.png';
+ var can_view = '{{LDT_MEDIA_PREFIX}}img/eye.png';
+
{% if group_edition %}
var search_url = "{% url ldt.ldt_utils.views.workspace.share_filter filter='__FILTER__' use_groups='false' %}";
{% else %}
var search_url = "{% url ldt.ldt_utils.views.workspace.share_filter filter='__FILTER__' use_groups='true' %}";
{% endif %}
- var share_this = '{% trans "share this project" %}';
- var do_not_share = '{% trans "do not share" %}';
- var share_img = '{{LDT_MEDIA_PREFIX}}img/user_add.png';
- var do_not_share_img = '{{LDT_MEDIA_PREFIX}}img/user_delete.png';
- var can_edit = '{{LDT_MEDIA_PREFIX}}img/pencil.png';
- var can_view = '{{LDT_MEDIA_PREFIX}}img/eye.png';
- var state = 1;
-
- if ($("#add_contribution").size()) {
- var resize_elem = $("#add_contribution");
- } else {
- var resize_elem = $("#add_content");
- }
input_list_init = [
{'input_selector':"#searchuserinput", 'container_selector': "#itemcontainer", 'url':search_url}
];
- searchFieldInit(input_list_init);
-
- $("#shareproject").click(function () {
- if (state == 1) {
- $("#sharecontainer").show();
- $("#public input").attr('checked', false);
- $("input[id=id_share]").val('True');
- var new_img = '<img class="shareicon" src=' + do_not_share_img + '>';
- $(this).html(new_img + do_not_share);
- state = 2;
+ searchFieldInit(input_list_init);
+
+ $("#public input[type=checkbox]").change(function () {
+ if ($(this).is(':checked')) {
+ $("#permissioncontainer").hide();
} else {
- $("#sharecontainer").hide();
- $("input[id=id_share]").val('False');
- var new_img = '<img class="shareicon" src=' + share_img + '>';
- $(this).html(new_img + share_this);
- state = 1;
+ $("#permissioncontainer").show();
}
-
- resize_modal_window(resize_elem);
- });
-
+ resize_modal_window("#add_content");
+ });
+
+
+
$(".can_edit").live('click', function () {
$(this).attr('src', can_view);
+ $(this).attr('title', "{% trans 'share.eye' %}");
$(this).removeClass('can_edit').addClass('can_view');
var id_item = $("input",$(this).closest('.shareline')).val();
$("#write input[value=" + id_item + "]").remove();
@@ -69,6 +52,7 @@
$(".can_view").live('click', function () {
$(this).attr('src', can_edit);
+ $(this).attr('title', "{% trans 'share.pencil' %}");
$(this).removeClass('can_view').addClass('can_edit');
var id_item = $("input",$(this).closest('.shareline')).val();
$("#write").append('<input type="hidden" name="write_list" value="' + id_item + '"/>');
@@ -87,7 +71,7 @@
selection.each(function () {
var id_item = $("input",$(this)).val();
$("#read").append('<input type="hidden" name="read_list" value="' + id_item + '"/>');
- $("td:last",$(this)).append('<img class="can_view" src="{{LDT_MEDIA_PREFIX}}img/eye.png" alt="{% trans "share.eye" %}"/>');
+ $("td:last",$(this)).append('<img class="can_view" src="{{LDT_MEDIA_PREFIX}}img/eye.png" title="{% trans "share.eye" %}" alt="{% trans "share.eye" %}"/>');
});
});
@@ -124,9 +108,13 @@
<input type="hidden" name="share" value="False" id="id_share"/>
-<div id="sharecontainer" {% if not group_edition %}style="display:none;"{% endif %}>
+<div id="sharecontainer">
- <div id="permissioncontainer" class="append-bottom clear">
+ {% if content_form %}
+ <div id="public">{{ content_form.is_public }}<label>{% trans "publish for everyone" %}</label></div>
+ {% endif %}
+
+ <div id="permissioncontainer" class="append-bottom clear" {% if content_form and content_form.is_public.value %}style="display: none;"{% endif %}>
<div id="elemslistcontainer" clas="span-9">
<div id="elemslistheader">
{% trans "User and group list" %}<br />
@@ -135,7 +123,7 @@
<div class="tableuserorgroup">
<table id="itemcontainer" class="userorgroups">
- {% include "ldt/ldt_utils/partial/sharewith.html" %}
+ {% include "ldt/ldt_utils/partial/sharewith.html" %}
</table>
</div>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/picture.html Tue Jan 24 10:25:28 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/picture.html Tue Jan 24 10:25:44 2012 +0100
@@ -4,52 +4,24 @@
<script type="text/javascript">
$(document).ready(function () {
- var picture_state = 1;
- var show_picture = '{% trans "choose a profile image" %}';
- var hide_picture = '{% trans "hide" %}';
- var show_img = '<img class="shareicon" title="' + show_picture + '" src="{{LDT_MEDIA_PREFIX}}img/zoom_in.png"/>';
- var hide_img = '<img class="shareicon" title="' + hide_picture + '"src="{{LDT_MEDIA_PREFIX}}img/zoom_out.png"/>';
-
- if ($("#add_contribution").size()) {
- var resize_elem = $("#add_contribution");
- } else if ($("#add_group").size()){
- var resize_elem = $("#add_group");
- } else {
- var resize_elem = $("#add_content");
- }
-
- $("#choosepicture").click(function () {
- if (picture_state == 1) {
- $("#choosepicturecontainer").show();
- $(this).html(hide_img + hide_picture);
- picture_state = 2;
- } else {
- $("#choosepicturecontainer").hide();
- $(this).html(show_img + show_picture);
- picture_state = 1;
- }
-
- resize_modal_window(resize_elem);
- });
-
+
if ('{{profile_picture_form.image.errors}}') {
$("#choosepicturecontainer").show();
- }
-
+ }
});
</script>
-<div id="choosepicture" class="clear dropdownlist">
+<div class="clear dropdownlist">
<img class="shareicon" title="{% trans "choose a profile image" %}" src="{{LDT_MEDIA_PREFIX}}img/zoom_in.png"/>
{% trans "choose a profile image" %}
</div>
-<table id="choosepicturecontainer" style="display:none;" >
+<table id="choosepicturecontainer" >
<tr>
<td class="leftcolumn">
- <strong>{% trans "Current profile picture" %}</strong>
+ {% trans "Current profile picture" %}
</td>
<td>
{% thumbnail img_container.image "x100" format="PNG" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />{% empty %} {% endthumbnail %}
@@ -57,7 +29,7 @@
</tr>
<tr>
<td class="leftcolumn">
- <label for="id_new_profile_picture">{% trans "Upload a new picture" %}<br/> (JPG, PNG, < 1 Mo)</label>
+ {% trans "Upload a new picture" %}<br/> (JPG, PNG, < 1 Mo)
</td>
<td>
<input type="file" name="image" id="id_image" accept="image/jpeg, image/png" />
--- a/src/ldt/ldt/ldt_utils/utils.py Tue Jan 24 10:25:28 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/utils.py Tue Jan 24 10:25:44 2012 +0100
@@ -175,7 +175,11 @@
"""
Add an annotation to a project. begin and dur must be strings. Default color is yellow.
"""
-
+
+ if dur < 0:
+ self.to_add = False
+ return False
+
# We check if the project references the media.
path_media = self.ldtdoc.xpath('/iri/medias/media[@id="%s"]' % media)
if len(path_media) == 0:
Binary file src/ldt/ldt/locale/en/LC_MESSAGES/django.mo has changed
--- a/src/ldt/ldt/locale/en/LC_MESSAGES/django.po Tue Jan 24 10:25:28 2012 +0100
+++ b/src/ldt/ldt/locale/en/LC_MESSAGES/django.po Tue Jan 24 10:25:44 2012 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:38+0100\n"
+"POT-Creation-Date: 2012-01-20 17:24+0100\n"
"PO-Revision-Date: 2010-02-17 03:53+0100\n"
"Last-Translator: Yves-Marie Haussonne <ymh.work@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,157 +24,173 @@
msgid "Time"
msgstr "Time"
-#: .\ldt_utils\forms.py:28
+#: .\ldt_utils\forms.py:32 .\ldt_utils\templates\front\front_base.html.py:33
#: .\ldt_utils\templates\ldt\ldt_utils\published_projects.html.py:52
msgid "Search"
msgstr "search"
-#: .\ldt_utils\forms.py:29
+#: .\ldt_utils\forms.py:33
msgid "all"
msgstr "all"
-#: .\ldt_utils\forms.py:29 .\ldt_utils\models.py:48
+#: .\ldt_utils\forms.py:33 .\ldt_utils\models.py:52
#: .\ldt_utils\templates\ldt\ldt_utils\content_list.html.py:69
msgid "title"
msgstr "title"
-#: .\ldt_utils\forms.py:29
+#: .\ldt_utils\forms.py:33
msgid "resume"
msgstr "resume"
-#: .\ldt_utils\forms.py:29
+#: .\ldt_utils\forms.py:33
msgid "tags"
msgstr "tags"
-#: .\ldt_utils\forms.py:29
+#: .\ldt_utils\forms.py:33
msgid "Fields"
msgstr "Fields"
-#: .\ldt_utils\forms.py:30
+#: .\ldt_utils\forms.py:34
msgid "Display the results in Lignes De Temps"
msgstr "Display the results in Lignes De Temps"
-#: .\ldt_utils\forms.py:46 .\ldt_utils\models.py:126
+#: .\ldt_utils\forms.py:50 .\ldt_utils\models.py:130
msgid "content.content_creation_date"
msgstr "content creation date"
-#: .\ldt_utils\forms.py:47
+#: .\ldt_utils\forms.py:51
msgid "content.media_input_type"
msgstr "Media source type"
-#: .\ldt_utils\forms.py:47
+#: .\ldt_utils\forms.py:51
msgid "file_upload"
msgstr "file upload"
-#: .\ldt_utils\forms.py:47
+#: .\ldt_utils\forms.py:51
msgid "url"
msgstr "url"
-#: .\ldt_utils\forms.py:47
+#: .\ldt_utils\forms.py:51
msgid "existing_media"
msgstr "existing media"
-#: .\ldt_utils\forms.py:47
+#: .\ldt_utils\forms.py:51
msgid "create_media"
msgstr "create media"
-#: .\ldt_utils\forms.py:47
+#: .\ldt_utils\forms.py:51
msgid "none_media"
msgstr "no media"
-#: .\ldt_utils\models.py:37
+#: .\ldt_utils\forms.py:54
+msgid "content.front_project"
+msgstr "front project"
+
+#: .\ldt_utils\models.py:41
msgid "media.external_id"
msgstr "external id"
-#: .\ldt_utils\models.py:38
+#: .\ldt_utils\models.py:42
msgid "media.external_permalink"
msgstr "media permalink"
-#: .\ldt_utils\models.py:39
+#: .\ldt_utils\models.py:43
msgid "media.external_publication_url"
msgstr "media publication url"
-#: .\ldt_utils\models.py:40
+#: .\ldt_utils\models.py:44
msgid "media.external_src_url"
msgstr "media external source url"
-#: .\ldt_utils\models.py:41
+#: .\ldt_utils\models.py:45
msgid "media.creation_date"
msgstr "media object creation date"
-#: .\ldt_utils\models.py:42
+#: .\ldt_utils\models.py:46
msgid "media.media_creation_date"
msgstr "media creation date"
-#: .\ldt_utils\models.py:43
+#: .\ldt_utils\models.py:47
msgid "media.update_date"
msgstr "update date"
-#: .\ldt_utils\models.py:44
+#: .\ldt_utils\models.py:48
msgid "media.videopath"
msgstr "videopath"
-#: .\ldt_utils\models.py:45
+#: .\ldt_utils\models.py:49
msgid "media.duration"
msgstr "duration (ms)"
-#: .\ldt_utils\models.py:46
+#: .\ldt_utils\models.py:50
msgid "media.creator"
msgstr "media creator"
-#: .\ldt_utils\models.py:47
+#: .\ldt_utils\models.py:51
msgid "description"
msgstr "description"
-#: .\ldt_utils\models.py:49
+#: .\ldt_utils\models.py:53
msgid "media.src"
msgstr "media source"
-#: .\ldt_utils\models.py:50
+#: .\ldt_utils\models.py:54
msgid "media.mimetype"
msgstr "mimetype"
-#: .\ldt_utils\models.py:118
+#: .\ldt_utils\models.py:122
msgid "content.iri_id"
msgstr "iri id"
-#: .\ldt_utils\models.py:119
+#: .\ldt_utils\models.py:123
msgid "content.iriurl"
msgstr "iri url"
-#: .\ldt_utils\models.py:120
+#: .\ldt_utils\models.py:124
msgid "content.creation_date"
msgstr "content creation date"
-#: .\ldt_utils\models.py:121
+#: .\ldt_utils\models.py:125
msgid "content.update_date"
msgstr "content update date"
-#: .\ldt_utils\models.py:122
+#: .\ldt_utils\models.py:126
msgid "content.title"
msgstr "title"
-#: .\ldt_utils\models.py:123
+#: .\ldt_utils\models.py:127
msgid "content.description"
msgstr "description"
-#: .\ldt_utils\models.py:124
+#: .\ldt_utils\models.py:128
msgid "content.authors"
msgstr "authors"
-#: .\ldt_utils\models.py:125
+#: .\ldt_utils\models.py:129
msgid "content.duration"
msgstr "duration (ms)"
-#: .\ldt_utils\models.py:352
+#: .\ldt_utils\models.py:134 .\ldt_utils\models.py:530
+msgid "content.stat_annotation"
+msgstr "annotation distribution"
+
+#: .\ldt_utils\models.py:135 .\ldt_utils\models.py:531
+msgid "content.nb_annotation"
+msgstr "annotation number"
+
+#: .\ldt_utils\models.py:136
+msgid "content.last_annotated"
+msgstr "last updated"
+
+#: .\ldt_utils\models.py:395
msgid "created by"
msgstr "created by"
-#: .\ldt_utils\models.py:353
+#: .\ldt_utils\models.py:396
msgid "changed by"
msgstr "changed by"
-#: .\ldt_utils\utils.py:198
+#: .\ldt_utils\utils.py:208
msgid "Personal cutting"
msgstr "Personal cutting"
@@ -187,6 +203,195 @@
msgid "Home"
msgstr "Home"
+#: .\ldt_utils\templates\front\front_all_contents.html.py:66
+#: .\ldt_utils\templates\front\front_home.html.py:17
+msgid "Filter the medias"
+msgstr "Filter the medias"
+
+#: .\ldt_utils\templates\front\front_all_contents.html.py:69
+#: .\ldt_utils\templates\front\front_all_contents.html.py:70
+#: .\ldt_utils\templates\front\front_home.html.py:23
+#: .\ldt_utils\templates\front\front_home.html.py:43
+msgid "All medias"
+msgstr "All medias"
+
+#: .\ldt_utils\templates\front\front_all_contents.html.py:74
+#: .\ldt_utils\templates\front\front_group.html.py:22
+#: .\ldt_utils\templates\front\front_group.html.py:24
+#: .\ldt_utils\templates\front\front_home.html.py:29
+#: .\ldt_utils\templates\front\front_home.html.py:31
+#: .\ldt_utils\templates\front\front_home.html.py:49
+#: .\ldt_utils\templates\front\front_home.html.py:51
+msgid "open this media"
+msgstr "Play this media"
+
+#: .\ldt_utils\templates\front\front_all_contents.html.py:76
+#: .\ldt_utils\templates\front\front_group.html.py:23
+#: .\ldt_utils\templates\front\front_home.html.py:30
+#: .\ldt_utils\templates\front\front_home.html.py:50
+#, python-format
+msgid "%(nb)s annotation on this media"
+msgid_plural "%(nb)s annotations on this media"
+msgstr[0] "%(nb)s annotation on this media"
+msgstr[1] "%(nb)s annotations on this media"
+
+#: .\ldt_utils\templates\front\front_all_contents.html.py:78
+#: .\ldt_utils\templates\front\front_group.html.py:25
+#: .\ldt_utils\templates\front\front_home.html.py:32
+#: .\ldt_utils\templates\front\front_home.html.py:52
+msgid "by"
+msgstr "by"
+
+#: .\ldt_utils\templates\front\front_all_contents.html.py:82
+msgid "All tags"
+msgstr "All tags"
+
+#: .\ldt_utils\templates\front\front_base.html.py:25
+msgid "homepage"
+msgstr "Home page"
+
+#: .\ldt_utils\templates\front\front_base.html.py:25
+msgid "<b>Lignes</b> de temps"
+msgstr "<b>Lignes</b> de temps"
+
+#: .\ldt_utils\templates\front\front_base.html.py:38
+#: .\ldt_utils\templates\front\front_base.html.py:56
+msgid "link IRI"
+msgstr "IRI's website"
+
+#: .\ldt_utils\templates\front\front_base.html.py:41
+#: .\ldt_utils\templates\front\front_player.html.py:5
+msgid "Annotate"
+msgstr "Annotate"
+
+#: .\ldt_utils\templates\front\front_base.html.py:45
+msgid "connection"
+msgstr "Login"
+
+#: .\ldt_utils\templates\front\front_base.html.py:53
+#, python-format
+msgid "%(WEB_VERSION)s | %(VERSION)s"
+msgstr "v%(WEB_VERSION)s | v%(VERSION)s"
+
+#: .\ldt_utils\templates\front\front_base.html.py:56
+msgid "about"
+msgstr "about"
+
+#: .\ldt_utils\templates\front\front_group.html.py:18
+msgid "Medias annotated by the group"
+msgstr "Medias annotated by the group"
+
+#: .\ldt_utils\templates\front\front_group.html.py:34
+msgid "About the group"
+msgstr "About the group"
+
+#: .\ldt_utils\templates\front\front_group.html.py:43
+msgid "Members"
+msgstr "Members"
+
+#: .\ldt_utils\templates\front\front_group.html.py:50
+msgid "active since"
+msgstr "active since"
+
+#: .\ldt_utils\templates\front\front_home.html.py:7
+msgid "front.home"
+msgstr ""
+
+#: .\ldt_utils\templates\front\front_home.html.py:21
+msgid "Last annotated medias"
+msgstr "Last annotated medias"
+
+#: .\ldt_utils\templates\front\front_home.html.py:23
+#: .\ldt_utils\templates\front\front_home.html.py:43
+msgid "view all medias"
+msgstr "view all medias"
+
+#: .\ldt_utils\templates\front\front_home.html.py:41
+msgid "Most annotated medias"
+msgstr "Most annotated medias"
+
+#: .\ldt_utils\templates\front\front_home.html.py:59
+msgid "Active groups"
+msgstr "Active groups"
+
+#: .\ldt_utils\templates\front\front_home.html.py:64
+msgid "group picture"
+msgstr "group picture"
+
+#: .\ldt_utils\templates\front\front_home.html.py:64
+#: .\ldt_utils\templates\front\front_home.html.py:68
+msgid "view more infos on this group"
+msgstr "View more information on this group"
+
+#: .\ldt_utils\templates\front\front_home.html.py:67
+#, fuzzy, python-format
+msgid "%(nb)s user in this group"
+msgid_plural "%(nb)s users in this group"
+msgstr[0] "%(count)s user in this group"
+msgstr[1] "%(count)s users in this group"
+
+#: .\ldt_utils\templates\front\front_player.html.py:87
+msgid "All annotations on the media"
+msgstr "All annotations on the media"
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:6
+#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:100
+#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:112
+#: .\ldt_utils\templates\ldt\ldt_utils\ldt_list.html.py:79
+#: .\ldt_utils\templates\ldt\ldt_utils\published_projects.html.py:70
+#: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:56
+#: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:68
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:121
+#: .\templates\ldt\ldt_base.html.py:126
+msgid "search"
+msgstr "search"
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:99
+#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:59
+#, python-format
+msgid " No results for <b>%(search)s</b>."
+msgstr "No results for <b>%(search)s</b>."
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:111
+msgid "Search results for "
+msgstr "Search results for"
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:114
+#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:62
+msgid "Result"
+msgstr "Result"
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:133
+msgid "annotation distribution"
+msgstr "annotation distribution"
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:148
+msgid "view this annotation in the player"
+msgstr "view this annotation in the player"
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:149
+#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:80
+msgid "No title"
+msgstr "No title"
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:150
+msgid "Begin"
+msgstr "Begin"
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:150
+msgid "duration"
+msgstr "duration"
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:162
+#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:101
+msgid "previous"
+msgstr "Previous"
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:183
+#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:111
+msgid "next"
+msgstr "Next"
+
#: .\ldt_utils\templates\ldt\ldt_utils\content_list.html.py:55
#: .\templates\admin\page_base.html.py:19
#: .\user\templates\ldt\user\login_form.html.py:33
@@ -220,7 +425,7 @@
msgstr "Copy your project"
#: .\ldt_utils\templates\ldt\ldt_utils\copy_ldt.html.py:17
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:70
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:87
msgid "Title"
msgstr "Title"
@@ -228,24 +433,33 @@
msgid "Copy"
msgstr "Copy"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:51
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:41
msgid "Browse"
msgstr "Browse"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:52
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:42
msgid "File uploaded"
msgstr "File uploaded"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:53
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:43
msgid "Please wait, the upload is not finished yet"
msgstr "Please wait, the upload is not finished yet"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:54
-#, fuzzy
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:44
msgid "Cancel upload"
msgstr "Cancel upload"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:73
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:53
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:47
+msgid "more options"
+msgstr ""
+
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:57
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:51
+msgid "hide"
+msgstr "hide"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:71
msgid ""
"The operation could not be performed because one or more error(s) occurred."
"<br />Please resubmit the media form after making the following changes:"
@@ -253,98 +467,100 @@
"The operation could not be performed because one or more error(s) occurred."
"<br />Please resubmit the media form after making the following changes:"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:83
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:85
#: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:54
msgid "Create content"
msgstr "Create content"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:101
-msgid "publish for everyone"
-msgstr "publish for everyone"
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:126
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:127
+msgid "More options"
+msgstr "More options"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:133
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:141
msgid "media file is being processed please wait."
msgstr "media file is being processed please wait."
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:137
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:102
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:115
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:145
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:100
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:136
#: .\ldt_utils\templates\ldt\ldt_utils\error_confirm.html.py:52
msgid "close_cancel"
msgstr "Close"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:138
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:146
msgid "delete"
msgstr "Approve delete"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:139
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:147
msgid "write"
msgstr "Write"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:64
-#, fuzzy
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:56
msgid "Do you really want to delete this group ?"
-msgstr "Do you want to leave this group ?"
+msgstr "Do you really want to delete this group ?"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:84
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:77
msgid "Update a group"
msgstr "Update a group"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:84
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:77
msgid "Create a group"
msgstr "Create a group"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:91
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:84
#: .\user\templates\ldt\user\change_profile.html.py:62
msgid "Name"
msgstr "Name"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:104
-#, fuzzy
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:90
+msgid "Description"
+msgstr "Description"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:102
msgid "update_group"
-msgstr "update project"
+msgstr "update the group"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:106
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:104
msgid "delete_group"
msgstr "delete project"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:109
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:107
msgid "create_group"
msgstr "Create a group"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:64
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:81
msgid "Update your project"
msgstr "Create your project"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:64
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:81
msgid "Create your project"
msgstr "Create your project"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:75
-#, fuzzy
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:92
msgid "Description :"
-msgstr "description"
+msgstr "description :"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:80
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:97
msgid "List of contents"
msgstr "List of contents"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:94
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:111
#: .\ldt_utils\templates\ldt\ldt_utils\partial\contentslist.html.py:4
#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:4
#: .\ldt_utils\templates\ldt\ldt_utils\partial\publishedprojectslist.html.py:4
msgid "name"
msgstr "name"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:117
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:138
msgid "delete_project"
msgstr "delete project"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:118
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:139
msgid "update_project"
msgstr "update project"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:120
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:141
msgid "create_project"
msgstr "Create new project"
@@ -402,23 +618,10 @@
msgstr "My groups"
#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:94
-#, fuzzy
msgid "Create group"
-msgstr "Create new project"
-
-#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:100
-#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:112
-#: .\ldt_utils\templates\ldt\ldt_utils\ldt_list.html.py:79
-#: .\ldt_utils\templates\ldt\ldt_utils\published_projects.html.py:70
-#: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:56
-#: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:68
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:133
-#: .\templates\ldt\ldt_base.html.py:126
-msgid "search"
-msgstr "search"
+msgstr "Create a new group"
#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:110
-#, fuzzy
msgid "The group's projects"
msgstr "The group's project"
@@ -452,19 +655,10 @@
msgid "The search field can not be empty."
msgstr "The search field can not be empty."
-#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:59
-#, python-format
-msgid " No results for <b>%(search)s</b>."
-msgstr "No results for <b>%(search)s</b>."
-
#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:62
msgid "Results for "
msgstr "Results for"
-#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:62
-msgid "Result"
-msgstr "Result"
-
#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:76
#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:16
#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:18
@@ -475,28 +669,15 @@
msgid "open ldt"
msgstr "open ldt"
-#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:80
-msgid "No title"
-msgstr "No title"
-
#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:87
-#, fuzzy
msgid "Tags"
-msgstr "Pages"
-
-#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:101
-msgid "previous"
-msgstr "Previous"
+msgstr "Tags"
#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:106
#, python-format
msgid "Page %(number)s of %(num_pages)s"
msgstr "Page %(number)s of %(num_pages)s"
-#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:111
-msgid "next"
-msgstr "Next"
-
#: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:53
msgid "content list"
msgstr "Contents"
@@ -513,97 +694,86 @@
msgid "You can't edit this content"
msgstr "You can not edit this content"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:4
-#, fuzzy
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:22
msgid "Click on the line to see the group's projects"
-msgstr "clik here to see the project content"
+msgstr "Click on the line to see the group's projects"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:15
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:16
-#, fuzzy
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:33
msgid "Change this group"
-msgstr "Create a group"
+msgstr "Edit this group"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:21
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:40
msgid "You are not allowed to edit this group"
msgstr "You are not allowed to change this group"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:34
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:55
msgid "Projects shared with me only"
msgstr "Projects shared with me only"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:25
-#, fuzzy
-msgid "share this project"
-msgstr "Create new project"
-
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:26
-msgid "do not share"
-msgstr "do not share"
-
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:90
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:175
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:47
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:74
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:163
msgid "share.eye"
msgstr "click to give to permission to edit this object"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:121
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:55
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:161
+msgid "share.pencil"
+msgstr "click to remove the right to edit this project"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:105
msgid "share"
msgstr "share with other users"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:132
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:114
+msgid "publish for everyone"
+msgstr "publish for everyone"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:120
msgid "User and group list"
msgstr "Users and groups list"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:143
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:131
msgid "select all displayed elements"
msgstr "add all displayed elements"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:148
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:136
msgid "select users"
msgstr "select users"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:149
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:137
msgid "remove users"
msgstr "remove users"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:154
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:142
msgid "Members list"
msgstr "Members list"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:164
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:152
#: .\ldt_utils\templates\ldt\ldt_utils\partial\sharewith.html.py:7
msgid "user"
msgstr "user"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:166
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:154
#: .\ldt_utils\templates\ldt\ldt_utils\partial\sharewith.html.py:9
msgid "group"
msgstr "group"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:173
-msgid "share.pencil"
-msgstr "click to remove the right to edit this project"
-
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:186
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:174
msgid "remove all"
msgstr "remove all"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:8
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:40
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:41
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:16
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:17
msgid "choose a profile image"
msgstr "choose a profile image"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:9
-msgid "hide"
-msgstr "hide"
-
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:48
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:24
#: .\user\templates\ldt\user\change_profile.html.py:154
msgid "Current profile picture"
msgstr "Current profile picture"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:56
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:32
#: .\user\templates\ldt\user\change_profile.html.py:162
msgid "Upload a new picture"
msgstr "Upload a new picture"
@@ -639,35 +809,35 @@
msgid "Project published"
msgstr " published"
-#: .\ldt_utils\views\content.py:158
+#: .\ldt_utils\views\content.py:164
msgid "Problem when downloading file from url : "
msgstr "Problem when downloading file from url: "
-#: .\ldt_utils\views\content.py:161
+#: .\ldt_utils\views\content.py:167
msgid "Problem when uploading file : "
msgstr "Problem when uploading file: "
-#: .\ldt_utils\views\content.py:256
+#: .\ldt_utils\views\content.py:269
#, python-format
msgid "There is %(count)d error when deleting content"
msgid_plural "There are %(count)d errors when deleting content"
msgstr[0] "There is %(count)d error when deleting content"
msgstr[1] "There are %(count)d errors when deleting content"
-#: .\ldt_utils\views\content.py:257
+#: .\ldt_utils\views\content.py:270
msgid "title error deleting content"
msgstr "Error when deleting content"
-#: .\ldt_utils\views\content.py:259
+#: .\ldt_utils\views\content.py:272
#, python-format
msgid "Confirm delete content %(titles)s"
msgstr "Confirm delete content %(titles)s"
-#: .\ldt_utils\views\content.py:260
+#: .\ldt_utils\views\content.py:273
msgid "confirm delete content"
msgstr "Confirm delete content"
-#: .\ldt_utils\views\content.py:301
+#: .\ldt_utils\views\content.py:315
#, python-format
msgid ""
"Content '%(title)s' is referenced by this project : %(project_titles)s. "
@@ -682,33 +852,41 @@
"Content '%(title)s' is referenced by %(count)d projects: %(project_titles)s. "
"Please delete them beforehand."
-#: .\ldt_utils\views\json.py:29 .\ldt_utils\views\rdf.py:15
-#: .\ldt_utils\views\workspace.py:100
-msgid "You can not access this project"
-msgstr "You can not access this project"
-
-#: .\ldt_utils\views\project.py:63
+#: .\ldt_utils\views\project.py:110
#, python-format
msgid "the project %(title)s is published. please unpublish before deleting."
msgstr "the project %(title)s is published. please unpublish before deleting."
-#: .\ldt_utils\views\project.py:64
+#: .\ldt_utils\views\project.py:111 .\ldt_utils\views\project.py:115
msgid "can not delete the project. Please correct the following error"
msgstr "can not delete the project. Please correct the following error"
-#: .\ldt_utils\views\project.py:65
+#: .\ldt_utils\views\project.py:112 .\ldt_utils\views\project.py:116
msgid "title error deleting project"
msgstr "Error when deleting project"
-#: .\ldt_utils\views\project.py:67
+#: .\ldt_utils\views\project.py:114
+#, python-format
+msgid ""
+"the project %(title)s is the front project of %(content)s. please delete "
+"this content first."
+msgstr ""
+"the project %(title)s is the front project of %(content)s. please delete "
+"this content beforehand."
+
+#: .\ldt_utils\views\project.py:118
#, python-format
msgid "please confirm deleting project %(title)s"
msgstr "Please confirm deleting project %(title)s"
-#: .\ldt_utils\views\project.py:68
+#: .\ldt_utils\views\project.py:119
msgid "confirm deletion"
msgstr "Confirm deletion"
+#: .\ldt_utils\views\rdf.py:15 .\ldt_utils\views\workspace.py:109
+msgid "You can not access this project"
+msgstr "You can not access this project"
+
#: .\templates\admin\cms_change_form.html.py:30
msgid "Approve page deletion"
msgstr "Approve page deletion"
@@ -937,9 +1115,8 @@
msgstr "Ldt Platform"
#: .\templates\ldt\ldt_base.html.py:90
-#, fuzzy
msgid "Link to admin"
-msgstr "link to administration"
+msgstr "link to administration pages"
#: .\templates\ldt\ldt_base.html.py:90
msgid "Staff"
@@ -1019,19 +1196,19 @@
msgid "annotation.update_date"
msgstr "update date"
-#: .\user\admin.py:24
+#: .\user\admin.py:27
msgid "User details"
msgstr "User details"
-#: .\user\admin.py:25
+#: .\user\admin.py:28
msgid "Groups"
msgstr "Groups"
-#: .\user\admin.py:26
+#: .\user\admin.py:29
msgid "Permissions"
msgstr "Permissions"
-#: .\user\admin.py:37 .\user\templates\ldt\user\change_profile.html.py:105
+#: .\user\admin.py:40 .\user\templates\ldt\user\change_profile.html.py:105
#: .\user\templates\ldt\user\login_form.html.py:61
msgid "Password"
msgstr "Password"
@@ -1067,24 +1244,27 @@
msgstr "Language"
#: .\user\forms.py:123
-#, fuzzy
msgid "Profile picture"
-msgstr "Profile change"
+msgstr "Profile picture"
-#: .\user\views.py:29
+#: .\user\forms.py:133
+#, python-format
+msgid "Image size is limited to %s"
+msgstr "Image size is limited to %s"
+
+#: .\user\views.py:28
msgid "Your profile has been updated."
msgstr "Your profile has been changed."
-#: .\user\views.py:56
+#: .\user\views.py:52
msgid "Your password has been updated."
msgstr "Your password has been updated."
-#: .\user\views.py:80
-#, fuzzy
+#: .\user\views.py:76
msgid "Your profile picture has been updated."
-msgstr "Your profile has been changed."
+msgstr "Your profile picture has been changed."
-#: .\user\views.py:102 .\user\templates\registration\login.html.py:24
+#: .\user\views.py:98 .\user\templates\registration\login.html.py:24
msgid "Sorry, that's not a valid username or password."
msgstr "Sorry, that's not a valid username or password."
@@ -1120,9 +1300,8 @@
msgstr "E-mail"
#: .\user\templates\ldt\user\change_profile.html.py:175
-#, fuzzy
msgid "Profile picture change"
-msgstr "Profile change"
+msgstr "Profile picture change"
#: .\user\templates\ldt\user\login_form.html.py:32
#: .\user\templates\registration\password_change_done.html.py:7
@@ -1351,70 +1530,3 @@
msgstr ""
"We've e-mailed you instructions for activate your account to the e-mail "
"address you submitted. You should be receiving it shortly."
-
-#, fuzzy
-#~ msgid "User list"
-#~ msgstr "User details"
-
-#~ msgid "select all"
-#~ msgstr "select all"
-
-#~ msgid "Decide whether a user user can change this group"
-#~ msgstr "Decide whether a user user can change this group"
-
-#~ msgid "is admin"
-#~ msgstr "is admin"
-
-#~ msgid "is not admin"
-#~ msgstr "is not admin"
-
-#~ msgid "contents"
-#~ msgstr "Contents"
-
-#~ msgid "indexation projects"
-#~ msgstr "indexation projects"
-
-#~ msgid "accounts"
-#~ msgstr "accounts"
-
-#, fuzzy
-#~ msgid "can change"
-#~ msgstr "Password change"
-
-#, fuzzy
-#~ msgid "can not change"
-#~ msgstr "Password change"
-
-#, fuzzy
-#~ msgid "Leave this group"
-#~ msgstr "Create a group"
-
-#~ msgid ""
-#~ "The operation could not be performed because one or more error(s) "
-#~ "occurred.<br />Please resubmit the content form after making the "
-#~ "following changes:"
-#~ msgstr ""
-#~ "The operation could not be performed because one or more error(s) "
-#~ "occurred.<br />Please resubmit the content form after making the "
-#~ "following changes:"
-
-#~ msgid "This group can read the project"
-#~ msgstr "This group can read the project"
-
-#~ msgid "perm.read"
-#~ msgstr "read"
-
-#~ msgid "This group can change the project"
-#~ msgstr "You can change the project"
-
-#~ msgid "perm.write"
-#~ msgstr "write"
-
-#~ msgid "List of members"
-#~ msgstr "Members list"
-
-#~ msgid "Check to include this user in the group"
-#~ msgstr "Check to include this user in the group"
-
-#~ msgid "Please enter valid keywords."
-#~ msgstr "Please enter valid keywords."
Binary file src/ldt/ldt/locale/fr/LC_MESSAGES/django.mo has changed
--- a/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po Tue Jan 24 10:25:28 2012 +0100
+++ b/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po Tue Jan 24 10:25:44 2012 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:37+0100\n"
+"POT-Creation-Date: 2012-01-20 17:24+0100\n"
"PO-Revision-Date: 2010-03-09 15:52+0100\n"
"Last-Translator: Yves-Marie Haussonne <ymh.work@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,157 +24,173 @@
msgid "Time"
msgstr "Heure"
-#: .\ldt_utils\forms.py:28
+#: .\ldt_utils\forms.py:32 .\ldt_utils\templates\front\front_base.html.py:33
#: .\ldt_utils\templates\ldt\ldt_utils\published_projects.html.py:52
msgid "Search"
msgstr "Recherche"
-#: .\ldt_utils\forms.py:29
+#: .\ldt_utils\forms.py:33
msgid "all"
msgstr "tous"
-#: .\ldt_utils\forms.py:29 .\ldt_utils\models.py:48
+#: .\ldt_utils\forms.py:33 .\ldt_utils\models.py:52
#: .\ldt_utils\templates\ldt\ldt_utils\content_list.html.py:69
msgid "title"
msgstr "titre"
-#: .\ldt_utils\forms.py:29
+#: .\ldt_utils\forms.py:33
msgid "resume"
msgstr "description"
-#: .\ldt_utils\forms.py:29
+#: .\ldt_utils\forms.py:33
msgid "tags"
msgstr "tags"
-#: .\ldt_utils\forms.py:29
+#: .\ldt_utils\forms.py:33
msgid "Fields"
msgstr "Champs"
-#: .\ldt_utils\forms.py:30
+#: .\ldt_utils\forms.py:34
msgid "Display the results in Lignes De Temps"
msgstr "Afficher les résultats dans Lignes De Temps"
-#: .\ldt_utils\forms.py:46 .\ldt_utils\models.py:126
+#: .\ldt_utils\forms.py:50 .\ldt_utils\models.py:130
msgid "content.content_creation_date"
msgstr "Date de création du contenu"
-#: .\ldt_utils\forms.py:47
+#: .\ldt_utils\forms.py:51
msgid "content.media_input_type"
msgstr "Source du média"
-#: .\ldt_utils\forms.py:47
+#: .\ldt_utils\forms.py:51
msgid "file_upload"
msgstr "upload fichier"
-#: .\ldt_utils\forms.py:47
+#: .\ldt_utils\forms.py:51
msgid "url"
msgstr "url"
-#: .\ldt_utils\forms.py:47
+#: .\ldt_utils\forms.py:51
msgid "existing_media"
msgstr "média existant"
-#: .\ldt_utils\forms.py:47
+#: .\ldt_utils\forms.py:51
msgid "create_media"
msgstr "source externe : fichier streamé, statique, url youtube..."
-#: .\ldt_utils\forms.py:47
+#: .\ldt_utils\forms.py:51
msgid "none_media"
msgstr "Aucun"
-#: .\ldt_utils\models.py:37
+#: .\ldt_utils\forms.py:54
+msgid "content.front_project"
+msgstr "Choisir le front project"
+
+#: .\ldt_utils\models.py:41
msgid "media.external_id"
msgstr "id externe"
-#: .\ldt_utils\models.py:38
+#: .\ldt_utils\models.py:42
msgid "media.external_permalink"
msgstr "permalien externe"
-#: .\ldt_utils\models.py:39
+#: .\ldt_utils\models.py:43
msgid "media.external_publication_url"
msgstr "url de publication externe"
-#: .\ldt_utils\models.py:40
+#: .\ldt_utils\models.py:44
msgid "media.external_src_url"
msgstr "url source"
-#: .\ldt_utils\models.py:41
+#: .\ldt_utils\models.py:45
msgid "media.creation_date"
msgstr "Date de création"
-#: .\ldt_utils\models.py:42
+#: .\ldt_utils\models.py:46
msgid "media.media_creation_date"
msgstr "Date de création du média"
-#: .\ldt_utils\models.py:43
+#: .\ldt_utils\models.py:47
msgid "media.update_date"
msgstr "Date de maj"
-#: .\ldt_utils\models.py:44
+#: .\ldt_utils\models.py:48
msgid "media.videopath"
msgstr "videopath"
-#: .\ldt_utils\models.py:45
+#: .\ldt_utils\models.py:49
msgid "media.duration"
msgstr "Durée du contenu (ms)"
-#: .\ldt_utils\models.py:46
+#: .\ldt_utils\models.py:50
msgid "media.creator"
msgstr "Créateur"
-#: .\ldt_utils\models.py:47
+#: .\ldt_utils\models.py:51
msgid "description"
msgstr "description"
-#: .\ldt_utils\models.py:49
+#: .\ldt_utils\models.py:53
msgid "media.src"
msgstr "Sources"
-#: .\ldt_utils\models.py:50
+#: .\ldt_utils\models.py:54
msgid "media.mimetype"
msgstr "mimetype"
-#: .\ldt_utils\models.py:118
+#: .\ldt_utils\models.py:122
msgid "content.iri_id"
msgstr "iri id"
-#: .\ldt_utils\models.py:119
+#: .\ldt_utils\models.py:123
msgid "content.iriurl"
msgstr "iri url"
-#: .\ldt_utils\models.py:120
+#: .\ldt_utils\models.py:124
msgid "content.creation_date"
msgstr "date de création"
-#: .\ldt_utils\models.py:121
+#: .\ldt_utils\models.py:125
msgid "content.update_date"
msgstr "Date de maj"
-#: .\ldt_utils\models.py:122
+#: .\ldt_utils\models.py:126
msgid "content.title"
msgstr "titre"
-#: .\ldt_utils\models.py:123
+#: .\ldt_utils\models.py:127
msgid "content.description"
msgstr "Description"
-#: .\ldt_utils\models.py:124
+#: .\ldt_utils\models.py:128
msgid "content.authors"
msgstr "Auteurs"
-#: .\ldt_utils\models.py:125
+#: .\ldt_utils\models.py:129
msgid "content.duration"
msgstr "Durée (ms)"
-#: .\ldt_utils\models.py:352
+#: .\ldt_utils\models.py:134 .\ldt_utils\models.py:530
+msgid "content.stat_annotation"
+msgstr "statistiques d'annotation"
+
+#: .\ldt_utils\models.py:135 .\ldt_utils\models.py:531
+msgid "content.nb_annotation"
+msgstr "nombre d'annotations"
+
+#: .\ldt_utils\models.py:136
+msgid "content.last_annotated"
+msgstr "annoté pour la dernière foiss"
+
+#: .\ldt_utils\models.py:395
msgid "created by"
msgstr "créé par"
-#: .\ldt_utils\models.py:353
+#: .\ldt_utils\models.py:396
msgid "changed by"
msgstr "modifié par"
-#: .\ldt_utils\utils.py:198
+#: .\ldt_utils\utils.py:208
msgid "Personal cutting"
msgstr "Découpages personnels"
@@ -187,6 +203,195 @@
msgid "Home"
msgstr "Accueil"
+#: .\ldt_utils\templates\front\front_all_contents.html.py:66
+#: .\ldt_utils\templates\front\front_home.html.py:17
+msgid "Filter the medias"
+msgstr "Filtrer les médias"
+
+#: .\ldt_utils\templates\front\front_all_contents.html.py:69
+#: .\ldt_utils\templates\front\front_all_contents.html.py:70
+#: .\ldt_utils\templates\front\front_home.html.py:23
+#: .\ldt_utils\templates\front\front_home.html.py:43
+msgid "All medias"
+msgstr "Tous les médias"
+
+#: .\ldt_utils\templates\front\front_all_contents.html.py:74
+#: .\ldt_utils\templates\front\front_group.html.py:22
+#: .\ldt_utils\templates\front\front_group.html.py:24
+#: .\ldt_utils\templates\front\front_home.html.py:29
+#: .\ldt_utils\templates\front\front_home.html.py:31
+#: .\ldt_utils\templates\front\front_home.html.py:49
+#: .\ldt_utils\templates\front\front_home.html.py:51
+msgid "open this media"
+msgstr "voir ce média"
+
+#: .\ldt_utils\templates\front\front_all_contents.html.py:76
+#: .\ldt_utils\templates\front\front_group.html.py:23
+#: .\ldt_utils\templates\front\front_home.html.py:30
+#: .\ldt_utils\templates\front\front_home.html.py:50
+#, python-format
+msgid "%(nb)s annotation on this media"
+msgid_plural "%(nb)s annotations on this media"
+msgstr[0] "%(nb)s annotation sur ce média"
+msgstr[1] "%(nb)s annotations sur ce média"
+
+#: .\ldt_utils\templates\front\front_all_contents.html.py:78
+#: .\ldt_utils\templates\front\front_group.html.py:25
+#: .\ldt_utils\templates\front\front_home.html.py:32
+#: .\ldt_utils\templates\front\front_home.html.py:52
+msgid "by"
+msgstr "par"
+
+#: .\ldt_utils\templates\front\front_all_contents.html.py:82
+msgid "All tags"
+msgstr "Tous les tags"
+
+#: .\ldt_utils\templates\front\front_base.html.py:25
+msgid "homepage"
+msgstr "Accueil"
+
+#: .\ldt_utils\templates\front\front_base.html.py:25
+msgid "<b>Lignes</b> de temps"
+msgstr "<b>Lignes</b> de temps"
+
+#: .\ldt_utils\templates\front\front_base.html.py:38
+#: .\ldt_utils\templates\front\front_base.html.py:56
+msgid "link IRI"
+msgstr "Site de l'IRI"
+
+#: .\ldt_utils\templates\front\front_base.html.py:41
+#: .\ldt_utils\templates\front\front_player.html.py:5
+msgid "Annotate"
+msgstr "Annoter"
+
+#: .\ldt_utils\templates\front\front_base.html.py:45
+msgid "connection"
+msgstr "connexion"
+
+#: .\ldt_utils\templates\front\front_base.html.py:53
+#, python-format
+msgid "%(WEB_VERSION)s | %(VERSION)s"
+msgstr "v%(WEB_VERSION)s | v%(VERSION)s "
+
+#: .\ldt_utils\templates\front\front_base.html.py:56
+msgid "about"
+msgstr "A propos"
+
+#: .\ldt_utils\templates\front\front_group.html.py:18
+msgid "Medias annotated by the group"
+msgstr "Médias annotés par le groupe"
+
+#: .\ldt_utils\templates\front\front_group.html.py:34
+msgid "About the group"
+msgstr "A propos du groupe"
+
+#: .\ldt_utils\templates\front\front_group.html.py:43
+msgid "Members"
+msgstr "liste des membres"
+
+#: .\ldt_utils\templates\front\front_group.html.py:50
+msgid "active since"
+msgstr "actif depuis"
+
+#: .\ldt_utils\templates\front\front_home.html.py:7
+msgid "front.home"
+msgstr "Plateforme ligne de temps"
+
+#: .\ldt_utils\templates\front\front_home.html.py:21
+msgid "Last annotated medias"
+msgstr "Derniers médias annotés"
+
+#: .\ldt_utils\templates\front\front_home.html.py:23
+#: .\ldt_utils\templates\front\front_home.html.py:43
+msgid "view all medias"
+msgstr "Voir tous les médias"
+
+#: .\ldt_utils\templates\front\front_home.html.py:41
+msgid "Most annotated medias"
+msgstr "Médias les plus annotés"
+
+#: .\ldt_utils\templates\front\front_home.html.py:59
+msgid "Active groups"
+msgstr "Groupes actifs"
+
+#: .\ldt_utils\templates\front\front_home.html.py:64
+msgid "group picture"
+msgstr "image du groupe"
+
+#: .\ldt_utils\templates\front\front_home.html.py:64
+#: .\ldt_utils\templates\front\front_home.html.py:68
+msgid "view more infos on this group"
+msgstr "Voir plus d'informations sur ce groupe"
+
+#: .\ldt_utils\templates\front\front_home.html.py:67
+#, python-format
+msgid "%(nb)s user in this group"
+msgid_plural "%(nb)s users in this group"
+msgstr[0] "%(nb)s utilisateur dans ce groupe"
+msgstr[1] "%(nb)s utilisateurs dans ce groupe"
+
+#: .\ldt_utils\templates\front\front_player.html.py:87
+msgid "All annotations on the media"
+msgstr "Toutes les annotations sur le média"
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:6
+#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:100
+#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:112
+#: .\ldt_utils\templates\ldt\ldt_utils\ldt_list.html.py:79
+#: .\ldt_utils\templates\ldt\ldt_utils\published_projects.html.py:70
+#: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:56
+#: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:68
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:121
+#: .\templates\ldt\ldt_base.html.py:126
+msgid "search"
+msgstr "Recherche"
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:99
+#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:59
+#, python-format
+msgid " No results for <b>%(search)s</b>."
+msgstr "Aucun résultat pour <b>%(search)s</b>."
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:111
+msgid "Search results for "
+msgstr "Résultats de recherhce pour "
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:114
+#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:62
+msgid "Result"
+msgstr "Résultat"
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:133
+msgid "annotation distribution"
+msgstr "Répartition des annotations"
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:148
+msgid "view this annotation in the player"
+msgstr "Visionner cette annotation"
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:149
+#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:80
+msgid "No title"
+msgstr "Sans titre"
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:150
+msgid "Begin"
+msgstr "Début"
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:150
+msgid "duration"
+msgstr "durée"
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:162
+#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:101
+msgid "previous"
+msgstr "Précedent"
+
+#: .\ldt_utils\templates\front\front_search_results.html.py:183
+#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:111
+msgid "next"
+msgstr "Suivant"
+
#: .\ldt_utils\templates\ldt\ldt_utils\content_list.html.py:55
#: .\templates\admin\page_base.html.py:19
#: .\user\templates\ldt\user\login_form.html.py:33
@@ -220,7 +425,7 @@
msgstr "Copier votre projet"
#: .\ldt_utils\templates\ldt\ldt_utils\copy_ldt.html.py:17
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:70
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:87
msgid "Title"
msgstr "Titre"
@@ -228,23 +433,33 @@
msgid "Copy"
msgstr "Copier"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:51
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:41
msgid "Browse"
msgstr "Parcourir"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:52
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:42
msgid "File uploaded"
msgstr "Fichier téléversé"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:53
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:43
msgid "Please wait, the upload is not finished yet"
msgstr "Veuillez patienter, le téléversement est en cours"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:54
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:44
msgid "Cancel upload"
msgstr "Annuler le téléversement"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:73
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:53
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:47
+msgid "more options"
+msgstr ""
+
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:57
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:51
+msgid "hide"
+msgstr "Réduire"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:71
msgid ""
"The operation could not be performed because one or more error(s) occurred."
"<br />Please resubmit the media form after making the following changes:"
@@ -252,96 +467,101 @@
"opération impossible à cause d'une ou plusieurs erreurs.<br />Veuillez "
"resoumettre le formulaire media après avoir fait les changements suivants:"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:83
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:85
#: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:54
msgid "Create content"
msgstr "Créer un contenu"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:101
-msgid "publish for everyone"
-msgstr "publier pour tout le monde"
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:126
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:127
+msgid "More options"
+msgstr "Plus d'options"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:133
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:141
msgid "media file is being processed please wait."
msgstr "Le fichier média est en cours de traitement. Veuillez patienter."
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:137
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:102
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:115
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:145
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:100
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:136
#: .\ldt_utils\templates\ldt\ldt_utils\error_confirm.html.py:52
msgid "close_cancel"
msgstr "Fermer"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:138
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:146
msgid "delete"
msgstr "Effacer"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:139
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:147
msgid "write"
msgstr "Enregistrer"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:64
-#, fuzzy
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:56
msgid "Do you really want to delete this group ?"
msgstr "Voulez-vous quitter ce groupe ?"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:84
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:77
msgid "Update a group"
msgstr "Mettre à jour votre groupe"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:84
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:77
msgid "Create a group"
msgstr "Créer un groupe"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:91
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:84
#: .\user\templates\ldt\user\change_profile.html.py:62
msgid "Name"
msgstr "Nom"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:104
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:90
+#, fuzzy
+msgid "Description"
+msgstr "Description :"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:102
msgid "update_group"
msgstr "Mettre à jour le groupe"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:106
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:104
msgid "delete_group"
msgstr "Effacer le groupe"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:109
+#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:107
msgid "create_group"
msgstr "Créer un nouveau groupe"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:64
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:81
msgid "Update your project"
msgstr "Mettre à jour votre projet Lignes de Temps"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:64
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:81
msgid "Create your project"
msgstr "Créer votre projet Lignes de Temps"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:75
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:92
msgid "Description :"
msgstr "Description :"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:80
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:97
msgid "List of contents"
msgstr "Liste de contenus"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:94
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:111
#: .\ldt_utils\templates\ldt\ldt_utils\partial\contentslist.html.py:4
#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:4
#: .\ldt_utils\templates\ldt\ldt_utils\partial\publishedprojectslist.html.py:4
msgid "name"
msgstr "Nom"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:117
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:138
msgid "delete_project"
msgstr "Effacer"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:118
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:139
msgid "update_project"
msgstr "Mettre à jour"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:120
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:141
msgid "create_project"
msgstr "Créer un nouveau projet Ligne de Temps"
@@ -402,17 +622,6 @@
msgid "Create group"
msgstr "Créer un nouveau groupe"
-#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:100
-#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:112
-#: .\ldt_utils\templates\ldt\ldt_utils\ldt_list.html.py:79
-#: .\ldt_utils\templates\ldt\ldt_utils\published_projects.html.py:70
-#: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:56
-#: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:68
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:133
-#: .\templates\ldt\ldt_base.html.py:126
-msgid "search"
-msgstr "Recherche"
-
#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:110
msgid "The group's projects"
msgstr "projets du groupe"
@@ -447,19 +656,10 @@
msgid "The search field can not be empty."
msgstr "Le champ de recherche ne peut pas être vide."
-#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:59
-#, python-format
-msgid " No results for <b>%(search)s</b>."
-msgstr "Aucun résultat pour <b>%(search)s</b>."
-
#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:62
msgid "Results for "
msgstr "Résultats pour "
-#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:62
-msgid "Result"
-msgstr "Résultat"
-
#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:76
#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:16
#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:18
@@ -470,28 +670,16 @@
msgid "open ldt"
msgstr "Ouvrir sous Lignes de Temps"
-#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:80
-msgid "No title"
-msgstr "Sans titre"
-
#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:87
#, fuzzy
msgid "Tags"
msgstr "tags"
-#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:101
-msgid "previous"
-msgstr "Précedent"
-
#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:106
#, python-format
msgid "Page %(number)s of %(num_pages)s"
msgstr "Page %(number)s de %(num_pages)s"
-#: .\ldt_utils\templates\ldt\ldt_utils\search_results.html.py:111
-msgid "next"
-msgstr "Suivant"
-
#: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:53
msgid "content list"
msgstr "Liste des contenus"
@@ -508,94 +696,86 @@
msgid "You can't edit this content"
msgstr "Vous n'avez pas l'autorisation d'éditer ce contenu"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:4
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:22
msgid "Click on the line to see the group's projects"
msgstr "cliquer ici pour voir les projets du groupe"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:15
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:16
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:33
msgid "Change this group"
msgstr "Modifier ce groupe"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:21
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:40
msgid "You are not allowed to edit this group"
msgstr "vous n'avez pas l'autorisation de modifier ce groupe"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:34
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:55
msgid "Projects shared with me only"
msgstr "Projets partagés avec moi uniquement"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:25
-msgid "share this project"
-msgstr "partager ce projet"
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:47
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:74
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:163
+msgid "share.eye"
+msgstr "Cet utilisateur ou ce groupe a le droit de voir cet élement"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:26
-msgid "do not share"
-msgstr "ne pas partager"
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:55
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:161
+msgid "share.pencil"
+msgstr "cet utilisateur ou ce groupe a le droit de modifier cet élement"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:90
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:175
-msgid "share.eye"
-msgstr "cliquer pour donner le droit de changer cet élement"
-
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:121
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:105
msgid "share"
msgstr "partager avec d'autres utilisateurs"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:132
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:114
+msgid "publish for everyone"
+msgstr "publier pour tout le monde"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:120
msgid "User and group list"
msgstr "Liste des groupes et des utilisateurs"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:143
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:131
msgid "select all displayed elements"
msgstr "ajouter tous les élements affichés"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:148
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:136
msgid "select users"
msgstr "choisir des utilisateurs"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:149
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:137
msgid "remove users"
msgstr "enlever des utilisateurs"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:154
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:142
msgid "Members list"
msgstr "liste des membres"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:164
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:152
#: .\ldt_utils\templates\ldt\ldt_utils\partial\sharewith.html.py:7
msgid "user"
msgstr "utilisateur"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:166
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:154
#: .\ldt_utils\templates\ldt\ldt_utils\partial\sharewith.html.py:9
msgid "group"
msgstr "groupe"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:173
-msgid "share.pencil"
-msgstr "cliquer pour retirer le droit de changer sur cet élement"
-
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:186
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:174
msgid "remove all"
msgstr "tout enlever"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:8
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:40
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:41
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:16
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:17
msgid "choose a profile image"
msgstr "choisir une image de profil"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:9
-msgid "hide"
-msgstr "réduire"
-
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:48
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:24
#: .\user\templates\ldt\user\change_profile.html.py:154
msgid "Current profile picture"
msgstr "Image de profil"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:56
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:32
#: .\user\templates\ldt\user\change_profile.html.py:162
msgid "Upload a new picture"
msgstr "Téléverser une nouvelle image"
@@ -631,35 +811,35 @@
msgid "Project published"
msgstr "Projet publié"
-#: .\ldt_utils\views\content.py:158
+#: .\ldt_utils\views\content.py:164
msgid "Problem when downloading file from url : "
msgstr "Problème lors du téléchargement du fichier : "
-#: .\ldt_utils\views\content.py:161
+#: .\ldt_utils\views\content.py:167
msgid "Problem when uploading file : "
msgstr "Problème lors de l'upload du fichier : "
-#: .\ldt_utils\views\content.py:256
+#: .\ldt_utils\views\content.py:269
#, python-format
msgid "There is %(count)d error when deleting content"
msgid_plural "There are %(count)d errors when deleting content"
msgstr[0] "Il y a %(count)d erreur lors de l'effacement du contenu"
msgstr[1] "Il y a %(count)d erreurs lors de l'effacement du contenu"
-#: .\ldt_utils\views\content.py:257
+#: .\ldt_utils\views\content.py:270
msgid "title error deleting content"
msgstr "Erreur lors de l'effacement du contenu"
-#: .\ldt_utils\views\content.py:259
+#: .\ldt_utils\views\content.py:272
#, python-format
msgid "Confirm delete content %(titles)s"
msgstr "Veuillez confirmer l'effacement du contenu %(titles)s"
-#: .\ldt_utils\views\content.py:260
+#: .\ldt_utils\views\content.py:273
msgid "confirm delete content"
msgstr "Confirmation effacement contenu"
-#: .\ldt_utils\views\content.py:301
+#: .\ldt_utils\views\content.py:315
#, python-format
msgid ""
"Content '%(title)s' is referenced by this project : %(project_titles)s. "
@@ -674,34 +854,42 @@
"Le contenu '%(title)s' est référencé par les projets suivants : '%"
"(project_titles)s'.Veuillez les effacer préalablement."
-#: .\ldt_utils\views\json.py:29 .\ldt_utils\views\rdf.py:15
-#: .\ldt_utils\views\workspace.py:100
-msgid "You can not access this project"
-msgstr "vous n'avez pas l'autorisation d'accéder à ce projet"
-
-#: .\ldt_utils\views\project.py:63
+#: .\ldt_utils\views\project.py:110
#, python-format
msgid "the project %(title)s is published. please unpublish before deleting."
msgstr "Le projet %(title)s est publié. Déplublier le avant de l'effacer."
-#: .\ldt_utils\views\project.py:64
+#: .\ldt_utils\views\project.py:111 .\ldt_utils\views\project.py:115
msgid "can not delete the project. Please correct the following error"
msgstr ""
"Le projet ne peut pas être effacé. Veuillez corriger les erreurs suivantes."
-#: .\ldt_utils\views\project.py:65
+#: .\ldt_utils\views\project.py:112 .\ldt_utils\views\project.py:116
msgid "title error deleting project"
msgstr "Erreur lors de l'effacement du projet"
-#: .\ldt_utils\views\project.py:67
+#: .\ldt_utils\views\project.py:114
+#, python-format
+msgid ""
+"the project %(title)s is the front project of %(content)s. please delete "
+"this content first."
+msgstr ""
+"Le projet %(title)s est référencé par le contenu '%(content)s'.Veuillez "
+"l'effacer préalablement."
+
+#: .\ldt_utils\views\project.py:118
#, python-format
msgid "please confirm deleting project %(title)s"
msgstr "Confirmer l'effacement du projet intitulé %(title)s"
-#: .\ldt_utils\views\project.py:68
+#: .\ldt_utils\views\project.py:119
msgid "confirm deletion"
msgstr "Confirmation d'effacement"
+#: .\ldt_utils\views\rdf.py:15 .\ldt_utils\views\workspace.py:109
+msgid "You can not access this project"
+msgstr "vous n'avez pas l'autorisation d'accéder à ce projet"
+
#: .\templates\admin\cms_change_form.html.py:30
msgid "Approve page deletion"
msgstr "Accepter l'effacement de la page"
@@ -1011,19 +1199,19 @@
msgid "annotation.update_date"
msgstr "Date de maj"
-#: .\user\admin.py:24
+#: .\user\admin.py:27
msgid "User details"
msgstr "Détail utilisateur"
-#: .\user\admin.py:25
+#: .\user\admin.py:28
msgid "Groups"
msgstr "Groupes"
-#: .\user\admin.py:26
+#: .\user\admin.py:29
msgid "Permissions"
msgstr "Permissions"
-#: .\user\admin.py:37 .\user\templates\ldt\user\change_profile.html.py:105
+#: .\user\admin.py:40 .\user\templates\ldt\user\change_profile.html.py:105
#: .\user\templates\ldt\user\login_form.html.py:61
msgid "Password"
msgstr "Mot de passe"
@@ -1059,24 +1247,27 @@
msgstr "Langue"
#: .\user\forms.py:123
-#, fuzzy
msgid "Profile picture"
-msgstr "Modification du profil"
+msgstr "Image de profil"
-#: .\user\views.py:29
+#: .\user\forms.py:133
+#, python-format
+msgid "Image size is limited to %s"
+msgstr "La taille de l'image est limitée à %s"
+
+#: .\user\views.py:28
msgid "Your profile has been updated."
msgstr "Votre profil a été modifié"
-#: .\user\views.py:56
+#: .\user\views.py:52
msgid "Your password has been updated."
msgstr "Votre mot de passe a été changeé."
-#: .\user\views.py:80
-#, fuzzy
+#: .\user\views.py:76
msgid "Your profile picture has been updated."
-msgstr "Votre profil a été modifié"
+msgstr "Votre image de profil a été modifiée"
-#: .\user\views.py:102 .\user\templates\registration\login.html.py:24
+#: .\user\views.py:98 .\user\templates\registration\login.html.py:24
msgid "Sorry, that's not a valid username or password."
msgstr "Saisissez un nom d'utilisateur et un mot de passe valide."
@@ -1113,9 +1304,8 @@
msgstr "E-mail"
#: .\user\templates\ldt\user\change_profile.html.py:175
-#, fuzzy
msgid "Profile picture change"
-msgstr "Modification du profil"
+msgstr "Modification de l'image de profil"
#: .\user\templates\ldt\user\login_form.html.py:32
#: .\user\templates\registration\password_change_done.html.py:7
@@ -1349,77 +1539,3 @@
msgstr ""
"Nous vous avons envoyé par courriel les instructions pour activer le compte "
"à l'adresse que vous avez indiquée. Vous devriez le recevoir rapidement."
-
-#~ msgid "User list"
-#~ msgstr "Liste des utilisateurs"
-
-#~ msgid "select all"
-#~ msgstr "Tout choisir"
-
-#~ msgid "Decide whether a user user can change this group"
-#~ msgstr "Précise si cet utilisateur peut créer et modifier ce groupe."
-
-#~ msgid "is admin"
-#~ msgstr "Administrateur"
-
-#~ msgid "is not admin"
-#~ msgstr "Administration"
-
-#~ msgid "contents"
-#~ msgstr "Liste des contenus"
-
-#~ msgid "indexation projects"
-#~ msgstr "Projets d'indexation"
-
-#~ msgid "accounts"
-#~ msgstr "Comptes"
-
-#, fuzzy
-#~ msgid "can change"
-#~ msgstr "Modification du mot de passe"
-
-#, fuzzy
-#~ msgid "can not change"
-#~ msgstr "Modification du mot de passe"
-
-#~ msgid "Leave this group"
-#~ msgstr "Quitter ce groupe"
-
-#~ msgid "Designates whether the user can create and leave groups."
-#~ msgstr "Précise si cet utilisateur peut créer et quitter des groupes."
-
-#~ msgid ""
-#~ "The operation could not be performed because one or more error(s) "
-#~ "occurred.<br />Please resubmit the content form after making the "
-#~ "following changes:"
-#~ msgstr ""
-#~ "Opération impossible à cause d'une ou plusieurs erreurs.<br />Veuillez "
-#~ "resoumettre le formulaire contenu après avoir fait les changements "
-#~ "suivants:"
-
-#~ msgid "nom"
-#~ msgstr "nom"
-
-#~ msgid "This group can read the project"
-#~ msgstr "Ce groupe peut lire le projet"
-
-#~ msgid "perm.read"
-#~ msgstr "lecture"
-
-#~ msgid "This group can change the project"
-#~ msgstr "Ce groupe peut changer le projet"
-
-#~ msgid "perm.write"
-#~ msgstr "écriture"
-
-#~ msgid "List of members"
-#~ msgstr "Liste des membres"
-
-#~ msgid "Check to include this user in the group"
-#~ msgstr "Cocher pour inclure cet utilisateur dans le groupe"
-
-#~ msgid "Check to give this user the right to change the group"
-#~ msgstr "Cocher pour donner à cet utilisateur le droit de modifier le groupe"
-
-#~ msgid "Please enter valid keywords."
-#~ msgstr "Veuillez entrer des mots-clés valides."
--- a/src/ldt/ldt/static/ldt/css/front_search.css Tue Jan 24 10:25:28 2012 +0100
+++ b/src/ldt/ldt/static/ldt/css/front_search.css Tue Jan 24 10:25:44 2012 +0100
@@ -18,13 +18,16 @@
}
#title_resultats {
- width: 250px;
+ width: 500px;
}
#title_resultats h2 {
font-size: 19px;
}
+#li_nb_resultats {
+ float:right;
+}
#p_nb_resultats {
margin : 10px 0 0;
}
--- a/src/ldt/ldt/static/ldt/css/ldtform.css Tue Jan 24 10:25:28 2012 +0100
+++ b/src/ldt/ldt/static/ldt/css/ldtform.css Tue Jan 24 10:25:44 2012 +0100
@@ -160,7 +160,7 @@
font-weight: bold;
}
-#elemslistcontainer, #selectors {
+#elemslistcontainer, #selectors, #public input {
float: left;
}
@@ -190,7 +190,6 @@
.dropdownlist {
font-weight: bold;
- cursor: pointer;
}
.userorgroups .ui-selected {
@@ -216,3 +215,13 @@
.tableuserorgroup {
border: 1px solid #B8B8B8;
}
+
+#moreoptions {
+ font-weight: bold;
+ font-size: 1.2em;
+ cursor: pointer;
+}
+
+#moreoptionscontainer {
+ display: none;
+}
--- a/src/ldt/ldt/static/ldt/js/projectscontents.js Tue Jan 24 10:25:28 2012 +0100
+++ b/src/ldt/ldt/static/ldt/js/projectscontents.js Tue Jan 24 10:25:44 2012 +0100
@@ -180,7 +180,7 @@
filters: ['iframe'],
sizes: {
minW: 740,
- minH: 520
+ minH: 490
},
closeOnClick:false,
callbacks: {
@@ -200,7 +200,7 @@
});
nm.store.iframe.width(730);
- nm.store.iframe.height(510);
+ nm.store.iframe.height(480);
}
}
});
@@ -219,7 +219,7 @@
filters: ['iframe'],
sizes: {
minW: 740,
- minH: 550
+ minH: 490
},
closeOnClick:false,
callbacks: {
@@ -234,8 +234,8 @@
}
});
- nm.store.iframe.width(740);
- nm.store.iframe.height(540);
+ nm.store.iframe.width(730);
+ nm.store.iframe.height(480);
}
}
});
@@ -378,7 +378,7 @@
filters: ['iriIframe'],
sizes: {
minW: '750',
- minH: '650'
+ minH: '750'
},
showCloseButton: true,
closeOnEscape:false,
@@ -394,7 +394,7 @@
});
nm.store.iframe.width(740);
- nm.store.iframe.height(640);
+ nm.store.iframe.height(740);
},
afterClose: function(nm) {
searchCallback($("#searchprojectsinput"), $("#groupslistcontainer"), groupfilterurl, 0);