Changeset 3e38b89


Ignore:
Timestamp:
Jun 7, 2012 10:14:49 AM (2 years ago)
Author:
yomguy <yomguy@…>
Branches:
lam, lam2
Children:
5647e60
Parents:
c43c968 (diff), 19f0503 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
yomguy <yomguy@…> (07/06/2012 10:14:49)
git-committer:
yomguy <yomguy@…> (07/06/2012 10:14:49)
Message:

Merge branch 'dev' into lam

Conflicts:

telemeta/locale/de/LC_MESSAGES/django.mo
telemeta/locale/de/LC_MESSAGES/django.po
telemeta/locale/de/LC_MESSAGES/djangojs.mo
telemeta/locale/de/LC_MESSAGES/djangojs.po
telemeta/locale/fr/LC_MESSAGES/django.mo
telemeta/locale/fr/LC_MESSAGES/djangojs.mo

Files:
4 added
14 edited

Legend:

Unmodified
Added
Removed
  • telemeta/locale/de/LC_MESSAGES/django.po

    r5856547 r19f0503  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 <<<<<<< HEAD 
    12 "POT-Creation-Date: 2012-05-31 15:31+0200\n" 
    13 ======= 
    14 "POT-Creation-Date: 2012-06-07 10:02+0200\n" 
    15 >>>>>>> dev 
     11"POT-Creation-Date: 2012-06-07 10:11+0200\n" 
    1612"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1713"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
     
    807803#: templates/telemeta/collection_detail.html:217 
    808804#: templates/telemeta/lists.html:58 
    809 #: templates/telemeta/mediaitem_detail.html:327 
     805#: templates/telemeta/mediaitem_detail.html:346 
    810806#: templates/telemeta/resource_detail.html:102 
    811807msgid "Delete" 
     
    10591055#: templates/telemeta/instrument_edit.html:7 
    10601056#: templates/telemeta/instrument_edit_value.html:5 
    1061 #: templates/telemeta/mediaitem_detail.html:193 
    10621057msgid "Instruments" 
    10631058msgstr "" 
     
    10791074#: templates/telemeta/base.html:165 
    10801075#: templates/telemeta/collection_detail.html:125 
    1081 #: templates/telemeta/mediaitem_detail.html:241 
    10821076msgid "Legal notices" 
    10831077msgstr "" 
     
    11761170 
    11771171#: templates/telemeta/collection_detail.html:103 
    1178 #: templates/telemeta/mediaitem_detail.html:230 
     1172#: templates/telemeta/mediaitem_detail.html:204 
    11791173#: templates/telemeta/resource_detail.html:73 
    11801174msgid "Last modification" 
     
    11821176 
    11831177#: templates/telemeta/collection_detail.html:112 
     1178#: templates/telemeta/mediaitem_detail.html:214 
    11841179msgid "Geographic and cultural informations" 
    11851180msgstr "" 
     
    11971192 
    11981193#: templates/telemeta/collection_detail.html:152 
    1199 #: templates/telemeta/mediaitem_detail.html:260 
     1194#: templates/telemeta/mediaitem_detail.html:284 
    12001195msgid "Archiving data" 
    12011196msgstr "" 
     
    12061201 
    12071202#: templates/telemeta/collection_detail.html:162 
    1208 #: templates/telemeta/mediaitem_detail.html:298 
     1203#: templates/telemeta/mediaitem_detail.html:315 
    12091204msgid "Comments" 
    12101205msgstr "" 
    12111206 
    12121207#: templates/telemeta/collection_detail.html:176 
    1213 #: templates/telemeta/mediaitem_detail.html:286 
     1208#: templates/telemeta/mediaitem_detail.html:300 
    12141209msgid "Technical data" 
    12151210msgstr "" 
    12161211 
    12171212#: templates/telemeta/collection_detail.html:181 
    1218 #: templates/telemeta/mediaitem_detail.html:226 
     1213#: templates/telemeta/mediaitem_detail.html:303 
    12191214msgid "Media type" 
    12201215msgstr "" 
     
    14691464msgstr "" 
    14701465 
     1466#: templates/telemeta/mediaitem_detail.html:196 
     1467msgid "Recording date" 
     1468msgstr "" 
     1469 
    14711470#: templates/telemeta/mediaitem_detail.html:200 
    1472 msgid "Recording date" 
    1473 msgstr "" 
    1474  
    1475 #: templates/telemeta/mediaitem_detail.html:208 
     1471msgid "Remarks" 
     1472msgstr "" 
     1473 
     1474#: templates/telemeta/mediaitem_detail.html:216 
    14761475#: templates/telemeta/inc/mediaitem_list.html:18 
    14771476msgid "Location" 
    14781477msgstr "" 
    14791478 
    1480 #: templates/telemeta/mediaitem_detail.html:215 
    1481 msgid "Interprets" 
    1482 msgstr "" 
    1483  
    1484 #: templates/telemeta/mediaitem_detail.html:223 
    1485 msgid "Remarks" 
    1486 msgstr "" 
    1487  
    1488 #: templates/telemeta/mediaitem_detail.html:243 
    1489 msgid "Organization" 
    1490 msgstr "" 
    1491  
    1492 #: templates/telemeta/mediaitem_detail.html:247 
    1493 msgid "Rights" 
    1494 msgstr "" 
    1495  
    1496 #: templates/telemeta/mediaitem_detail.html:273 
     1479#: templates/telemeta/mediaitem_detail.html:222 
     1480msgid "Language ISO" 
     1481msgstr "" 
     1482 
     1483#: templates/telemeta/mediaitem_detail.html:226 
     1484msgid "Ethnographic context" 
     1485msgstr "" 
     1486 
     1487#: templates/telemeta/mediaitem_detail.html:237 
     1488msgid "Musical informations" 
     1489msgstr "" 
     1490 
     1491#: templates/telemeta/mediaitem_detail.html:274 
     1492msgid "General informations" 
     1493msgstr "" 
     1494 
     1495#: templates/telemeta/mediaitem_detail.html:290 
    14971496msgid "Published references" 
    14981497msgstr "" 
  • telemeta/locale/de/LC_MESSAGES/djangojs.po

    r5856547 r19f0503  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 <<<<<<< HEAD 
    12 "POT-Creation-Date: 2012-05-31 15:31+0200\n" 
    13 ======= 
    14 "POT-Creation-Date: 2012-06-07 10:02+0200\n" 
    15 >>>>>>> dev 
     11"POT-Creation-Date: 2012-06-07 10:11+0200\n" 
    1612"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1713"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
  • telemeta/locale/fr/LC_MESSAGES/django.po

    rc43c968 r3e38b89  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-06-07 10:02+0200\n" 
     11"POT-Creation-Date: 2012-06-07 10:11+0200\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: Olivier Guilyardi <olivier samalyse com>\n" 
  • telemeta/locale/fr/LC_MESSAGES/djangojs.po

    r188eaaa r19f0503  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-06-07 10:02+0200\n" 
     11"POT-Creation-Date: 2012-06-07 10:11+0200\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n" 
  • CHANGELOG

    r0d62fe4 re6922a5  
    77 * EXPERIMENTAL: WebM and MP4 video handling for items, NO transcode but decode, add a nice video.js player 
    88 * RECOMMEND: install django-extensions 
     9 * transitional package to 1.5 (maybe 1.4.4 *soon*) 
    910 
    1011telemeta (1.4.2-1) unstable; urgency=low 
  • telemeta/models/media.py

    r521a3e9 r5856547  
    343343    contributor           = CharField(_('contributor')) 
    344344 
    345     # Legal mentions 
     345    # Legal notices 
    346346    organization          = WeakForeignKey('Organization', verbose_name=_('organization')) 
    347347    public_access         = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES, 
     
    365365    copied_from_item      = WeakForeignKey('self', related_name="copies", verbose_name=_('copy of')) 
    366366 
     367    # Technical data 
     368    approx_duration       = DurationField(_('approximative duration')) 
     369 
    367370    # Media 
    368371    file                  = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename") 
    369  
    370     # Technical data 
    371     approx_duration       = DurationField(_('approximative duration')) 
    372372 
    373373    # Manager 
  • telemeta/templates/telemeta/base.html

    r2c4c2e5b r99c44f5  
    4646<div id="logo"> 
    4747{% block logo %} 
    48 <a href="{% url telemeta-home %}"><img src="{% url telemeta-images "logo_telemeta_2.png" %}" alt="Telemeta" /></a> 
     48<a href="{% url telemeta-home %}"><img src="{{ STATIC_URL }}telemeta/images/logo_lam3.png" alt="Telemeta" /></a> 
    4949{% endblock %} 
    5050</div> 
  • telemeta/templates/telemeta/mediaitem_detail.html

    ra7f10c1 r4cc87cb  
    190190        <dl class="listing"> 
    191191            {% dl_field item "title" placeholder %} 
    192             {% dl_field item "alt_title" %} 
     192 
     193            <dt>{% trans "Instruments" %}</dt> 
     194            <dd> 
     195            {% if item.performances %} 
     196             {% for performance in item.performances.all %}{{ performance.instrument|default:"" }}, {% endfor %} 
     197            {% endif %} 
     198            </dd> 
     199 
     200            <dt>{% trans "Recording date" %}</dt> 
     201            <dd>{% if item.recorded_from_date %}{{ item.recorded_from_date }}{% endif %}{% if item.recorded_from_date and item.recorded_to_date%} - {% endif %}{% if item.recorded_to_date %}{{ item.recorded_to_date}}{% endif %}</dd> 
     202 
    193203            {% dl_field item "collector" placeholder %} 
     204 
    194205            <dt>{% field_label item "collection" %}</dt> 
    195206            <dd><a href="{% url telemeta-collection-detail item.collection.public_id %}">{{ item.collection }}</a></dd> 
    196             <dt>{% trans "Recording date" %}</dt> 
    197  
    198             <dd>{% if item.recorded_from_date %}{{ item.recorded_from_date }}{% endif %}{% if item.recorded_from_date and item.recorded_to_date%} - {% endif %}{% if item.recorded_to_date %}{{ item.recorded_to_date}}{% endif %}</dd> 
     207 
     208            <dt>{% trans "Location" %}</dt> 
     209            <dd>{% if item.location %}{{ item.location.fullnames|join:"<br/>" }}{% endif %}</dd> 
     210 
     211            {% dl_field item "summary" %} 
     212            {% dl_field item "scientist" %} 
     213            {% dl_field item "contributor" %} 
     214 
     215            <dt>{% trans "Interprets" %}</dt> 
     216            {% if item.performances %} 
     217             <dd>{% for performance in item.performances.all %}{{ performance.musicians|default:"" }}, {% endfor %}</dd> 
     218            {% endif %} 
     219 
     220            {% dl_field item "author" %} 
     221            {% dl_field item "subject" %} 
    199222 
    200223            <dt>{% trans "Remarks" %}</dt> 
    201224            <dd>{{ item.comment|html_line_break|safe }}</dd> 
    202225 
     226            <dt>{% trans "Media type" %}</dt> 
     227            <dd>{% trans mime_type|mime_to_media_type %}</dd> 
     228 
    203229            {% if last_revision %} 
    204             <dt>{% trans "Last modification" %}</dt> 
    205             <dd>{{ last_revision.time }} {% if user.is_authenticated %}(<a href="{% url telemeta-profile-detail last_revision.user.username %}">{{last_revision.user.username}}</a>){% endif %}</dd> 
     230                <dt>{% trans "Last modification" %}</dt> 
     231                <dd>{{ last_revision.time }} {% if user.is_authenticated %}(<a href="{% url telemeta-profile-detail last_revision.user.username %}">{{last_revision.user.username}}</a>){% endif %}</dd> 
    206232            {% endif %} 
    207  
    208233        </dl> 
    209234        {% endblock general_info %} 
    210235    </div> 
     236 
     237 
    211238    <div class="extraInfos"> 
    212         {% block geoethnic_data %} 
     239        {% block legal_notices %} 
    213240        <div> 
    214             <h4><a href="#">{% trans "Geographic and cultural informations" %}</a></h4> 
     241            <h4><a href="#">{% trans "Legal notices" %}</a></h4> 
    215242            <dl class="listing"> 
    216                 <dt>{% trans "Location" %}</dt> 
    217                 <dd>{% if item.location %}{{ item.location.fullnames|join:"<br/>" }}{% endif %}</dd> 
    218                 {% dl_field item "location_comment" %} 
    219                 {% dl_field item "cultural_area" %} 
    220                 {% dl_field item "language" %} 
    221                 {% if item.language_iso %} 
    222                 <dt>{% trans "Language ISO" %}</dt> 
    223                 <dd>{{ item.language_iso.name|to_utf8 }}</dd> 
    224                 {% endif %} 
    225                 {% dl_field item "ethnic_group" placeholder %} 
    226                 <dt>{% trans "Ethnographic context" %}</dt> 
    227                 <dd>{{ item.context_comment|html_line_break|safe }}</dd> 
    228                 {% dl_field item "keywords" join with ", " %} 
     243             <dt>{% trans "Organization" %}</dt> 
     244             <dd>{% organization %}</dd> 
     245             {% dl_field item "public_access_label" %} 
     246             {% dl_field item "depositor" %} 
     247             <dt>{% trans "Rights" %}</dt> 
     248             <dd>{% if item.performances %} 
     249             {% for performance in item.performances.all %}{{ performance.instrument|default:"" }}, {% endfor %} 
     250             {% endif %}{{ item.author }} 
     251            </dd> 
    229252            </dl> 
    230253        </div> 
    231         {% endblock geoethnic_data %} 
     254        {% endblock legal_notices %} 
    232255    </div> 
    233256 
    234257    <div class="extraInfos"> 
    235         {% block musical_data %} 
    236         <div> 
    237             <h4><a href="#">{% trans "Musical informations" %}</a></h4> 
    238             <dl class="listing"> 
    239                 {% dl_field item "vernacular_style" %} 
    240                 {% dl_field item "generic_style" %} 
    241                 {% dl_field item "author" %} 
    242             </dl> 
    243             {% if item.performances %} 
    244             <div class="instruments"> 
    245                 <table class="instruments"> 
    246                     <thead> 
    247                         <tr> 
    248                             <td>{% field_label "MediaItemPerformance" "instruments_num" %}</td> 
    249                             <td>{% field_label "MediaItemPerformance" "instrument" %}</td> 
    250                             <td>{% field_label "MediaItemPerformance" "alias" %}</td> 
    251                             <td>{% field_label "MediaItemPerformance" "musicians" %}</td> 
    252                         </tr> 
    253                     </thead> 
    254                     <tbody> 
    255                         {% for performance in item.performances.all %} 
    256                         <tr> 
    257                             <td>{{ performance.instruments_num }}</td> 
    258                             <td>{{ performance.instrument|default:"" }}</td> 
    259                             <td>{{ performance.alias|default:"" }}</td> 
    260                             <td>{{ performance.musicians }}</td> 
    261                         </tr> 
    262                         {% endfor %} 
    263                     </tbody> 
    264                 </table> 
    265             </div> 
    266             {% endif %} 
    267         </div> 
    268         {% endblock musical_data %} 
    269     </div> 
    270  
    271     <div class="extraInfos"> 
    272         {% block general_data %} 
    273         <div> 
    274             <h4><a href="#">{% trans "General informations" %}</a></h4> 
    275             <dl class="listing"> 
    276  
    277             </dl> 
    278         </div> 
    279         {% endblock general_data %} 
    280     </div> 
    281     <div class="extraInfos"> 
    282         {% block archive_data %} 
     258    {% block archive_data %} 
    283259        <div> 
    284260            <h4><a href="#">{% trans "Archiving data" %}</a></h4> 
     
    286262                {% dl_field item "code" %} 
    287263                {% dl_field item "old_code" %} 
    288                 {% dl_field item "track" %} 
     264                {% if format %} 
     265                 {% dl_field format "original_status" %} 
     266                 {% dl_field format "original_number" %} 
     267                {% endif %} 
     268                {% dl_field item "recordist" %} 
     269                {% if format %} 
     270                {% dl_field format "original_location" %} 
     271                {% endif %} 
    289272                {% dl_field item "creator_reference" %} 
    290273                <dt>{% trans "Published references" %}</dt> 
    291274                <dd>{{ item.external_references|html_line_break|safe }}</dd> 
    292                 {% dl_field item "public_access_label" %} 
     275                {% dl_field item "digitalist" %} 
     276                {% dl_field item "digitization_date" %} 
     277                {% dl_field item "publishing_date" %} 
    293278            </dl> 
    294279        </div> 
    295280        {% endblock archive_data %} 
    296281    </div> 
     282 
    297283    <div class="extraInfos"> 
    298284        {% block technical_data %} 
     
    301287            <div> 
    302288                <dl class="listing"> 
    303                     <dt>{% trans "Media type" %}</dt> 
    304                     <dd>{% trans mime_type|mime_to_media_type %}</dd> 
    305289                    {% dl_field item "approx_duration" %} 
    306  
    307290                    {% if format %} 
    308291                     {% dl_field format "physical_format" %} 
    309                      {% dl_field format "original_code" %} 
    310                      {% dl_field format "original_number" %} 
    311                      {% dl_field format "original_status" %} 
    312                      {% dl_field format "original_location" %} 
     292                     {% dl_field format "recording_system" %} 
     293                     {% dl_field format "original_channels" %} 
     294                     {% dl_field format "tape_speed" %} 
     295                     {% dl_field format "tape_wheel_diameter" %} 
     296                     {% dl_field format "tape_vendor" %} 
     297                     {% dl_field format "tape_reference" %} 
     298                     <dt>{% trans "Comments" %}</dt> 
     299                     <dd>{{ format.original_comments|html_line_break|safe }}</dd> 
     300                     {% dl_field format "tape_thickness" %} 
     301                     {% dl_field format "sticker_presence" %} 
    313302                     {% dl_field format "original_state" %} 
    314303                     {% dl_field format "original_audio_quality" %} 
    315                      <dt>{% trans "Comments" %}</dt> 
    316                      <dd>{{ format.original_comments|html_line_break|safe }}</dd> 
    317                      {% dl_field format "tape_wheel_diameter" %} 
    318                      {% dl_field format "tape_thickness" %} 
    319                      {% dl_field format "tape_speed" %} 
    320                      {% dl_field format "tape_vendor" %} 
    321                      {% dl_field format "tape_reference" %} 
    322                      {% dl_field format "sticker_presence" %} 
    323304                    {% endif %} 
    324305                </dl> 
  • telemeta/templates/telemeta/mediaitem_edit.html

    rbc866e5 r1d503bb  
    1717    {% for form in forms %} 
    1818    <tr><td colspan="2">{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</td></tr> 
     19    <tr><td colspan="2"><h2>{{ form.prefix|capitalize }}</h2><hr /></td></tr> 
     20 
    1921    {% for field in form %} 
    2022    <tr> 
     
    3638    {% endfor %} 
    3739    </table> 
     40    <hr /> 
    3841    <div align="center" style="margin-top:3ex;"> 
    3942    <a href="{% url telemeta-item-detail item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a> 
  • telemeta/urls.py

    rc676291 r1d503bb  
    123123    url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/related_edit/$', item_view.related_media_edit,  dict(template='telemeta/mediaitem_related_edit.html'), name="telemeta-item-related_edit"), 
    124124    # Markers 
    125     url(r'^markers/(?P<marker_id>[A-Za-z0-9]+)/$', item_view.item_detail, name="telemeta-item-detail-marker"), 
     125    url(r'^archives/markers/(?P<marker_id>[A-Za-z0-9]+)/$', item_view.item_detail, name="telemeta-item-detail-marker"), 
    126126    # FIXME: need all paths 
    127127    url(r'^items/(?P<path>[A-Za-z0-9._-s/]+)/$', redirect_to, {'url': '/archives/items/%(path)s/', 'permanent': False}, name="telemeta-item-redir"), 
Note: See TracChangeset for help on using the changeset viewer.