Ligne de Temps

# HG changeset patch # User ymh # Date 1330987526 -3600 # Node ID e7410c4df032ce9d46d2a2e29fe3ed32fb6ba5db # Parent a18a8abd1089ed6a6bd308dc95bdd42abb9f034a template cleaning, translation in js, and add generic google analytics diff -r a18a8abd1089 -r e7410c4df032 src/ldt/README --- a/src/ldt/README Sun Mar 04 04:30:43 2012 +0100 +++ b/src/ldt/README Mon Mar 05 23:45:26 2012 +0100 @@ -6,3 +6,7 @@ +trick: +compile messages for js +python ../../../web/ldtplatform/manage.py makemessages -a -d djangojs +python ../../../web/ldtplatform/manage.py compilemessages diff -r a18a8abd1089 -r e7410c4df032 src/ldt/ldt/ldt_utils/templates/front/front_base.html --- a/src/ldt/ldt/ldt_utils/templates/front/front_base.html Sun Mar 04 04:30:43 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/front/front_base.html Mon Mar 05 23:45:26 2012 +0100 @@ -1,6 +1,7 @@ {% load i18n %} {% load logintag %} {% load navigation %} +{% load analytics %} @@ -86,6 +87,7 @@

+{% analytics %} diff -r a18a8abd1089 -r e7410c4df032 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 Sun Mar 04 04:30:43 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html Mon Mar 05 23:45:26 2012 +0100 @@ -6,13 +6,12 @@ {% block js_import %} {{ block.super }} - + - {{ content_form.media.js }} {% endblock %} diff -r a18a8abd1089 -r e7410c4df032 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html Sun Mar 04 04:30:43 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html Mon Mar 05 23:45:26 2012 +0100 @@ -6,7 +6,8 @@ {% block js_import %} {{ block.super }} - + + {{ content_form.media.js }} diff -r a18a8abd1089 -r e7410c4df032 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_ldt.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_ldt.html Sun Mar 04 04:30:43 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_ldt.html Mon Mar 05 23:45:26 2012 +0100 @@ -5,7 +5,8 @@ {% block js_import %} {{ block.super }} - + + {{ content_form.media.js }} diff -r a18a8abd1089 -r e7410c4df032 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html Sun Mar 04 04:30:43 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html Mon Mar 05 23:45:26 2012 +0100 @@ -1,4 +1,5 @@ {% load i18n %} +{% load analytics %} @@ -78,7 +79,7 @@ {% trans 'clik here to see the project content' %} - +{% analytics %} diff -r a18a8abd1089 -r e7410c4df032 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm.html Sun Mar 04 04:30:43 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm.html Mon Mar 05 23:45:26 2012 +0100 @@ -3,7 +3,8 @@ {% load i18n %} {# form of creation of content #} {% block js_import %} - {{ block.super }} + {{ block.super }} + {% endblock %} diff -r a18a8abd1089 -r e7410c4df032 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html Sun Mar 04 04:30:43 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html Mon Mar 05 23:45:26 2012 +0100 @@ -3,6 +3,7 @@ {% block js_import %} {{block.super}} + {% endblock %} diff -r a18a8abd1089 -r e7410c4df032 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/init_ldt.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/init_ldt.html Sun Mar 04 04:30:43 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/init_ldt.html Mon Mar 05 23:45:26 2012 +0100 @@ -8,6 +8,7 @@ Ligne de Temps - IRI + {% endblock %} diff -r a18a8abd1089 -r e7410c4df032 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/published_projects.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/published_projects.html Sun Mar 04 04:30:43 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/published_projects.html Mon Mar 05 23:45:26 2012 +0100 @@ -3,6 +3,7 @@ {% block js_import %} {{block.super}} + {% endblock %} diff -r a18a8abd1089 -r e7410c4df032 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/search_results.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/search_results.html Sun Mar 04 04:30:43 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/search_results.html Mon Mar 05 23:45:26 2012 +0100 @@ -2,7 +2,8 @@ {% load i18n %} {% block js_import %} - {{ block.super }} + {{ block.super }} + {% endblock %} diff -r a18a8abd1089 -r e7410c4df032 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/workspace_base.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/workspace_base.html Sun Mar 04 04:30:43 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/workspace_base.html Mon Mar 05 23:45:26 2012 +0100 @@ -3,7 +3,8 @@ {% block js_import %} {{block.super}} - + + {% endblock %} diff -r a18a8abd1089 -r e7410c4df032 src/ldt/ldt/ldt_utils/urls.py --- a/src/ldt/ldt/ldt_utils/urls.py Sun Mar 04 04:30:43 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/urls.py Mon Mar 05 23:45:26 2012 +0100 @@ -49,7 +49,8 @@ ) urlpatterns += patterns('', - url('^jsi18n', 'django.views.i18n.javascript_catalog', name='jsi18n'), + url('^jsi18n/?$', 'django.views.i18n.javascript_catalog', name='ldt.jsi18n.all'), + url('^jsi18n/(?P\S+?)/$', 'django.views.i18n.javascript_catalog', {'domain':'djangojs'}, name='ldt.jsi18n'), ) diff -r a18a8abd1089 -r e7410c4df032 src/ldt/ldt/locale/en/LC_MESSAGES/djangojs.mo Binary file src/ldt/ldt/locale/en/LC_MESSAGES/djangojs.mo has changed diff -r a18a8abd1089 -r e7410c4df032 src/ldt/ldt/locale/en/LC_MESSAGES/djangojs.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/ldt/ldt/locale/en/LC_MESSAGES/djangojs.po Mon Mar 05 23:45:26 2012 +0100 @@ -0,0 +1,26 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-03-05 20:40+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: static/ldt/js/projectscontents.js:712 +msgid "check all" +msgstr "check all" + +#: static/ldt/js/projectscontents.js:713 +msgid "uncheck all" +msgstr "uncheck all" diff -r a18a8abd1089 -r e7410c4df032 src/ldt/ldt/locale/fr/LC_MESSAGES/djangojs.mo Binary file src/ldt/ldt/locale/fr/LC_MESSAGES/djangojs.mo has changed diff -r a18a8abd1089 -r e7410c4df032 src/ldt/ldt/locale/fr/LC_MESSAGES/djangojs.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/ldt/ldt/locale/fr/LC_MESSAGES/djangojs.po Mon Mar 05 23:45:26 2012 +0100 @@ -0,0 +1,26 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Yves-Marie Haussonne , 2012. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-03-05 20:40+0100\n" +"PO-Revision-Date: 2012-03-05 20:44+0200\n" +"Last-Translator: Yves-Marie Haussonne \n" +"Language-Team: IRI\n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Virtaal 0.7.0-mac-beta-1\n" + +#: static/ldt/js/projectscontents.js:712 +msgid "check all" +msgstr "Tout cocher" + +#: static/ldt/js/projectscontents.js:713 +msgid "uncheck all" +msgstr "Tout décocher" diff -r a18a8abd1089 -r e7410c4df032 src/ldt/ldt/static/ldt/js/projectscontents.js --- a/src/ldt/ldt/static/ldt/js/projectscontents.js Sun Mar 04 04:30:43 2012 +0100 +++ b/src/ldt/ldt/static/ldt/js/projectscontents.js Mon Mar 05 23:45:26 2012 +0100 @@ -712,3 +712,23 @@ } } } + +function check_uncheck_all(name) { + var check_all = gettext("check all"); + var uncheck_all = gettext("uncheck all"); + var id_name = "#global_checkbox_" + name; + + $(id_name).attr('title', uncheck_all); + + $(id_name).change(function () { + var checkbox_names = ".checkbox_" + name; + if ($(id_name).is(":checked")) { + $(checkbox_names).prop('checked', true); + $(id_name).attr('title', uncheck_all ); + } else { + $(checkbox_names).prop('checked', false); + $(id_name).attr('title', check_all); + } + $(checkbox_names).trigger("change"); + }); +} diff -r a18a8abd1089 -r e7410c4df032 src/ldt/ldt/templates/google_analytics/analytics_template.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/ldt/ldt/templates/google_analytics/analytics_template.html Mon Mar 05 23:45:26 2012 +0100 @@ -0,0 +1,10 @@ + \ No newline at end of file diff -r a18a8abd1089 -r e7410c4df032 src/ldt/ldt/templates/google_analytics/async_analytics_template.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/ldt/ldt/templates/google_analytics/async_analytics_template.html Mon Mar 05 23:45:26 2012 +0100 @@ -0,0 +1,6 @@ + \ No newline at end of file diff -r a18a8abd1089 -r e7410c4df032 src/ldt/ldt/templates/ldt/ldt_raw_base.html --- a/src/ldt/ldt/templates/ldt/ldt_raw_base.html Sun Mar 04 04:30:43 2012 +0100 +++ b/src/ldt/ldt/templates/ldt/ldt_raw_base.html Mon Mar 05 23:45:26 2012 +0100 @@ -1,6 +1,7 @@ {% load i18n %} {% load logintag %} {% load navigation %} +{% load analytics %} @@ -13,27 +14,6 @@ {% block title %}{% trans "page_title" %}{% endblock %} {% block js_import %} - {% endblock %} {% block css_declaration %} @@ -61,5 +41,6 @@ {% block body %} {% endblock %} +{% analytics %} diff -r a18a8abd1089 -r e7410c4df032 src/ldt/ldt/templatetags/analytics.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/ldt/ldt/templatetags/analytics.py Mon Mar 05 23:45:26 2012 +0100 @@ -0,0 +1,70 @@ +### +# Taken and adapted form django-google-analytics : http:// +# +# +## +from django import template + +from django.template import Context, loader +from django.conf import settings + + +register = template.Library() + +def __clean_token(str, tag_name): + if not (str[0] == str[-1] and str[0] in ('"', "'")): + raise template.TemplateSyntaxError, "%r tag's argument should be in quotes" % tag_name + return str[1:-1] + +def do_get_analytics(parser, token): + code = None + style = None + tag_name = None + try: + # split_contents() knows not to split quoted strings. + tokens = token.split_contents() + if len(tokens) > 0 : + tag_name = tokens[0] + if len(tokens) > 1 : + style = tokens[1] + if len(tokens) > 2 : + code = tokens[2] + except ValueError: + code = None + + if not code: + code = getattr(settings,'GOOGLE_ANALYTICS_CODE',None) + else: + code = __clean_token(code, tag_name) + + if style: + style = __clean_token(style, tag_name) + else: + style = 'async' + + return AnalyticsNode(code, style) + +class AnalyticsNode(template.Node): + def __init__(self, code=None, style='async'): + self.code = code + self.style = style + + def render(self, context): + if not self.code: + return '' + + if self.style == 'async': + template_path = 'google_analytics/async_analytics_template.html' + else: + template_path = 'google_analytics/analytics_template.html' + + if self.code.strip() != '': + t = loader.get_template(template_path) + c = Context({ + 'analytics_code': self.code, + }) + return t.render(c) + else: + return '' + +register.tag('analytics', do_get_analytics) diff -r a18a8abd1089 -r e7410c4df032 web/ldtplatform/config.py.tmpl --- a/web/ldtplatform/config.py.tmpl Sun Mar 04 04:30:43 2012 +0100 +++ b/web/ldtplatform/config.py.tmpl Mon Mar 05 23:45:26 2012 +0100 @@ -72,6 +72,8 @@ MANAGERS = ADMINS +GOOGLE_ANALYTICS_CODE = 'UA-1234-1' + EMAIL_USE_TLS = True EMAIL_HOST = 'smtp.gmail.com' EMAIL_HOST_USER = 'iri.ddc@gmail.com' @@ -95,3 +97,4 @@ FRONT_TAG_LIST = [u"Enmi 2011", u"film", u"conférence"] +