From: yomguy Date: Wed, 11 May 2011 21:18:12 +0000 (+0200) Subject: update media autonomous minimal player (working), big title cleanup X-Git-Tag: 1.1~201 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6e65a5b3c4b87ca9d8209aafde163ea01ca535c8;p=telemeta.git update media autonomous minimal player (working), big title cleanup --- diff --git a/INSTALL b/INSTALL index f1492d4e..c0670861 100644 --- a/INSTALL +++ b/INSTALL @@ -148,7 +148,7 @@ Add the following variables: TELEMETA_SUBJECTS = tuple of subject keywords (used for Dublin Core), such as "Ethnology", etc... TELEMETA_CACHE_DIR = absolute path to the cache directory that you just created TELEMETA_GMAP_KEY = your Google Map API key - TELEMETA_DOWNLOAD_ENABLED = True to enable audio data download + TELEMETA_DOWNLOAD_ENABLED = True to enable raw audio data download TELEMETA_STREAMING_FORMATS = tuple of authoized streaming formats. Ex : ('mp3', 'ogg') TELEMETA_PUBLIC_ACCESS_PERIOD = number of years above which item files are automagically published EMAIL_HOST = your default SMTP server diff --git a/telemeta/templates/telemeta_default/base.html b/telemeta/templates/telemeta_default/base.html index bac8560a..817b092e 100644 --- a/telemeta/templates/telemeta_default/base.html +++ b/telemeta/templates/telemeta_default/base.html @@ -7,6 +7,7 @@ {% get_available_languages as LANGUAGES %} {%block head_title %}{% organization %} - Telemeta{% endblock %} + {% block stylesheets %} @@ -17,23 +18,25 @@ {% endblock %} + +{% block javascript %} - {% if user.is_authenticated %} - + {% else %} - + {% endif %} -{% block extra_javascript %}{% endblock %} - - +{% endblock %} +{% block extra_javascript %}{% endblock %} +
+{% block header %} +{% endblock header %}
- +

{% block title %}{% endblock %}

{% block title %}{% endblock %}

 {% block title_buttons %}{% endblock %}
{% block content %}{% endblock %}
- diff --git a/telemeta/templates/telemeta_default/collection_add.html b/telemeta/templates/telemeta_default/collection_add.html index ff77b629..df9c6269 100644 --- a/telemeta/templates/telemeta_default/collection_add.html +++ b/telemeta/templates/telemeta_default/collection_add.html @@ -3,7 +3,7 @@ {% load telemeta_utils %} {% block title %} -

Collection : NEW

+ Collection : NEW {% endblock %} {% block title_buttons %} diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html index 7e9838eb..6db326f9 100644 --- a/telemeta/templates/telemeta_default/collection_detail.html +++ b/telemeta/templates/telemeta_default/collection_detail.html @@ -34,7 +34,7 @@ {% if collection %} {% block title %} -

Collection : {{ collection.title }}

+ Collection : {{ collection.title }} {% endblock %} {% block title_buttons %} diff --git a/telemeta/templates/telemeta_default/collection_edit.html b/telemeta/templates/telemeta_default/collection_edit.html index fa5fd405..9182bbc8 100644 --- a/telemeta/templates/telemeta_default/collection_edit.html +++ b/telemeta/templates/telemeta_default/collection_edit.html @@ -3,7 +3,7 @@ {% load telemeta_utils %} {% block title %} -

Collection : {{ collection }}

+ Collection : {{ collection }} {% endblock %} {% block title_buttons %} {% trans "Cancel" %} diff --git a/telemeta/templates/telemeta_default/collection_list.html b/telemeta/templates/telemeta_default/collection_list.html index 914f4be8..ac18e1e9 100644 --- a/telemeta/templates/telemeta_default/collection_list.html +++ b/telemeta/templates/telemeta_default/collection_list.html @@ -5,8 +5,9 @@ {% block head_title %}{% trans "Media Collections" %} - {{ block.super }}{% endblock %} {% block title%} -

{% trans "Media Collections" %}

+ {% trans "Media Collections" %} {% endblock %} + {% block title_buttons %} {% trans "All" %} {% trans "Unpublished" %} @@ -22,5 +23,4 @@ {% include "telemeta/inc/collection_list.html" %}
{% endwith %} - {% endblock %} diff --git a/telemeta/templates/telemeta_default/geo_continents.html b/telemeta/templates/telemeta_default/geo_continents.html index ef557d5d..3b861523 100644 --- a/telemeta/templates/telemeta_default/geo_continents.html +++ b/telemeta/templates/telemeta_default/geo_continents.html @@ -17,7 +17,7 @@ var resourceMap = new ResourceMap('.continents', { {% endblock %} {% block title %} -

{% trans "Geographic Navigator" %}

+ {% trans "Geographic Navigator" %} {% endblock %} {% block title_buttons %} diff --git a/telemeta/templates/telemeta_default/geo_countries.html b/telemeta/templates/telemeta_default/geo_countries.html index 30bee517..6e22bdd7 100644 --- a/telemeta/templates/telemeta_default/geo_countries.html +++ b/telemeta/templates/telemeta_default/geo_countries.html @@ -5,8 +5,7 @@ {% block head_title %}{{ continent }} - {% trans "Geographic Navigator" %} - {{ block.super }}{% endblock %} {% block title %} -

{% trans "World" %} / - {{ continent }}

+ {% trans "World" %} / {{ continent }} {% endblock title %} {% block content %} diff --git a/telemeta/templates/telemeta_default/geo_country_collections.html b/telemeta/templates/telemeta_default/geo_country_collections.html index f12f97f9..624c0301 100644 --- a/telemeta/templates/telemeta_default/geo_country_collections.html +++ b/telemeta/templates/telemeta_default/geo_country_collections.html @@ -4,15 +4,15 @@ {% block head_title %}{{ country }} - {% trans "Geographic Navigator" %} - {{ block.super }}{% endblock %} -{% block content %} -

{% trans "World" %} / - {{ continent }} - / {{ country }}

+{% block title %} + {% trans "World" %} / + {{ continent }} / {{ country }} +{% endblock title %} +{% block content %} {% with object_list as collections %}
{% include "telemeta/inc/collection_list.html" %}
{% endwith %} - {% endblock %} diff --git a/telemeta/templates/telemeta_default/inc/mediaitem_list.html b/telemeta/templates/telemeta_default/inc/mediaitem_list.html index 3c6e48bf..cc09245c 100644 --- a/telemeta/templates/telemeta_default/inc/mediaitem_list.html +++ b/telemeta/templates/telemeta_default/inc/mediaitem_list.html @@ -1,6 +1,7 @@ {% load telemeta_utils %} {% load i18n %} {% if items %} + {% if hits %}

{% blocktrans %}Items {{ first_on_page }} to {{ last_on_page }} on {{ hits }}{% endblocktrans %} diff --git a/telemeta/templates/telemeta_default/login.html b/telemeta/templates/telemeta_default/login.html index db020262..659df29a 100644 --- a/telemeta/templates/telemeta_default/login.html +++ b/telemeta/templates/telemeta_default/login.html @@ -2,7 +2,7 @@ {% load i18n %} {% block title %} -

{% trans "User authentication" %}

+ {% trans "User authentication" %} {% endblock %} {% block content %} diff --git a/telemeta/templates/telemeta_default/mediaitem_add.html b/telemeta/templates/telemeta_default/mediaitem_add.html index 632ed544..bca4bfcf 100644 --- a/telemeta/templates/telemeta_default/mediaitem_add.html +++ b/telemeta/templates/telemeta_default/mediaitem_add.html @@ -4,11 +4,11 @@ {% block head_title %}{% trans "Item" %}- {{ block.super }}{% endblock %} - {% if item %} {% block title %} -

Item : NEW

+ Item : NEW {% endblock %} + {% block title_buttons %} {% if perms.telemeta.add_mediaitem %}

Item : NEW

+ Item : NEW {% endblock %} + {% block title_buttons %} {% if user.is_authenticated and perms.telemeta.add_mediaitem %} {% trans "Cancel" %} @@ -43,6 +44,5 @@ - {% endblock infos %} - + {% endblock infos %} {% endblock %} diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html index 92828016..b829d80a 100644 --- a/telemeta/templates/telemeta_default/mediaitem_detail.html +++ b/telemeta/templates/telemeta_default/mediaitem_detail.html @@ -80,17 +80,15 @@ }); - - {% endif %} {% endblock %} - {% if item %} {% block title %} -

Item : {{ item }}

+ Item : {{ item }} {% endblock %} + {% block title_buttons %}
{% if user.is_authenticated and perms.telemeta.change_mediaitem %} @@ -107,7 +105,6 @@ {% endblock %} {% block content %} -
{% if item.file %} {% if public_access or user.is_staff %} diff --git a/telemeta/templates/telemeta_default/mediaitem_detail_dc.html b/telemeta/templates/telemeta_default/mediaitem_detail_dc.html index 59f6bb71..0347be9c 100644 --- a/telemeta/templates/telemeta_default/mediaitem_detail_dc.html +++ b/telemeta/templates/telemeta_default/mediaitem_detail_dc.html @@ -4,7 +4,7 @@ {% if item %} {% block title_buttons %} - {% trans "Normal View" %} + {% trans "Normal View" %} {% endblock %} {% block infos %} diff --git a/telemeta/templates/telemeta_default/mediaitem_edit.html b/telemeta/templates/telemeta_default/mediaitem_edit.html index 6a71ce6c..afa7f6f0 100644 --- a/telemeta/templates/telemeta_default/mediaitem_edit.html +++ b/telemeta/templates/telemeta_default/mediaitem_edit.html @@ -2,45 +2,45 @@ {% load i18n %} {% load telemeta_utils %} - {% block title %} -

Item : {{ item }}

- {% endblock %} - - {% block title_buttons %} - {% trans "Cancel" %} - {% endblock %} +{% block title %} + Item : {{ item }} +{% endblock %} - {% block infos %} -
-
{% csrf_token %} - - - {% for field in form %} - {% if not field.html_name == "copied_from_item" %} - - - - {% if field.html_name == "file" %} - - {% else %} - {% if field.html_name == "collection" %} - - {% else %} - - {% endif %} - {% endif %} - - {% else %} - - {% endif %} - {% endfor %} -
{% for error in form.non_field_errors %}
  • {{ error }}
    • {% endfor %}
    {{ field.errors }}
    {{ field.label_tag }}: {{ item.file.name }}
    {{ field }}    		{{ field }}
     {% trans "Title" %} : {{ item.collection.title }}    		{{ field }}
    {{ field.label_tag.as_hidden }}{{ field.as_hidden }}
    - -
    +{% block title_buttons %} +{% trans "Cancel" %} +{% endblock %} + +{% block infos %} +
    +
    {% csrf_token %} + + + {% for field in form %} + {% if not field.html_name == "copied_from_item" %} + + + + {% if field.html_name == "file" %} + + {% else %} + {% if field.html_name == "collection" %} + + {% else %} + + {% endif %} + {% endif %} + + {% else %} + + {% endif %} + {% endfor %} +
    {% for error in form.non_field_errors %}
  • {{ error }}
    • {% endfor %}
    {{ field.errors }}
    {{ field.label_tag }}: {{ item.file.name }}
    {{ field }}    		{{ field }}
     {% trans "Title" %} : {{ item.collection.title }}    		{{ field }}
    {{ field.label_tag.as_hidden }}{{ field.as_hidden }}
    + - {% endblock infos %} +
    +
    +{% endblock infos %} diff --git a/telemeta/templates/telemeta_default/mediaitem_list.html b/telemeta/templates/telemeta_default/mediaitem_list.html index c83cc57a..19ac64a1 100644 --- a/telemeta/templates/telemeta_default/mediaitem_list.html +++ b/telemeta/templates/telemeta_default/mediaitem_list.html @@ -5,8 +5,9 @@ {% block head_title %}{% trans "Media Items" %} - {{ block.super }}{% endblock %} {% block title %} -

    {% trans "Media Items" %}

    + {% trans "Media Items" %} {% endblock %} + {% block title_buttons %} {% if user.is_authenticated and perms.telemeta.add_mediaitem %} {% trans "Add" %} @@ -19,5 +20,4 @@ {% include "telemeta/inc/mediaitem_list.html" %}
    {% endwith %} - {% endblock %} diff --git a/telemeta/templates/telemeta_default/mediaitem_performances_edit.html b/telemeta/templates/telemeta_default/mediaitem_performances_edit.html index c44c7161..84547a2c 100644 --- a/telemeta/templates/telemeta_default/mediaitem_performances_edit.html +++ b/telemeta/templates/telemeta_default/mediaitem_performances_edit.html @@ -2,15 +2,15 @@ {% load i18n %} {% load telemeta_utils %} -{% block extra_javascript %} +{% block extra_javascript %}{% endblock %} + +{% block title %} + Item : {{ item }} {% endblock %} - {% block title %} -

    Item : {{ item }}

    - {% endblock %} - {% block title_buttons %} - {% trans "Cancel" %} - {% endblock %} +{% block title_buttons %} + {% trans "Cancel" %} +{% endblock %} {% block content %} {% block infos %} @@ -37,16 +37,13 @@
    {% endfor %} -
    {% trans "Cancel" %} {% trans "Save" %}
    -
    - {% endblock infos %} {% endblock content %} diff --git a/telemeta/templates/telemeta_default/mediaitem_player.html b/telemeta/templates/telemeta_default/mediaitem_player.html index 29fd10c9..eac13d39 100644 --- a/telemeta/templates/telemeta_default/mediaitem_player.html +++ b/telemeta/templates/telemeta_default/mediaitem_player.html @@ -1,177 +1,25 @@ - - - - -{% load i18n %} +{% extends "telemeta/mediaitem_detail.html" %} {% load telemeta_utils %} +{% load i18n %} -{%block head_title %}{% organization %} - Telemeta - {% trans "Item" %} : {{ item.title }}{% endblock%} - -{% block stylesheets %} - - - - -{% endblock %} - - - - -{% block extra_javascript %} - - - -{% endblock %} - -{% if user.is_authenticated and perms.telemeta.change_mediaitem %} - -{% else %} - -{% endif %} - - - - +{% block header %}{% endblock %} +{% block title %}{% endblock %} +{% block title_buttons %}{% endblock %} {% block content %} -
    {% if item.file %} {% if public_access or user.is_staff %} -
    - Minimize -
    -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -
    -  Visualization : - - -
    -
    - -
    - -   - Loading... - - -
    - -
    - -
    - - - - - - - -
    {% trans "Property" %}{% trans "Value" %}{% trans "Unit" %}
    -
    - - - {% if audio_export_enabled %} -
    -

    {% trans "Download:" %} - {% for format in export_formats %} - - {{ format.extension }} - {% endfor %}

    -
    - {% endif %} -
    {% endif %} - {% endif %} - +{% endif %}
    - {% endblock %} - - \ No newline at end of file +{% block footer %}{% endblock %} diff --git a/telemeta/templates/telemeta_default/messages.html b/telemeta/templates/telemeta_default/messages.html index 6eabeab5..c0442bea 100644 --- a/telemeta/templates/telemeta_default/messages.html +++ b/telemeta/templates/telemeta_default/messages.html @@ -2,14 +2,11 @@ {% load i18n %} {% block content %} - {% if messages %} {% for message in messages %}

    {{ message }}

    {{ description }} - {% endfor %} {% endif %} - {% endblock %} diff --git a/telemeta/templates/telemeta_default/profile_detail.html b/telemeta/templates/telemeta_default/profile_detail.html index 0b01b019..a901f13a 100644 --- a/telemeta/templates/telemeta_default/profile_detail.html +++ b/telemeta/templates/telemeta_default/profile_detail.html @@ -4,6 +4,10 @@ {% block head_title %}{% trans "User Profile" %} : {{ usr.username }}{% endblock %} +{% block title %} + {% trans "User profile" %} : {{ usr.username }} +{% endblock %} + {% block content %}

    {% block modules %} @@ -21,9 +25,8 @@
    {% endblock %} -
    + -

    {% trans "User profile" %} : {{ usr.username }}

    {% trans "First Name" %}
    {{ usr.first_name }}
    diff --git a/telemeta/templates/telemeta_default/profile_edit.html b/telemeta/templates/telemeta_default/profile_edit.html index 7bf81845..31b7693d 100644 --- a/telemeta/templates/telemeta_default/profile_edit.html +++ b/telemeta/templates/telemeta_default/profile_edit.html @@ -2,12 +2,13 @@ {% load i18n %} {% load telemeta_utils %} -{% trans "Cancel" %} +{% block title_buttons %} + {% trans "Cancel" %} +{% endblock %} {% block content %} -

    {% trans "User profile" %} : {{ usr.username }}

    - +
    {% csrf_token %} {% for form in forms %} diff --git a/telemeta/templates/telemeta_default/registration/password_change_done.html b/telemeta/templates/telemeta_default/registration/password_change_done.html index 77197a03..3d3d9fac 100644 --- a/telemeta/templates/telemeta_default/registration/password_change_done.html +++ b/telemeta/templates/telemeta_default/registration/password_change_done.html @@ -1,9 +1,10 @@ {% extends "telemeta/base.html" %} {% load i18n %} {% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}{% trans 'Documentation' %} / {% endif %}{% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} + {% block breadcrumbs %}
    {% trans 'Home' %} › {% trans 'Password change' %}
    {% endblock %} -{% block title %}

    {% trans 'Password change successful' %}

    {% endblock %} +{% block title %}
    {% trans 'Password change successful' %}{% endblock %} {% block content %} diff --git a/telemeta/templates/telemeta_default/registration/password_change_form.html b/telemeta/templates/telemeta_default/registration/password_change_form.html index a3657170..4f138ef1 100644 --- a/telemeta/templates/telemeta_default/registration/password_change_form.html +++ b/telemeta/templates/telemeta_default/registration/password_change_form.html @@ -4,7 +4,7 @@ {% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}{% trans 'Documentation' %} / {% endif %} {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} {% block breadcrumbs %}
    {% trans 'Home' %} › {% trans 'Password change' %}
    {% endblock %} -{% block title %}

    {% trans 'Password change' %}

    {% endblock %} +{% block title %}
    {% trans 'Password change' %}{% endblock %} {% block content %}
    diff --git a/telemeta/templates/telemeta_default/registration/password_reset_complete.html b/telemeta/templates/telemeta_default/registration/password_reset_complete.html index 8df0b86d..92eda265 100644 --- a/telemeta/templates/telemeta_default/registration/password_reset_complete.html +++ b/telemeta/templates/telemeta_default/registration/password_reset_complete.html @@ -3,7 +3,7 @@ {% block breadcrumbs %}
    {% trans 'Home' %} › {% trans 'Password reset' %}
    {% endblock %} -{% block title %}

    {% trans 'Password reset complete' %}

    {% endblock %} +{% block title %}
    {% trans 'Password reset complete' %}{% endblock %} {% block content %} diff --git a/telemeta/templates/telemeta_default/registration/password_reset_confirm.html b/telemeta/templates/telemeta_default/registration/password_reset_confirm.html index bc8a06fc..990c45ee 100644 --- a/telemeta/templates/telemeta_default/registration/password_reset_confirm.html +++ b/telemeta/templates/telemeta_default/registration/password_reset_confirm.html @@ -3,7 +3,7 @@ {% block breadcrumbs %}
    {% trans 'Home' %} › {% trans 'Password reset confirmation' %}
    {% endblock %} -{% block title %}

    {% trans 'Password reset' %}

    {% endblock %} +{% block title %}
    {% trans 'Password reset' %}{% endblock %} {% block content %} diff --git a/telemeta/templates/telemeta_default/registration/password_reset_done.html b/telemeta/templates/telemeta_default/registration/password_reset_done.html index 322ac703..28417954 100644 --- a/telemeta/templates/telemeta_default/registration/password_reset_done.html +++ b/telemeta/templates/telemeta_default/registration/password_reset_done.html @@ -3,7 +3,7 @@ {% block breadcrumbs %}
    {% trans 'Home' %} › {% trans 'Password reset' %}
    {% endblock %} -{% block title %}

    {% trans 'Password reset successful' %}

    {% endblock %} +{% block title %}
    {% trans 'Password reset successful' %}{% endblock %} {% block content %} diff --git a/telemeta/templates/telemeta_default/registration/password_reset_form.html b/telemeta/templates/telemeta_default/registration/password_reset_form.html index ddfd6f99..cedf1146 100644 --- a/telemeta/templates/telemeta_default/registration/password_reset_form.html +++ b/telemeta/templates/telemeta_default/registration/password_reset_form.html @@ -3,7 +3,7 @@ {% block breadcrumbs %}
    {% trans 'Home' %} › {% trans 'Password reset' %}
    {% endblock %} -{% block title %}

    {% trans "Password reset" %}

    {% endblock %} +{% block title %}
    {% trans "Password reset" %}{% endblock %} {% block content %} diff --git a/telemeta/templates/telemeta_default/search_criteria.html b/telemeta/templates/telemeta_default/search_criteria.html index da523e32..6ed4fd44 100644 --- a/telemeta/templates/telemeta_default/search_criteria.html +++ b/telemeta/templates/telemeta_default/search_criteria.html @@ -52,7 +52,7 @@ $(document).ready(function () { {% endblock %} {% block title %} -

    {% trans "Advanced Search" %}

    + {% trans "Advanced Search" %} {% endblock %} {% block content %} diff --git a/telemeta/templates/telemeta_default/search_results.html b/telemeta/templates/telemeta_default/search_results.html index a6ab0d62..56e1c331 100644 --- a/telemeta/templates/telemeta_default/search_results.html +++ b/telemeta/templates/telemeta_default/search_results.html @@ -5,7 +5,7 @@ {% block head_title %}{% trans "Search Results" %} - {{ block.super }}{% endblock %} {% block title %} -

    {% trans "Search Results" %}

    + {% trans "Search Results" %} {% endblock %} {% block content %}