hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 06:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove chrome frame toggler

Browse Source
This commit is contained in:
Romain Neutron
2013-09-23 14:11:58 +02:00
parent 9474196f23
commit b96c7e8622
4 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Alchemy/Phrasea/Controller/Root/Login.php
View File

@@ -52,7 +52,6 @@ class Login implements ControllerProviderInterface
return array( return array(
'instance_title' => $app['phraseanet.registry']->get('GV_homeTitle'), 'instance_title' => $app['phraseanet.registry']->get('GV_homeTitle'),
'has_terms_of_use' => $app->hasTermsOfUse(), 'has_terms_of_use' => $app->hasTermsOfUse(),
'display_google_chrome_frame' => $app['phraseanet.registry']->get('GV_display_gcf'),
'meta_description' => $app['phraseanet.registry']->get('GV_metaDescription'), 'meta_description' => $app['phraseanet.registry']->get('GV_metaDescription'),
'meta_keywords' => $app['phraseanet.registry']->get('GV_metakeywords'), 'meta_keywords' => $app['phraseanet.registry']->get('GV_metakeywords'),
'browser_name' => $app['browser']->getBrowser(), 'browser_name' => $app['browser']->getBrowser(),

1
lib/classes/API/V1/adapter.php
View File

@@ -366,7 +366,6 @@ class API_V1_adapter extends API_V1_Abstract
'webServices' => array( 'webServices' => array(
'googleApi' => $app['phraseanet.registry']->get('GV_google_api'), 'googleApi' => $app['phraseanet.registry']->get('GV_google_api'),
'googleAnalyticsId' => $app['phraseanet.registry']->get('GV_googleAnalytics'), 'googleAnalyticsId' => $app['phraseanet.registry']->get('GV_googleAnalytics'),
'googleChromeFrameDisclaimer' => $app['phraseanet.registry']->get('GV_display_gcf'),
'i18nWebService' => $app['phraseanet.registry']->get('GV_i18n_service'), 'i18nWebService' => $app['phraseanet.registry']->get('GV_i18n_service'),
'recaptacha' => array( 'recaptacha' => array(
'active' => $app['phraseanet.registry']->get('GV_captchas'), 'active' => $app['phraseanet.registry']->get('GV_captchas'),

6
lib/conf.d/_GV_template.inc
View File

@@ -662,12 +662,6 @@ return call_user_func_array(function(Application $app) {
'comment' => _('Allow the website to be indexed by search engines like Google'), 'comment' => _('Allow the website to be indexed by search engines like Google'),
'default' => true 'default' => true
), ),
array(
'type' => \registry::TYPE_BOOLEAN,
'name' => 'GV_display_gcf',
'comment' => _('Enable Google Chrome frame'),
'default' => true
)
) )
) )
); );

18
templates/web/login/layout/base-layout.html.twig
View File

@@ -48,16 +48,14 @@
</head> </head>
<body> <body>
{% block google_chrome_frame %} {% block google_chrome_frame %}
{% if display_google_chrome_frame %} <!--[if lt IE 7]>
<!--[if lt IE 7]> {% set browserLink = "<a href='http://browsehappy.com/'>" ~ browser_name ~ "</a>"|raw %}
{% set browserLink = "<a href='http://browsehappy.com/'>" ~ browser_name ~ "</a>"|raw %} {% set GCFLink = "<a href='http://www.google.com/chromeframe/?redirect=true'>Google Chrome Frame</a>"|raw %}
{% set GCFLink = "<a href='http://www.google.com/chromeframe/?redirect=true'>Google Chrome Frame</a>"|raw %} <p class="alert alert-warning text-center">
<p class="alert alert-warning text-center"> <strong>{% trans %}You are using an outdated browser.{% endtrans %}</strong>
<strong>{% trans %}You are using an outdated browser.{% endtrans %}</strong> {% trans %}Please upgrade {{ browserLink }} or activate {{ GCFLink }} to improve your experience.{% endtrans %}
{% trans %}Please upgrade {{ browserLink }} or activate {{ GCFLink }} to improve your experience.{% endtrans %} </p>
</p> <![endif]-->
<![endif]-->
{% endif %}
{% endblock google_chrome_frame %} {% endblock google_chrome_frame %}
<div class="container full-height"> <div class="container full-height">