From: yomguy Date: Fri, 29 Apr 2011 08:46:31 +0000 (+0200) Subject: fix help and legal_notices translated pages, add set_var template tag X-Git-Tag: 1.1~266 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=304e1c2043fe1f3d7aa395610ddf3d60c7fb93d0;p=telemeta.git fix help and legal_notices translated pages, add set_var template tag --- diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css index ba0a1e06..8321625d 100644 --- a/telemeta/htdocs/css/telemeta.css +++ b/telemeta/htdocs/css/telemeta.css @@ -488,7 +488,7 @@ form.login .submit { font-size: 10px; border-top: 1px solid; height: 31px; - padding: 0.5em; + padding: 0.5em 0.5em 0.7em 0.5em; margin-top: 2.5em; } #footer :link, #footer :visited { color: #FFF; } diff --git a/telemeta/pages/default/parts/help-en.rst b/telemeta/pages/default/parts/help-en.rst new file mode 100644 index 00000000..10c1e681 --- /dev/null +++ b/telemeta/pages/default/parts/help-en.rst @@ -0,0 +1,15 @@ +======================== +Help page for Telemeta +======================== + +Glossary : + +#. Introduction +#. First time +#. Models +#. Interface +#. Advanced functions + +For more informations, see `telemeta.org `_ + + diff --git a/telemeta/pages/default/parts/help-fr.rst b/telemeta/pages/default/parts/help-fr.rst new file mode 100644 index 00000000..e6707145 --- /dev/null +++ b/telemeta/pages/default/parts/help-fr.rst @@ -0,0 +1,15 @@ +======================== +Page d'aide Telemeta +======================== + +Plan : + +#. Introduction +#. Prise en main +#. Modèles +#. Interface +#. Fonctions avancées + +Pour plus d'informations, voir `telemeta.org `_ + + diff --git a/telemeta/pages/default/parts/help.rst b/telemeta/pages/default/parts/help.rst deleted file mode 100644 index e6707145..00000000 --- a/telemeta/pages/default/parts/help.rst +++ /dev/null @@ -1,15 +0,0 @@ -======================== -Page d'aide Telemeta -======================== - -Plan : - -#. Introduction -#. Prise en main -#. Modèles -#. Interface -#. Fonctions avancées - -Pour plus d'informations, voir `telemeta.org `_ - - diff --git a/telemeta/pages/default/parts/home-en.rst b/telemeta/pages/default/parts/home-en.rst new file mode 100644 index 00000000..38fe1403 --- /dev/null +++ b/telemeta/pages/default/parts/home-en.rst @@ -0,0 +1,23 @@ +=================================================== +Telemeta : Web Audio Content Management System +=================================================== + +Telemeta is a web audio archiving program which introduces useful and secure methods to backup, index, transcode, analyse and publish any digitalized audio file with its metadata. It is dedicated to professionnals who wants to easily backup and publish documented sounds from collections of vinyls, magnetic tapes or audio CDs over a strong database, in accordance with open standards. + +Here are the main features of Telemeta: + +* Secure archiving, editing and publishing of audio files over internet. +* User friendly web frontend including workflows and high level search methods +* Smart dynamical and skinnable audio player (thanks to Timeside and soundmanager2) +* "On the fly" analyzing, transcoding and metadata embedding based on an easy plugin architecture +* Multi-format support : FLAC, OGG, MP3, WAV and more +* GEO Navigator for audio geolocalization +* DublinCore compatibility +* OAI-PMH data provider +* XML serialized backup +* Strong SQL backend + +The Telemeta data model is based on 'collections' and 'items'. A collection is described by its metadata and includes original audio items (sounds) and its own metadata. This existing model has been designed to fit the one of the French Centre of Etnomusicology (CREM) but could be easily adapted/overrided to suit other data structures. + + + diff --git a/telemeta/pages/default/parts/home-fr.rst b/telemeta/pages/default/parts/home-fr.rst new file mode 100644 index 00000000..38fe1403 --- /dev/null +++ b/telemeta/pages/default/parts/home-fr.rst @@ -0,0 +1,23 @@ +=================================================== +Telemeta : Web Audio Content Management System +=================================================== + +Telemeta is a web audio archiving program which introduces useful and secure methods to backup, index, transcode, analyse and publish any digitalized audio file with its metadata. It is dedicated to professionnals who wants to easily backup and publish documented sounds from collections of vinyls, magnetic tapes or audio CDs over a strong database, in accordance with open standards. + +Here are the main features of Telemeta: + +* Secure archiving, editing and publishing of audio files over internet. +* User friendly web frontend including workflows and high level search methods +* Smart dynamical and skinnable audio player (thanks to Timeside and soundmanager2) +* "On the fly" analyzing, transcoding and metadata embedding based on an easy plugin architecture +* Multi-format support : FLAC, OGG, MP3, WAV and more +* GEO Navigator for audio geolocalization +* DublinCore compatibility +* OAI-PMH data provider +* XML serialized backup +* Strong SQL backend + +The Telemeta data model is based on 'collections' and 'items'. A collection is described by its metadata and includes original audio items (sounds) and its own metadata. This existing model has been designed to fit the one of the French Centre of Etnomusicology (CREM) but could be easily adapted/overrided to suit other data structures. + + + diff --git a/telemeta/pages/default/parts/home.rst b/telemeta/pages/default/parts/home.rst deleted file mode 100644 index 38fe1403..00000000 --- a/telemeta/pages/default/parts/home.rst +++ /dev/null @@ -1,23 +0,0 @@ -=================================================== -Telemeta : Web Audio Content Management System -=================================================== - -Telemeta is a web audio archiving program which introduces useful and secure methods to backup, index, transcode, analyse and publish any digitalized audio file with its metadata. It is dedicated to professionnals who wants to easily backup and publish documented sounds from collections of vinyls, magnetic tapes or audio CDs over a strong database, in accordance with open standards. - -Here are the main features of Telemeta: - -* Secure archiving, editing and publishing of audio files over internet. -* User friendly web frontend including workflows and high level search methods -* Smart dynamical and skinnable audio player (thanks to Timeside and soundmanager2) -* "On the fly" analyzing, transcoding and metadata embedding based on an easy plugin architecture -* Multi-format support : FLAC, OGG, MP3, WAV and more -* GEO Navigator for audio geolocalization -* DublinCore compatibility -* OAI-PMH data provider -* XML serialized backup -* Strong SQL backend - -The Telemeta data model is based on 'collections' and 'items'. A collection is described by its metadata and includes original audio items (sounds) and its own metadata. This existing model has been designed to fit the one of the French Centre of Etnomusicology (CREM) but could be easily adapted/overrided to suit other data structures. - - - diff --git a/telemeta/pages/default/parts/legal_notices-en.rst b/telemeta/pages/default/parts/legal_notices-en.rst new file mode 100644 index 00000000..8481e3b8 --- /dev/null +++ b/telemeta/pages/default/parts/legal_notices-en.rst @@ -0,0 +1,7 @@ +================== +Legal notices +================== + +... + + diff --git a/telemeta/pages/default/parts/legal_notices-fr.rst b/telemeta/pages/default/parts/legal_notices-fr.rst new file mode 100644 index 00000000..7bcd70a8 --- /dev/null +++ b/telemeta/pages/default/parts/legal_notices-fr.rst @@ -0,0 +1,7 @@ +================== +Mentions légales +================== + +... + + diff --git a/telemeta/pages/default/parts/legal_notices.rst b/telemeta/pages/default/parts/legal_notices.rst deleted file mode 100644 index 0c2146bb..00000000 --- a/telemeta/pages/default/parts/legal_notices.rst +++ /dev/null @@ -1,13 +0,0 @@ -================== -Mentions légales -================== - -... - -================== -Legal notices -================== - -... - - diff --git a/telemeta/templates/telemeta_default/base.html b/telemeta/templates/telemeta_default/base.html index c6abf552..360c4835 100644 --- a/telemeta/templates/telemeta_default/base.html +++ b/telemeta/templates/telemeta_default/base.html @@ -50,11 +50,11 @@ {{ user.username }}. {% endif %} {% trans "Account" %} | -{% trans "Help" %} | +{% trans "Help" %} | {% trans "Sign out" %} {% else %} -{% trans "Help" %} | +{% trans "Help" %} | {% trans "Sign in" %} {% endif %} @@ -105,7 +105,7 @@

Copyright © 2011 Parisson
- {% trans "Legal notices" %} + {% trans "Legal notices" %}

{% endblock %} diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py index df83d36a..f5984e51 100644 --- a/telemeta/templatetags/telemeta_utils.py +++ b/telemeta/templatetags/telemeta_utils.py @@ -267,3 +267,28 @@ render_flatpage.is_safe = True def organization(): return settings.TELEMETA_ORGANIZATION +class SetVarNode(template.Node): + + def __init__(self, var_name, var_value): + self.var_name = var_name + self.var_value = var_value + + def render(self, context): + try: + value = template.Variable(self.var_value).resolve(context) + except template.VariableDoesNotExist: + value = "" + context[self.var_name] = value + return u"" + +@register.tag +def set_var(parser, token): + """ + {% set = %} + """ + parts = token.split_contents() + if len(parts) < 4: + raise template.TemplateSyntaxError("'set' tag must be of the form: {% set = %}") + return SetVarNode(parts[1], parts[3]) + + diff --git a/telemeta/urls.py b/telemeta/urls.py index 5d69fbcd..00ab6e79 100644 --- a/telemeta/urls.py +++ b/telemeta/urls.py @@ -61,7 +61,6 @@ htdocs = os.path.dirname(__file__) + '/htdocs' urlpatterns = patterns('', url(r'^$', web_view.index, name="telemeta-home"), - url(r'^help$', web_view.help, name="telemeta-help"), # items url(r'^items/$', 'django.views.generic.list_detail.object_list', diff --git a/telemeta/web/base.py b/telemeta/web/base.py index 8e8d0ac5..53bed1d4 100644 --- a/telemeta/web/base.py +++ b/telemeta/web/base.py @@ -112,9 +112,8 @@ class WebView(object): template = loader.get_template('telemeta/index.html') ids = [id for id in MediaItem.objects.all().values_list('id', flat=True).order_by('?')[0:3]] items = MediaItem.objects.enriched().filter(pk__in=ids) - context = RequestContext(request, { - 'page_content': pages.get_page_content(request, 'parts/home', ignore_slash_issue=True), + 'page_content': pages.get_page_content(request, 'parts/home-'+request.LANGUAGE_CODE, ignore_slash_issue=True), 'items': items}) return HttpResponse(template.render(context)) else: @@ -122,13 +121,8 @@ class WebView(object): playlists = self.get_playlists(request) revisions = self.get_revisions(request) searches = Search.objects.filter(username=request.user) - translation_list = ['Title', 'Description', 'OK', 'Cancel'] - translations = {} - for term in translation_list: - translations[term] = ugettext(term) - return render(request, template, {'playlists': playlists, 'searches': searches, - 'revisions': revisions, 'translations': translations}) + 'revisions': revisions,}) def get_revisions(self, request): last_revisions = Revision.objects.all().order_by('-time')[0:15] @@ -1032,16 +1026,6 @@ class WebView(object): writer.writerow(data) return response - def help(self, request): - """Render the help page""" - template = loader.get_template('telemeta/index.html') - ids = [id for id in MediaItem.objects.all().values_list('id', flat=True).order_by('?')[0:3]] - items = MediaItem.objects.enriched().filter(pk__in=ids) - context = RequestContext(request, { - 'page_content': pages.get_page_content(request, 'parts/help', ignore_slash_issue=True), - 'items': items}) - return HttpResponse(template.render(context)) - def rss(self, request): "Render the RSS feed of last revisions" rss_item_list = []