From 4677f0e9a2852aebcc9ee525d87549531afb9883 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Fri, 28 Sep 2012 11:59:03 +0200 Subject: [PATCH] Remove providers instanciation in Twig setup --- lib/Alchemy/Phrasea/Application.php | 7 ------- .../api/auth/end_user_authorization.html.twig | 2 ++ .../api/auth/native_app_access_token.html.twig | 2 +- templates/mobile/common/analytics.html.twig | 4 ++-- templates/mobile/common/index.html.twig | 2 +- templates/mobile/login/index.html.twig | 10 +++++----- templates/web/account/base.html.twig | 4 ++-- templates/web/admin/dashboard.html.twig | 2 +- templates/web/admin/databox/databox.html.twig | 2 +- templates/web/admin/index.html.twig | 2 +- templates/web/admin/setup.html.twig | 12 ++++++------ templates/web/admin/tree.html.twig | 4 ++-- .../api/auth/end_user_authorization.html.twig | 2 ++ .../api/auth/native_app_access_token.html.twig | 2 +- templates/web/common/analytics.html.twig | 4 ++-- templates/web/common/dialog_export.html.twig | 2 +- templates/web/common/index_bootstrap.html.twig | 4 ++-- templates/web/common/indexfloat.html.twig | 4 ++-- templates/web/common/menubar.html.twig | 2 +- templates/web/developers/application.html.twig | 4 ++-- templates/web/login/head.html.twig | 4 ++-- templates/web/login/index.html.twig | 8 ++++---- .../index_layout_displaycooliris.html.twig | 6 +++--- .../login/index_layout_displayscroll.html.twig | 6 +++--- .../web/login/index_layout_displayx1.html.twig | 6 +++--- templates/web/login/register.html.twig | 4 ++-- templates/web/overview.html.twig | 2 +- .../web/prod/actions/Bridge/error.html.twig | 2 +- .../web/prod/actions/Tools/index.html.twig | 6 +++--- templates/web/prod/index.html.twig | 18 +++++++++--------- .../web/prod/preview/appears_in.html.twig | 2 +- .../web/prod/preview/basket_train.html.twig | 2 +- .../web/prod/preview/feed_train.html.twig | 2 +- templates/web/prod/preview/reg_train.html.twig | 2 +- .../ajax_dashboard_content_child.html.twig | 2 +- templates/web/setup/upgrader.html.twig | 4 ++-- 36 files changed, 75 insertions(+), 78 deletions(-) diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php index 31e4c745ca..86a6a5fca0 100644 --- a/lib/Alchemy/Phrasea/Application.php +++ b/lib/Alchemy/Phrasea/Application.php @@ -306,14 +306,7 @@ class Application extends SilexApplication } $twig->addGlobal('app', $app); - $twig->addGlobal('display_chrome_frame', $app['phraseanet.appbox']->get_registry()->is_set('GV_display_gcf') ? $app['phraseanet.appbox']->get_registry()->get('GV_display_gcf') : true); - $twig->addGlobal('user', $app['phraseanet.user']); $twig->addGlobal('current_date', new \DateTime()); - $twig->addGlobal('home_title', $app['phraseanet.appbox']->get_registry()->get('GV_homeTitle')); - $twig->addGlobal('meta_description', $app['phraseanet.appbox']->get_registry()->get('GV_metaDescription')); - $twig->addGlobal('meta_keywords', $app['phraseanet.appbox']->get_registry()->get('GV_metaKeywords')); - $twig->addGlobal('maintenance', $app['phraseanet.appbox']->get_registry()->get('GV_maintenance')); - $twig->addGlobal('registry', $app['phraseanet.appbox']->get_registry()); $twig->addExtension(new \Twig_Extension_Core()); $twig->addExtension(new \Twig_Extension_Optimizer()); diff --git a/templates/mobile/api/auth/end_user_authorization.html.twig b/templates/mobile/api/auth/end_user_authorization.html.twig index e5e0027fa1..5bf12682ea 100644 --- a/templates/mobile/api/auth/end_user_authorization.html.twig +++ b/templates/mobile/api/auth/end_user_authorization.html.twig @@ -23,6 +23,8 @@ + {% set home_title = app['phraseanet.registry'].get('GV_homeTitle') %} +
diff --git a/templates/mobile/api/auth/native_app_access_token.html.twig b/templates/mobile/api/auth/native_app_access_token.html.twig index dd960b1c3a..419a5ff6b6 100644 --- a/templates/mobile/api/auth/native_app_access_token.html.twig +++ b/templates/mobile/api/auth/native_app_access_token.html.twig @@ -34,7 +34,7 @@
-

{{home_title}}

+

{{ app['phraseanet.registry'].get('GV_homeTitle') }}

{% if app['phraseanet.user'] is not none %} diff --git a/templates/mobile/common/analytics.html.twig b/templates/mobile/common/analytics.html.twig index 97059d1095..fe6249702e 100644 --- a/templates/mobile/common/analytics.html.twig +++ b/templates/mobile/common/analytics.html.twig @@ -1,8 +1,8 @@ -{% if registry.get('GV_googleAnalytics') != '' %} +{% if app['phraseanet.registry'].get('GV_googleAnalytics') != '' %} {% block stylesheet %}{% endblock %} diff --git a/templates/mobile/login/index.html.twig b/templates/mobile/login/index.html.twig index 35d5eca3da..922acc4051 100644 --- a/templates/mobile/login/index.html.twig +++ b/templates/mobile/login/index.html.twig @@ -14,7 +14,7 @@ {% block content %}
-

{{home_title}}

+

{{ app['phraseanet.registry'].get('GV_homeTitle') }}

@@ -26,15 +26,15 @@ alert("{{confirmWarning|striptags}}"); {% endif %} - {% if meta_description != '' %} -
{{meta_description}}
+ {% if app['phraseanet.registry'].get('GV_metaDescription') != '' %} +
{{ app['phraseanet.registry'].get('GV_metaDescription') }}
{% endif %}
- -
diff --git a/templates/web/account/base.html.twig b/templates/web/account/base.html.twig index cb5d2100e6..cc8568971a 100644 --- a/templates/web/account/base.html.twig +++ b/templates/web/account/base.html.twig @@ -1,6 +1,6 @@ - {{ home_title }} {% block title %}{% endblock %} + {{ app['phraseanet.registry'].get('GV_homeTitle') }} {% block title %}{% endblock %} {% block head %}{% endblock %} @@ -12,7 +12,7 @@
- {{ home_title }} + {{ app['phraseanet.registry'].get('GV_homeTitle') }} {{ block('title') }} diff --git a/templates/web/admin/dashboard.html.twig b/templates/web/admin/dashboard.html.twig index 8b8e46cebf..4687baa52b 100644 --- a/templates/web/admin/dashboard.html.twig +++ b/templates/web/admin/dashboard.html.twig @@ -148,7 +148,7 @@