diff --git a/lib/Alchemy/Phrasea/Controller/Root/Login.php b/lib/Alchemy/Phrasea/Controller/Root/Login.php index 11e385702e..f8e2700bd2 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/Login.php +++ b/lib/Alchemy/Phrasea/Controller/Root/Login.php @@ -52,7 +52,6 @@ class Login implements ControllerProviderInterface return array( 'instance_title' => $app['phraseanet.registry']->get('GV_homeTitle'), '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_keywords' => $app['phraseanet.registry']->get('GV_metakeywords'), 'browser_name' => $app['browser']->getBrowser(), diff --git a/lib/classes/API/V1/adapter.php b/lib/classes/API/V1/adapter.php index 1310ef9df8..ccbbacb809 100644 --- a/lib/classes/API/V1/adapter.php +++ b/lib/classes/API/V1/adapter.php @@ -366,7 +366,6 @@ class API_V1_adapter extends API_V1_Abstract 'webServices' => array( 'googleApi' => $app['phraseanet.registry']->get('GV_google_api'), 'googleAnalyticsId' => $app['phraseanet.registry']->get('GV_googleAnalytics'), - 'googleChromeFrameDisclaimer' => $app['phraseanet.registry']->get('GV_display_gcf'), 'i18nWebService' => $app['phraseanet.registry']->get('GV_i18n_service'), 'recaptacha' => array( 'active' => $app['phraseanet.registry']->get('GV_captchas'), diff --git a/lib/conf.d/_GV_template.inc b/lib/conf.d/_GV_template.inc index 27cd40d684..2bf9d89cc9 100644 --- a/lib/conf.d/_GV_template.inc +++ b/lib/conf.d/_GV_template.inc @@ -662,12 +662,6 @@ return call_user_func_array(function(Application $app) { 'comment' => _('Allow the website to be indexed by search engines like Google'), 'default' => true ), - array( - 'type' => \registry::TYPE_BOOLEAN, - 'name' => 'GV_display_gcf', - 'comment' => _('Enable Google Chrome frame'), - 'default' => true - ) ) ) ); diff --git a/templates/web/login/include/cooliris-content.html.twig b/templates/web/login/include/cooliris-content.html.twig index a8c1781137..cf5c1508e4 100644 --- a/templates/web/login/include/cooliris-content.html.twig +++ b/templates/web/login/include/cooliris-content.html.twig @@ -1,3 +1,4 @@ + diff --git a/templates/web/login/layout/base-layout.html.twig b/templates/web/login/layout/base-layout.html.twig index 96a9badeff..a69e5e0f85 100644 --- a/templates/web/login/layout/base-layout.html.twig +++ b/templates/web/login/layout/base-layout.html.twig @@ -48,16 +48,44 @@ {% block google_chrome_frame %} - {% if display_google_chrome_frame %} - - {% endif %} + {% endblock google_chrome_frame %}
diff --git a/www/skins/login/img/ie6dead.png b/www/skins/login/img/ie6dead.png new file mode 100755 index 0000000000..11fe0cad14 Binary files /dev/null and b/www/skins/login/img/ie6dead.png differ diff --git a/www/skins/login/less/ie6.less b/www/skins/login/less/ie6.less new file mode 100644 index 0000000000..d263633c9b --- /dev/null +++ b/www/skins/login/less/ie6.less @@ -0,0 +1,44 @@ +html.lt-ie7 body > .container{ + display: none; +} + +html.lt-ie7 .ie6-special { + background-color:#95cebe; + position:absolute; + top:0; + left:0; + width:100%; + height:100%; +} + +html.lt-ie7 .ie6-special .ie6-container { + margin: 0 auto; + width:800px; +} + +html.lt-ie7 .ie6-special .ie6-container table tr { + vertical-align:top; +} + +html.lt-ie7 .ie6-special .ie6-container h1 { + color: #5A776C; + margin: 20px; +} + +html.lt-ie7 .ie6-special .ie6-container p { + margin:30px 20px; + width: 300px; + color: #5A776C; +} + +html.lt-ie7 .ie6-special .ie6-container .links { + margin-top:50px; + text-align: right; +} + +html.lt-ie7 .ie6-special a, +html.lt-ie7 .ie6-special a:hover, +html.lt-ie7 .ie6-special a:visited { + text-decoration: underline; + color:white; +} diff --git a/www/skins/login/less/login.less b/www/skins/login/less/login.less index 51a0246475..cf3796802a 100644 --- a/www/skins/login/less/login.less +++ b/www/skins/login/less/login.less @@ -62,4 +62,5 @@ @import "variables.less"; @import "../../../../plugins/login.less"; +@import "ie6.less"; @import "skin.less";