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

Remove providers instanciation in Twig setup

Browse Source
This commit is contained in:
Romain Neutron
2012-09-28 11:59:03 +02:00
parent 23b842d4ca
commit 4677f0e9a2
36 changed files with 75 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Alchemy/Phrasea/Application.php
View File

@@ -306,14 +306,7 @@ class Application extends SilexApplication
} }
$twig->addGlobal('app', $app); $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('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_Core());
$twig->addExtension(new \Twig_Extension_Optimizer()); $twig->addExtension(new \Twig_Extension_Optimizer());

2
templates/mobile/api/auth/end_user_authorization.html.twig
View File

@@ -23,6 +23,8 @@
<![endif]--> <![endif]-->
</head> </head>
{% set home_title = app['phraseanet.registry'].get('GV_homeTitle') %}
<body> <body>
<div id="page" class="container"> <div id="page" class="container">
<div id="main" class="row"> <div id="main" class="row">

2
templates/mobile/api/auth/native_app_access_token.html.twig
View File

@@ -34,7 +34,7 @@
<div id="main" class="row"> <div id="main" class="row">
<div id="title-box" class="span6 offset3"> <div id="title-box" class="span6 offset3">
<h1 id="namePhr">{{home_title}}</h1> <h1 id="namePhr">{{ app['phraseanet.registry'].get('GV_homeTitle') }}</h1>
</div> </div>
{% if app['phraseanet.user'] is not none %} {% if app['phraseanet.user'] is not none %}

4
templates/mobile/common/analytics.html.twig
View File

@@ -1,8 +1,8 @@
{% if registry.get('GV_googleAnalytics') != '' %} {% if app['phraseanet.registry'].get('GV_googleAnalytics') != '' %}
<script type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', '{{ registry.get('GV_googleAnalytics') }}']); _gaq.push(['_setAccount', '{{ app['phraseanet.registry'].get('GV_googleAnalytics') }}']);
_gaq.push(['_trackPageview']); _gaq.push(['_trackPageview']);
(function() { (function() {

2
templates/mobile/common/index.html.twig
View File

@@ -4,7 +4,7 @@
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" /> <meta name="apple-mobile-web-app-status-bar-style" content="black" />
<title>{{home_title}} - {{ module_name }} </title> <title>{{ app['phraseanet.registry'].get('GV_homeTitle') }} - {{ module_name }} </title>
<link rel="stylesheet" href="/include/jslibs/jquery.mobile-1.0a4/jquery.mobile-1.0a4.min.css" /> <link rel="stylesheet" href="/include/jslibs/jquery.mobile-1.0a4/jquery.mobile-1.0a4.min.css" />
<script src="/include/minify/f=include/jslibs/jquery-1.7.1.js"></script> <script src="/include/minify/f=include/jslibs/jquery-1.7.1.js"></script>
{% block stylesheet %}{% endblock %} {% block stylesheet %}{% endblock %}

10
templates/mobile/login/index.html.twig
View File

@@ -14,7 +14,7 @@
{% block content %} {% block content %}
<div data-role="page"> <div data-role="page">
<div data-role="header"> <div data-role="header">
<h1>{{home_title}}</h1> <h1>{{ app['phraseanet.registry'].get('GV_homeTitle') }}</h1>
</div> </div>
<div data-role="content"> <div data-role="content">
<form name="send" action="/login/authenticate/" method="post" id="authentication"> <form name="send" action="/login/authenticate/" method="post" id="authentication">
@@ -26,15 +26,15 @@
alert("{{confirmWarning|striptags}}"); alert("{{confirmWarning|striptags}}");
{% endif %} {% endif %}
</script> </script>
{% if meta_description != '' %} {% if app['phraseanet.registry'].get('GV_metaDescription') != '' %}
<div class="info">{{meta_description}}</div> <div class="info">{{ app['phraseanet.registry'].get('GV_metaDescription') }}</div>
{% endif %} {% endif %}
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<fieldset> <fieldset>
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<input autocapitalize="off" autocorrect="off" type="text" name="login" id="name" value="" {% if maintenance == true %}disabled{% endif %} tabindex="1" <input autocapitalize="off" autocorrect="off" type="text" name="login" id="name" value="" {% if app['phraseanet.registry'].get('GV_maintenance') == true %}disabled{% endif %} tabindex="1"
placeholder="{% trans 'admin::compte-utilisateur identifiant' %}" /> placeholder="{% trans 'admin::compte-utilisateur identifiant' %}" />
<input autocapitalize="off" autocorrect="off" {% if maintenance == true %}disabled{% endif %} tabindex="2" <input autocapitalize="off" autocorrect="off" {% if app['phraseanet.registry'].get('GV_maintenance') == true %}disabled{% endif %} tabindex="2"
placeholder="{% trans 'admin::compte-utilisateur mot de passe' %}" name="pwd" id="pwd" value="" type="password" /> placeholder="{% trans 'admin::compte-utilisateur mot de passe' %}" name="pwd" id="pwd" value="" type="password" />
<input type="hidden" name="redirect" value="{{redirect}}"> <input type="hidden" name="redirect" value="{{redirect}}">
<fieldset data-role="controlgroup"> <fieldset data-role="controlgroup">

4
templates/web/account/base.html.twig
View File

@@ -1,6 +1,6 @@
<html lang="{{ app['locale.I18n'] }}"> <html lang="{{ app['locale.I18n'] }}">
<head> <head>
<title>{{ home_title }} {% block title %}{% endblock %}</title> <title>{{ app['phraseanet.registry'].get('GV_homeTitle') }} {% block title %}{% endblock %}</title>
<link rel="stylesheet" type="text/css" href="/include/minify/f=/skins/login/home.css,/skins/html5/bootstrap/css/bootstrap.min.css,/skins/html5/bootstrap/css/bootstrap-responsive.min.css,/skins/login/css/main.css"/> <link rel="stylesheet" type="text/css" href="/include/minify/f=/skins/login/home.css,/skins/html5/bootstrap/css/bootstrap.min.css,/skins/html5/bootstrap/css/bootstrap-responsive.min.css,/skins/login/css/main.css"/>
<script type="text/javascript" language="javascript" src="/include/minify/f=include/jslibs/jquery-1.7.1.js,include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js"></script> <script type="text/javascript" language="javascript" src="/include/minify/f=include/jslibs/jquery-1.7.1.js,include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js"></script>
{% block head %}{% endblock %} {% block head %}{% endblock %}
@@ -12,7 +12,7 @@
<table style="width: 100%;"> <table style="width: 100%;">
<tr style="height: 35px;"> <tr style="height: 35px;">
<td style="width: 580px;"> <td style="width: 580px;">
<span class="title-name">{{ home_title }}</span> <span class="title-name">{{ app['phraseanet.registry'].get('GV_homeTitle') }}</span>
<span class="title-desc">{{ block('title') }}</span> <span class="title-desc">{{ block('title') }}</span>
</td> </td>
<td style="color: #b1b1b1; text-align: right;"> <td style="color: #b1b1b1; text-align: right;">

2
templates/web/admin/dashboard.html.twig
View File

@@ -148,7 +148,7 @@
<ul class="setup"> <ul class="setup">
{% if app['cache'].isServer() %} {% if app['cache'].isServer() %}
{% set stats = app['cache'].getStats() %} {% set stats = app['cache'].getStats() %}
<li>{% trans 'setup::Serveur actif sur %s' %} {{registry.get('GV_cache_server_host')}} : {{registry.get('GV_cache_server_port')}}</li> <li>{% trans 'setup::Serveur actif sur %s' %} {{app['phraseanet.registry'].get('GV_cache_server_host')}} : {{app['phraseanet.registry'].get('GV_cache_server_port')}}</li>
<table> <table>
{% for name, stat in stats%} {% for name, stat in stats%}
<tr class="even"><td>{{ name }}</td><td> {{ stat }}</td></tr> <tr class="even"><td>{{ name }}</td><td> {{ stat }}</td></tr>

2
templates/web/admin/databox/databox.html.twig
View File

@@ -59,7 +59,7 @@
{% trans 'admin::base: nombre de mots indexes sur la base' %} {% trans 'admin::base: nombre de mots indexes sur la base' %}
{{ databox.get_index_amount() }} {{ databox.get_index_amount() }}
</li> </li>
{% if registry.get('GV_thesaurus') %} {% if app['phraseanet.registry'].get('GV_thesaurus') %}
<li> <li>
{% trans 'admin::base: nombre de termes de Thesaurus indexes :' %} {% trans 'admin::base: nombre de termes de Thesaurus indexes :' %}
{{ databox.get_thesaurus_hits() }} {{ databox.get_thesaurus_hits() }}

2
templates/web/admin/index.html.twig
View File

@@ -25,7 +25,7 @@
var bodySize = {x:0,y:0}; var bodySize = {x:0,y:0};
var language = { var language = {
serverName: '{{ registry.get('GV_ServerName') }}', serverName: '{{ app['phraseanet.registry'].get('GV_ServerName') }}',
serverError: '{% trans 'phraseanet::erreur: Une erreur est survenue, si ce probleme persiste, contactez le support technique' %}', serverError: '{% trans 'phraseanet::erreur: Une erreur est survenue, si ce probleme persiste, contactez le support technique' %}',
serverTimeout: '{% trans 'phraseanet::erreur: La connection au serveur Phraseanet semble etre indisponible' %}', serverTimeout: '{% trans 'phraseanet::erreur: La connection au serveur Phraseanet semble etre indisponible' %}',
serverDisconnected: '{% trans 'phraseanet::erreur: Votre session est fermee, veuillez vous re-authentifier' %}', serverDisconnected: '{% trans 'phraseanet::erreur: Votre session est fermee, veuillez vous re-authentifier' %}',

12
templates/web/admin/setup.html.twig
View File

@@ -8,25 +8,25 @@
<div class="control-group"> <div class="control-group">
<label class="control-label">Adresse : </label> <label class="control-label">Adresse : </label>
<div class="controls"> <div class="controls">
<input type="text" class="input-xlarge" readonly="readonly" value="{{ registry.get('GV_ServerName') }}" /> <input type="text" class="input-xlarge" readonly="readonly" value="{{ app['phraseanet.registry'].get('GV_ServerName') }}" />
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label">Installation : </label> <label class="control-label">Installation : </label>
<div class="controls"> <div class="controls">
<input type="text" class="input-xlarge" readonly="readonly" value="{{ registry.get('GV_RootPath') }}" /> <input type="text" class="input-xlarge" readonly="readonly" value="{{ app['phraseanet.registry'].get('GV_RootPath') }}" />
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label">Maintenance : </label> <label class="control-label">Maintenance : </label>
<div class="controls"> <div class="controls">
<input type="checkbox" readonly="readonly" disabled="disabled" {{ maintenance == true ? "checked='checked'" : '' }} /> <input type="checkbox" readonly="readonly" disabled="disabled" {{ app['phraseanet.registry'].get('GV_maintenance') == true ? "checked='checked'" : '' }} />
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label">Debug : </label> <label class="control-label">Debug : </label>
<div class="controls"> <div class="controls">
<input type="checkbox" readonly="readonly" disabled="disabled" {{ registry.get('GV_debug') == true ? "checked='checked'" : '' }} /> <input type="checkbox" readonly="readonly" disabled="disabled" {{ app['phraseanet.registry'].get('GV_debug') == true ? "checked='checked'" : '' }} />
</div> </div>
</div> </div>
</form> </form>
@@ -55,8 +55,8 @@
{% set currentValue = '' %} {% set currentValue = '' %}
{% set is_new = false %} {% set is_new = false %}
{% if registry.is_set(value['name']) %} {% if app['phraseanet.registry'].is_set(value['name']) %}
{% set currentValue = registry.get(value['name']) %} {% set currentValue = app['phraseanet.registry'].get(value['name']) %}
{% set is_new = true %} {% set is_new = true %}
{% elseif value['default'] is defined %} {% elseif value['default'] is defined %}
{% set currentValue = value['default'] %} {% set currentValue = value['default'] %}

4
templates/web/admin/tree.html.twig
View File

@@ -11,7 +11,7 @@
</li> </li>
{% else %} {% else %}
<li> <li>
<span>{{ registry.get('GV_ServerName') }}</span> <span>{{ app['phraseanet.registry'].get('GV_ServerName') }}</span>
</li> </li>
{% endif %} {% endif %}
@@ -22,7 +22,7 @@
<span>Setup</span> <span>Setup</span>
</a> </a>
</li> </li>
{% if registry.get('GV_sphinx') %} {% if app['phraseanet.registry'].get('GV_sphinx') %}
<li> <li>
<a target="right" href="/admin/sphinx/configuration/" class="ajax"> <a target="right" href="/admin/sphinx/configuration/" class="ajax">
<span>Sphinx Conf</span> <span>Sphinx Conf</span>

2
templates/web/api/auth/end_user_authorization.html.twig
View File

@@ -23,6 +23,8 @@
<![endif]--> <![endif]-->
</head> </head>
{% set home_title = app['phraseanet.registry'].get('GV_homeTitle') %}
<body> <body>
<div id="page" class="container"> <div id="page" class="container">
<div id="main" class="row"> <div id="main" class="row">

2
templates/web/api/auth/native_app_access_token.html.twig
View File

@@ -34,7 +34,7 @@
<div id="main" class="row"> <div id="main" class="row">
<div id="title-box" class="span6 offset3"> <div id="title-box" class="span6 offset3">
<h1 id="namePhr">{{home_title}}</h1> <h1 id="namePhr">{{ app['phraseanet.registry'].get('GV_homeTitle') }}</h1>
</div> </div>
{% if user is not none %} {% if user is not none %}

4
templates/web/common/analytics.html.twig
View File

@@ -1,8 +1,8 @@
{% if registry.get('GV_googleAnalytics') != '' %} {% if app['phraseanet.registry'].get('GV_googleAnalytics') != '' %}
<script type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', '{{ registry.get('GV_googleAnalytics') }}']); _gaq.push(['_setAccount', '{{ app['phraseanet.registry'].get('GV_googleAnalytics') }}']);
_gaq.push(['_trackPageview']); _gaq.push(['_trackPageview']);
(function() { (function() {

2
templates/web/common/dialog_export.html.twig
View File

@@ -498,7 +498,7 @@
} }
}); });
{% set max_download = registry.get('GV_download_max', 120) %} {% set max_download = app['phraseanet.registry'].get('GV_download_max', 120) %}
{% set alert_too_big_one %} {% set alert_too_big_one %}
{% trans %} You can not directly download more than {{max_download}} Mo ; time to package all documents is too long{% endtrans %} {% trans %} You can not directly download more than {{max_download}} Mo ; time to package all documents is too long{% endtrans %}
{% endset %} {% endset %}

4
templates/web/common/index_bootstrap.html.twig
View File

@@ -2,11 +2,11 @@
<html lang="{{ app['locale.I18n'] }}" style="overflow:hidden;"> <html lang="{{ app['locale.I18n'] }}" style="overflow:hidden;">
<head> <head>
<meta http-equiv="X-UA-Compatible" content="chrome=1"> <meta http-equiv="X-UA-Compatible" content="chrome=1">
<title>{% if local_title is defined%}{{local_title}} | {% endif %}{{home_title}} - {{ module_name }} </title> <title>{% if local_title is defined%}{{local_title}} | {% endif %}{{ app['phraseanet.registry'].get('GV_homeTitle') }} - {{ module_name }} </title>
<link type="text/css" rel="stylesheet" href="/skins/html5/bootstrap/css/bootstrap.min.css" /> <link type="text/css" rel="stylesheet" href="/skins/html5/bootstrap/css/bootstrap.min.css" />
<link type="text/css" rel="stylesheet" href="/skins/html5/bootstrap/css/bootstrap-responsive.min.css" /> <link type="text/css" rel="stylesheet" href="/skins/html5/bootstrap/css/bootstrap-responsive.min.css" />
<link type="text/css" rel="stylesheet" href="{{registry.get('GV_STATIC_URL')}}/skins/common/main.css"> <link type="text/css" rel="stylesheet" href="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/skins/common/main.css">
<script type="text/javascript" src="/include/minify/f=include/jslibs/jquery-1.7.1.js"></script> <script type="text/javascript" src="/include/minify/f=include/jslibs/jquery-1.7.1.js"></script>
<script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap.min.js"></script> <script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap.min.js"></script>

4
templates/web/common/indexfloat.html.twig
View File

@@ -2,8 +2,8 @@
<html lang="{{ app['locale.I18n'] }}"> <html lang="{{ app['locale.I18n'] }}">
<head> <head>
<meta http-equiv="X-UA-Compatible" content="chrome=1"> <meta http-equiv="X-UA-Compatible" content="chrome=1">
<title>{% if local_title is defined%}{{local_title}} | {% endif %}{{home_title}} - {{ module_name }} </title> <title>{% if local_title is defined%}{{local_title}} | {% endif %}{{ app['phraseanet.registry'].get('GV_homeTitle') }} - {{ module_name }} </title>
<link type="text/css" rel="stylesheet" href="{{registry.get('GV_STATIC_URL')}}/skins/common/main.css"> <link type="text/css" rel="stylesheet" href="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/skins/common/main.css">
{% block stylesheet %}{% endblock %} {% block stylesheet %}{% endblock %}
{% block icon %}{% endblock %} {% block icon %}{% endblock %}
{% block rss %}{% endblock %} {% block rss %}{% endblock %}

2
templates/web/common/menubar.html.twig
View File

@@ -33,7 +33,7 @@
{% endif %} {% endif %}
</li> </li>
{% if app['browser'].isNewGeneration and registry.get('GV_thesaurus') == true and app['phraseanet.user'].ACL.has_access_to_module('thesaurus') %} {% if app['browser'].isNewGeneration and app['phraseanet.registry'].get('GV_thesaurus') == true and app['phraseanet.user'].ACL.has_access_to_module('thesaurus') %}
<li> <li>
<a target="_blank" href="/thesaurus2/"> <a target="_blank" href="/thesaurus2/">
<span class="{% if module == "thesaurus" %}selected{% endif %}"> <span class="{% if module == "thesaurus" %}selected{% endif %}">

4
templates/web/developers/application.html.twig
View File

@@ -47,11 +47,11 @@
</tr> </tr>
<tr> <tr>
<td>Authorize endpoint</td> <td>Authorize endpoint</td>
<td>{{registry.get('GV_ServerName')}}api/oauthv2/authorize</td> <td>{{app['phraseanet.registry'].get('GV_ServerName')}}api/oauthv2/authorize</td>
</tr> </tr>
<tr> <tr>
<td>Access endpoint</td> <td>Access endpoint</td>
<td>{{registry.get('GV_ServerName')}}api/oauthv2/token</td> <td>{{app['phraseanet.registry'].get('GV_ServerName')}}api/oauthv2/token</td>
</tr> </tr>
<tr> <tr>
<td>{% trans 'Activer le grant_type de type password pour votre application' %}</td> <td>{% trans 'Activer le grant_type de type password pour votre application' %}</td>

4
templates/web/login/head.html.twig
View File

@@ -1,7 +1,7 @@
<title>{{module_name}}</title> <title>{{module_name}}</title>
<meta content="{{meta_description}}" name="description"/> <meta content="{{ app['phraseanet.registry'].get('GV_metaDescription') }}" name="description"/>
<meta http-equiv="X-UA-Compatible" content="chrome=1"> <meta http-equiv="X-UA-Compatible" content="chrome=1">
<meta content="{{meta_keywords}}" name="keywords"/> <meta content="{{ app['phraseanet.registry'].get('GV_metaKeywords') }}" name="keywords"/>
<meta content="phraseanet" name="generator"/> <meta content="phraseanet" name="generator"/>
{% for feed in feeds %} {% for feed in feeds %}

8
templates/web/login/index.html.twig
View File

@@ -3,7 +3,7 @@
{% include 'login/head.html.twig' %} {% include 'login/head.html.twig' %}
</head> </head>
<body> <body>
<div style="display:none;">{{meta_description}}</div> <div style="display:none;">{{ app['phraseanet.registry'].get('GV_metaDescription') }}</div>
<noscript> <noscript>
<div style="width:100%;height:40px;background:#00a8FF;font-size:14px;font-weight:bold;text-align:center;"> <div style="width:100%;height:40px;background:#00a8FF;font-size:14px;font-weight:bold;text-align:center;">
{% trans 'phraseanet::noscript' %} {% trans 'phraseanet::noscript' %}
@@ -44,7 +44,7 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% if display_chrome_frame and app['request'].cookies.get('gfc_box') == false %} {% if app['phraseanet.appbox'].get_registry().get('GV_display_gcf', 1) and app['request'].cookies.get('gfc_box') == false %}
<!--[if IE]> <!--[if IE]>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/chrome-frame/1.0.2/CFInstall.min.js"></script> <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/chrome-frame/1.0.2/CFInstall.min.js"></script>
<link href="https://www.google.com/css/modules/buttons/g-button.css" type="text/css" rel="stylesheet"> <link href="https://www.google.com/css/modules/buttons/g-button.css" type="text/css" rel="stylesheet">
@@ -114,8 +114,8 @@
<div style="height:35px;"> <div style="height:35px;">
<table style="width:100%;"> <table style="width:100%;">
<tr style="height:35px;"> <tr style="height:35px;">
<td style="width:500px;white-space:nowrap"><span style="font-size:28px;color:#b1b1b1;margin:0 10px 0 0">{{home_title}} <td style="width:500px;white-space:nowrap"><span style="font-size:28px;color:#b1b1b1;margin:0 10px 0 0">{{ app['phraseanet.registry'].get('GV_homeTitle') }}
</span><span class="title-desc">{{meta_description}}</span></td> </span><span class="title-desc">{{ app['phraseanet.registry'].get('GV_metaDescription') }}</span></td>
<td style="color:#b1b1b1;text-align:right;"> <td style="color:#b1b1b1;text-align:right;">
<a class="tab click" onclick="setTab('help',this);return false;">{% trans 'phraseanet:: aide' %}</a> <a class="tab click" onclick="setTab('help',this);return false;">{% trans 'phraseanet:: aide' %}</a>
{% if login.register_enabled(app) %} {% if login.register_enabled(app) %}

6
templates/web/login/index_layout_displaycooliris.html.twig
View File

@@ -11,7 +11,7 @@
</div> </div>
<div style="margin-top:10px;height:25px;"> <div style="margin-top:10px;height:25px;">
<div style="float:left;text-align:left;"> <div style="float:left;text-align:left;">
<input {% if maintenance == true %}disabled{% endif %} tabindex="5" <input {% if app['phraseanet.registry'].get('GV_maintenance') == true %}disabled{% endif %} tabindex="5"
type="submit" value="{% trans 'login:: connexion' %}"/> type="submit" value="{% trans 'login:: connexion' %}"/>
<input tabindex="4" class="checkbox" type="checkbox" name="remember" id="remember-me" value="1" /> <input tabindex="4" class="checkbox" type="checkbox" name="remember" id="remember-me" value="1" />
<label for="remember-me">{% trans 'login::Remember me' %}</label> <label for="remember-me">{% trans 'login::Remember me' %}</label>
@@ -34,13 +34,13 @@
<div style="margin-top:10px;"> <div style="margin-top:10px;">
<div style="margin-top:3px;">{% trans 'admin::compte-utilisateur identifiant' %}</div> <div style="margin-top:3px;">{% trans 'admin::compte-utilisateur identifiant' %}</div>
<div style="margin-top:3px;"> <div style="margin-top:3px;">
<input {% if maintenance == true %}disabled{% endif %} tabindex="1" name="login" <input {% if app['phraseanet.registry'].get('GV_maintenance') == true %}disabled{% endif %} tabindex="1" name="login"
id="login" type="text" style="width:100%" /> id="login" type="text" style="width:100%" />
</div> </div>
</div> </div>
<div style="margin-top:10px;"> <div style="margin-top:10px;">
<div style="margin-top:3px;">{% trans 'admin::compte-utilisateur mot de passe' %}</div> <div style="margin-top:3px;">{% trans 'admin::compte-utilisateur mot de passe' %}</div>
<div style="margin-top:3px;"><input {% if maintenance == true %}disabled{% endif %} tabindex="2" name="pwd" id="pwd" <div style="margin-top:3px;"><input {% if app['phraseanet.registry'].get('GV_maintenance') == true %}disabled{% endif %} tabindex="2" name="pwd" id="pwd"
value="" type="password" style="width:100%" /> value="" type="password" style="width:100%" />
</div> </div>
</div> </div>

6
templates/web/login/index_layout_displayscroll.html.twig
View File

@@ -11,7 +11,7 @@
</div> </div>
<div style="margin-top:10px;height:25px;"> <div style="margin-top:10px;height:25px;">
<div style="float:left;text-align:left;"> <div style="float:left;text-align:left;">
<input {% if maintenance == true %}disabled{% endif %} tabindex="5" type="submit" <input {% if app['phraseanet.registry'].get('GV_maintenance') == true %}disabled{% endif %} tabindex="5" type="submit"
value="{% trans 'login:: connexion' %}"/> value="{% trans 'login:: connexion' %}"/>
</div> </div>
</div> </div>
@@ -32,14 +32,14 @@
<div style="margin-top:10px;"> <div style="margin-top:10px;">
<div style="margin-top:3px;">{% trans 'admin::compte-utilisateur identifiant' %}</div> <div style="margin-top:3px;">{% trans 'admin::compte-utilisateur identifiant' %}</div>
<div style="margin-top:3px;"> <div style="margin-top:3px;">
<input {% if maintenance == true %}disabled{% endif %} tabindex="1" name="login" <input {% if app['phraseanet.registry'].get('GV_maintenance') == true %}disabled{% endif %} tabindex="1" name="login"
id="login" type="text" style="width:100%" /> id="login" type="text" style="width:100%" />
</div> </div>
</div> </div>
<div style="margin-top:10px;"> <div style="margin-top:10px;">
<div style="margin-top:3px;">{% trans 'admin::compte-utilisateur mot de passe' %}</div> <div style="margin-top:3px;">{% trans 'admin::compte-utilisateur mot de passe' %}</div>
<div style="margin-top:3px;"> <div style="margin-top:3px;">
<input {% if maintenance == true %}disabled{% endif %} tabindex="2" name="pwd" id="pwd" value="" <input {% if app['phraseanet.registry'].get('GV_maintenance') == true %}disabled{% endif %} tabindex="2" name="pwd" id="pwd" value=""
type="password" style="width:100%" /> type="password" style="width:100%" />
</div> </div>
</div> </div>

6
templates/web/login/index_layout_displayx1.html.twig
View File

@@ -31,12 +31,12 @@
</div> </div>
<div style="margin-top:20px;"> <div style="margin-top:20px;">
<div style="margin-top:3px;">{% trans 'admin::compte-utilisateur identifiant' %}</div> <div style="margin-top:3px;">{% trans 'admin::compte-utilisateur identifiant' %}</div>
<div style="margin-top:3px;"><input {% if maintenance == true %}disabled{% endif %} tabindex="1" name="login" <div style="margin-top:3px;"><input {% if app['phraseanet.registry'].get('GV_maintenance') == true %}disabled{% endif %} tabindex="1" name="login"
id="login" value="" type="text" style="width:100%" /></div> id="login" value="" type="text" style="width:100%" /></div>
</div> </div>
<div style="margin-top:20px;"> <div style="margin-top:20px;">
<div style="margin-top:3px;">{% trans 'admin::compte-utilisateur mot de passe' %}</div> <div style="margin-top:3px;">{% trans 'admin::compte-utilisateur mot de passe' %}</div>
<div style="margin-top:3px;"><input {% if maintenance == true %}disabled{% endif %} tabindex="2" name="pwd" <div style="margin-top:3px;"><input {% if app['phraseanet.registry'].get('GV_maintenance') == true %}disabled{% endif %} tabindex="2" name="pwd"
id="pwd" value="" type="password" style="width:100%" /></div> id="pwd" value="" type="password" style="width:100%" /></div>
<div style="text-align:right;margin-top:3px;"> <div style="text-align:right;margin-top:3px;">
<a target="_self" class="link" rel="external" href="/login/forgot-password/"> <a target="_self" class="link" rel="external" href="/login/forgot-password/">
@@ -50,7 +50,7 @@
<label for="remember-me">{% trans 'login::Remember me' %}</label></div> <label for="remember-me">{% trans 'login::Remember me' %}</label></div>
</div> </div>
<div style="margin-top:10px;height:25px;"> <div style="margin-top:10px;height:25px;">
<div style="float:right;text-align:right;"><input {% if maintenance == true %}disabled{% endif %} <div style="float:right;text-align:right;"><input {% if app['phraseanet.registry'].get('GV_maintenance') == true %}disabled{% endif %}
tabindex="5" type="submit" value="{% trans 'login:: connexion' %}"/></div> tabindex="5" type="submit" value="{% trans 'login:: connexion' %}"/></div>
</div> </div>
<div style="margin-top:20px;"> <div style="margin-top:20px;">

4
templates/web/login/register.html.twig
View File

@@ -286,7 +286,7 @@
<hr /> <hr />
</div><!-- /form_register_table --> </div><!-- /form_register_table -->
{% if registry.get('GV_autoselectDB') %} {% if app['phraseanet.registry'].get('GV_autoselectDB') %}
<div style="display: none;"> <div style="display: none;">
{% endif %} {% endif %}
@@ -367,7 +367,7 @@
</div> </div>
{% if registry.get('GV_autoselectDB') %} {% if app['phraseanet.registry'].get('GV_autoselectDB') %}
</div> </div>
{% endif %} {% endif %}

2
templates/web/overview.html.twig
View File

@@ -7,7 +7,7 @@
{% endblock %} {% endblock %}
{% block stylesheet %} {% block stylesheet %}
<link type="text/css" rel="stylesheet" href="{{registry.get('GV_STATIC_URL')}}/include/minify/f=include/jslibs/yui2.8/build/reset/reset.css" > <link type="text/css" rel="stylesheet" href="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/include/minify/f=include/jslibs/yui2.8/build/reset/reset.css" >
<style type="text/css"> <style type="text/css">
html{ html{

2
templates/web/prod/actions/Bridge/error.html.twig
View File

@@ -21,7 +21,7 @@
<div style="text-align:center;margin:10px 0;"> <div style="text-align:center;margin:10px 0;">
Details : {{message}} Details : {{message}}
</div> </div>
{% if registry.get('GV_debug') %} {% if app['phraseanet.registry'].get('GV_debug') %}
<div> <div>
{{file}}:{{line}} {{file}}:{{line}}
</div> </div>

6
templates/web/prod/actions/Tools/index.html.twig
View File

@@ -57,7 +57,7 @@
</a> </a>
</li> </li>
{% endif %} {% endif %}
{% if selectionLength == 1 and registry.get('GV_seeOngChgDoc') %} {% if selectionLength == 1 and app['phraseanet.registry'].get('GV_seeOngChgDoc') %}
<li> <li>
<a href="#substitution"> <a href="#substitution">
{% trans "substitution" %} {% trans "substitution" %}
@@ -261,7 +261,7 @@
{% for record in selection %} {% for record in selection %}
<div id="substitution" class="tabBox"> <div id="substitution" class="tabBox">
{% if registry.get('GV_seeOngChgDoc') %} {% if app['phraseanet.registry'].get('GV_seeOngChgDoc') %}
<div id="substitution-hd"> <div id="substitution-hd">
<form <form
name ="formchgHD" name ="formchgHD"
@@ -295,7 +295,7 @@
</div> </div>
{% endif %} {% endif %}
{% if registry.get('GV_seeNewThumb') %} {% if app['phraseanet.registry'].get('GV_seeNewThumb') %}
<div id="substitution-sd"> <div id="substitution-sd">
<form <form
name="formchgHD" name="formchgHD"

18
templates/web/prod/index.html.twig
View File

@@ -89,9 +89,9 @@
} }
</style> </style>
<link type="text/css" rel="stylesheet" href="{{registry.get('GV_STATIC_URL')}}/include/minify/f=include/jslibs/jquery.contextmenu.css,include/jslibs/colorpicker/css/colorpicker.css,include/jslibs/jquery-treeview/jquery.treeview.css,skins/common/main.css,skins/account/geonames.css,include/jquery.image_enhancer.css,include/jslibs/jquery-ui-1.8.17/css/dark-hive/jquery-ui-1.8.17.custom.css" > <link type="text/css" rel="stylesheet" href="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/include/minify/f=include/jslibs/jquery.contextmenu.css,include/jslibs/colorpicker/css/colorpicker.css,include/jslibs/jquery-treeview/jquery.treeview.css,skins/common/main.css,skins/account/geonames.css,include/jquery.image_enhancer.css,include/jslibs/jquery-ui-1.8.17/css/dark-hive/jquery-ui-1.8.17.custom.css" >
<link id="skinCss" type="text/css" rel="stylesheet" href="{{registry.get('GV_STATIC_URL')}}/include/minify/f=skins/prod/{{cssfile}}/prodcolor.css" > <link id="skinCss" type="text/css" rel="stylesheet" href="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/include/minify/f=skins/prod/{{cssfile}}/prodcolor.css" >
<link type="text/css" rel="stylesheet" href="{{registry.get('GV_STATIC_URL')}}/include/minify/f=include/vendor/humane-js/themes/libnotify.css,skins/prod/Prod.css,skins/prod/Basket.css,skins/prod/Push.css" > <link type="text/css" rel="stylesheet" href="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/include/minify/f=include/vendor/humane-js/themes/libnotify.css,skins/prod/Prod.css,skins/prod/Basket.css,skins/prod/Push.css" >
<!--[if IE 7]> <!--[if IE 7]>
<link type="text/css" rel="stylesheet" href="/include/minify/f=skins/prod/ie7.css" > <link type="text/css" rel="stylesheet" href="/include/minify/f=skins/prod/ie7.css" >
@@ -264,7 +264,7 @@
{% trans 'Browse Baskets' %} {% trans 'Browse Baskets' %}
</a> </a>
</div> </div>
{% if registry.get('GV_multiAndReport') %} {% if app['phraseanet.registry'].get('GV_multiAndReport') %}
<div class="context-menu-item-inner"@> <div class="context-menu-item-inner"@>
<a title="{% trans 'action:: nouveau reportage' %}" class="dialog small-dialog" href="/prod/story/create/"> <a title="{% trans 'action:: nouveau reportage' %}" class="dialog small-dialog" href="/prod/story/create/">
<img style="cursor:pointer;" src="/skins/icons/mtadd_0.gif" title="{% trans 'action:: nouveau reportage' %}" /> <img style="cursor:pointer;" src="/skins/icons/mtadd_0.gif" title="{% trans 'action:: nouveau reportage' %}" />
@@ -349,7 +349,7 @@
<div class="btn-toolbar"> <div class="btn-toolbar">
<input class="btn btn-inverse" type="button" value="{% trans 'Re-initialiser' %}" onclick="reset_adv_search();" /> <input class="btn btn-inverse" type="button" value="{% trans 'Re-initialiser' %}" onclick="reset_adv_search();" />
</div> </div>
{% if registry.get('GV_sphinx') %} {% if app['phraseanet.registry'].get('GV_sphinx') %}
<span>{% trans 'Trier par ' %}</span> <span>{% trans 'Trier par ' %}</span>
<select name="sort" class="input-mini"> <select name="sort" class="input-mini">
<option value="relevance">{% trans 'pertinence'%}</option> <option value="relevance">{% trans 'pertinence'%}</option>
@@ -367,7 +367,7 @@
<option value=""></option> <option value=""></option>
{% for field_id, field in search_datas['fields'] %} {% for field_id, field in search_datas['fields'] %}
{% if field['type'] == 'date' %} {% if field['type'] == 'date' %}
<option class="field_switch field_{{field['sbas']|join(' field_')}}" value="{{field_id}}" {% if registry.get('GV_phrasea_sort') == field['fieldname'] %}selected="selected"{% endif %}>{{ field['fieldname'] }}</option> <option class="field_switch field_{{field['sbas']|join(' field_')}}" value="{{field_id}}" {% if app['phraseanet.registry'].get('GV_phrasea_sort') == field['fieldname'] %}selected="selected"{% endif %}>{{ field['fieldname'] }}</option>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</select> </select>
@@ -1033,9 +1033,9 @@
<script type="text/javascript"> <script type="text/javascript">
{% include "prod/thesaurus.js" %} {% include "prod/thesaurus.js" %}
</script> </script>
<script type="text/javascript" src="{{registry.get('GV_STATIC_URL')}}/include/minify/g=prod"></script> <script type="text/javascript" src="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/include/minify/g=prod"></script>
<script type="text/javascript" src="{{registry.get('GV_STATIC_URL')}}/include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js"></script> <script type="text/javascript" src="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js"></script>
<script type="text/javascript" src="{{registry.get('GV_STATIC_URL')}}/include/minify/f=include/tinymce/jscripts/tiny_mce/tiny_mce.js"></script> <script type="text/javascript" src="{{app['phraseanet.registry'].get('GV_STATIC_URL')}}/include/minify/f=include/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
p4.reg_delete="{% if app['phraseanet.user'].getPrefs("warning_on_delete_story") %}true{% else %}false{% endif %}"; p4.reg_delete="{% if app['phraseanet.user'].getPrefs("warning_on_delete_story") %}true{% else %}false{% endif %}";

2
templates/web/prod/preview/appears_in.html.twig
View File

@@ -4,7 +4,7 @@
<li class="title">{% trans 'Apparait aussi dans ces reportages' %}</li> <li class="title">{% trans 'Apparait aussi dans ces reportages' %}</li>
{% for par in parents %} {% for par in parents %}
<li onclick="openPreview('REG',0,'{{par.get_serialize_key()}}'); return(false);" <li onclick="openPreview('REG',0,'{{par.get_serialize_key()}}'); return(false);"
class="otherRegToolTip" {% if registry.get('GV_rollover_reg_preview') %}tooltipsrc="/prod/tooltip/caption/{{par.get_sbas_id()}}/{{par.get_record_id()}}/basket/" {% endif %}> class="otherRegToolTip" {% if app['phraseanet.registry'].get('GV_rollover_reg_preview') %}tooltipsrc="/prod/tooltip/caption/{{par.get_sbas_id()}}/{{par.get_record_id()}}/basket/" {% endif %}>
<img src="{{par.get_thumbnail().get_url()}}" style="width:25px;height:25px;"/> <img src="{{par.get_thumbnail().get_url()}}" style="width:25px;height:25px;"/>
<span class="title"> {{ par.get_title() }} </span> <span class="title"> {{ par.get_title() }} </span>
</li> </li>

2
templates/web/prod/preview/basket_train.html.twig
View File

@@ -13,7 +13,7 @@
{% endif %} {% endif %}
{% set tooltip = '' %} {% set tooltip = '' %}
{% if registry.get('GV_rollover_reg_preview') %} {% if app['phraseanet.registry'].get('GV_rollover_reg_preview') %}
{% set tooltip = 'tooltipsrc="/prod/tooltip/caption/' ~ child.getRecord(app).get_sbas_id() ~ '/' ~ child.getRecord(app).get_record_id() ~ '/basket/"' %} {% set tooltip = 'tooltipsrc="/prod/tooltip/caption/' ~ child.getRecord(app).get_sbas_id() ~ '/' ~ child.getRecord(app).get_record_id() ~ '/basket/"' %}
{% endif %} {% endif %}

2
templates/web/prod/preview/feed_train.html.twig
View File

@@ -13,7 +13,7 @@
{% endif %} {% endif %}
{% set tooltip = '' %} {% set tooltip = '' %}
{% if registry.get('GV_rollover_reg_preview') %} {% if app['phraseanet.registry'].get('GV_rollover_reg_preview') %}
{% set tooltip = 'tooltipsrc="/prod/tooltip/preview/' ~ child.get_record().get_sbas_id() ~ '/' ~ child.get_record().get_record_id() ~ '/"'%} {% set tooltip = 'tooltipsrc="/prod/tooltip/preview/' ~ child.get_record().get_sbas_id() ~ '/' ~ child.get_record().get_record_id() ~ '/"'%}
{% endif %} {% endif %}

2
templates/web/prod/preview/reg_train.html.twig
View File

@@ -32,7 +32,7 @@
{% endif %} {% endif %}
{% set tooltip = '' %} {% set tooltip = '' %}
{% if registry.get('GV_rollover_reg_preview') %} {% if app['phraseanet.registry'].get('GV_rollover_reg_preview') %}
{% set tooltip = 'tooltipsrc="/prod/tooltip/caption/'~ contained.get_sbas_id() ~'/'~ contained.get_record_id() ~ '/preview/?number=' ~ contained.get_number() ~ '"' %} {% set tooltip = 'tooltipsrc="/prod/tooltip/caption/'~ contained.get_sbas_id() ~'/'~ contained.get_record_id() ~ '/preview/?number=' ~ contained.get_number() ~ '"' %}
{% endif %} {% endif %}

2
templates/web/report/ajax_dashboard_content_child.html.twig
View File

@@ -45,7 +45,7 @@
{{ dash.table('report:: Les questions les plus posees' , 'report:: utilisateurs' , 'report:: question', item.ask, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }} {{ dash.table('report:: Les questions les plus posees' , 'report:: utilisateurs' , 'report:: question', item.ask, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }}
{%endif %} {%endif %}
{% if "top_ten_question"|key_exists(item) %} {% if "top_ten_question"|key_exists(item) %}
{{dash.top_ten_question(home_title, "report:: question", "report:: poids preview" , item.top_ten_question,dashboard.getTitleDate('dmin') , dashboard.getTitleDate('dmax')) }} {{dash.top_ten_question(app['phraseanet.registry'].get('GV_homeTitle'), "report:: question", "report:: poids preview" , item.top_ten_question,dashboard.getTitleDate('dmin') , dashboard.getTitleDate('dmax')) }}
{%endif %} {%endif %}
{% if "top_ten_site"|key_exists(item) %} {% if "top_ten_site"|key_exists(item) %}
{{ dash.table('report:: site d\'ou les photo sont les plus consultees' , 'report:: site' , 'report:: nombre de vue', item.top_ten_site, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }} {{ dash.table('report:: site d\'ou les photo sont les plus consultees' , 'report:: site' , 'report:: nombre de vue', item.top_ten_site, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }}

4
templates/web/setup/upgrader.html.twig
View File

@@ -76,7 +76,7 @@
</p> </p>
<p> <p>
<code style="width:90%"> <code style="width:90%">
{{registry.get('GV_cli')}} {% if registry.get('GV_PHP_INI') %} -c {{registry.get('GV_PHP_INI')}}{% endif %} bin/console system:mailCheck {{app['phraseanet.registry'].get('GV_cli')}} {% if app['phraseanet.registry'].get('GV_PHP_INI') %} -c {{app['phraseanet.registry'].get('GV_PHP_INI')}}{% endif %} bin/console system:mailCheck
</code> </code>
</p> </p>
{% else %} {% else %}
@@ -85,7 +85,7 @@
</p> </p>
<p> <p>
<code style="width:90%"> <code style="width:90%">
{{registry.get('GV_cli')}} {% if registry.get('GV_PHP_INI') %} -c {{registry.get('GV_PHP_INI')}}{% endif %} bin/console system:upgrade {{app['phraseanet.registry'].get('GV_cli')}} {% if app['phraseanet.registry'].get('GV_PHP_INI') %} -c {{app['phraseanet.registry'].get('GV_PHP_INI')}}{% endif %} bin/console system:upgrade
</code> </code>
</p> </p>
<p> <p>