--- a/src/ldt/ldt/api/ldt/handlers.py Fri Jan 20 10:26:58 2012 +0100
+++ b/src/ldt/ldt/api/ldt/handlers.py Fri Jan 20 15:36:37 2012 +0100
@@ -234,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/projectserializer.py Fri Jan 20 10:26:58 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/projectserializer.py Fri Jan 20 15:36:37 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:
--- a/src/ldt/ldt/ldt_utils/segmentserializer.py Fri Jan 20 10:26:58 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/segmentserializer.py Fri Jan 20 15:36:37 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
@@ -67,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",
@@ -126,6 +133,22 @@
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,
@@ -156,20 +179,24 @@
"dc:modified": seg.date,
"id-ref": seg.iri_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/templates/front/front_group.html Fri Jan 20 10:26:58 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_group.html Fri Jan 20 15:36:37 2012 +0100
@@ -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}}" title="{{group.name}}" alt="{{group.name}}">{% 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">
--- a/src/ldt/ldt/ldt_utils/templates/front/front_home.html Fri Jan 20 10:26:58 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_home.html Fri Jan 20 15:36:37 2012 +0100
@@ -60,12 +60,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 }}" alt="{% trans 'group picture' %}" title="{% trans 'view more infos on this group'%}">{% 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" title="{% blocktrans with count=group.user_set.count%}{{count}} 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.profile.description|length > 69 %}{{group.profile.description|safe|slice:":69"}}...{% else %}{{group.profile.description|safe}}{% endif %}</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/ldt/ldt_utils/create_content.html Fri Jan 20 10:26:58 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html Fri Jan 20 15:36:37 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_ldt.html Fri Jan 20 10:26:58 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_ldt.html Fri Jan 20 15:36:37 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 Fri Jan 20 10:26:58 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html Fri Jan 20 15:36:37 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 Fri Jan 20 10:26:58 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/picture.html Fri Jan 20 15:36:37 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" />
Binary file src/ldt/ldt/locale/en/LC_MESSAGES/django.mo has changed
--- a/src/ldt/ldt/locale/en/LC_MESSAGES/django.po Fri Jan 20 10:26:58 2012 +0100
+++ b/src/ldt/ldt/locale/en/LC_MESSAGES/django.po Fri Jan 20 15:36:37 2012 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-20 10:24+0100\n"
+"POT-Creation-Date: 2012-01-20 15:02+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"
@@ -337,7 +337,7 @@
#: .\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
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:122
#: .\templates\ldt\ldt_base.html.py:126
msgid "search"
msgstr "search"
@@ -421,7 +421,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"
@@ -429,23 +429,23 @@
msgid "Copy"
msgstr "Copy"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:47
+#: .\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:48
+#: .\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:49
+#: .\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:50
+#: .\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:69
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:"
@@ -453,31 +453,32 @@
"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:87
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:83
#: .\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:105
-msgid "publish for everyone"
-msgstr "publish for everyone"
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:124
+#: .\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:143
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:139
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:147
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:143
#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:99
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:116
+#: .\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:148
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:144
msgid "delete"
msgstr "Approve delete"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:149
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:145
msgid "write"
msgstr "Write"
@@ -514,38 +515,46 @@
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:47
+msgid "more options"
+msgstr ""
+
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:51
+msgid "hide"
+msgstr "hide"
+
+#: .\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
+#: .\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 "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:118
+#: .\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:119
+#: .\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:121
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:141
msgid "create_project"
msgstr "Create new project"
@@ -695,77 +704,70 @@
msgid "Projects shared with me only"
msgstr "Projects shared with me only"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:25
-msgid "share this project"
-msgstr "share this 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:48
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:75
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:164
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:56
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:162
+msgid "share.pencil"
+msgstr "click to remove the right to edit this project"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:106
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:115
+msgid "publish for everyone"
+msgstr "publish for everyone"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:121
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:132
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:137
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:138
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:143
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:153
#: .\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:155
#: .\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:175
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:44
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:45
+#: .\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:52
+#: .\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:60
+#: .\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"
@@ -1523,6 +1525,12 @@
"We've e-mailed you instructions for activate your account to the e-mail "
"address you submitted. You should be receiving it shortly."
+#~ msgid "share this project"
+#~ msgstr "share this project"
+
+#~ msgid "do not share"
+#~ msgstr "do not share"
+
#, fuzzy
#~ msgid "annotations on this media"
#~ msgstr "title"
Binary file src/ldt/ldt/locale/fr/LC_MESSAGES/django.mo has changed
--- a/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po Fri Jan 20 10:26:58 2012 +0100
+++ b/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po Fri Jan 20 15:36:37 2012 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-20 10:24+0100\n"
+"POT-Creation-Date: 2012-01-20 15:01+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"
@@ -337,7 +337,7 @@
#: .\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
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:122
#: .\templates\ldt\ldt_base.html.py:126
msgid "search"
msgstr "Recherche"
@@ -421,7 +421,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"
@@ -429,23 +429,23 @@
msgid "Copy"
msgstr "Copier"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:47
+#: .\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:48
+#: .\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:49
+#: .\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:50
+#: .\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:69
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:"
@@ -453,31 +453,32 @@
"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:87
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:83
#: .\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:105
-msgid "publish for everyone"
-msgstr "publier pour tout le monde"
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:124
+#: .\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:143
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:139
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:147
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:143
#: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:99
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:116
+#: .\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:148
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:144
msgid "delete"
msgstr "Effacer"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:149
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:145
msgid "write"
msgstr "Enregistrer"
@@ -515,38 +516,46 @@
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:47
+msgid "more options"
+msgstr ""
+
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:51
+msgid "hide"
+msgstr "Réduire"
+
+#: .\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:118
+#: .\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:119
+#: .\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:121
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:141
msgid "create_project"
msgstr "Créer un nouveau projet Ligne de Temps"
@@ -697,77 +706,70 @@
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:48
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:75
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:164
+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:56
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:162
+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:106
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:115
+msgid "publish for everyone"
+msgstr "publier pour tout le monde"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\permissions.html.py:121
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:132
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:137
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:138
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:143
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:153
#: .\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:155
#: .\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:175
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:44
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:45
+#: .\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:52
+#: .\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:60
+#: .\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"
@@ -1532,6 +1534,12 @@
"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 "share this project"
+#~ msgstr "partager ce projet"
+
+#~ msgid "do not share"
+#~ msgstr "ne pas partager"
+
#~ msgid "annotations on this media"
#~ msgstr "annotations sur ce média"
--- a/src/ldt/ldt/static/ldt/css/ldtform.css Fri Jan 20 10:26:58 2012 +0100
+++ b/src/ldt/ldt/static/ldt/css/ldtform.css Fri Jan 20 15:36:37 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 Fri Jan 20 10:26:58 2012 +0100
+++ b/src/ldt/ldt/static/ldt/js/projectscontents.js Fri Jan 20 15:36:37 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);