# HG changeset patch # User verrierj # Date 1327070197 -3600 # Node ID 4328cd4a7533624ba1b5a831b037f9eedcf3eee9 # Parent 2d18ba523343eb8facfeeb296172b4697734a087 refactor modal windows + add translations diff -r 2d18ba523343 -r 4328cd4a7533 src/ldt/ldt/api/ldt/handlers.py --- 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 ) diff -r 2d18ba523343 -r 4328cd4a7533 src/ldt/ldt/ldt_utils/projectserializer.py --- 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: diff -r 2d18ba523343 -r 4328cd4a7533 src/ldt/ldt/ldt_utils/segmentserializer.py --- 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 diff -r 2d18ba523343 -r 4328cd4a7533 src/ldt/ldt/ldt_utils/templates/front/front_group.html --- 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 @@

{% trans 'About the group' %}

- {{group.profile.description|safe}} + {{group.get_profile.description|safe}}

- {% thumbnail group.profile.image "54x40" format="PNG" crop="center" as im %}{{content.title}}{% endthumbnail %} + {% thumbnail group.get_profile.image "54x40" format="PNG" crop="center" as im %}{{content.title}}{% endthumbnail %}

 

diff -r 2d18ba523343 -r 4328cd4a7533 src/ldt/ldt/ldt_utils/templates/front/front_home.html --- 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 %}
  • - {% thumbnail group.profile.image "54x40" format="PNG" crop="center" as im %}{% trans 'group picture' %}{% endthumbnail %} + {% thumbnail group.get_profile.image "54x40" format="PNG" crop="center" as im %}{% trans 'group picture' %}{% endthumbnail %}
    {{ group.user_set.count }}

    {{group.name}}

    -

    {% if group.profile.description|length > 69 %}{{group.profile.description|safe|slice:":69"}}...{% else %}{{group.profile.description|safe}}{% endif %}

    +

    {% if group.get_profile.description|length > 69 %}{{group.get_profile.description|safe|slice:":69"}}...{% else %}{{group.get_profile.description|safe}}{% endif %}

    • {% endfor %} diff -r 2d18ba523343 -r 4328cd4a7533 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html --- 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 @@ @@ -107,9 +124,12 @@
    +
    {% trans 'More options' %}
    +
    + {% include "ldt/ldt_utils/partial/picture.html" %} {% include "ldt/ldt_utils/partial/permissions.html" %} - {% include "ldt/ldt_utils/partial/picture.html" %} - +
    +
    diff -r 2d18ba523343 -r 4328cd4a7533 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html --- 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 = ''; - $(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 = ''; - $(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(''); @@ -87,7 +71,7 @@ selection.each(function () { var id_item = $("input",$(this)).val(); $("#read").append(''); - $("td:last",$(this)).append('{% trans '); + $("td:last",$(this)).append('{% trans '); }); }); @@ -124,9 +108,13 @@ -
    +
    -
    + {% if content_form %} +
    {{ content_form.is_public }}
    + {% endif %} + +
    {% trans "User and group list" %}
    @@ -135,7 +123,7 @@
    - {% include "ldt/ldt_utils/partial/sharewith.html" %} + {% include "ldt/ldt_utils/partial/sharewith.html" %}
    diff -r 2d18ba523343 -r 4328cd4a7533 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/picture.html --- 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 @@ -