From: yomguy Date: Fri, 24 Jun 2011 16:43:07 +0000 (+0200) Subject: 100 of last revisions in RSS, fix save buttons for item, remove TELEMETA_OAI_HOST_NAM... X-Git-Tag: 1.1~53 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=75617ad26e461a37919bf7eccb60bd4c800dc1f0;p=telemeta.git 100 of last revisions in RSS, fix save buttons for item, remove TELEMETA_OAI_HOST_NAME global parameter, add TELEMETA_DESCRIPTION and parsing it to each page title --- diff --git a/INSTALL.rst b/INSTALL.rst index 8e423c6f..c91bf132 100644 --- a/INSTALL.rst +++ b/INSTALL.rst @@ -166,6 +166,7 @@ Add the following variables: TELEMETA_ORGANIZATION = name of the organization which hosts this installation TELEMETA_SUBJECTS = tuple of subject keywords (used for Dublin Core), such as "Ethnology", etc... + TELEMETA_DESCRIPTION = the description of the site 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 raw audio data download @@ -173,7 +174,6 @@ Add the following variables: TELEMETA_PUBLIC_ACCESS_PERIOD = number of years above which item files are automagically published EMAIL_HOST = your default SMTP server DEFAULT_FROM_EMAIL = the default sending email address - TELEMETA_OAI_REPOSITORY_NAME = the description of the OAI data provider Just paste the lines below:: diff --git a/example/sandbox/settings.py b/example/sandbox/settings.py index f85fe5eb..8ff9c2cc 100644 --- a/example/sandbox/settings.py +++ b/example/sandbox/settings.py @@ -110,14 +110,13 @@ TEMPLATE_CONTEXT_PROCESSORS = ( TELEMETA_ORGANIZATION = 'Parisson' TELEMETA_SUBJECTS = ('test', 'telemeta', 'sandbox') +TELEMETA_DESCRIPTION = "Telemeta TEST sandbox" TELEMETA_GMAP_KEY = '***************************************************************************' TELEMETA_DOWNLOAD_ENABLED = True TELEMETA_STREAMING_FORMATS = ('mp3', 'ogg') TELEMETA_PUBLIC_ACCESS_PERIOD = 51 AUTH_PROFILE_MODULE = 'telemeta.userprofile' -TELEMETA_OAI_REPOSITORY_NAME = "Telemeta TEST sandbox" - LOGIN_URL = '/login' LOGIN_REDIRECT_URL = '/' EMAIL_HOST = 'smtp.free.fr' diff --git a/telemeta/templates/telemeta_default/base.html b/telemeta/templates/telemeta_default/base.html index c6e544c0..fb423e7a 100644 --- a/telemeta/templates/telemeta_default/base.html +++ b/telemeta/templates/telemeta_default/base.html @@ -7,7 +7,7 @@ -{%block head_title %}{% organization %} - Telemeta{% endblock %} +{%block head_title %}{% organization %} - Telemeta - {% description %}{% endblock %} {% block stylesheets %} diff --git a/telemeta/templates/telemeta_default/collection_add.html b/telemeta/templates/telemeta_default/collection_add.html index 49cf82a3..e1f3bed6 100644 --- a/telemeta/templates/telemeta_default/collection_add.html +++ b/telemeta/templates/telemeta_default/collection_add.html @@ -24,7 +24,7 @@ {% endif %} {% endfor %} -
+
{% trans "Cancel" %} {% trans "Save" %} diff --git a/telemeta/templates/telemeta_default/collection_edit.html b/telemeta/templates/telemeta_default/collection_edit.html index 62331a7d..d4bcb7a6 100644 --- a/telemeta/templates/telemeta_default/collection_edit.html +++ b/telemeta/templates/telemeta_default/collection_edit.html @@ -23,7 +23,7 @@ {% endif %} {% endfor %} -
+
{% trans "Cancel" %} {% trans "Save" %} diff --git a/telemeta/templates/telemeta_default/mediaitem_add.html b/telemeta/templates/telemeta_default/mediaitem_add.html index 03615c75..31aefe87 100644 --- a/telemeta/templates/telemeta_default/mediaitem_add.html +++ b/telemeta/templates/telemeta_default/mediaitem_add.html @@ -31,7 +31,7 @@ {% endif %} {% endfor %} -
+
{% trans "Cancel" %} -
+
{% trans "Cancel" %} {% trans "Save" %} diff --git a/telemeta/templates/telemeta_default/mediaitem_edit.html b/telemeta/templates/telemeta_default/mediaitem_edit.html index c916ea7e..eb130a57 100644 --- a/telemeta/templates/telemeta_default/mediaitem_edit.html +++ b/telemeta/templates/telemeta_default/mediaitem_edit.html @@ -37,7 +37,7 @@ {% endif %} {% endfor %} -