hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-09 19:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source
This commit is contained in:
Romain Neutron
2013-09-24 12:43:00 +02:00
parent 47af41e7cb fe4a99cf96
commit d00b39fec8
8 changed files with 404 additions and 304 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

@@ -372,7 +372,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
)
) )
) )
); );

607
locale/phraseanet.pot
View File

File diff suppressed because it is too large Load Diff

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

@@ -48,16 +48,44 @@
</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> <div class="ie6-special">
<![endif]--> <div class="ie6-container">
{% endif %} <table>
<tr>
<td style="width:350px;">
<img src="/skins/login/img/ie6dead.png" />
</td>
<td>
<h1>
{% block main_title %}{% endblock %}
</h1>
<p>
{% trans %}Mettez à jour votre navigateur ou téléchargez un navigateur plus récent.{% endtrans %}
</p>
<p>
{% trans %}Si vous ne pouvez pas installer un autre navigateur, utilisez Google Chrome Frame.{% endtrans %}
</p>
<p class="links">
<a href="https://www.google.com/chrome">
{% trans %}Installer Google Chrome{% endtrans %}
</a><br/>
<a href="https://www.google.com/chromeframe">
{% trans %}Installer Google Chrome Frame{% endtrans %}
</a>
</p>
</td>
</tr>
</table>
</div>
</div>
<![endif]-->
{% endblock google_chrome_frame %} {% endblock google_chrome_frame %}
<div class="container full-height"> <div class="container full-height">

BIN
www/skins/login/img/ie6dead.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 95 KiB

44
www/skins/login/less/ie6.less Normal file
View File

@@ -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;
}

1
www/skins/login/less/login.less
View File

@@ -62,4 +62,5 @@
@import "variables.less"; @import "variables.less";
@import "../../../../plugins/login.less"; @import "../../../../plugins/login.less";
@import "ie6.less";
@import "skin.less"; @import "skin.less";