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

Update templates

Browse Source
This commit is contained in:
Romain Neutron
2012-09-21 11:31:48 +02:00
parent d920fe6de5
commit ec11550eab
114 changed files with 510 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@
<h1 id="namePhr">{{home_title}}</h1> <h1 id="namePhr">{{home_title}}</h1>
</div> </div>
{% if not session.is_authenticated %} {% if not app.isAuthenticated() %}
<div id="content-box" class="span6 offset3"> <div id="content-box" class="span6 offset3">
<form id="login-form" class="form-vertical" method="post"> <form id="login-form" class="form-vertical" method="post">
{% for key,value in auth.getParams %} {% for key,value in auth.getParams %}

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

@@ -1,5 +1,5 @@
<!doctype html> <!doctype html>
<html lang="{{ session.get_I18n }}"> <html lang="{{ app['locale.I18n'] }}">
<head> <head>
<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" />

8
templates/mobile/common/thumbnail.html.twig
View File

@@ -1,4 +1,4 @@
{% macro format(thumbnail, b_w, b_h, extraclass, session)%} {% macro format(thumbnail, b_w, b_h, extraclass)%}
{% set b_width = b_w %} {% set b_width = b_w %}
{% set b_height = b_h|default(b_w) %} {% set b_height = b_h|default(b_w) %}
@@ -44,7 +44,7 @@
swfobject.embedSWF("/include/FlexPaper_flash/FlexPaperViewer.swf", swfobject.embedSWF("/include/FlexPaper_flash/FlexPaperViewer.swf",
"preview_{{thumbnail.get_base_id()}}_{{thumbnail.get_record_id()}}_{{random}}", "preview_{{thumbnail.get_base_id()}}_{{thumbnail.get_record_id()}}_{{random}}",
"100%", "100%", "9.0.0", false, false, "100%", "100%", "9.0.0", false, false,
{menu: "false",flashvars: "SwfFile={{thumbnail.get_url()}}&Scale=0.6&ZoomTransition=easeOut&ZoomTime=0.5&ZoomInterval=0.1&FitPageOnLoad=true&FitWidthOnLoad=true&PrintEnabled=true&FullScreenAsMaxWindow=false&localeChain={{session.get_locale()}}", movie: "/include/FlexPaper_flash/FlexPaperViewer.swf", allowFullScreen :"true",wmode: "transparent"}, false);</script> {menu: "false",flashvars: "SwfFile={{thumbnail.get_url()}}&Scale=0.6&ZoomTransition=easeOut&ZoomTime=0.5&ZoomInterval=0.1&FitPageOnLoad=true&FitWidthOnLoad=true&PrintEnabled=true&FullScreenAsMaxWindow=false&localeChain={{ app['locale'] }}", movie: "/include/FlexPaper_flash/FlexPaperViewer.swf", allowFullScreen :"true",wmode: "transparent"}, false);</script>
{% elseif record_type == 'AUDIO_MP3' %} {% elseif record_type == 'AUDIO_MP3' %}
{% set random = thumbnail.get_random() %} {% set random = thumbnail.get_random() %}
@@ -70,7 +70,7 @@
{% endmacro %} {% endmacro %}
{% macro format100percent(thumbnail, extraclass, session)%} {% macro format100percent(thumbnail, extraclass)%}
{% set record_type = thumbnail.get_type() %} {% set record_type = thumbnail.get_type() %}
<div style="width:100%" class="thumb_wrapper {{extraclass|default('')}}"> <div style="width:100%" class="thumb_wrapper {{extraclass|default('')}}">
{% if record_type == 'VIDEO_MP4' or record_type == 'VIDEO_FLV' %} {% if record_type == 'VIDEO_MP4' or record_type == 'VIDEO_FLV' %}
@@ -91,7 +91,7 @@
swfobject.embedSWF("/include/FlexPaper_flash/FlexPaperViewer.swf", swfobject.embedSWF("/include/FlexPaper_flash/FlexPaperViewer.swf",
"preview_{{thumbnail.get_base_id()}}_{{thumbnail.get_record_id()}}_{{random}}", "preview_{{thumbnail.get_base_id()}}_{{thumbnail.get_record_id()}}_{{random}}",
"100%", "100%", "9.0.0", false, false, "100%", "100%", "9.0.0", false, false,
{menu: "false",flashvars: "SwfFile={{thumbnail.get_url()}}&Scale=0.6&ZoomTransition=easeOut&ZoomTime=0.5&ZoomInterval=0.1&FitPageOnLoad=true&FitWidthOnLoad=true&PrintEnabled=true&FullScreenAsMaxWindow=false&localeChain={{session.get_locale()}}", movie: "/include/FlexPaper_flash/FlexPaperViewer.swf", allowFullScreen :"true",wmode: "transparent"}, false);</script> {menu: "false",flashvars: "SwfFile={{thumbnail.get_url()}}&Scale=0.6&ZoomTransition=easeOut&ZoomTime=0.5&ZoomInterval=0.1&FitPageOnLoad=true&FitWidthOnLoad=true&PrintEnabled=true&FullScreenAsMaxWindow=false&localeChain={{app['locale']}}", movie: "/include/FlexPaper_flash/FlexPaperViewer.swf", allowFullScreen :"true",wmode: "transparent"}, false);</script>
{% elseif record_type == 'AUDIO_MP3' %} {% elseif record_type == 'AUDIO_MP3' %}
{% set random = thumbnail.get_random() %} {% set random = thumbnail.get_random() %}

10
templates/mobile/lightbox/basket_element.html.twig
View File

@@ -11,7 +11,7 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{% set record = basket_element.getRecord() %} {% set record = basket_element.getRecord(app) %}
<div data-role="page"> <div data-role="page">
<div data-role="header"> <div data-role="header">
<a href="/lightbox/validate/{{basket_element.getId()}}/" data-rel="back" data-icon="arrow-l">Back</a> <a href="/lightbox/validate/{{basket_element.getId()}}/" data-rel="back" data-icon="arrow-l">Back</a>
@@ -19,14 +19,14 @@
<a rel="external" href="/lightbox/" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a> <a rel="external" href="/lightbox/" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a>
</div> </div>
<div data-role="content"> <div data-role="content">
{{ thumbnail.format100percent(record.get_preview(),'',session, record.get_thumbnail()) }} {{ thumbnail.format100percent(record.get_preview(),'', record.get_thumbnail()) }}
{% if basket_element.getBasket().getValidation() %} {% if basket_element.getBasket().getValidation() %}
{% if basket_element.getBasket().getValidation().getParticipant(user).getCanAgree() %} {% if basket_element.getBasket().getValidation().getParticipant(user, app).getCanAgree() %}
<fieldset data-role="controlgroup" data-type="horizontal" style="text-align:center;"> <fieldset data-role="controlgroup" data-type="horizontal" style="text-align:center;">
<input {% if basket_element.getUserValidationDatas(user).getAgreement() == true%}checked="checked"{% endif %} type="radio" name="radio-view" id="radio-view-yes_{{basket_element.getId()}}" value="yes" /> <input {% if basket_element.getUserValidationDatas(user, app).getAgreement() == true%}checked="checked"{% endif %} type="radio" name="radio-view" id="radio-view-yes_{{basket_element.getId()}}" value="yes" />
<label class="agreement_radio" style="width:130px;text-align:center;" for="radio-view-yes_{{basket_element.getId()}}">{% trans 'validation:: OUI' %}</label> <label class="agreement_radio" style="width:130px;text-align:center;" for="radio-view-yes_{{basket_element.getId()}}">{% trans 'validation:: OUI' %}</label>
<input {% if basket_element.getUserValidationDatas(user).getAgreement() == false and basket_element.getUserValidationDatas(user).getAgreement() is not null %}checked="checked"{% endif %} type="radio" name="radio-view" id="radio-view-no_{{basket_element.getId()}}" value="no" /> <input {% if basket_element.getUserValidationDatas(user, app).getAgreement() == false and basket_element.getUserValidationDatas(user, app).getAgreement() is not null %}checked="checked"{% endif %} type="radio" name="radio-view" id="radio-view-no_{{basket_element.getId()}}" value="no" />
<label class="agreement_radio" style="width:130px;text-align:center;" for="radio-view-no_{{basket_element.getId()}}">{% trans 'validation:: NON' %}</label> <label class="agreement_radio" style="width:130px;text-align:center;" for="radio-view-no_{{basket_element.getId()}}">{% trans 'validation:: NON' %}</label>
</fieldset> </fieldset>
{% endif %} {% endif %}

2
templates/mobile/lightbox/feed.html.twig
View File

@@ -29,7 +29,7 @@
{% for item in feed_entry.get_content() %} {% for item in feed_entry.get_content() %}
<li class="image_box" id="item_{{item.get_id()}}"> <li class="image_box" id="item_{{item.get_id()}}">
<a href="/lightbox/ajax/LOAD_FEED_ITEM/{{feed_entry.get_id()}}/{{item.get_id()}}/"> <a href="/lightbox/ajax/LOAD_FEED_ITEM/{{feed_entry.get_id()}}/{{item.get_id()}}/">
{{thumbnail.format(item.get_record().get_thumbnail(), 80, 80, '', session, true)}} {{thumbnail.format(item.get_record().get_thumbnail(), 80, 80, '', true, false)}}
</a> </a>
<input type="hidden" class="display_id" name="display_id" value="{{item.get_ord()}}" /> <input type="hidden" class="display_id" name="display_id" value="{{item.get_ord()}}" />
</li> </li>

2
templates/mobile/lightbox/feed_element.html.twig
View File

@@ -19,7 +19,7 @@
<a rel="external" href="/lightbox/" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a> <a rel="external" href="/lightbox/" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a>
</div> </div>
<div data-role="content"> <div data-role="content">
{{ thumbnail.format100percent(record.get_preview(),'',session, record.get_thumbnail()) }} {{ thumbnail.format100percent(record.get_preview(),'', record.get_thumbnail()) }}
</div> </div>
<div data-role="footer"> <div data-role="footer">

6
templates/mobile/lightbox/index.html.twig
View File

@@ -63,7 +63,7 @@
<h1>{% trans 'a propos'%}</h1> <h1>{% trans 'a propos'%}</h1>
</div> </div>
<div data-role="content"> <div data-role="content">
<p>Phraseanet Version {{core.getVersion().getName()}} - {{core.getVersion().getNumber()}}</p> <p>Phraseanet Version {{ app['phraseanet.version'].getName() }} - {{ app['phraseanet.version'].getNumber() }}</p>
<p> <p>
<a href='http://www.gnu.org/licenses/gpl.html' target='_blank'> <a href='http://www.gnu.org/licenses/gpl.html' target='_blank'>
<img src='https://www.gnu.org/graphics/gplv3-88x31.png' style='vertical-align:middle;'/> <img src='https://www.gnu.org/graphics/gplv3-88x31.png' style='vertical-align:middle;'/>
@@ -92,7 +92,7 @@
{% set basket_length = basket.getElements().count() %} {% set basket_length = basket.getElements().count() %}
<li> <li>
{% if basket.getElements().first() %} {% if basket.getElements().first() %}
<img src="{{ basket.getElements().first().getRecord().get_thumbnail.get_url()}}" /> <img src="{{ basket.getElements().first().getRecord(app).get_thumbnail.get_url()}}" />
{% endif %} {% endif %}
<h3><a href="/lightbox/validate/{{basket.getId()}}/">{{basket.getName()}}</a></h3> <h3><a href="/lightbox/validate/{{basket.getId()}}/">{{basket.getName()}}</a></h3>
<p>{{ basket.getDescription() }}</p> <p>{{ basket.getDescription() }}</p>
@@ -121,7 +121,7 @@
{% set basket_length = basket.getElements().count() %} {% set basket_length = basket.getElements().count() %}
<li> <li>
{% if basket.getElements().first() %} {% if basket.getElements().first() %}
<img src="{{ basket.getElements().first().getRecord().get_thumbnail.get_url()}}" /> <img src="{{ basket.getElements().first().getRecord(app).get_thumbnail.get_url()}}" />
{% endif %} {% endif %}
<h3><a href="/lightbox/validate/{{ basket.getId() }}/">{{ basket.getName() }}</a></h3> <h3><a href="/lightbox/validate/{{ basket.getId() }}/">{{ basket.getName() }}</a></h3>
<p>{{ basket.getDescription() }}</p> <p>{{ basket.getDescription() }}</p>

4
templates/mobile/lightbox/note_form.html.twig
View File

@@ -13,13 +13,13 @@
{% block content %} {% block content %}
<div data-role="page" data-ajax="false" id="note_form_{{basket_element.getId()}}"> <div data-role="page" data-ajax="false" id="note_form_{{basket_element.getId()}}">
<div data-role="header"> <div data-role="header">
<h1>{{basket_element.getRecord().get_title}} - Note</h1> <h1>{{basket_element.getRecord(app).get_title}} - Note</h1>
</div> </div>
<div data-role="content"> <div data-role="content">
<form action=""> <form action="">
<textarea class="note_area" <textarea class="note_area"
id="note_area_{{basket_element.getId()}}" id="note_area_{{basket_element.getId()}}"
{% if basket_element.getUserValidationDatas(user).getNote() == '' %}placeholder="Note"{% endif %}>{{basket_element.getUserValidationDatas(user).getNote()}}</textarea> {% if basket_element.getUserValidationDatas(user, app).getNote() == '' %}placeholder="Note"{% endif %}>{{basket_element.getUserValidationDatas(user, app).getNote()}}</textarea>
<button type="submit" class="note_area_validate">{% trans 'boutton::valider' %}</button> <button type="submit" class="note_area_validate">{% trans 'boutton::valider' %}</button>
<input name="sselcont_id" value="{{basket_element.getId()}}" type="hidden"/> <input name="sselcont_id" value="{{basket_element.getId()}}" type="hidden"/>
</form> </form>

4
templates/mobile/lightbox/sc_note.html.twig
View File

@@ -1,5 +1,5 @@
{% for validationDatas in basket_element.getValidationDatas() %} {% for validationDatas in basket_element.getValidationDatas() %}
{% set is_mine = validationDatas.getParticipant().getUser().get_id() == user.get_id() %} {% set is_mine = validationDatas.getParticipant().getUser(app).get_id() == user.get_id() %}
{% if validationDatas.getNote() != '' or (validationDatas.getAgreement() is not null and is_mine) %} {% if validationDatas.getNote() != '' or (validationDatas.getAgreement() is not null and is_mine) %}
<li> <li>
<h3 style="text-align:left;"> <h3 style="text-align:left;">
@@ -7,7 +7,7 @@
<img style="vertical-align:middle;" <img style="vertical-align:middle;"
src="/skins/lightbox/{% if validationDatas.getAgreement() == true %}agree.png{% else %}disagree.png{% endif %}" /> src="/skins/lightbox/{% if validationDatas.getAgreement() == true %}agree.png{% else %}disagree.png{% endif %}" />
{% endif %} {% endif %}
{{ validationDatas.getParticipant().getUser().get_display_name() }} {{ validationDatas.getParticipant().getUser(app).get_display_name() }}
</h3> </h3>
{% if validationDatas.getNote() != '' %} {% if validationDatas.getNote() != '' %}
<p style="text-align:left;">{% trans 'validation:: note'%} : {{ validationDatas.getNote()|nl2br }}</p> <p style="text-align:left;">{% trans 'validation:: note'%} : {{ validationDatas.getNote()|nl2br }}</p>

6
templates/mobile/lightbox/validate.html.twig
View File

@@ -24,12 +24,12 @@
<ul class="image_set"> <ul class="image_set">
{% for basket_element in basket.getElements() %} {% for basket_element in basket.getElements() %}
<li class="image_box" id="sselcontid_{{basket_element.getId()}}"> <li class="image_box" id="sselcontid_{{basket_element.getId()}}">
{% if basket_element.getBasket().getValidation() and basket_element.getBasket().getValidation().getParticipant(user).getCanAgree() %} {% if basket_element.getBasket().getValidation() and basket_element.getBasket().getValidation().getParticipant(user, app).getCanAgree() %}
<div class="valid_choice valid_choice_{{basket_element.getId()}} {% if basket_element.getUserValidationDatas(user).getAgreement() == true %}agree{% elseif basket_element.getUserValidationDatas(user).getAgreement() == false and basket_element.getUserValidationDatas(user).getAgreement() is not null %}disagree{% endif %}"> <div class="valid_choice valid_choice_{{basket_element.getId()}} {% if basket_element.getUserValidationDatas(user, app).getAgreement() == true %}agree{% elseif basket_element.getUserValidationDatas(user, app).getAgreement() == false and basket_element.getUserValidationDatas(user, app).getAgreement() is not null %}disagree{% endif %}">
</div> </div>
{% endif %} {% endif %}
<a href="/lightbox/ajax/LOAD_BASKET_ELEMENT/{{basket_element.getId()}}/"> <a href="/lightbox/ajax/LOAD_BASKET_ELEMENT/{{basket_element.getId()}}/">
{{thumbnail.format(basket_element.getRecord().get_thumbnail(), 80, 80, '', session, true)}} {{thumbnail.format(basket_element.getRecord(app).get_thumbnail(), 80, 80, '', true, false)}}
</a> </a>
<input type="hidden" class="display_id" name="display_id" value="{{basket_element.getOrd()}}" /> <input type="hidden" class="display_id" name="display_id" value="{{basket_element.getOrd()}}" />
</li> </li>

30
templates/web/account/access.html.twig
View File

@@ -11,17 +11,17 @@
{% for sbasId, baseInsc in inscriptions %} {% for sbasId, baseInsc in inscriptions %}
{% if baseInsc['CollsRegistered'] or baseInsc['CollsRefuse'] or baseInsc['CollsWait'] or baseInsc['CollsIntime'] or baseInsc['CollsOuttime'] or baseInsc['CollsNonactif'] or baseInsc['CollsCGU'] or baseInsc['Colls'] %} {% if baseInsc['CollsRegistered'] or baseInsc['CollsRefuse'] or baseInsc['CollsWait'] or baseInsc['CollsIntime'] or baseInsc['CollsOuttime'] or baseInsc['CollsNonactif'] or baseInsc['CollsCGU'] or baseInsc['Colls'] %}
<tr> <tr>
<td colspan="3" style="text-align: center;"><h3>{{ sbasId | sbas_names }}</h3></td> <td colspan="3" style="text-align: center;"><h3>{{ sbasId | sbas_names(app) }}</h3></td>
</tr> </tr>
{% endif %} {% endif %}
{% if baseInsc['CollsRegistered'] is not none %} {% if baseInsc['CollsRegistered'] is not none %}
{% for base in baseInsc['CollsRegistered']%} {% for base in baseInsc['CollsRegistered']%}
{% for collId, isTrue in base %} {% for collId, isTrue in base %}
{% set base_id = sbasId |base_from_coll(collId) %} {% set base_id = sbasId |base_from_coll(collId, app) %}
<tr> <tr>
<td colspan="3" style="text-align:center;"> <td colspan="3" style="text-align:center;">
{% trans 'login::register: acces authorise sur la collection ' %}{{ sbasId |sbas_names }} {% trans 'login::register: acces authorise sur la collection ' %}{{ sbasId |sbas_names(app) }}
{% if isTrue | trim != '' %} {% if isTrue | trim != '' %}
<a class="inscriptlink" href="/include/cguUtils.php?action=PRINT&bas={{sbasId}}&col='{{collId}}">{% trans 'login::register::CGU: lire les CGU' %}</a> <a class="inscriptlink" href="/include/cguUtils.php?action=PRINT&bas={{sbasId}}&col='{{collId}}">{% trans 'login::register::CGU: lire les CGU' %}</a>
{% endif %} {% endif %}
@@ -37,10 +37,10 @@
{% if baseInsc['CollsRefuse'] %} {% if baseInsc['CollsRefuse'] %}
{% for collId, isTrue in baseInsc['CollsRefuse'] %} {% for collId, isTrue in baseInsc['CollsRefuse'] %}
{% set base_id = sbasId |base_from_coll(collId) %} {% set base_id = sbasId |base_from_coll(collId, app) %}
<tr> <tr>
<td colspan="3" style="text-align: center;"> <td colspan="3" style="text-align: center;">
<span style="color: red;">{% trans 'login::register: acces refuse sur la collection ' %}{{ sbasId |sbas_names }}</span> <span style="color: red;">{% trans 'login::register: acces refuse sur la collection ' %}{{ sbasId |sbas_names(app) }}</span>
{% if isTrue | trim != '' %} {% if isTrue | trim != '' %}
<a class="inscriptlink" href="/include/cguUtils.php?action=PRINT&bas={{sbasId}}&col='{{collId}}">{% trans 'login::register::CGU: lire les CGU' %}</a> <a class="inscriptlink" href="/include/cguUtils.php?action=PRINT&bas={{sbasId}}&col='{{collId}}">{% trans 'login::register::CGU: lire les CGU' %}</a>
{% endif %} {% endif %}
@@ -55,10 +55,10 @@
{% if baseInsc['CollsWait'] %} {% if baseInsc['CollsWait'] %}
{% for collId, isTrue in baseInsc['CollsWait'] %} {% for collId, isTrue in baseInsc['CollsWait'] %}
{% set base_id = sbasId |base_from_coll(collId) %} {% set base_id = sbasId |base_from_coll(collId, app) %}
<tr> <tr>
<td colspan="3" style="text-align: center;"> <td colspan="3" style="text-align: center;">
<span style="color: orange;">{% trans 'login::register: en attente d\'acces sur' %} {{ sbasId |sbas_names }}</span> <span style="color: orange;">{% trans 'login::register: en attente d\'acces sur' %} {{ sbasId |sbas_names(app) }}</span>
{% if isTrue | trim != '' %} {% if isTrue | trim != '' %}
<a class="inscriptlink" href="/include/cguUtils.php?action=PRINT&bas={{sbasId}}&col='{{collId}}">{% trans 'login::register::CGU: lire les CGU' %}</a> <a class="inscriptlink" href="/include/cguUtils.php?action=PRINT&bas={{sbasId}}&col='{{collId}}">{% trans 'login::register::CGU: lire les CGU' %}</a>
{% endif %} {% endif %}
@@ -70,10 +70,10 @@
{% if baseInsc['CollsIntime'] %} {% if baseInsc['CollsIntime'] %}
{% for collId, isTrue in baseInsc['CollsIntime'] %} {% for collId, isTrue in baseInsc['CollsIntime'] %}
{% set base_id = sbasId |base_from_coll(collId) %} {% set base_id = sbasId |base_from_coll(collId, app) %}
<tr> <tr>
<td colspan="3" style="text-align: center;"> <td colspan="3" style="text-align: center;">
<span>{% trans 'login::register: acces temporaire sur' %} {{ sbasId |sbas_names }}</span> <span>{% trans 'login::register: acces temporaire sur' %} {{ sbasId |sbas_names(app) }}</span>
{% if isTrue |trim != '' %} {% if isTrue |trim != '' %}
<a class="inscriptlink" href="/include/cguUtils.php?action=PRINT&bas={{sbasId}}&col='{{collId}}">{% trans 'login::register::CGU: lire les CGU' %}</a> <a class="inscriptlink" href="/include/cguUtils.php?action=PRINT&bas={{sbasId}}&col='{{collId}}">{% trans 'login::register::CGU: lire les CGU' %}</a>
{% endif %} {% endif %}
@@ -85,10 +85,10 @@
{% if baseInsc['CollsOuttime'] %} {% if baseInsc['CollsOuttime'] %}
{% for collId, isTrue in baseInsc['CollsOuttime'] %} {% for collId, isTrue in baseInsc['CollsOuttime'] %}
{% set base_id = sbasId |base_from_coll(collId) %} {% set base_id = sbasId |base_from_coll(collId, app) %}
<tr> <tr>
<td colspan="3" style="text-align: center;"> <td colspan="3" style="text-align: center;">
<span style="color:red;">{% trans 'login::register: acces temporaire termine sur ' %}{{ sbasId |sbas_names }}</span> <span style="color:red;">{% trans 'login::register: acces temporaire termine sur ' %}{{ sbasId |sbas_names(app) }}</span>
{% if isTrue |trim != '' %} {% if isTrue |trim != '' %}
<a class="inscriptlink" href="/include/cguUtils.php?action=PRINT&bas={{sbasId}}&col='{{collId}}">{% trans 'login::register::CGU: lire les CGU' %}</a> <a class="inscriptlink" href="/include/cguUtils.php?action=PRINT&bas={{sbasId}}&col='{{collId}}">{% trans 'login::register::CGU: lire les CGU' %}</a>
{% endif %} {% endif %}
@@ -100,10 +100,10 @@
{% if baseInsc['CollsNonactif'] %} {% if baseInsc['CollsNonactif'] %}
{% for collId, isTrue in baseInsc['CollsNonactif'] %} {% for collId, isTrue in baseInsc['CollsNonactif'] %}
{% set base_id = sbasId |base_from_coll(collId) %} {% set base_id = sbasId |base_from_coll(collId, app) %}
<tr> <tr>
<td colspan="3" style="text-align: center;"> <td colspan="3" style="text-align: center;">
<span style="color:red;">{% trans 'login::register: acces supendu sur' %} {{ sbasId |sbas_names }}</span> <span style="color:red;">{% trans 'login::register: acces supendu sur' %} {{ sbasId |sbas_names(app) }}</span>
{% if isTrue |trim != '' %} {% if isTrue |trim != '' %}
<a class="inscriptlink" href="/include/cguUtils.php?action=PRINT&bas={{sbasId}}&col='{{collId}}">{% trans 'login::register::CGU: lire les CGU' %}</a> <a class="inscriptlink" href="/include/cguUtils.php?action=PRINT&bas={{sbasId}}&col='{{collId}}">{% trans 'login::register::CGU: lire les CGU' %}</a>
{% endif %} {% endif %}
@@ -124,7 +124,7 @@
</tr> </tr>
{% endif %} {% endif %}
{% for collId, collName in baseInsc['Colls'] %} {% for collId, collName in baseInsc['Colls'] %}
{% set base_id = sbasId |base_from_coll(collId) %} {% set base_id = sbasId |base_from_coll(collId, app) %}
<tr> <tr>
<td style="text-align: right;">{{ collName }}</td> <td style="text-align: right;">{{ collName }}</td>
<td></td> <td></td>
@@ -137,7 +137,7 @@
{% endif %} {% endif %}
{% if baseInsc['CollsCGU'] %} {% if baseInsc['CollsCGU'] %}
{% for collId, collDesc in baseInsc['CollsCGU'] %} {% for collId, collDesc in baseInsc['CollsCGU'] %}
{% set base_id = sbasId |base_from_coll(collId) %} {% set base_id = sbasId |base_from_coll(collId, app) %}
<tr> <tr>
<td colspan="3" style="text-align: center;"><hr style="width: 80%"/></td> <td colspan="3" style="text-align: center;"><hr style="width: 80%"/></td>
</tr> </tr>

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

@@ -90,7 +90,7 @@
<div class="control-group"> <div class="control-group">
<label class="form_label control-label" for="form_city">{% trans 'admin::compte-utilisateur ville' %}</label> <label class="form_label control-label" for="form_city">{% trans 'admin::compte-utilisateur ville' %}</label>
<div class="controls"> <div class="controls">
<input class="input_element geoname_field" type="text" name="form_geonameid" id="form_geonameid" geonameid="{{ user.get_geonameid() }}" value="{{ geonames.name_from_id(user.get_geonameid()) }}" /> <input class="input_element geoname_field" type="text" name="form_geonameid" id="form_geonameid" geonameid="{{ user.get_geonameid() }}" value="{{ geonames.name_from_id(user.get_geonameid(), app) }}" />
<p class="form_alert help-block"></p> <p class="form_alert help-block"></p>
</div> </div>
</div> </div>

2
templates/web/account/authorized_apps.html.twig
View File

@@ -76,7 +76,7 @@ $(document).ready(function(){
{% endif%} {% endif%}
</span> </span>
<span class='app-row'> <span class='app-row'>
<font size="1"><i>{{app.get_created_on()|prettyDate}}</i></font> <font size="1"><i>{{ app['date-formatter'].getPrettyString(app.get_created_on()) }}</i></font>
</span> </span>
<span class='app-row'>{{ app.get_description() }}</span> <span class='app-row'>{{ app.get_description() }}</span>
</div> </div>

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

@@ -1,4 +1,4 @@
<html lang="{{ session.get_I18n() }}"> <html lang="{{ app['locale.I18n'] }}">
<head> <head>
<title>{{ home_title }} {% block title %}{% endblock %}</title> <title>{{ home_title }} {% 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"/>

8
templates/web/account/sessions.html.twig
View File

@@ -30,18 +30,18 @@
{% trans 'Session persistante' %} {% trans 'Session persistante' %}
</td> </td>
</tr> </tr>
{% for row in session.get_my_sessions() %} {% for row in sessions %}
<tr> <tr>
<td> <td>
{% if session.get_ses_id() != row['session_id'] %} {% if app['session'].get('phrasea_session_id') != row['session_id'] %}
<img src="/skins/icons/delete.png"/> <img src="/skins/icons/delete.png"/>
{% endif %} {% endif %}
</td> </td>
<td> <td>
{{ row['created_on'] |formatDate }} {{ app['date-formatter'].getDate(row['created_on']) }}
</td> </td>
<td> <td>
{{ row['lastaccess'] |formatDate }} {{ app['date-formatter'].getDate(row['lastaccess']) }}
</td> </td>
<td> <td>
{{ row['ip'] }} {{ row['ip'] }}

8
templates/web/admin/collection/collection.html.twig
View File

@@ -12,12 +12,12 @@
</h1> </h1>
</div> </div>
{% if app.request.query.get('success') == '1' %} {% if app['request'].query.get('success') == '1' %}
<div class="alert alert-success"> <div class="alert alert-success">
<a class="close" data-dismiss="alert" href="#">×</a> <a class="close" data-dismiss="alert" href="#">×</a>
{% trans 'Successful update' %} {% trans 'Successful update' %}
</div> </div>
{% elseif app.request.query.get('success') == '0' %} {% elseif app['request'].query.get('success') == '0' %}
<div class="alert alert-error"> <div class="alert alert-error">
<a class="close" data-dismiss="alert" href="#">×</a> <a class="close" data-dismiss="alert" href="#">×</a>
<strong>{% trans 'An error occured' %}</strong> <strong>{% trans 'An error occured' %}</strong>
@@ -118,8 +118,8 @@
{# mini logo #} {# mini logo #}
<div class="well well-small action-block"> <div class="well well-small action-block">
<h5>{% trans 'admin::base:collection: minilogo actuel' %}</h5> <h5>{% trans 'admin::base:collection: minilogo actuel' %}</h5>
{% if collection.getLogo(bas_id) is not empty %} {% if collection.getLogo(bas_id, app) is not empty %}
<div class="thumbnail" style="width:120px;height:24px;margin-top:5px;margin-bottom:5px">{{ collection.getLogo(bas_id) | raw }}</div> <div class="thumbnail" style="width:120px;height:24px;margin-top:5px;margin-bottom:5px">{{ collection.getLogo(bas_id, app) | raw }}</div>
{% if user.ACL.has_right_on_base(bas_id, 'manage') %} {% if user.ACL.has_right_on_base(bas_id, 'manage') %}
<form method="post" action="/admin/collection/{{ bas_id }}/picture/mini-logo/delete/" style="margin:0;"> <form method="post" action="/admin/collection/{{ bas_id }}/picture/mini-logo/delete/" style="margin:0;">
<button class="btn btn-danger btn-mini" > <button class="btn btn-danger btn-mini" >

10
templates/web/admin/collection/create.html.twig
View File

@@ -2,21 +2,21 @@
<h1>{% trans 'admin::base:collection: Creer une collection' %}</h1> <h1>{% trans 'admin::base:collection: Creer une collection' %}</h1>
</div> </div>
{% if app.request.get('error') == 'name' %} {% if app['request'].get('error') == 'name' %}
<div class="alert alert-error"> <div class="alert alert-error">
<a class="close" data-dismiss="alert" href="#">×</a> <a class="close" data-dismiss="alert" href="#">×</a>
{% trans 'admin:: La collection n\'a pas ete creee : vous devez donner un nom a votre collection' %} {% trans 'admin:: La collection n\'a pas ete creee : vous devez donner un nom a votre collection' %}
</div> </div>
{% elseif app.request.get('error') == 'error' %} {% elseif app['request'].get('error') == 'error' %}
<div class="alert alert-error"> <div class="alert alert-error">
<a class="close" data-dismiss="alert" href="#">×</a> <a class="close" data-dismiss="alert" href="#">×</a>
{% trans 'An error occured, please retry or contact an admin if problem persist' %} {% trans 'An error occured, please retry or contact an admin if problem persist' %}
</div> </div>
{% endif %} {% endif %}
<div class="well well-small"> <div class="well-small">
<form class="form-horizontal" method="post" action="{{ path('admin_database_submit_collection', {'databox_id': app.request.get('databox_id')}) }}"> <form class="form-horizontal" method='post' action='{{ path('admin_database_submit_collection', {'databox_id': app['request'].get('databox_id')}) }}'>
<fieldset> <fieldset>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="cnm">{% trans 'admin::base:collection: Nom de la nouvelle collection : ' %}</label> <label class="control-label" for="cnm">{% trans 'admin::base:collection: Nom de la nouvelle collection : ' %}</label>
@@ -44,7 +44,7 @@
</div> </div>
<div class="form-actions"> <div class="form-actions">
<button class="btn btn-primary" type="submit">{% trans 'boutton::valider' %}</button> <button class="btn btn-primary" type="submit">{% trans 'boutton::valider' %}</button>
<a href="{{ path('admin_database', {'databox_id': app.request.get('databox_id')}) }}" target="right" class="btn ajax">{% trans 'boutton::annuler' %}</a> <a href='{{ path('admin_database', {'databox_id': app['request'].get('databox_id')}) }}' target='right' class="btn ajax">{% trans 'boutton::annuler' %}</a>
</div> </div>
</fieldset> </fieldset>
</form> </form>

2
templates/web/admin/collection/reorder.html.twig
View File

@@ -62,7 +62,7 @@
dataType:'json', dataType:'json',
type:'POST', type:'POST',
data: {order: order}, data: {order: order},
url: '{{ path('admin_database_submit_collections_order', {'databox_id': app.request.attributes.get('databox_id')}) }}', url: '{{ path('admin_database_submit_collections_order', {'databox_id': app['request'].attributes.get('databox_id')}) }}',
beforeSend : function() { beforeSend : function() {
$this.attr('disabled', true); $this.attr('disabled', true);
}, },

8
templates/web/admin/collection/suggested_value.html.twig
View File

@@ -14,12 +14,12 @@
</div> </div>
{% if app.request.query.get('success') == '1' %} {% if app['request'].query.get('success') == '1' %}
<div class="alert alert-success"> <div class="alert alert-success">
<a class="close" data-dismiss="alert" href="#">×</a> <a class="close" data-dismiss="alert" href="#">×</a>
{% trans 'Successful update' %} {% trans 'Successful update' %}
</div> </div>
{% elseif app.request.query.get('success') == '0' %} {% elseif app['request'].query.get('success') == '0' %}
<div class="alert alert-error"> <div class="alert alert-error">
<a class="close" data-dismiss="alert" href="#">×</a> <a class="close" data-dismiss="alert" href="#">×</a>
<strong>{% trans 'An error occured' %}</strong> <strong>{% trans 'An error occured' %}</strong>
@@ -51,7 +51,7 @@
</td> </td>
<td style="text-align:center;height:30px;font-size:12px; border:0px;background-position: 0px 0px;background-repeat: repeat-x" nowrap> <td style="text-align:center;height:30px;font-size:12px; border:0px;background-position: 0px 0px;background-repeat: repeat-x" nowrap>
{% trans 'admin::sugval: Valeurs suggerees/Preferences de la collection' %} {{ app.request.attributes.get('bas_id')|bas_names }} {% trans 'admin::sugval: Valeurs suggerees/Preferences de la collection' %} {{ app['request'].attributes.get('bas_id')|bas_names(app) }}
</td> </td>
<td style="height:30px;width:20px;font-size:12px;border:0px; text-align:right"> <td style="height:30px;width:20px;font-size:12px;border:0px; text-align:right">
@@ -134,7 +134,7 @@
</tr> </tr>
</table> </table>
<form method="post" name="chgStructure" action="/admin/collection/{{ app.request.attributes.get('bas_id') }}/suggested-values/" onsubmit="return(false);" target="right" style="visibility:hidden;"> <form method="post" name="chgStructure" action="/admin/collection/{{ app['request'].attributes.get('bas_id') }}/suggested-values/" onsubmit="return(false);" target="right" style="visibility:hidden;">
<textarea nowrap style="visibility:hidden;white-space:pre" name="str" id="idstr">{{ collection.get_prefs() }}</textarea> <textarea nowrap style="visibility:hidden;white-space:pre" name="str" id="idstr">{{ collection.get_prefs() }}</textarea>
</form> </form>

2
templates/web/admin/common/iframe_wrap.html.twig
View File

@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html lang="{{ session.get_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> </title> <title> </title>

70
templates/web/admin/connected-users.html.twig
View File

@@ -1,37 +1,38 @@
{% macro tooltip_connected_users(row) %} {% macro tooltip_connected_users(row) %}
{% set user = row.getUser(app) %}
<span id="tooltip-usr"> <span id="tooltip-usr">
<table id="tabledescexp" cellpadding="0" cellspacing="0"> <table id="tabledescexp" cellpadding="0" cellspacing="0">
<tr> <tr>
<td class="tooltip-title" colspan="2" valign="center" >usr_id : {{ row['user'].get_id() }}</td> <td class="tooltip-title" colspan="2" valign="center" >usr_id : {{ user.get_id() }}</td>
</tr> </tr>
<tr> <tr>
<td colspan="2" style="height: 10px;"></td> <td colspan="2" style="height: 10px;"></td>
</tr> </tr>
<tr> <tr>
<td colspan="2"><strong>{{ 'admin::compte-utilisateur nom' | trans }} : </strong>{{ row['user'].get_display_name() }}</td> <td colspan="2"><strong>{{ 'admin::compte-utilisateur nom' | trans }} : </strong>{{ user.get_display_name() }}</td>
</tr> </tr>
<tr> <tr>
<td colspan="2"><strong>{{ 'admin::compte-utilisateur societe' | trans }} : </strong>{{ row['user'].get_company() }}</td> <td colspan="2"><strong>{{ 'admin::compte-utilisateur societe' | trans }} : </strong>{{ user.get_company() }}</td>
</tr> </tr>
<tr> <tr>
<td colspan="2"><strong>{{ 'admin::compte-utilisateur telephone' | trans }} : </strong>{{ row['user'].get_tel() }}</td> <td colspan="2"><strong>{{ 'admin::compte-utilisateur telephone' | trans }} : </strong>{{ user.get_tel() }}</td>
</tr> </tr>
<tr> <tr>
<td colspan="2"><strong>{{ 'admin::compte-utilisateur email' | trans }} : </strong>{{ row['user'].get_email() }}</td> <td colspan="2"><strong>{{ 'admin::compte-utilisateur email' | trans }} : </strong>{{ user.get_email() }}</td>
</tr> </tr>
<tr> <tr>
<td colspan="2"><strong>{{ 'admin::monitor: bases sur lesquelles l\'utilisateur est connecte : ' | trans }} :</strong></td> <td colspan="2"><strong>{{ 'admin::monitor: bases sur lesquelles l\'utilisateur est connecte : ' | trans }} :</strong></td>
</tr> </tr>
{% for databox in row['user'].ACL().get_granted_sbas() %} {% for databox in user.ACL().get_granted_sbas() %}
<tr> <tr>
<td colspan="2" style="overflow:hidden;" >{{ databox.get_viewname() }}</td> <td colspan="2" style="overflow:hidden;" >{{ databox.get_viewname() }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
<tr> <tr>
<td colspan="2" valign="center" > <td colspan="2" valign="center" >
<strong>{{ row['platform'] }} / {{ row['browser'] }} - {{ row['browser_version'] }}</strong><br/> <strong>{{ row.getPlatform() }} / {{ row.getBrowserName() }} - {{ row.getBrowserVersion() }}</strong><br/>
{% if row['token'] %} {% if row.getToken() %}
{{ 'Session persistente' | trans }} {{ 'Session persistente' | trans }}
{%endif%} {%endif%}
</td> </td>
@@ -47,36 +48,36 @@
<table class="whoisTable" > <table class="whoisTable" >
<tr> <tr>
<td class="colTitle" nowrap >{{ 'admin::monitor: module production' | trans }}</td> <td class="colTitle" nowrap >{{ 'admin::monitor: module production' | trans }}</td>
<td class="colValue" nowrap >{{ datas['applications'][1] }}</td> <td class="colValue" nowrap >{{ data['applications'][1] }}</td>
</tr> </tr>
<tr> <tr>
<td class="colTitle" nowrap >{{ 'admin::monitor: module client' | trans }}</td> <td class="colTitle" nowrap >{{ 'admin::monitor: module client' | trans }}</td>
<td class="colValue" >{{ datas['applications'][2] }}</td> <td class="colValue" >{{ data['applications'][2] }}</td>
</tr> </tr>
<tr> <tr>
<td class="colTitle" >{{ 'admin::monitor: module admin' | trans }}</td> <td class="colTitle" >{{ 'admin::monitor: module admin' | trans }}</td>
<td class="colValue" >{{ datas['applications'][3] }}</td> <td class="colValue" >{{ data['applications'][3] }}</td>
</tr> </tr>
<tr> <tr>
<td class="colTitle" >{{ 'admin::monitor: module report' | trans }}</td> <td class="colTitle" >{{ 'admin::monitor: module report' | trans }}</td>
<td class="colValue" >{{ datas['applications'][4] }}</td> <td class="colValue" >{{ data['applications'][4] }}</td>
</tr> </tr>
<tr> <tr>
<td class="colTitle" >{{ 'admin::monitor: module thesaurus' | trans }}</td> <td class="colTitle" >{{ 'admin::monitor: module thesaurus' | trans }}</td>
<td class="colValue" >{{ datas['applications'][5] }}</td> <td class="colValue" >{{ data['applications'][5] }}</td>
</tr> </tr>
<tr> <tr>
<td class="colTitle" >{{ 'admin::monitor: module comparateur' | trans }}</td> <td class="colTitle" >{{ 'admin::monitor: module comparateur' | trans }}</td>
<td class="colValue" >{{ datas['applications'][6] }}</td> <td class="colValue" >{{ data['applications'][6] }}</td>
</tr> </tr>
<tr> <tr>
<td class="colTitle" >{{ 'admin::monitor: module validation' | trans }}</td> <td class="colTitle" >{{ 'admin::monitor: module validation' | trans }}</td>
<td class="colValue" >{{ datas['applications'][7] }}</td> <td class="colValue" >{{ data['applications'][7] }}</td>
</tr> </tr>
{% if datas['applications'][0] != 0 %} {% if data['applications'][0] != 0 %}
<tr> <tr>
<td class="colTitle" >{{ 'admin::monitor: total des utilisateurs uniques : ' | trans }}</td> <td class="colTitle" >{{ 'admin::monitor: total des utilisateurs uniques : ' | trans }}</td>
<td class="colValue" >{{ datas['applications'][0] }}</td> <td class="colValue" >{{ data['applications'][0] }}</td>
</tr> </tr>
{% endif %} {% endif %}
</table> </table>
@@ -96,26 +97,37 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for row in datas['sessions'] %} {% for row in data['sessions'] %}
<tr title="{{ _self.tooltip_connected_users(row) | e }}" class="{% if loop.index is odd %}odd{% else %}even{% endif %} usrTips" id="TREXP_{{ row["session_id"]}}"> <tr title="{{ _self.tooltip_connected_users(row) | e }}" class="{% if loop.index is odd %}odd{% else %}even{% endif %} usrTips" id="TREXP_{{ row.getId()}}">
{% if row["session_id"] == session.get_ses_id() %} {% if row.getId() == app['session'].get('session_id') %}
<td style="color:#ff0000"><i>{{ row['user'].get_display_name() }}</i></td> <td style="color:#ff0000"><i>{{ user.get_display_name() }}</i></td>
{% else %} {% else %}
<td>{{ row['user'].get_display_name() }}</td> <td>{{ user.get_display_name() }}</td>
{% endif %} {% endif %}
<td> <td>
{% for app in row["app"] %} {% for module in row.getModules() %}
{% if app != 0 %} {{ module.getmoduleId() | AppName }}<br>
{{ app | AppName }}<br>
{% endif %}
{% endfor %} {% endfor %}
</td> </td>
<td>{{ row["ip"] }}<br/>{{ row["ip_infos"] }}</td> {% set geoname = app['geonames'].find_geoname_from_ip(row.getIpAddress()) %}
<td>{{ row['created_on'] | formatDate }}</td>
<td>{{ row['lastaccess'] | prettyDate }}</td> {% if geoname['city'] %}
{% set ip_infos = geoname['city'] ~ ' (' ~ geoname['country'] ~ ')' %}
{% elseif geoname['fips'] %}
{% set ip_infos = geoname['fips'] ~ ' (' ~ geoname['country'] ~ ')' %}
{% elseif geoname['country'] %}
{% set ip_infos = geoname['country'] %}
{% else %}
{% set ip_infos = '' %}
{% endif %}
<td>{{ row.getIpAddress() }}<br/>{{ ip_infos }}</td>
<td>{{ app['date-formatter'].getDate(row.getCreated()) }}</td>
<td>{{ app['date-formatter'].getPrettyString(row.getUpdated()) }}</td>
</tr> </tr>
{% endfor %} {% endfor %}

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

@@ -146,8 +146,8 @@
<h2>{% trans 'setup:: Serveur Memcached' %}</h2> <h2>{% trans 'setup:: Serveur Memcached' %}</h2>
<ul class="setup"> <ul class="setup">
{% if core.getCache().isServer() %} {% if app['cache'].isServer() %}
{% set stats = core.getCache().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' %} {{registry.get('GV_cache_server_host')}} : {{registry.get('GV_cache_server_port')}}</li>
<table> <table>
{% for name, stat in stats%} {% for name, stat in stats%}
@@ -158,7 +158,7 @@
<li class="non-blocker">{% trans 'setup::Aucun serveur memcached rattache.' %}</li> <li class="non-blocker">{% trans 'setup::Aucun serveur memcached rattache.' %}</li>
{% endif %} {% endif %}
</ul> </ul>
{% if core.getCache().isServer() %} {% if app['cache'].isServer() %}
<form id="cache_flusher" method="post" action="/admin/dashboard/flush-cache/"> <form id="cache_flusher" method="post" action="/admin/dashboard/flush-cache/">
<input type="submit" id="flush_button" class="btn btn-warning" value="Flush All Caches" /> <input type="submit" id="flush_button" class="btn btn-warning" value="Flush All Caches" />
</form> </form>
@@ -166,10 +166,10 @@
<h2>{% trans 'OPCode cache' %}</h2> <h2>{% trans 'OPCode cache' %}</h2>
<ul class="setup"> <ul class="setup">
{% if core['OpcodeCache'].getName() == 'array' %} {% if app['opcode-cache'].getName() == 'array' %}
<li class="non-blocker">{% trans 'Array opcode cache is activated, but phrasea strongly recommand the use of APC or Xcache in production' %}</li> <li class="non-blocker">{% trans 'Array opcode cache is activated, but phrasea strongly recommand the use of APC or Xcache in production' %}</li>
{% else %} {% else %}
<li>{{ core['OpcodeCache'].getName() }}</li> <li>{{ app['opcode-cache'].getName() }}</li>
{% endif %} {% endif %}
</ul> </ul>

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

@@ -1,9 +1,9 @@
{% if app.request.query.get('success') == '1' %} {% if app['request'].query.get('success') == '1' %}
<div class="alert alert-success"> <div class="alert alert-success">
<a class="close" data-dismiss="alert" href="#">×</a> <a class="close" data-dismiss="alert" href="#">×</a>
{% trans 'Successful update' %} {% trans 'Successful update' %}
</div> </div>
{% elseif app.request.query.get('success') == '0' %} {% elseif app['request'].query.get('success') == '0' %}
<div class="alert alert-error"> <div class="alert alert-error">
<a class="close" data-dismiss="alert" href="#">×</a> <a class="close" data-dismiss="alert" href="#">×</a>
<strong>{% trans 'An error occured' %}</strong> <strong>{% trans 'An error occured' %}</strong>
@@ -13,7 +13,7 @@
</div> </div>
{% endif %} {% endif %}
{% if app.request.query.get('notice') == 'restart' %} {% if app['request'].query.get('notice') == 'restart' %}
<div class="alert"> <div class="alert">
<a class="close" data-dismiss="alert" href="#">×</a> <a class="close" data-dismiss="alert" href="#">×</a>
{% trans 'Do not forget to restart the tasks scheduler' %} {% trans 'Do not forget to restart the tasks scheduler' %}
@@ -37,14 +37,14 @@
</ul> </ul>
</div> </div>
{% if user.is_admin() %} {% if user.ACL().is_admin() %}
<div class="db_infos"> <div class="db_infos">
<h2>{% trans 'admin::base: Version' %}</h2> <h2>{% trans 'admin::base: Version' %}</h2>
{% if upgrade_available %} {% if upgrade_available %}
<p>{% trans 'update::Votre application necessite une mise a jour vers : ' %} {{ version_number }}</p> <p>{% trans 'update::Votre application necessite une mise a jour vers : ' %} {{ app['phraseanet.version'].getNumber() }}</p>
{% else %} {% else %}
<p>{% trans 'update::Votre version est a jour : ' %} {{ version_number }}</p> <p>{% trans 'update::Votre version est a jour : ' %} {{ app['phraseanet.version'].getNumber() }}</p>
{% endif %} {% endif %}
{% if recommendations | length > 0%} {% if recommendations | length > 0%}

8
templates/web/admin/databox/cgus.html.twig
View File

@@ -1,9 +1,9 @@
<h1>{% trans'Terms Of Use' %}</h1> <h1>{% trans'Terms Of Use' %}</h1>
<form target="_self" method="post" action="{{ path('admin_database_submit_cgus', {'databox_id': app.request.attributes.get('databox_id')}) }}"> <form target="_self" method="post" action="{{ path('admin_database_submit_cgus', {'databox_id': app['request'].attributes.get('databox_id')}) }}">
<div class="well well-small"> <div class='well'>
<input class="btn btn-primary" type="submit" value="{% trans'Mettre a jour' %}" id="valid" style="margin-bottom:9px;"/> <input class='btn btn-primary' type="submit" value="{% trans'Mettre a jour' %}" id="valid"/>
<label for="valid" class="checkbox"> <label for="valid" class='checkbox'>
{% trans'admin::CGU Les utilisateurs doivent imperativement revalider ces conditions' %} {% trans'admin::CGU Les utilisateurs doivent imperativement revalider ces conditions' %}
<input type="checkbox" value="1" name="valid"/> <input type="checkbox" value="1" name="valid"/>
</label> </label>

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

@@ -8,12 +8,12 @@
<h1>{{ databox.get_serialized_server_info() }}</h1> <h1>{{ databox.get_serialized_server_info() }}</h1>
</div> </div>
{% if app.request.query.get('success') == '1' %} {% if app['request'].query.get('success') == '1' %}
<div class="alert alert-success"> <div class="alert alert-success">
<a class="close" data-dismiss="alert" href="#">×</a> <a class="close" data-dismiss="alert" href="#">×</a>
{% trans 'forms::operation effectuee OK' %} {% trans 'forms::operation effectuee OK' %}
</div> </div>
{% elseif app.request.query.get('success') == '0' %} {% elseif app['request'].query.get('success') == '0' %}
<div class="alert alert-error"> <div class="alert alert-error">
<a class="close" data-dismiss="alert" href="#">×</a> <a class="close" data-dismiss="alert" href="#">×</a>
<strong>{% trans 'An error occured' %}</strong> <strong>{% trans 'An error occured' %}</strong>
@@ -184,8 +184,8 @@
<ul> <ul>
{% for baseId in databox.get_activable_colls() %} {% for baseId in databox.get_activable_colls() %}
<li> <li>
<form class="form-inline" method="post" action="{{ path('admin_collection_enable', {'bas_id': baseId}) }}"> <form class='form-inline' method="post" action="{{ path('admin_collection_enable', {'bas_id': baseId}) }}">
{{ baseId|bas_names }} {{ baseId|bas_names(app) }}
<a href="#" class="btn btn-mini submiter">{% trans "Activer" %}></a> <a href="#" class="btn btn-mini submiter">{% trans "Activer" %}></a>
</form> </form>
</li> </li>

4
templates/web/admin/databox/details.html.twig
View File

@@ -6,14 +6,14 @@
<thead> <thead>
<tr> <tr>
<th class='col'> <th class='col'>
{% if app.request.query.get('sort') == 'col' %} {% if app['request'].query.get('sort') == 'col' %}
<img src="/skins/icons/tsort_desc.gif"> <img src="/skins/icons/tsort_desc.gif">
{% endif %} {% endif %}
{% trans 'phraseanet:: collection' %} {% trans 'phraseanet:: collection' %}
</th> </th>
<th class="obj"> <th class="obj">
{% if app.request.query.get('sort') == 'obj' %} {% if app['request'].query.get('sort') == 'obj' %}
<img src="/skins/icons/tsort_desc.gif"> <img src="/skins/icons/tsort_desc.gif">
{% endif %} {% endif %}
{% trans 'admin::base: objet' %} {% trans 'admin::base: objet' %}

10
templates/web/admin/editusers.html.twig
View File

@@ -163,7 +163,7 @@
</th> </th>
<th colspan="26"> <th colspan="26">
<img src="/skins/lng/inclin-{{session.get_I18n()}}.png" style="width:698px"/> <img src="/skins/lng/inclin-{{app['locale.I18n']}}.png" style="width:698px"/>
</th> </th>
</tr> </tr>
</thead> </thead>
@@ -186,7 +186,7 @@
</th> </th>
<th colspan="26"> <th colspan="26">
<img src="/skins/lng/inclin-{{session.get_I18n()}}.gif" > <img src="/skins/lng/inclin-{{app['locale.I18n']}}.gif" >
</th> </th>
</tr> </tr>
</thead>--> </thead>-->
@@ -203,7 +203,7 @@
<tr> <tr>
<td style="width:122px;overflow:hidden;white-space:nowrap;"> <td style="width:122px;overflow:hidden;white-space:nowrap;">
{{rights['sbas_id']|sbas_names}} {{rights['sbas_id']|sbas_names(app)}}
</td> </td>
<td class="users_col options"> <td class="users_col options">
<div> <div>
@@ -353,7 +353,7 @@
{% endif %} {% endif %}
<tr> <tr>
<td style="overflow:hidden;white-space:nowrap;"> <td style="overflow:hidden;white-space:nowrap;">
{{rights['base_id']|bas_names}} {{rights['base_id']|bas_names(app)}}
</td> </td>
<td class="users_col case_right_access" title="{% trans 'Access' %}"> <td class="users_col case_right_access" title="{% trans 'Access' %}">
{{_self.format_checkbox(user, rights, 'access', users, 'base')}} {{_self.format_checkbox(user, rights, 'access', users, 'base')}}
@@ -519,7 +519,7 @@
{% trans 'admin::compte-utilisateur ville' %} {% trans 'admin::compte-utilisateur ville' %}
</td> </td>
<td> <td>
<input type="text" geonameid="{{main_user.get_geonameid()}}" value="{{main_user.get_geonameid()|geoname_name_from_id}}" class="geoname_field" name="geonameid" /> <input type="text" geonameid="{{main_user.get_geonameid()}}" value="{{ app['geonames'].name_from_id(main_user.get_geonameid()) }}" class="geoname_field" name="geonameid" />
</td> </td>
</tr> </tr>
<tr> <tr>

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

@@ -1,9 +1,9 @@
<h1>Masks</h1> <h1>Masks</h1>
<div> <div>
Base {{base_id|sbasFromBas|sbas_names}} Base {{ collection.get_databox().get_viewname() }}
</div> </div>
<div> <div>
Collection {{base_id|bas_names}} Collection {{base_id|bas_names(app)}}
</div> </div>
<form> <form>
<table style="table-layout:fixed; width:280px;position:relative;left:10px;" width="280px"> <table style="table-layout:fixed; width:280px;position:relative;left:10px;" width="280px">

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

@@ -38,11 +38,11 @@
<h1>{% trans 'Quotas' %}</h1> <h1>{% trans 'Quotas' %}</h1>
<div> <div>
{% set base = base_id|sbasFromBas|sbas_names %} {% set base = collection.get_databox().get_viewname() %}
{% trans %}Base {{base}}{% endtrans %} {% trans %}Base {{base}}{% endtrans %}
</div> </div>
<div> <div>
{% set collection = base_id|bas_names %} {% set collection = base_id|bas_names(app) %}
{% trans %}Collection {{collection}}{% endtrans %} {% trans %}Collection {{collection}}{% endtrans %}
</div> </div>
<form> <form>

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

@@ -1,10 +1,10 @@
<h1>{% trans 'Limite temporelle' %}</h1> <h1>{% trans 'Limite temporelle' %}</h1>
<div> <div>
{% set base = base_id|sbasFromBas|sbas_names %} {% set base = collection.get_databox().get_viewname() %}
{% trans %}Base {{base}}{% endtrans %} {% trans %}Base {{base}}{% endtrans %}
</div> </div>
<div> <div>
{% set collection = base_id|bas_names %} {% set collection = base_id|bas_names(app) %}
{% trans %}Collection {{collection}}{% endtrans %} {% trans %}Collection {{collection}}{% endtrans %}
</div> </div>
<form> <form>

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

@@ -59,7 +59,7 @@
dataType: 'json', dataType: 'json',
data: { data: {
app : 3, app : 3,
usr : {{ session.get_usr_id() }} usr : {{ app['phraseanet.user'].get_id() }}
}, },
error: function(){ error: function(){
window.setTimeout("sessionactive();", 10000); window.setTimeout("sessionactive();", 10000);

4
templates/web/admin/publications/list.html.twig
View File

@@ -66,8 +66,8 @@
<td valign="center" align="left"> <td valign="center" align="left">
<a href="/admin/publications/feed/{{ feed.get_id() }}/" style="display:block;">{{ feed.get_title() }}</a> <a href="/admin/publications/feed/{{ feed.get_id() }}/" style="display:block;">{{ feed.get_title() }}</a>
</td> </td>
<td valign="center" align="center"> <td style="text-align: center;">
{{ feed.get_created_on()|formatDate }} {{ app['date-formatter'].getDate(feed.get_created_on()) }}
</td> </td>
<td valign="center" align="center"> <td valign="center" align="center">
{% if feed.get_collection() != null %} {% if feed.get_collection() != null %}

2
templates/web/admin/sphinx/configuration.html.twig
View File

@@ -1,4 +1,4 @@
{% if app.request.query.get('success') == '1' %} {% if app['request'].query.get('success') == '1' %}
<div class="alert alert-success"> <div class="alert alert-success">
<a class="close" data-dismiss="alert" href="#">×</a> <a class="close" data-dismiss="alert" href="#">×</a>
{% trans 'Successful update' %} {% trans 'Successful update' %}

17
templates/web/admin/statusbit/edit.html.twig
View File

@@ -5,16 +5,17 @@
</div> </div>
{% endif %} {% endif %}
<h1 style="padding-left:30px;">{% trans 'status:: numero de bit' %} {{ app.request.get('bit') }}</h1> <h1 style='padding-left:30px;'>{% trans 'status:: numero de bit' %} {{ app['request'].get('bit') }}</h1>
<form id="fileupload" class="form-horizontal" enctype="multipart/form-data" method="post" action="/admin/statusbit/{{ app.request.get('databox_id') }}/status/{{ app.request.get('bit') }}/">
<form id="fileupload" class="form-horizontal" enctype="multipart/form-data" method="post" action="/admin/statusbit/{{ app['request'].get('databox_id') }}/status/{{ app['request'].get('bit') }}/">
<fieldset> <fieldset>
<div class="span5 well well-small"> <div class="span5 well-small">
<label for="name"> <label for="name">
{% trans'admin::status: nom du status : '%} {% trans'admin::status: nom du status : '%}
<input id="name" name="name" class="input-xlarge" type="text" value="{{ status['name']|default('') }}"> <input id="name" name="name" class="input-xlarge" type="text" value="{{ status['name']|default('') }}">
</label> </label>
</div> </div>
<div class="span5 well well-small"> <div class="span5 well">
<span class="label">{% trans'admin::status: case A'%}</span> <span class="label">{% trans'admin::status: case A'%}</span>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="label_off"> <label class="control-label" for="label_off">
@@ -30,7 +31,7 @@
</label> </label>
<div class="controls"> <div class="controls">
<input type="file" name="image_off" accept="image/*"/> <input type="file" name="image_off" accept="image/*"/>
<div class="thumbnail" style="height:20px; width:20px"> <div class='thumbnail' style='height:20px;width:20px'>
{% if status['img_off'] is defined and status['img_off'] %} {% if status['img_off'] is defined and status['img_off'] %}
<img src="{{ status['img_off'] }}" /> <img src="{{ status['img_off'] }}" />
{% endif %} {% endif %}
@@ -48,7 +49,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="span5 well well-small"> <div class="span5 well">
<span class="label">{% trans'admin::status: case B'%}</span> <span class="label">{% trans'admin::status: case B'%}</span>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="label_on"> <label class="control-label" for="label_on">
@@ -64,7 +65,7 @@
</label> </label>
<div class="controls"> <div class="controls">
<input type="file" name="image_on" accept="image/*"/> <input type="file" name="image_on" accept="image/*"/>
<div class="thumbnail" style="height:20px; width:20px"> <div class='thumbnail' style='height:20px;width:20px'>
{% if status['img_on'] is defined and status['img_on'] %} {% if status['img_on'] is defined and status['img_on'] %}
<img src="{{ status['img_on'] }}" /> <img src="{{ status['img_on'] }}" />
{% endif %} {% endif %}
@@ -97,7 +98,7 @@
<button id="form_submitter" class="btn btn-primary" type="button"> <button id="form_submitter" class="btn btn-primary" type="button">
{% trans 'boutton::valider' %} {% trans 'boutton::valider' %}
</button> </button>
<a style="text-decoration:none;" class="btn" href="/admin/statusbit/{{ app.request.get('databox_id') }}/">{% trans 'boutton::retour' %} <a style='text-decoration:none;' class="btn" href="/admin/statusbit/{{ app['request'].get('databox_id') }}/">{% trans 'boutton::retour' %}
</a> </a>
</div> </div>
</div> </div>

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

@@ -2,7 +2,7 @@
<ul id="tree" class="filetree"> <ul id="tree" class="filetree">
{% if user.is_admin() %} {% if user.ACL().is_admin() %}
<li> <li>
<a target="right" href="/admin/dashboard/" class="ajax"> <a target="right" href="/admin/dashboard/" class="ajax">
<img src="/skins/admin/Dashboard.png" /> <img src="/skins/admin/Dashboard.png" />
@@ -15,7 +15,7 @@
</li> </li>
{% endif %} {% endif %}
{% if user.is_admin() %} {% if user.ACL().is_admin() %}
<li> <li>
<a target="right" href="/admin/setup/" class="ajax"> <a target="right" href="/admin/setup/" class="ajax">
<img src="/skins/admin/Setup.png" /> <img src="/skins/admin/Setup.png" />

6
templates/web/admin/user/demand.html.twig
View File

@@ -113,7 +113,7 @@
<h1>{% trans 'admin:: demandes en cours' %}</h1> <h1>{% trans 'admin:: demandes en cours' %}</h1>
</div> </div>
{% if app.request.query.get('success') == '1' %} {% if app['request'].query.get('success') == '1' %}
<div class="alert alert-success"> <div class="alert alert-success">
<a class="close" data-dismiss="alert" href="#">×</a> <a class="close" data-dismiss="alert" href="#">×</a>
{% trans 'Requests for the application registrations were recorded successfully' %} {% trans 'Requests for the application registrations were recorded successfully' %}
@@ -182,7 +182,7 @@
</dl> </dl>
</td> </td>
<td> <td>
{{ row["date_modif"]|prettyDate }} {{ app['date-formatter'].getPrettyString(row["date_modif"]) }}
</td> </td>
<td> <td>
{# Delete this when the JS 'll be updated -- {# Delete this when the JS 'll be updated --
@@ -202,7 +202,7 @@
<input name="watermark[]" value="{{ row['usr_id'] }}_{{ basId }}" onclick="checkAdd(this)" id="{{ 'watermark_' ~ row['usr_id'] ~ '_' ~ basId }}" class="{{ 'disabler_' ~ row['usr_id'] ~ '_' ~ basId }} watermark_checker tipInfoUsr {{ 'checker_' ~ row['usr_id'] }}" title="{% trans 'admin:: watermarquer les documents' %}" type="checkbox"/> <input name="watermark[]" value="{{ row['usr_id'] }}_{{ basId }}" onclick="checkAdd(this)" id="{{ 'watermark_' ~ row['usr_id'] ~ '_' ~ basId }}" class="{{ 'disabler_' ~ row['usr_id'] ~ '_' ~ basId }} watermark_checker tipInfoUsr {{ 'checker_' ~ row['usr_id'] }}" title="{% trans 'admin:: watermarquer les documents' %}" type="checkbox"/>
</td> </td>
<td> <td>
{{ basId| bas_names }} {{ basId| bas_names(app) }}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}

4
templates/web/admin/user/import/file.html.twig
View File

@@ -2,8 +2,8 @@
<h1>{% trans 'Upload a "csv" file for users creation' %}</h1> <h1>{% trans 'Upload a "csv" file for users creation' %}</h1>
</div> </div>
{% if app.request.query.get('error') is not none %} {% if app['request'].query.get('error') is not none %}
{% set error = app.request.query.get('error') %} {% set error = app['request'].query.get('error') %}
<div class="alert alert-error"> <div class="alert alert-error">
<button class="close" data-dismiss="alert" type="button">×</button> <button class="close" data-dismiss="alert" type="button">×</button>
{% if error == 'file-invalid' %} {% if error == 'file-invalid' %}

6
templates/web/admin/users.html.twig
View File

@@ -3,10 +3,10 @@
{% block content %} {% block content %}
{% if app.request.query.get('user-updated') is not none%} {% if app['request'].query.get('user-updated') is not none%}
<div class="alert alert-success"> <div class="alert alert-success">
<button class="close" data-dismiss="alert" type="button">×</button> <button class="close" data-dismiss="alert" type="button">×</button>
{% set user_count = app.request.get('user-updated') %} {% set user_count = app['request'].get('user-updated') %}
{% trans %} {% trans %}
{{ user_count }} user has been crreated {{ user_count }} user has been crreated
{% plural user_count %} {% plural user_count %}
@@ -140,7 +140,7 @@
{{usr.get_applied_template()}} {{usr.get_applied_template()}}
</td> </td>
<td> <td>
{{usr.get_creation_date()|formatDate}} {{ app['date-formatter'].getDate(usr.get_creation_date()) }}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}

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

@@ -31,7 +31,7 @@
<h1 id="namePhr">{{home_title}}</h1> <h1 id="namePhr">{{home_title}}</h1>
</div> </div>
{% if not session.is_authenticated %} {% if not app.isAuthenticated() %}
<div id="content-box" class="span6 offset3"> <div id="content-box" class="span6 offset3">
<form id="login-form" class="form-vertical" method="post"> <form id="login-form" class="form-vertical" method="post">
{% for key,value in auth.getParams %} {% for key,value in auth.getParams %}

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

@@ -1,4 +1,4 @@
{% macro format(arraySubdefs, displayWidth, displayHeight, extraclass, session, wrap)%} {% macro format(arraySubdefs, displayWidth, displayHeight, extraclass, wrap)%}
{% set displayWidth = displayWidth %} {% set displayWidth = displayWidth %}
{% set displayHeight = displayHeight|default(displayWidth) %} {% set displayHeight = displayHeight|default(displayWidth) %}
@@ -20,7 +20,7 @@
{% set s_width = subdef.get_width() %} {% set s_width = subdef.get_width() %}
{% set s_height = subdef.get_height() %} {% set s_height = subdef.get_height() %}
{% endif %} {% endif %}
{% if session.is_authenticated() == true %} {% if app.isAuthenticated() == true %}
{% set url = subdef.get_url() %} {% set url = subdef.get_url() %}
{% else %} {% else %}
{% set url = subdef.get_permalink().get_url() %} {% set url = subdef.get_permalink().get_url() %}

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

@@ -120,7 +120,7 @@
<div style="display:none;" class="undisposable"> <div style="display:none;" class="undisposable">
<div>{% trans 'Les documents ne peuvent pas etre exportes' %}</div> <div>{% trans 'Les documents ne peuvent pas etre exportes' %}</div>
{% for datas in values.refused%} {% for datas in values.refused%}
{{ thumbnail.format(datas, 80, 80,'', session, true, false) }} {{ thumbnail.format(datas, 80, 80,'', true, false) }}
{% endfor %} {% endfor %}
</div> </div>
{% endif %} {% endif %}
@@ -187,7 +187,7 @@
<div style="display:none;" class="undisposable"> <div style="display:none;" class="undisposable">
<div><i>{% trans 'La sous resolution n\'est pas disponible pour les documents suivants' %}</i></div> <div><i>{% trans 'La sous resolution n\'est pas disponible pour les documents suivants' %}</i></div>
{% for datas in values.refused%} {% for datas in values.refused%}
{{ thumbnail.format(datas, 80, 80,'', session, true, false) }} {{ thumbnail.format(datas, 80, 80,'', true, false) }}
{% endfor %} {% endfor %}
</div> </div>
{% endif %} {% endif %}
@@ -233,7 +233,7 @@
<div style="display:none;" class="undisposable"> <div style="display:none;" class="undisposable">
<div><i>{% trans 'La sous resolution n\'est pas disponible pour les documents suivants' %}</i></div> <div><i>{% trans 'La sous resolution n\'est pas disponible pour les documents suivants' %}</i></div>
{% for datas in values.refused%} {% for datas in values.refused%}
{{ thumbnail.format(datas, 80, 80,'', session, true, false) }} {{ thumbnail.format(datas, 80, 80,'', true, false) }}
{% endfor %} {% endfor %}
</div> </div>
{% endif %} {% endif %}
@@ -329,7 +329,7 @@
<div class="control-group"> <div class="control-group">
<label class="control-label" for="command_geoname_field">{% trans 'admin::compte-utilisateur ville' %} *</label> <label class="control-label" for="command_geoname_field">{% trans 'admin::compte-utilisateur ville' %} *</label>
<div class="controls"> <div class="controls">
<input class="required geoname_field" type="text" name="geonameid" id="command_geoname_field" geonameid="{{ user.get_geonameid() }}" value="{{ user.get_geonameid()|geoname_display }}" /> <input class="required geoname_field" type="text" name="geonameid" id="command_geoname_field" geonameid="{{ user.get_geonameid() }}" value="{{ app['geonames'].name_from_id(user.get_geonameid()) }}" />
</div> </div>
</div> </div>
@@ -391,7 +391,7 @@
<div style="display:none;" class="undisposable"> <div style="display:none;" class="undisposable">
<div><i>{% trans 'La sous resolution n\'est pas disponible pour les documents suivants' %}</i></div> <div><i>{% trans 'La sous resolution n\'est pas disponible pour les documents suivants' %}</i></div>
{% for datas in values.refused%} {% for datas in values.refused%}
{{ thumbnail.format(datas, 80, 80,'', session, true, false) }} {{ thumbnail.format(datas, 80, 80,'', true, false) }}
{% endfor %} {% endfor %}
</div> </div>
{% endif %} {% endif %}

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

@@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="{{ session.get_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 %}{{home_title}} - {{ module_name }} </title>

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

@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html lang="{{ session.get_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 %}{{home_title}} - {{ module_name }} </title>

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

@@ -6,7 +6,7 @@
Phraseanet Phraseanet
</span> </span>
</li> </li>
{% if module != "lightbox" and session.is_authenticated %} {% if module != "lightbox" and app.isAuthenticated() %}
<li> <li>
{% if module == "prod" %} {% if module == "prod" %}
<a target="_self" href="/client/"> <a target="_self" href="/client/">
@@ -15,7 +15,7 @@
</span> </span>
</a> </a>
{% else %} {% else %}
{% if browser.isNewGeneration %} {% if app['browser'].isNewGeneration %}
{% if module == "client" %} {% if module == "client" %}
<a target="_self" href="/prod/"> <a target="_self" href="/prod/">
<span class=""> <span class="">
@@ -33,7 +33,7 @@
{% endif %} {% endif %}
</li> </li>
{% if browser.isNewGeneration and registry.get('GV_thesaurus') == true and user.ACL.has_access_to_module('thesaurus') %} {% if app['browser'].isNewGeneration and registry.get('GV_thesaurus') == true and 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 %}">
@@ -81,7 +81,7 @@
<li> <li>
{% set link = '/prod/upload/' %} {% set link = '/prod/upload/' %}
{% if not browser.supportFileAPI() %} {% if not app['browser'].supportFileAPI() %}
{% set link = '/prod/upload/flash-version/' %} {% set link = '/prod/upload/flash-version/' %}
{% endif %} {% endif %}
@@ -127,9 +127,9 @@
<a href="#" style="font-weight:bold;text-decoration:none;"> <a href="#" style="font-weight:bold;text-decoration:none;">
<span> <span>
{% trans 'Notifications' %} {% trans 'Notifications' %}
<button class="counter btn btn-danger" style="visibility:{% if core['events-manager'].get_unread_notifications_number > 0 %}visible{% else %}hidden{% endif %};"> <button class="counter btn btn-danger" style="visibility:{% if app['events-manager'].get_unread_notifications_number > 0 %}visible{% else %}hidden{% endif %};">
{% if core['events-manager'].get_unread_notifications_number > 0 %} {% if app['events-manager'].get_unread_notifications_number > 0 %}
{{core['events-manager'].get_unread_notifications_number}} {{app['events-manager'].get_unread_notifications_number}}
{% endif %} {% endif %}
</button> </button>
</span> </span>
@@ -138,7 +138,7 @@
{% endif %} {% endif %}
<li> <li>
{% if session.is_authenticated %} {% if app.isAuthenticated() %}
{% if user.is_guest %} {% if user.is_guest %}
<span> <span>
{% trans 'Guest' %} {% trans 'Guest' %}
@@ -172,7 +172,7 @@
</div> </div>
{% endif %} {% endif %}
<div title="" class="context-menu-item menu3-custom-item"> <div title="" class="context-menu-item menu3-custom-item">
<div style="" class="context-menu-item-inner infoDialog" infos="<div><span style='color:#F7F7F7;font-size:18px;'>PHRASEANET</span> {{version_name}} (V{{version_number}})</div><div></div><br/><div><a href='http://www.gnu.org/licenses/gpl.html' target='_blank'><img src='http://www.gnu.org/graphics/gplv3-88x31.png' style='vertical-align:middle;'/><span>License GNU GPL v3</span></a></div><br/><div><a href='http://www.phraseanet.com/' target='_blank'> &copy; Copyright Alchemy 2005-{{ "now"|date("Y") }}</a></div>">{% trans 'phraseanet:: a propos' %}</div> <div style="" class="context-menu-item-inner infoDialog" infos="<div><span style='color:#F7F7F7;font-size:18px;'>PHRASEANET</span> {{ app['phraseanet.version'].getName() }} (V{{ app['phraseanet.version'].getNumber() }})</div><div></div><br/><div><a href='http://www.gnu.org/licenses/gpl.html' target='_blank'><img src='http://www.gnu.org/graphics/gplv3-88x31.png' style='vertical-align:middle;'/><span>License GNU GPL v3</span></a></div><br/><div><a href='http://www.phraseanet.com/' target='_blank'> &copy; Copyright Alchemy 2005-{{ "now"|date("Y") }}</a></div>">{% trans 'phraseanet:: a propos' %}</div>
</div> </div>
</div> </div>
</td> </td>
@@ -181,7 +181,7 @@
</table> </table>
</li> </li>
<li> <li>
{% if session.is_authenticated %} {% if app.isAuthenticated() %}
<a href="/login/logout/?app={{module}}" target="_self"> <a href="/login/logout/?app={{module}}" target="_self">
<span> <span>
{% trans 'phraseanet:: deconnection' %} {% trans 'phraseanet:: deconnection' %}
@@ -196,6 +196,6 @@
</div> </div>
<div style="display:none;z-index:30000;" id="notification_box"> <div style="display:none;z-index:30000;" id="notification_box">
{% set notifications = core['events-manager'].get_notifications %} {% set notifications = app['events-manager'].get_notifications %}
{% include 'prod/notifications.html.twig' %} {% include 'prod/notifications.html.twig' %}
</div> </div>

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

@@ -18,4 +18,4 @@
{% set width = preview_obj.get_width() %} {% set width = preview_obj.get_width() %}
{% set height = preview_obj.get_height() %} {% set height = preview_obj.get_height() %}
{{ thumbnail.format(preview_obj, preview_obj.get_width(), preview_obj.get_height(), '', session, wrap, false) }} {{ thumbnail.format(preview_obj, preview_obj.get_width(), preview_obj.get_height(), '', wrap, false) }}

12
templates/web/common/thumbnail.html.twig
View File

@@ -1,4 +1,4 @@
{% macro format(thumbnail, b_w, b_h, extraclass, session, wrap, lazyload)%} {% macro format(thumbnail, b_w, b_h, extraclass, wrap, lazyload)%}
{% set record_type = thumbnail.get_type() %} {% set record_type = thumbnail.get_type() %}
@@ -42,7 +42,7 @@
{% if session.is_authenticated() == true %} {% if app.isAuthenticated() == true %}
{% set url = thumbnail.get_url() %} {% set url = thumbnail.get_url() %}
{% else %} {% else %}
{% set url = thumbnail.get_permalink().get_url() %} {% set url = thumbnail.get_permalink().get_url() %}
@@ -76,7 +76,7 @@
swfobject.embedSWF("/include/FlexPaper_flash/FlexPaperViewer.swf", swfobject.embedSWF("/include/FlexPaper_flash/FlexPaperViewer.swf",
"preview_{{thumbnail.get_sbas_id()}}_{{thumbnail.get_record_id()}}_{{random}}", "preview_{{thumbnail.get_sbas_id()}}_{{thumbnail.get_record_id()}}_{{random}}",
"100%", "100%", "9.0.0", false, false, "100%", "100%", "9.0.0", false, false,
{menu: "false",flashvars: "SwfFile={{url}}&Scale=0.6&ZoomTransition=easeOut&ZoomTime=0.5&ZoomInterval=0.1&FitPageOnLoad=true&FitWidthOnLoad=true&PrintEnabled=true&FullScreenAsMaxWindow=false&localeChain={{session.get_locale()}}", movie: "/include/FlexPaper_flash/FlexPaperViewer.swf", allowFullScreen :"true",wmode: "transparent"}, false);</script> {menu: "false",flashvars: "SwfFile={{url}}&Scale=0.6&ZoomTransition=easeOut&ZoomTime=0.5&ZoomInterval=0.1&FitPageOnLoad=true&FitWidthOnLoad=true&PrintEnabled=true&FullScreenAsMaxWindow=false&localeChain={{app['locale']}}", movie: "/include/FlexPaper_flash/FlexPaperViewer.swf", allowFullScreen :"true",wmode: "transparent"}, false);</script>
{% elseif record_type == 'AUDIO_MP3' %} {% elseif record_type == 'AUDIO_MP3' %}
{% set random = thumbnail.get_random() %} {% set random = thumbnail.get_random() %}
@@ -107,7 +107,7 @@
{% macro format_fit(thumbnail, b_w, b_h, extraclass, session, wrap)%} {% macro format_fit(thumbnail, b_w, b_h, extraclass, wrap)%}
{% set record_type = thumbnail.get_type() %} {% set record_type = thumbnail.get_type() %}
{% if record_type == 'AUDIO_MP3' %} {% if record_type == 'AUDIO_MP3' %}
@@ -146,7 +146,7 @@
{% if session.is_authenticated() == true %} {% if app.isAuthenticated() == true %}
{% set url = thumbnail.get_url() %} {% set url = thumbnail.get_url() %}
{% else %} {% else %}
{% set url = thumbnail.get_permalink().get_url() %} {% set url = thumbnail.get_permalink().get_url() %}
@@ -178,7 +178,7 @@
swfobject.embedSWF("/include/FlexPaper_flash/FlexPaperViewer.swf", swfobject.embedSWF("/include/FlexPaper_flash/FlexPaperViewer.swf",
"preview_{{thumbnail.get_sbas_id()}}_{{thumbnail.get_record_id()}}_{{random}}", "preview_{{thumbnail.get_sbas_id()}}_{{thumbnail.get_record_id()}}_{{random}}",
"100%", "100%", "9.0.0", false, false, "100%", "100%", "9.0.0", false, false,
{menu: "false",flashvars: "SwfFile={{url}}&Scale=0.6&ZoomTransition=easeOut&ZoomTime=0.5&ZoomInterval=0.1&FitPageOnLoad=true&FitWidthOnLoad=true&PrintEnabled=true&FullScreenAsMaxWindow=false&localeChain={{session.get_locale()}}", movie: "/include/FlexPaper_flash/FlexPaperViewer.swf", allowFullScreen :"true",wmode: "transparent"}, false);</script> {menu: "false",flashvars: "SwfFile={{url}}&Scale=0.6&ZoomTransition=easeOut&ZoomTime=0.5&ZoomInterval=0.1&FitPageOnLoad=true&FitWidthOnLoad=true&PrintEnabled=true&FullScreenAsMaxWindow=false&localeChain={{app['locale']}}", movie: "/include/FlexPaper_flash/FlexPaperViewer.swf", allowFullScreen :"true",wmode: "transparent"}, false);</script>
{% elseif record_type == 'AUDIO_MP3' %} {% elseif record_type == 'AUDIO_MP3' %}
{% set random = thumbnail.get_random() %} {% set random = thumbnail.get_random() %}

10
templates/web/lightbox/IE6/agreement_box.html.twig
View File

@@ -14,11 +14,11 @@
</table> </table>
{% if basket.getValidation() %} {% if basket.getValidation() %}
<div style="margin-left:10px;width:220px;"> <div style="margin-left:10px;width:220px;">
{{ basket.getValidation().getValidationString(user) }} {{ basket.getValidation().getValidationString(app, user) }}
</div> </div>
<ul style="margin:10px 0 0 20px;width:200px;"> <ul style="margin:10px 0 0 20px;width:200px;">
{% for validation_data in basket_element.getValidationDatas() %} {% for validation_data in basket_element.getValidationDatas() %}
{% if basket.getValidation().getParticipant(user).getCanSeeOthers() or validation_data.getParticipant().getUser() == core.getAuthenticatedUser() %} {% if basket.getValidation().getParticipant(user, app).getCanSeeOthers() or validation_data.getParticipant().getUser(app) == app['phraseanet.user'] %}
{% if validation_data.getAgreement() == true %} {% if validation_data.getAgreement() == true %}
{% set classuser = 'agree' %} {% set classuser = 'agree' %}
{% elseif validation_data.getAgreement() is null %} {% elseif validation_data.getAgreement() is null %}
@@ -26,20 +26,20 @@
{% else %} {% else %}
{% set classuser = 'disagree' %} {% set classuser = 'disagree' %}
{% endif %} {% endif %}
{% set participant = validation_data.getParticipant().getUser() %} {% set participant = validation_data.getParticipant().getUser(app) %}
<li class="{% if participant.get_id() == user.get_id() %}me{% endif %} {{classuser}} userchoice">{{participant.get_display_name()}}</li> <li class="{% if participant.get_id() == user.get_id() %}me{% endif %} {{classuser}} userchoice">{{participant.get_display_name()}}</li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</ul> </ul>
{% endif %} {% endif %}
{% if basket_element and basket_element.getBasket().getValidation() and basket.getValidation().getParticipant(user).getCanAgree() %} {% if basket_element and basket_element.getBasket().getValidation() and basket.getValidation().getParticipant(user, app).getCanAgree() %}
<div class="left choices"> <div class="left choices">
<div style="height:60px;margin-top:15px;"> <div style="height:60px;margin-top:15px;">
<table cellspacing="0" cellpadding="0" style="width:230px;"> <table cellspacing="0" cellpadding="0" style="width:230px;">
<tr> <tr>
<td> <td>
{% set agreement = basket_element.getUserValidationDatas(user).getAgreement() %} {% set agreement = basket_element.getUserValidationDatas(user, app).getAgreement() %}
<div style="width:70px;margin:0px auto 0;" class="ui-corner-all big_box agree_{{basket_element.getId()}} agree {% if agreement is null or agreement == false %}not_decided{% endif %}"> <div style="width:70px;margin:0px auto 0;" class="ui-corner-all big_box agree_{{basket_element.getId()}} agree {% if agreement is null or agreement == false %}not_decided{% endif %}">
<img src="/skins/lightbox/agree-bigie6.gif" style="vertical-align:middle;"/><span>{% trans 'validation:: OUI' %}</span> <img src="/skins/lightbox/agree-bigie6.gif" style="vertical-align:middle;"/><span>{% trans 'validation:: OUI' %}</span>
</div> </div>

2
templates/web/lightbox/IE6/basket_options.html.twig
View File

@@ -1,4 +1,4 @@
{% if basket.getValidation() and basket.getValidation().getParticipant(user).getCanAgree() %} {% if basket.getValidation() and basket.getValidation().getParticipant(user, app).getCanAgree() %}
<button class="confirm_report" title="{% trans 'validation::envoyer mon rapport'%}"> <button class="confirm_report" title="{% trans 'validation::envoyer mon rapport'%}">
<img src="/skins/lightbox/envoyerie6.gif"/> <img src="/skins/lightbox/envoyerie6.gif"/>
{% trans 'validation::envoyer mon rapport'%} {% trans 'validation::envoyer mon rapport'%}

2
templates/web/lightbox/IE6/feed.html.twig
View File

@@ -42,7 +42,7 @@
<div class="container left"> <div class="container left">
{% if first_item %} {% if first_item %}
{% set preview = first_item.get_record().get_preview() %} {% set preview = first_item.get_record().get_preview() %}
{{thumbnail.format(preview, preview.get_width(), preview.get_height(),'',session, false, false)}} {{thumbnail.format(preview, preview.get_width(), preview.get_height(),'', false, false)}}
{% endif %} {% endif %}
</div> </div>
</div> </div>

2
templates/web/lightbox/IE6/feed_container.html.twig
View File

@@ -6,7 +6,7 @@
<a href="/lightbox/ajax/LOAD_FEED_ITEM/{{feed_entry.get_id()}}/{{element.get_id()}}/"> <a href="/lightbox/ajax/LOAD_FEED_ITEM/{{feed_entry.get_id()}}/{{element.get_id()}}/">
<div id="scid_{{element.get_id()}}" class="basket_element ui-corner-all {% if first_item and first_item.get_id() == element.get_id() %}selected{% endif %}"> <div id="scid_{{element.get_id()}}" class="basket_element ui-corner-all {% if first_item and first_item.get_id() == element.get_id() %}selected{% endif %}">
<div class="display_id">{{element.get_ord()}}</div> <div class="display_id">{{element.get_ord()}}</div>
{{thumbnail.format(element.get_record().get_thumbnail() ,114,85, '', session, true, false)}} {{thumbnail.format(element.get_record().get_thumbnail() ,114,85, '', true, false)}}
<form name="download_form" class="download_form" style="display:none;"> <form name="download_form" class="download_form" style="display:none;">
<input type="hidden" name="basrec" value="{{element.get_record().get_serialize_key()}}"/> <input type="hidden" name="basrec" value="{{element.get_record().get_serialize_key()}}"/>
</form> </form>

8
templates/web/lightbox/IE6/index.html.twig
View File

@@ -41,7 +41,7 @@
<tr> <tr>
<td style="width:170px;"> <td style="width:170px;">
{% if basket_length > 0%} {% if basket_length > 0%}
{{thumbnail.format(basket.getELements().first().getRecord().get_thumbnail, 170, 170, '', session, true, false)}} {{thumbnail.format(basket.getELements().first().getRecord(app).get_thumbnail, 170, 170, '', true, false)}}
{% endif %} {% endif %}
</td> </td>
<td style="width:20px;"> <td style="width:20px;">
@@ -56,7 +56,7 @@
</h2> </h2>
{% if basket.getValidation().isFinished() %} {% if basket.getValidation().isFinished() %}
{% trans '(validation) session terminee' %} {% trans '(validation) session terminee' %}
{% elseif basket.getValidation().getParticipant(user).getIsConfirmed() %} {% elseif basket.getValidation().getParticipant(user, app).getIsConfirmed() %}
{% trans '(validation) envoyee' %} {% trans '(validation) envoyee' %}
{% else %} {% else %}
{% trans '(validation) a envoyer' %} {% trans '(validation) a envoyer' %}
@@ -72,7 +72,7 @@
<tr> <tr>
<td colspan="2"> <td colspan="2">
<div>{{ basket.getDescription() }}</div> <div>{{ basket.getDescription() }}</div>
<div>{{ basket.getValidation.getValidationString(user) }}</div> <div>{{ basket.getValidation.getValidationString(app, user) }}</div>
</td> </td>
</tr> </tr>
</table> </table>
@@ -106,7 +106,7 @@
<tr> <tr>
<td style="width:170px;"> <td style="width:170px;">
{% if basket_length > 0%} {% if basket_length > 0%}
{{thumbnail.format(basket.getElements().first().getRecord().get_thumbnail, 170, 170, '', session, true, false)}} {{thumbnail.format(basket.getElements().first().getRecord(app).get_thumbnail, 170, 170, '', true, false)}}
{% endif %} {% endif %}
</td> </td>
<td style="width:20px;"> <td style="width:20px;">

12
templates/web/lightbox/IE6/sc_container.html.twig
View File

@@ -5,20 +5,20 @@
<div class="basket_element_wrapper"> <div class="basket_element_wrapper">
<a href="/lightbox/ajax/LOAD_BASKET_ELEMENT/{{element.getId()}}/"> <a href="/lightbox/ajax/LOAD_BASKET_ELEMENT/{{element.getId()}}/">
<div id="scid_{{element.getId()}}" class="basket_element ui-corner-all {% if basket_element and basket_element.getId() == element.getId() %}selected{% endif %}"> <div id="scid_{{element.getId()}}" class="basket_element ui-corner-all {% if basket_element and basket_element.getId() == element.getId() %}selected{% endif %}">
<div class="display_id">{{element.getRecord().get_number()}}</div> <div class="display_id">{{element.getRecord(app).get_number()}}</div>
{% if basket.getValidation() %} {% if basket.getValidation() %}
<div class="agreement"> <div class="agreement">
<img src="/skins/lightbox/agree.png" <img src="/skins/lightbox/agree.png"
class="agree_button {%if element.getUserValidationDatas(user).getAgreement() == false or element.getUserValidationDatas(user).getAgreement() is null %}not_decided{%endif%} agree_{{element.getId()}}" /> class="agree_button {%if element.getUserValidationDatas(user, app).getAgreement() == false or element.getUserValidationDatas(user, app).getAgreement() is null %}not_decided{%endif%} agree_{{element.getId()}}" />
<img src="/skins/lightbox/disagree.png" <img src="/skins/lightbox/disagree.png"
class="disagree_button {%if element.getUserValidationDatas(user).getAgreement() == true or element.getUserValidationDatas(user).getAgreement() is null %}not_decided{%endif%} disagree_{{element.getId()}}" /> class="disagree_button {%if element.getUserValidationDatas(user, app).getAgreement() == true or element.getUserValidationDatas(user, app).getAgreement() is null %}not_decided{%endif%} disagree_{{element.getId()}}" />
</div> </div>
{% endif %} {% endif %}
{{thumbnail.format(element.getRecord().get_thumbnail,114,85, '', session, true, false)}} {{thumbnail.format(element.getRecord(app).get_thumbnail,114,85, '', true, false)}}
<form name="download_form" class="download_form" style="display:none;"> <form name="download_form" class="download_form" style="display:none;">
<input type="hidden" name="basrec" value="{{element.getRecord().get_serialize_key()}}"/> <input type="hidden" name="basrec" value="{{element.getRecord(app).get_serialize_key()}}"/>
</form> </form>
<div tooltipsrc="/prod/tooltip/preview/{{element.getRecord().get_sbas_id()}}/{{element.getRecord().get_record_id()}}/" class="previewTips"></div> <div tooltipsrc="/prod/tooltip/preview/{{element.getRecord(app).get_sbas_id()}}/{{element.getRecord(app).get_record_id()}}/" class="previewTips"></div>
</div> </div>
</a> </a>
</div> </div>

2
templates/web/lightbox/IE6/sc_options_box.html.twig
View File

@@ -22,7 +22,7 @@
<img src="/skins/lightbox/saveie6.png"/> <img src="/skins/lightbox/saveie6.png"/>
</button> </button>
<form name="download_form" style="display:none;"> <form name="download_form" style="display:none;">
<input type="hidden" name="basrec" value="{{basket_element.getRecord().get_serialize_key()}}"/> <input type="hidden" name="basrec" value="{{basket_element.getRecord(app).get_serialize_key()}}"/>
</form> </form>
| |
{% if basket_element.getBasket().getValidation() %} {% if basket_element.getBasket().getValidation() %}

16
templates/web/lightbox/IE6/validate.html.twig
View File

@@ -30,8 +30,8 @@
<div class="display_id">{% if basket_element %}{{basket_element.getOrd()}}{% endif %}</div> <div class="display_id">{% if basket_element %}{{basket_element.getOrd()}}{% endif %}</div>
</td> </td>
<td style="text-align:left;width:auto;"> <td style="text-align:left;width:auto;">
<div class="title title15" title="{% if basket_element %}{{basket_element.getRecord().get_title}}{% endif %}"> <div class="title title15" title="{% if basket_element %}{{basket_element.getRecord(app).get_title}}{% endif %}">
{% if basket_element %}{{basket_element.getRecord().get_title}}{% endif %} {% if basket_element %}{{basket_element.getRecord(app).get_title}}{% endif %}
</div> </div>
</td> </td>
<td style="text-align:right;width:230px;"> <td style="text-align:right;width:230px;">
@@ -45,12 +45,12 @@
<div class="container left"> <div class="container left">
{% if basket_element %} {% if basket_element %}
{% set bask_prev = basket_element.getRecord().get_preview() %} {% set bask_prev = basket_element.getRecord(app).get_preview() %}
{% set width = bask_prev.get_width() %} {% set width = bask_prev.get_width() %}
{% set height = bask_prev.get_height() %} {% set height = bask_prev.get_height() %}
{{ thumbnail.format(bask_prev, width,height, '', session, false, false) }} {{ thumbnail.format(bask_prev, width,height, '', false, false) }}
{% endif %} {% endif %}
{% include 'lightbox/selector_box.html.twig' %} {% include 'lightbox/selector_box.html.twig' %}
@@ -66,8 +66,8 @@
<div class="display_id"></div> <div class="display_id"></div>
</td> </td>
<td style="text-align:left;width:auto;"> <td style="text-align:left;width:auto;">
<div class="title title15" title="{% if basket_element %}{{basket_element.getRecord().get_title}}{% endif %}"> <div class="title title15" title="{% if basket_element %}{{basket_element.getRecord(app).get_title}}{% endif %}">
{% if basket_element %}{{basket_element.getRecord().get_title}}{% endif %} {% if basket_element %}{{basket_element.getRecord(app).get_title}}{% endif %}
</div> </div>
</td> </td>
<td style="text-align:right;width:230px;"> <td style="text-align:right;width:230px;">
@@ -102,8 +102,8 @@
<div id="record_infos"> <div id="record_infos">
<div class="container"> <div class="container">
{% if basket_element %} {% if basket_element %}
{% set business = user.ACL().has_right_on_base(basket_element.getRecord().get_base_id(), 'canmodifrecord') %} {% set business = user.ACL().has_right_on_base(basket_element.getRecord(app).get_base_id(), 'canmodifrecord') %}
{{caption.format_caption(basket_element.getRecord(), '', null, business)}} {{caption.format_caption(basket_element.getRecord(app), '', null, business)}}
{% endif %} {% endif %}
</div> </div>
</div> </div>

10
templates/web/lightbox/agreement_box.html.twig
View File

@@ -13,10 +13,10 @@
</tbody> </tbody>
</table> </table>
{% if basket.getValidation() %} {% if basket.getValidation() %}
<div>{{ basket.getValidation().getValidationString(user) }}</div> <div>{{ basket.getValidation().getValidationString(app, user) }}</div>
<ul> <ul>
{% for choice in basket_element.getValidationDatas() %} {% for choice in basket_element.getValidationDatas() %}
{% if basket.getValidation().getParticipant(user).getCanSeeOthers() or choice.getParticipant().getUser() == core.getAuthenticatedUser() %} {% if basket.getValidation().getParticipant(user, app).getCanSeeOthers() or choice.getParticipant().getUser(app) == app['phraseanet.user'] %}
{% if choice.getAgreement() == true %} {% if choice.getAgreement() == true %}
{% set classuser = 'agree' %} {% set classuser = 'agree' %}
{% elseif choice.getAgreement() is null %} {% elseif choice.getAgreement() is null %}
@@ -24,7 +24,7 @@
{% else %} {% else %}
{% set classuser = 'disagree' %} {% set classuser = 'disagree' %}
{% endif %} {% endif %}
{% set participant = choice.getParticipant().getUser() %} {% set participant = choice.getParticipant().getUser(app) %}
<li class="{% if participant.get_id() == user.get_id() %}me{% endif %} {{classuser}} userchoice">{{participant.get_display_name()}}</li> <li class="{% if participant.get_id() == user.get_id() %}me{% endif %} {{classuser}} userchoice">{{participant.get_display_name()}}</li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
@@ -32,10 +32,10 @@
{% endif %} {% endif %}
</div> </div>
<div class="PNB user_infos"> <div class="PNB user_infos">
{% if basket_element and basket_element.getBasket().getValidation() and basket.getValidation().getParticipant(user).getCanAgree() %} {% if basket_element and basket_element.getBasket().getValidation() and basket.getValidation().getParticipant(user, app).getCanAgree() %}
<div class="PNB choices"> <div class="PNB choices">
<div style="height:60px;"> <div style="height:60px;">
{% set agreement = basket_element.getUserValidationDatas(user).getAgreement() %} {% set agreement = basket_element.getUserValidationDatas(user, app).getAgreement() %}
<div class="ui-corner-all big_box agree_{{basket_element.getId()}} agree {% if agreement is null or agreement == false %}not_decided{% endif %}"> <div class="ui-corner-all big_box agree_{{basket_element.getId()}} agree {% if agreement is null or agreement == false %}not_decided{% endif %}">
<img src="/skins/lightbox/agree-big.png"/><span class="title15">{% trans 'validation:: OUI' %}</span> <img src="/skins/lightbox/agree-big.png"/><span class="title15">{% trans 'validation:: OUI' %}</span>
</div> </div>

6
templates/web/lightbox/basket_content_report.html.twig
View File

@@ -3,7 +3,7 @@
<div style="margin:0 7px;overflow:hidden;"> <div style="margin:0 7px;overflow:hidden;">
{% for basket_element in basket.getElements() %} {% for basket_element in basket.getElements() %}
{% set record = basket_element.getRecord() %} {% set record = basket_element.getRecord(app) %}
<span class="wrapCHIM_{{basket_element.getId()}} valid"> <span class="wrapCHIM_{{basket_element.getId()}} valid">
<div style="margin:20px;"> <div style="margin:20px;">
<table style="width: 100%; min-width: 330px;"> <table style="width: 100%; min-width: 330px;">
@@ -14,7 +14,7 @@
<div class="display_id"> <div class="display_id">
{{basket_element.getOrd()}} {{basket_element.getOrd()}}
</div> </div>
{{thumbnail.format(record.get_thumbnail(),165, 125, '', session, true, false)}} {{thumbnail.format(record.get_thumbnail(),165, 125, '', true, false)}}
</div> </div>
</td> </td>
<td style="width:10px;"> <td style="width:10px;">
@@ -33,7 +33,7 @@
{% set imguser = '<img src="/skins/lightbox/disagree.png" />' %} {% set imguser = '<img src="/skins/lightbox/disagree.png" />' %}
{% set styleuser = '' %} {% set styleuser = '' %}
{% endif %} {% endif %}
<b style="{{styleuser}}">{{imguser|raw}} {{validationDatas.getParticipant().getUser().get_display_name()}}</b> <b style="{{styleuser}}">{{imguser|raw}} {{validationDatas.getParticipant().getUser(app).get_display_name()}}</b>
{% if validationDatas.getNote() != '' %} {% if validationDatas.getNote() != '' %}
: {{validationDatas.getNote()|nl2br}} : {{validationDatas.getNote()|nl2br}}
{% endif %} {% endif %}

2
templates/web/lightbox/basket_options.html.twig
View File

@@ -1,4 +1,4 @@
{% if basket.getValidation() and basket.getValidation().getParticipant(user).getCanAgree() %} {% if basket.getValidation() and basket.getValidation().getParticipant(user, app).getCanAgree() %}
<button class="confirm_report" title="{% trans 'validation::envoyer mon rapport'%}"> <button class="confirm_report" title="{% trans 'validation::envoyer mon rapport'%}">
<img src="/skins/lightbox/envoyer.png"/> <img src="/skins/lightbox/envoyer.png"/>
{% trans 'validation::envoyer mon rapport'%} {% trans 'validation::envoyer mon rapport'%}

2
templates/web/lightbox/feed.html.twig
View File

@@ -46,7 +46,7 @@
<div class="container PNB"> <div class="container PNB">
{% if first_item %} {% if first_item %}
{% set bask_prev = first_item.get_record().get_preview() %} {% set bask_prev = first_item.get_record().get_preview() %}
{{thumbnail.format(bask_prev,bask_prev.get_width(),bask_prev.get_height(),'',session, false, false)}} {{thumbnail.format(bask_prev,bask_prev.get_width(),bask_prev.get_height(),'', false, false)}}
{% endif %} {% endif %}
</div> </div>
</div> </div>

2
templates/web/lightbox/feed_container.html.twig
View File

@@ -6,7 +6,7 @@
<a href="/lightbox/ajax/LOAD_FEED_ITEM/{{feed_entry.get_id()}}/{{element.get_id()}}/"> <a href="/lightbox/ajax/LOAD_FEED_ITEM/{{feed_entry.get_id()}}/{{element.get_id()}}/">
<div id="scid_{{element.get_id()}}" class="basket_element ui-corner-all {% if first_item and first_item.get_id() == element.get_id() %}selected{% endif %}"> <div id="scid_{{element.get_id()}}" class="basket_element ui-corner-all {% if first_item and first_item.get_id() == element.get_id() %}selected{% endif %}">
<div class="display_id">{{element.get_ord()}}</div> <div class="display_id">{{element.get_ord()}}</div>
{{thumbnail.format(element.get_record().get_thumbnail() ,114,85, '', session, true, false)}} {{thumbnail.format(element.get_record().get_thumbnail() ,114,85, '', true, false)}}
<form name="download_form" class="download_form" style="display:none;"> <form name="download_form" class="download_form" style="display:none;">
<input type="hidden" name="basrec" value="{{element.get_record().get_serialize_key()}}"/> <input type="hidden" name="basrec" value="{{element.get_record().get_serialize_key()}}"/>
</form> </form>

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

@@ -42,7 +42,7 @@
<tr> <tr>
<td style="width:170px;"> <td style="width:170px;">
{% if basket_length > 0%} {% if basket_length > 0%}
{{thumbnail.format(basket.getElements().first().getRecord().get_thumbnail, 170, 170, '', session, true, false)}} {{thumbnail.format(basket.getElements().first().getRecord(app).get_thumbnail, 170, 170, '', true, false)}}
{% endif %} {% endif %}
</td> </td>
<td style="width:20px;"> <td style="width:20px;">
@@ -57,7 +57,7 @@
</h2> </h2>
{% if basket.getValidation().isFinished() %} {% if basket.getValidation().isFinished() %}
{% trans '(validation) session terminee' %} {% trans '(validation) session terminee' %}
{% elseif basket.getValidation().getParticipant(user).getIsConfirmed() %} {% elseif basket.getValidation().getParticipant(user, app).getIsConfirmed() %}
{% trans '(validation) envoyee' %} {% trans '(validation) envoyee' %}
{% else %} {% else %}
{% trans '(validation) a envoyer' %} {% trans '(validation) a envoyer' %}
@@ -73,7 +73,7 @@
<tr> <tr>
<td colspan="2"> <td colspan="2">
<div>{{ basket.getDescription() }}</div> <div>{{ basket.getDescription() }}</div>
<div>{{ basket.getValidation().getValidationString(user) }}</div> <div>{{ basket.getValidation().getValidationString(app, user) }}</div>
</td> </td>
</tr> </tr>
</table> </table>
@@ -107,7 +107,7 @@
<tr> <tr>
<td style="width:170px;"> <td style="width:170px;">
{% if basket_length > 0%} {% if basket_length > 0%}
{{thumbnail.format(basket.getElements().first().getRecord().get_thumbnail, 170, 170, '', session, true, false)}} {{thumbnail.format(basket.getElements().first().getRecord(app).get_thumbnail, 170, 170, '', true, false)}}
{% endif %} {% endif %}
</td> </td>
<td style="width:20px;"> <td style="width:20px;">

12
templates/web/lightbox/sc_container.html.twig
View File

@@ -5,21 +5,21 @@
<div class="basket_element_wrapper"> <div class="basket_element_wrapper">
<a href="/lightbox/ajax/LOAD_BASKET_ELEMENT/{{element.getId()}}/"> <a href="/lightbox/ajax/LOAD_BASKET_ELEMENT/{{element.getId()}}/">
<div id="scid_{{element.getId()}}" class="basket_element ui-corner-all {% if basket_element and basket_element.getId() == element.getId() %}selected{% endif %}"> <div id="scid_{{element.getId()}}" class="basket_element ui-corner-all {% if basket_element and basket_element.getId() == element.getId() %}selected{% endif %}">
{% set record = element.getRecord().set_number(loop.index) %} {% set record = element.getRecord(app).set_number(loop.index) %}
<div class="display_id">{{record.get_number()}}</div> <div class="display_id">{{record.get_number()}}</div>
{% if basket.getValidation() %} {% if basket.getValidation() %}
<div class="agreement"> <div class="agreement">
<img src="/skins/lightbox/agree.png" <img src="/skins/lightbox/agree.png"
class="agree_button {%if element.getUserValidationDatas(user).getAgreement() == false or element.getUserValidationDatas(user).getAgreement() is null %}not_decided{%endif%} agree_{{element.getId()}}" /> class="agree_button {%if element.getUserValidationDatas(user, app).getAgreement() == false or element.getUserValidationDatas(user, app).getAgreement() is null %}not_decided{%endif%} agree_{{element.getId()}}" />
<img src="/skins/lightbox/disagree.png" <img src="/skins/lightbox/disagree.png"
class="disagree_button {%if element.getUserValidationDatas(user).getAgreement() == true or element.getUserValidationDatas(user).getAgreement() is null %}not_decided{%endif%} disagree_{{element.getId()}}" /> class="disagree_button {%if element.getUserValidationDatas(user, app).getAgreement() == true or element.getUserValidationDatas(user, app).getAgreement() is null %}not_decided{%endif%} disagree_{{element.getId()}}" />
</div> </div>
{% endif %} {% endif %}
{{thumbnail.format(element.getRecord().get_thumbnail,114,85, '', session, true, false)}} {{thumbnail.format(element.getRecord(app).get_thumbnail,114,85, '', true, false)}}
<form name="download_form" class="download_form" style="display:none;"> <form name="download_form" class="download_form" style="display:none;">
<input type="hidden" name="basrec" value="{{element.getRecord().get_serialize_key()}}"/> <input type="hidden" name="basrec" value="{{element.getRecord(app).get_serialize_key()}}"/>
</form> </form>
<div tooltipsrc="/prod/tooltip/preview/{{element.getRecord().get_sbas_id()}}/{{element.getRecord().get_record_id()}}/" class="previewTips"></div> <div tooltipsrc="/prod/tooltip/preview/{{element.getRecord(app).get_sbas_id()}}/{{element.getRecord(app).get_record_id()}}/" class="previewTips"></div>
</div> </div>
</a> </a>
</div> </div>

6
templates/web/lightbox/sc_note.html.twig
View File

@@ -9,16 +9,16 @@
<hr/> <hr/>
{% for validationDatas in basket_element.getValidationDatas() %} {% for validationDatas in basket_element.getValidationDatas() %}
{% if validationDatas.getNote() != '' %} {% if validationDatas.getNote() != '' %}
<div class="note_wrapper ui-corner-all {% if validationDatas.getParticipant().getUser().get_id() == user.get_id() %}my_note{% endif %} "> <div class="note_wrapper ui-corner-all {% if validationDatas.getParticipant().getUser(app).get_id() == user.get_id() %}my_note{% endif %} ">
<span class="note_author title15"> <span class="note_author title15">
{{validationDatas.getParticipant().getUser().get_display_name()}} {{validationDatas.getParticipant().getUser(app).get_display_name()}}
</span> : {{ validationDatas.getNote()|nl2br }} </span> : {{ validationDatas.getNote()|nl2br }}
</div> </div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
<form> <form>
<textarea>{{basket_element.getUserValidationDatas(user).getNote()}}</textarea> <textarea>{{basket_element.getUserValidationDatas(user, app).getNote()}}</textarea>
<div class="buttons"> <div class="buttons">
<button class="note_closer ui-corner-all"> <button class="note_closer ui-corner-all">
{% trans 'boutton::fermer' %} {% trans 'boutton::fermer' %}

2
templates/web/lightbox/sc_options_box.html.twig
View File

@@ -22,7 +22,7 @@
<img src="/skins/lightbox/save.png"/> <img src="/skins/lightbox/save.png"/>
</button> </button>
<form name="download_form" style="display:none;"> <form name="download_form" style="display:none;">
<input type="hidden" name="basrec" value="{{basket_element.getRecord().get_serialize_key()}}"/> <input type="hidden" name="basrec" value="{{basket_element.getRecord(app).get_serialize_key()}}"/>
</form> </form>
| |
{% if basket_element.getBasket().getValidation() %} {% if basket_element.getBasket().getValidation() %}

4
templates/web/lightbox/selector_box.html.twig
View File

@@ -1,8 +1,8 @@
{% if basket_element and basket_element.getBasket().getValidation() %} {% if basket_element and basket_element.getBasket().getValidation() %}
<div class="agreement_selector" style="display:none;"> <div class="agreement_selector" style="display:none;">
<img src="/skins/lightbox/agree-big.png" <img src="/skins/lightbox/agree-big.png"
class="{% if basket_element.getUserValidationDatas (user) != true %}not_decided{% endif %} agree_{{basket_element.getId()}}"/> class="{% if basket_element.getUserValidationDatas (user, app) != true %}not_decided{% endif %} agree_{{basket_element.getId()}}"/>
<img src="/skins/lightbox/disagree-big.png" <img src="/skins/lightbox/disagree-big.png"
class="{% if basket_element.getUserValidationDatas (user) != false %}not_decided{% endif %} disagree_{{basket_element.getId()}}" /> class="{% if basket_element.getUserValidationDatas (user, app) != false %}not_decided{% endif %} disagree_{{basket_element.getId()}}" />
</div> </div>
{% endif %} {% endif %}

18
templates/web/lightbox/validate.html.twig
View File

@@ -36,9 +36,9 @@
</div> </div>
</td> </td>
<td style="text-align:left;width:auto;"> <td style="text-align:left;width:auto;">
<div class="title title15" title="{% if basket_element %}{{basket_element.getRecord().get_title}}{% endif %}"> <div class="title title15" title="{% if basket_element %}{{basket_element.getRecord(app).get_title}}{% endif %}">
{% if basket_element %} {% if basket_element %}
{{basket_element.getRecord().get_title}} {{basket_element.getRecord(app).get_title}}
{% endif %} {% endif %}
</div> </div>
</td> </td>
@@ -53,12 +53,12 @@
<div class="container PNB"> <div class="container PNB">
{% if basket_element %} {% if basket_element %}
{% set bask_prev = basket_element.getRecord().get_preview() %} {% set bask_prev = basket_element.getRecord(app).get_preview() %}
{% set width = bask_prev.get_width() %} {% set width = bask_prev.get_width() %}
{% set height = bask_prev.get_height() %} {% set height = bask_prev.get_height() %}
{{ thumbnail.format(bask_prev, width,height, '', session, false, false) }} {{ thumbnail.format(bask_prev, width,height, '', false, false) }}
{% endif %} {% endif %}
{% include 'lightbox/selector_box.html.twig' %} {% include 'lightbox/selector_box.html.twig' %}
@@ -74,8 +74,8 @@
<div class="display_id"></div> <div class="display_id"></div>
</td> </td>
<td style="text-align:left;width:auto;"> <td style="text-align:left;width:auto;">
<div class="title title15" title="{% if basket_element %}{{basket_element.getRecord().get_title}}{% endif %}"> <div class="title title15" title="{% if basket_element %}{{basket_element.getRecord(app).get_title}}{% endif %}">
{% if basket_element %}{{basket_element.getRecord().get_title}}{% endif %} {% if basket_element %}{{basket_element.getRecord(app).get_title}}{% endif %}
</div> </div>
</td> </td>
<td style="text-align:right;width:230px;"> <td style="text-align:right;width:230px;">
@@ -100,8 +100,8 @@
<div id="record_infos" class="PNB"> <div id="record_infos" class="PNB">
<div class="container PNB"> <div class="container PNB">
{% if basket_element %} {% if basket_element %}
{% set business = user.ACL().has_right_on_base(basket_element.getRecord().get_base_id(), 'canmodifrecord') %} {% set business = user.ACL().has_right_on_base(basket_element.getRecord(app).get_base_id(), 'canmodifrecord') %}
{{caption.format_caption(basket_element.getRecord(), '', null, business)}} {{caption.format_caption(basket_element.getRecord(app), '', null, business)}}
{% endif %} {% endif %}
</div> </div>
</div> </div>
@@ -184,7 +184,7 @@
<div id="dialog_dwnl" title="{% trans 'action : exporter' %}" style="display:none;"></div> <div id="dialog_dwnl" title="{% trans 'action : exporter' %}" style="display:none;"></div>
<script type="text/javascript"> <script type="text/javascript">
{% if basket.getValidation() %} {% if basket.getValidation() %}
p4.releasable = {% if basket.getValidation().getParticipant(user).isReleasable() %}"{% trans 'Do you want to send your report ?' %}"{% else %}false{% endif %} p4.releasable = {% if basket.getValidation().getParticipant(user, app).isReleasable() %}"{% trans 'Do you want to send your report ?' %}"{% else %}false{% endif %}
{% endif %} {% endif %}
</script> </script>
{% endblock %} {% endblock %}

4
templates/web/login/forgot-password.html.twig
View File

@@ -60,7 +60,7 @@
{% if tokenize %} {% if tokenize %}
{% if app.request.get('salt') %} {% if app['request'].get('salt') %}
<div class="notice" style="text-align: center; margin: 20px 40px; padding: 10px; font-weight: bold; font-size: 14px;"> <div class="notice" style="text-align: center; margin: 20px 40px; padding: 10px; font-weight: bold; font-size: 14px;">
{% trans 'Pour ameliorer la securite de l\'application, vous devez mettre a jour votre mot de passe.' %}<br/> {% trans 'Pour ameliorer la securite de l\'application, vous devez mettre a jour votre mot de passe.' %}<br/>
{% trans 'Cette tache ne pouvant etre automatisee, merci de bien vouloir la realiser.' %} {% trans 'Cette tache ne pouvant etre automatisee, merci de bien vouloir la realiser.' %}
@@ -109,7 +109,7 @@
<tr style="height: 30px;"> <tr style="height: 30px;">
<td></td> <td></td>
<td> <td>
<input type="hidden" value="{{ app.request.get('token') }}" name="token"/> <input type="hidden" value="{{ app['request'].get('token') }}" name="token"/>
<input type="submit" value="valider"/> <input type="submit" value="valider"/>
</td> </td>
<td> <td>

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

@@ -1,4 +1,4 @@
<html lang="{{session.get_I18n}}"> <html lang="{{app['locale.I18n']}}">
<head> <head>
{% include 'login/head.html.twig' %} {% include 'login/head.html.twig' %}
</head> </head>
@@ -10,13 +10,13 @@
</div> </div>
</noscript> </noscript>
{% if browser.isOldBrowser %} {% if app['browser'].isOldBrowser %}
<div id="wrongBrowser" style="display:none;text-align:center;width:100%;background:#00a8FF;font-size:14px;font-weight:bold;"> <div id="wrongBrowser" style="display:none;text-align:center;width:100%;background:#00a8FF;font-size:14px;font-weight:bold;">
<div> <div>
{% trans 'phraseanet::browser not compliant' %}<br/>{% trans 'phraseanet::recommend browser' %} {% trans 'phraseanet::browser not compliant' %}<br/>{% trans 'phraseanet::recommend browser' %}
</div> </div>
<div style="height:30px;text-align:center;margin-top:15px;width:950px;margin-right:auto;margin-left:auto;"> <div style="height:30px;text-align:center;margin-top:15px;width:950px;margin-right:auto;margin-left:auto;">
{% if browser.getPlatform == 'Windows' %} {% if app['browser'].getPlatform == 'Windows' %}
<span style="margin:0 10px;padding:0;white-space:nowrap;height:25px;"> <span style="margin:0 10px;padding:0;white-space:nowrap;height:25px;">
<img style="vertical-align:middle;" src="/skins/login/img/firefox.png"/> <img style="vertical-align:middle;" src="/skins/login/img/firefox.png"/>
<a href="http://www.mozilla.com/firefox/" target="_blank">Mozilla Firefox</a></span> <a href="http://www.mozilla.com/firefox/" target="_blank">Mozilla Firefox</a></span>
@@ -26,7 +26,7 @@
<span style="margin:0 10px;padding:0;white-space:nowrap;height:25px;"> <span style="margin:0 10px;padding:0;white-space:nowrap;height:25px;">
<img style="vertical-align:middle;" src="/skins/login/img/chrome.png"/> <img style="vertical-align:middle;" src="/skins/login/img/chrome.png"/>
<a href="http://www.google.com/chrome/" target="_blank">Google Chrome</a></span> <a href="http://www.google.com/chrome/" target="_blank">Google Chrome</a></span>
{% elseif browser.getPlatform == 'Apple' %} {% elseif app['browser'].getPlatform == 'Apple' %}
<span style="margin:0 10px;padding:0;white-space:nowrap;height:25px;"> <span style="margin:0 10px;padding:0;white-space:nowrap;height:25px;">
<img style="vertical-align:middle;" src="/skins/login/img/firefox.png"/> <img style="vertical-align:middle;" src="/skins/login/img/firefox.png"/>
<a href="http://www.mozilla.com/firefox/" target="_blank">Mozilla Firefox</a></span> <a href="http://www.mozilla.com/firefox/" target="_blank">Mozilla Firefox</a></span>
@@ -44,7 +44,7 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% if display_chrome_frame and session.get_cookie('gfc_box') == false %} {% if display_chrome_frame 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">
@@ -105,7 +105,7 @@
var RecaptchaOptions = { var RecaptchaOptions = {
theme : 'custom', theme : 'custom',
tabindex : 3, tabindex : 3,
lang : '{{session.get_locale()}}' lang : '{{app['locale']}}'
}; };
</script> </script>
{% endif %} {% endif %}
@@ -118,10 +118,10 @@
</span><span class="title-desc">{{meta_description}}</span></td> </span><span class="title-desc">{{meta_description}}</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 %} {% if login.register_enabled(app) %}
<a href="/login/register/" class="tab" id="register-tab">{% trans 'login:: register' %}</a> <a href="/login/register/" class="tab" id="register-tab">{% trans 'login:: register' %}</a>
{% endif %} {% endif %}
{% if login.get_cgus != '' %} {% if login.get_cgus(app) != '' %}
<a class="tab" onclick="setTab('about',this);return false;">{% trans 'login:: CGUs' %}</a> <a class="tab" onclick="setTab('about',this);return false;">{% trans 'login:: CGUs' %}</a>
{% endif %} {% endif %}
<a class="tab" id="main-tab" onclick="setTab('main',this);return false;">{% trans 'login:: accueil' %}</a> <a class="tab" id="main-tab" onclick="setTab('main',this);return false;">{% trans 'login:: accueil' %}</a>
@@ -146,10 +146,10 @@
<input type="hidden" name="redirect" value="{{redirect}}"> <input type="hidden" name="redirect" value="{{redirect}}">
</form> </form>
</div> </div>
{% if login.get_cgus != '' %} {% if login.get_cgus(app) != '' %}
<div id="id-about" class="tab-content" style="display:none;"> <div id="id-about" class="tab-content" style="display:none;">
<div style="position:relative;float:left;width:930px;height:490px;overflow:auto;"> <div style="position:relative;float:left;width:930px;height:490px;overflow:auto;">
{{login.get_cgus|raw}} {{login.get_cgus(app)|raw}}
</div> </div>
</div> </div>
{% endif %} {% endif %}
@@ -162,8 +162,8 @@
{% trans 'phraseanet:: language' %} {% trans 'phraseanet:: language' %}
<select name="lng" id="lng-select" onchange="setLanguage();"> <select name="lng" id="lng-select" onchange="setLanguage();">
{% for code, language in core.getAvailableLanguages() %} {% for code, language in app.getAvailableLanguages() %}
<option value="{{ code }}" {% if code == session.get_locale() %}selected="selected"{% endif %}> <option value="{{ code }}" {% if code == app['locale'] %}selected="selected"{% endif %}>
{{ language }} {{ language }}
</option> </option>
{% endfor %} {% endfor %}

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

@@ -1,8 +1,8 @@
<div style="height:130px;position:relative;"> <div style="height:130px;position:relative;">
<div style="height:95px;width:220px;float:right;margin:25px 10px 0;"> <div style="height:95px;width:220px;float:right;margin:25px 10px 0;">
<div style="margin-top:0px;height:20px;"> <div style="margin-top:0px;height:20px;">
{{login.get_register_link|raw}} {{login.get_register_link(app) |raw}}
{{login.get_guest_link|raw}} {{login.get_guest_link(app) |raw}}
</div> </div>
<div style="margin-top:10px;height:20px;"> <div style="margin-top:10px;height:20px;">
<a target="_self" class="link" rel="external" href="/login/forgot-password/"> <a target="_self" class="link" rel="external" href="/login/forgot-password/">

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

@@ -1,8 +1,8 @@
<div style="height:180px;position:relative;"> <div style="height:180px;position:relative;">
<div style="height:95px;width:220px;float:right;margin:25px 10px 0;"> <div style="height:95px;width:220px;float:right;margin:25px 10px 0;">
<div style="margin-top:0px;height:20px;"> <div style="margin-top:0px;height:20px;">
{{login.get_register_link|raw}} {{login.get_register_link(app) |raw}}
{{login.get_guest_link|raw}} {{login.get_guest_link(app) |raw}}
</div> </div>
<div style="margin-top:10px;height:20px;"> <div style="margin-top:10px;height:20px;">
<a target="_self" class="link" rel="external" href="/login/forgot-password/"> <a target="_self" class="link" rel="external" href="/login/forgot-password/">

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

@@ -54,10 +54,10 @@
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;">
{{login.get_register_link|raw}} {{login.get_register_link(app) |raw}}
</div> </div>
<div style="margin-top:10px;"> <div style="margin-top:10px;">
{{login.get_guest_link|raw}} {{login.get_guest_link(app) |raw}}
</div> </div>
</div> </div>
</div> </div>

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

@@ -169,7 +169,7 @@
{% trans 'admin::compte-utilisateur ville' %} {% trans 'admin::compte-utilisateur ville' %}
</label> </label>
<div class="controls"> <div class="controls">
<input type="text" id="form_geonameid" class="input_element geoname_field" name="form_geonameid" geonameid="{{ parms['form_geonameid'] is defined ? parms['form_geonameid'] : '' }}" value="{{ parms['form_geonameid'] is defined ? geonames.name_from_id(parms['form_geonameid']) : ''}}" /> <input type="text" id="form_geonameid" class="input_element geoname_field" name="form_geonameid" geonameid="{{ parms['form_geonameid'] is defined ? parms['form_geonameid'] : '' }}" value="{{ parms['form_geonameid'] is defined ? geonames.name_from_id(parms['form_geonameid'], app) : ''}}" />
<p class="form_alert help-block">{{ needed['form_geonameid'] is defined ? needed['form_geonameid'] : '' }}</p> <p class="form_alert help-block">{{ needed['form_geonameid'] is defined ? needed['form_geonameid'] : '' }}</p>
</div> </div>
</div> </div>
@@ -311,7 +311,7 @@
{% if (baseInsc['CollsCGU'] or baseInsc['Colls']) and baseInsc['inscript'] %} {% if (baseInsc['CollsCGU'] or baseInsc['Colls']) and baseInsc['inscript'] %}
<tr> <tr>
<td colspan="3" style="text-align: center;"> <td colspan="3" style="text-align: center;">
<h3 style="margin: 15px 0pt 2px;" class="inscriptbase">{{ sbasId |sbas_names }}</h3> <h3 style="margin: 15px 0pt 2px;" class="inscriptbase">{{ sbasId |sbas_names(app) }}</h3>
</td> </td>
</tr> </tr>
{% if baseInsc['Colls'] %} {% if baseInsc['Colls'] %}
@@ -324,7 +324,7 @@
</tr> </tr>
{% endif %} {% endif %}
{% for collId, collName in baseInsc['Colls'] %} {% for collId, collName in baseInsc['Colls'] %}
{% set baseId = sbasId |base_from_coll(collId) %} {% set baseId = sbasId |base_from_coll(collId, app) %}
<tr> <tr>
<td style="text-align: right;">{{ collName }}</td> <td style="text-align: right;">{{ collName }}</td>
<td></td> <td></td>
@@ -338,7 +338,7 @@
{% if baseInsc['CollsCGU'] %} {% if baseInsc['CollsCGU'] %}
{% for collId, collDesc in baseInsc['CollsCGU'] %} {% for collId, collDesc in baseInsc['CollsCGU'] %}
{% set baseId = sbasId |base_from_coll(collId) %} {% set baseId = sbasId |base_from_coll(collId, app) %}
<tr> <tr>
<td colspan="3" style="text-align: center;"> <td colspan="3" style="text-align: center;">
<hr style="width: 80%"/> <hr style="width: 80%"/>

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

@@ -83,7 +83,7 @@
{% import 'common/thumbnail.html.twig' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
{% set subdef = record.get_subdef(subdef_name) %} {% set subdef = record.get_subdef(subdef_name) %}
{{ thumbnail.format(subdef, subdef.get_width(), subdef.get_height(), '', session, true, false) }} {{ thumbnail.format(subdef, subdef.get_width(), subdef.get_height(), '', true, false) }}
</div> </div>
<div class="caption"> <div class="caption">
{% include 'common/caption.html.twig' %} {% include 'common/caption.html.twig' %}

8
templates/web/prod/Baskets/Reorder.html.twig
View File

@@ -19,12 +19,12 @@
<div class="elements"> <div class="elements">
{% for element in basket.getElements() %} {% for element in basket.getElements() %}
<div id="ORDER_{{ element.getId() }}" class="CHIM diapo" style="height:130px;overflow:hidden;"> <div id="ORDER_{{ element.getId() }}" class="CHIM diapo" style="height:130px;overflow:hidden;">
<div class="title" title="{{ element.getRecord().get_title() }}" style="position:relative;z-index:1200;height:30px;overflow:visible;text-align:center;"> <div class="title" title="{{ element.getRecord(app).get_title() }}" style="position:relative;z-index:1200;height:30px;overflow:visible;text-align:center;">
<span>{{ element.getRecord().get_title() }}</span> <span>{{ element.getRecord(app).get_title() }}</span>
{{ thumbnail.format(element.getRecord().get_thumbnail(), 80, 80, '', session, false, false) }} {{ thumbnail.format(element.getRecord(app).get_thumbnail(), 80, 80, '', false, false) }}
<form style="display:none;"> <form style="display:none;">
<input type="hidden" name="id" value="{{ element.getId() }}"/> <input type="hidden" name="id" value="{{ element.getId() }}"/>
<input type="hidden" name="title" value="{{ element.getRecord().get_title() }}"/> <input type="hidden" name="title" value="{{ element.getRecord(app).get_title() }}"/>
<input type="hidden" name="default" value="{{ element.getOrd() }}"/> <input type="hidden" name="default" value="{{ element.getOrd() }}"/>
</form> </form>
</div> </div>

2
templates/web/prod/Story/Reorder.html.twig
View File

@@ -15,7 +15,7 @@
<div id="ORDER_{{ element.get_record_id() }}" class="CHIM diapo" style="height:130px;overflow:hidden;"> <div id="ORDER_{{ element.get_record_id() }}" class="CHIM diapo" style="height:130px;overflow:hidden;">
<div class="title" title="{{ element.get_title() }}" style="position:relative;z-index:1200;height:30px;overflow:visible;text-align:center;"> <div class="title" title="{{ element.get_title() }}" style="position:relative;z-index:1200;height:30px;overflow:visible;text-align:center;">
<span>{{ element.get_title() }}</span> <span>{{ element.get_title() }}</span>
{{ thumbnail.format(element.get_thumbnail(), 80, 80, '', session, false, false) }} {{ thumbnail.format(element.get_thumbnail(), 80, 80, '', false, false) }}
<form style="display:none;"> <form style="display:none;">
<input type="hidden" name="id" value="{{ element.get_record_id() }}"/> <input type="hidden" name="id" value="{{ element.get_record_id() }}"/>
<input type="hidden" name="title" value="{{ element.get_title() }}"/> <input type="hidden" name="title" value="{{ element.get_title() }}"/>

4
templates/web/prod/Tooltip/Basket.html.twig
View File

@@ -13,7 +13,7 @@
</div> </div>
<div style="margin:5px 0;text-align:right;font-style:italic;position:relative;"> <div style="margin:5px 0;text-align:right;font-style:italic;position:relative;">
{% set nb_records = basket.getElements()|length %} {% set nb_records = basket.getElements()|length %}
{% set date = basket.getUpdated() | prettyDate %} {% set date = app['date-formatter'].getPrettyString(basket.getUpdated()) %}
{% trans %} {% trans %}
{{ nb_records }} records {{ nb_records }} records
{% endtrans %} {% endtrans %}
@@ -23,7 +23,7 @@
{% for element in basket.getElements() %} {% for element in basket.getElements() %}
{% if loop.index <= 9 %} {% if loop.index <= 9 %}
<div style="margin:5px;position:relative;float:left;width:80px;height:80px;overflow:hidden;"> <div style="margin:5px;position:relative;float:left;width:80px;height:80px;overflow:hidden;">
{{ thumbnail.format(element.getRecord().get_thumbnail(), 80, 80 , '', session, false, false) }} {{ thumbnail.format(element.getRecord(app).get_thumbnail(), 80, 80 , '', false, false) }}
</div> </div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}

4
templates/web/prod/Tooltip/Story.html.twig
View File

@@ -10,7 +10,7 @@
<div class="noToolTipResize" style="margin:5px;width:{{ width - 40 }}px;height:300px;position:relative;"> <div class="noToolTipResize" style="margin:5px;width:{{ width - 40 }}px;height:300px;position:relative;">
<div style="margin:5px 0;text-align:right;font-style:italic;position:relative;"> <div style="margin:5px 0;text-align:right;font-style:italic;position:relative;">
{% set nb_records = Story.get_children().get_elements()|length %} {% set nb_records = Story.get_children().get_elements()|length %}
{% set date = Story.get_modification_date() | prettyDate %} {% set date = app['date-formatter'].getPrettyString(Story.get_modification_date()) %}
{% trans %} {% trans %}
{{ nb_records }} records {{ nb_records }} records
{% endtrans %} {% endtrans %}
@@ -20,7 +20,7 @@
{% for element in Story.get_children().get_elements() %} {% for element in Story.get_children().get_elements() %}
{% if loop.index <= 9 %} {% if loop.index <= 9 %}
<div style="margin:5px;position:relative;float:left;width:80px;height:80px;overflow:hidden;"> <div style="margin:5px;position:relative;float:left;width:80px;height:80px;overflow:hidden;">
{{ thumbnail.format(element.get_thumbnail(), 80, 80 , '', session, false, false) }} {{ thumbnail.format(element.get_thumbnail(), 80, 80 , '', false, false) }}
</div> </div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}

4
templates/web/prod/WorkZone/Basket.html.twig
View File

@@ -68,9 +68,9 @@
{% import 'prod/WorkZone/Macros.html.twig' as Macros %} {% import 'prod/WorkZone/Macros.html.twig' as Macros %}
{% if basket.getValidation() %} {% if basket.getValidation() %}
{{ Macros.display_validation(basket, ordre, user, session) }} {{ Macros.display_validation(app, basket, ordre, user) }}
{% else %} {% else %}
{{ Macros.display_basket(basket, user, session) }} {{ Macros.display_basket(app, basket, user) }}
{% endif %} {% endif %}
</div> </div>

14
templates/web/prod/WorkZone/Browser/Basket.html.twig
View File

@@ -34,12 +34,12 @@
{% set top = 0 %} {% set top = 0 %}
{% if Basket.getPusher() %} {% if Basket.getPusher(app) %}
{% set top = top + 40 %} {% set top = top + 40 %}
<div class="PNB" style="top:40px;bottom:auto;height:40px;background-color:#404040;"> <div class="PNB" style="top:40px;bottom:auto;height:40px;background-color:#404040;">
<div class="PNB10"> <div class="PNB10">
<p> <p>
{% set user_name = '<a tooltipsrc="/prod/tooltip/user/' ~ Basket.getPusher().get_id() ~ '/" href="/user/' ~ Basket.getPusher().get_id() ~ '/" class="UserTips">' ~ Basket.getPusher().get_display_name() ~ '</a>' %} {% set user_name = '<a tooltipsrc="/prod/tooltip/user/' ~ Basket.getPusher(app).get_id() ~ '/" href="/user/' ~ Basket.getPusher(app).get_id() ~ '/" class="UserTips">' ~ Basket.getPusher(app).get_display_name() ~ '</a>' %}
{% trans %} {% trans %}
Received from {{ user_name }} Received from {{ user_name }}
{% endtrans %} {% endtrans %}
@@ -61,10 +61,10 @@
{% endif %} {% endif %}
{% set list_participants = list_participants ~ '<a class="UserTips" tooltipsrc="/prod/tooltip/user/' {% set list_participants = list_participants ~ '<a class="UserTips" tooltipsrc="/prod/tooltip/user/'
~ Participant.getUser().get_id() ~ Participant.getUser(app).get_id()
~ '/" href="/user/' ~ '/" href="/user/'
~ Participant.getUser().get_id() ~ '/">' ~ Participant.getUser(app).get_id() ~ '/">'
~ Participant.getUser().get_display_name ~ Participant.getUser(app).get_display_name
~ '</a>' %} ~ '</a>' %}
{% endfor %} {% endfor %}
{% trans %} {% trans %}
@@ -100,13 +100,13 @@
<div class="PNB" style="top:{{ top }}px;"> <div class="PNB" style="top:{{ top }}px;">
<div class="PNB10"> <div class="PNB10">
{% for BasketElement in Basket.getElements() %} {% for BasketElement in Basket.getElements() %}
{% set record = BasketElement.getRecord() %} {% set record = BasketElement.getRecord(app) %}
<div class="diapo" style="width:150px; height:180px;"> <div class="diapo" style="width:150px; height:180px;">
<div class='title'> <div class='title'>
{{record.get_original_name()}} {{record.get_original_name()}}
</div> </div>
<div> <div>
{{thumbnail.format(record.get_thumbnail,140,140, '', session, true, false)}} {{thumbnail.format(record.get_thumbnail,140,140, '', true, false)}}
</div> </div>
<div style='position:absolute; bottom:0px; left:0px; height:20px'> <div style='position:absolute; bottom:0px; left:0px; height:20px'>
<div class="previewTips" tooltipsrc="/prod/tooltip/preview/{{record.get_sbas_id()}}/{{record.get_record_id()}}/"></div> <div class="previewTips" tooltipsrc="/prod/tooltip/preview/{{record.get_sbas_id()}}/{{record.get_record_id()}}/"></div>

12
templates/web/prod/WorkZone/Browser/Results.html.twig
View File

@@ -40,7 +40,7 @@
<td class="thumbnail"> <td class="thumbnail">
{% set BasketElement = Basket.getElements().first() %} {% set BasketElement = Basket.getElements().first() %}
{% if BasketElement %} {% if BasketElement %}
{{thumbnail.format(BasketElement.getRecord().get_thumbnail(), 80, 80, '', session, true, false)}} {{thumbnail.format(BasketElement.getRecord(app).get_thumbnail(), 80, 80, '', true, false)}}
{% endif %} {% endif %}
<div class="counter"> <div class="counter">
{{ Basket.getElements().count() }} {{ Basket.getElements().count() }}
@@ -66,9 +66,9 @@
</a> </a>
</h1> </h1>
{% if Basket.getPusher() %} {% if Basket.getPusher(app) %}
<p> <p>
{% set user_name = '<a href="/user/' ~ Basket.getPusher().get_id() ~ '/" tooltipsrc="/prod/tooltip/user/' ~ Basket.getPusher().get_id() ~ '/" class="UserTips">' ~ Basket.getPusher().get_display_name() ~ '</a>' %} {% set user_name = '<a href="/user/' ~ Basket.getPusher(app).get_id() ~ '/" tooltipsrc="/prod/tooltip/user/' ~ Basket.getPusher(app).get_id() ~ '/" class="UserTips">' ~ Basket.getPusher(app).get_display_name() ~ '</a>' %}
{% trans %} {% trans %}
Received from {{ user_name }} Received from {{ user_name }}
{% endtrans %} {% endtrans %}
@@ -86,9 +86,9 @@
{% endif %} {% endif %}
{% set list_participants = list_participants ~ '<a class="UserTips" tooltipsrc="/prod/tooltip/user/' {% set list_participants = list_participants ~ '<a class="UserTips" tooltipsrc="/prod/tooltip/user/'
~ Participant.getUser().get_id() ~ Participant.getUser(app).get_id()
~ '/" href="/user/' ~ Participant.getUser().get_id() ~ '/">' %} ~ '/" href="/user/' ~ Participant.getUser(app).get_id() ~ '/">' %}
{% set list_participants = list_participants ~ Participant.getUser().get_display_name %} {% set list_participants = list_participants ~ Participant.getUser(app).get_display_name %}
{% set list_participants = list_participants ~ '</a>' %} {% set list_participants = list_participants ~ '</a>' %}
{% endfor %} {% endfor %}
{% trans %} {% trans %}

44
templates/web/prod/WorkZone/Macros.html.twig
View File

@@ -1,4 +1,4 @@
{% macro make_bloc(WorkZone, selected_type, selected_id, srt) %} {% macro make_bloc(app, WorkZone, selected_type, selected_id, srt) %}
<div class="alert_datas_changed ui-corner-all"> <div class="alert_datas_changed ui-corner-all">
<a title="{% trans 'rafraichir' %}" class="basket_refresher" href="#"> <a title="{% trans 'rafraichir' %}" class="basket_refresher" href="#">
{% trans 'Vous avez recu un nouveau panier' %} {% trans 'Vous avez recu un nouveau panier' %}
@@ -91,8 +91,8 @@
<img title="{% trans 'Vous avez envoye une demande de validation de document sur ce panier' %}" <img title="{% trans 'Vous avez envoye une demande de validation de document sur ce panier' %}"
class="basketTips" src="/skins/icons/myvalid.png"/> class="basketTips" src="/skins/icons/myvalid.png"/>
{% endif %} {% endif %}
{% if basket.getPusher() %} {% if basket.getPusher(app) %}
{% set pusher = basket.getPusher().get_display_name() %} {% set pusher = basket.getPusher(app).get_display_name() %}
<img class="basketTips" title="{% trans %}paniers:: panier recu de {{pusher}}{% endtrans %}" <img class="basketTips" title="{% trans %}paniers:: panier recu de {{pusher}}{% endtrans %}"
src="/skins/icons/push16.png"/> src="/skins/icons/push16.png"/>
{% endif %} {% endif %}
@@ -171,15 +171,15 @@
{% for story in content.get(constant('\\Alchemy\\Phrasea\\Helper\\WorkZone::STORIES')) %} {% for story in content.get(constant('\\Alchemy\\Phrasea\\Helper\\WorkZone::STORIES')) %}
<div tooltipsrc="/prod/tooltip/Story/{{story.getRecord().get_sbas_id()}}/{{story.getRecord().get_record_id()}}/" <div tooltipsrc="/prod/tooltip/Story/{{story.getRecord(app).get_sbas_id()}}/{{story.getRecord(app).get_record_id()}}/"
id="SSWZ_{{story.getId()}}" sbas="{{story.getSbasId()}}" id="SSWZ_{{story.getId()}}" sbas="{{story.getSbasId()}}"
class="STORY_{{ story.getRecord().get_serialize_key() }} basketTips ui-accordion-header ui-state-default class="STORY_{{ story.getRecord(app).get_serialize_key() }} basketTips ui-accordion-header ui-state-default
ui-corner-all header SSTT grouping ui-corner-all header SSTT grouping
{% if story.getId() == selected_id and selected_type == 'story' %}active{% endif %}"> {% if story.getId() == selected_id and selected_type == 'story' %}active{% endif %}">
<a href="/prod/story/{{ story.getRecord().get_sbas_id }}/{{ story.getRecord().get_record_id() }}/"> <a href="/prod/story/{{ story.getRecord(app).get_sbas_id }}/{{ story.getRecord(app).get_record_id() }}/">
<span> <span>
{{ story.getRecord().get_base_id()|get_collection_logo|raw }} {{ story.getRecord(app).get_base_id()|get_collection_logo(app)|raw }}
<i> {{ story.getRecord().get_title() }} </i> <i> {{ story.getRecord(app).get_title() }} </i>
</span> </span>
</a> </a>
<div class="menu"> <div class="menu">
@@ -194,25 +194,25 @@
<div class="context-menu context-menu-theme-vista"> <div class="context-menu context-menu-theme-vista">
<div title="" class="context-menu-item"> <div title="" class="context-menu-item">
<div class="context-menu-item-inner" <div class="context-menu-item-inner"
onclick="downloadThis('lst={{story.getRecord().get_serialize_key()}}');">{% trans 'action::exporter' %} onclick="downloadThis('lst={{story.getRecord(app).get_serialize_key()}}');">{% trans 'action::exporter' %}
</div> </div>
</div> </div>
<div title="" class="context-menu-item menu3-custom-item"> <div title="" class="context-menu-item menu3-custom-item">
<div onclick="editThis('IMGT','{{story.getRecord().get_serialize_key()}}');" style="" <div onclick="editThis('IMGT','{{story.getRecord(app).get_serialize_key()}}');" style=""
class="context-menu-item-inner">{% trans 'action::editer' %} class="context-menu-item-inner">{% trans 'action::editer' %}
</div> </div>
</div> </div>
<div title="" class="context-menu-item menu3-custom-item"> <div title="" class="context-menu-item menu3-custom-item">
<div class="context-menu-item-inner"> <div class="context-menu-item-inner">
<a class="story_unfix" href="/prod/WorkZone/detachStory/{{story.getRecord().get_sbas_id()}}/{{story.getRecord().get_record_id()}}/"> <a class="story_unfix" href="/prod/WorkZone/detachStory/{{story.getRecord(app).get_sbas_id()}}/{{story.getRecord(app).get_record_id()}}/">
{% trans 'action::detacher' %} {% trans 'action::detacher' %}
</a> </a>
</div> </div>
</div> </div>
<div title="" class="context-menu-item menu3-custom-item"> <div title="" class="context-menu-item menu3-custom-item">
<div class="context-menu-item-inner"> <div class="context-menu-item-inner">
<a class="dialog" title="{% trans 'Re-ordonner' %}" href="/prod/story/{{story.getRecord().get_sbas_id()}}/{{story.getRecord().get_record_id()}}/reorder/"> <a class="dialog" title="{% trans 'Re-ordonner' %}" href="/prod/story/{{story.getRecord(app).get_sbas_id()}}/{{story.getRecord(app).get_record_id()}}/reorder/">
{% trans 'Re-ordonner' %} {% trans 'Re-ordonner' %}
</a> </a>
</div> </div>
@@ -239,7 +239,7 @@
{% endmacro %} {% endmacro %}
{% macro element(wz_scope, container, contained, record, ord, user, session) %} {% macro element(wz_scope, container, contained, record, ord, user) %}
{% set box_height = 110 %} {% set box_height = 110 %}
{% if user.getPrefs('basket_title_display') == '1' %} {% if user.getPrefs('basket_title_display') == '1' %}
{% set box_height = (box_height + 20) %} {% set box_height = (box_height + 20) %}
@@ -267,7 +267,7 @@
<div style="position:absolute;background-color:#959595;color:black;font-weight:bold;padding:3px;z-index:90;"> <div style="position:absolute;background-color:#959595;color:black;font-weight:bold;padding:3px;z-index:90;">
{{record.get_number()}} {{record.get_number()}}
</div> </div>
{{thumbnail.format(record.get_thumbnail,82,82, '', session, true, false)}} {{thumbnail.format(record.get_thumbnail,82,82, '', true, false)}}
<div class="bottom"> <div class="bottom">
<a <a
{% if wz_scope == 'groupings' %} {% if wz_scope == 'groupings' %}
@@ -289,15 +289,15 @@
</div> </div>
{% endmacro %} {% endmacro %}
{% macro display_basket(basket, user, session) %} {% macro display_basket(app, basket, user) %}
{% for basket_element in basket.getElements() %} {% for basket_element in basket.getElements() %}
<span class="wrapCHIM_{{ basket_element.getRecord().get_serialize_key() }}"> <span class="wrapCHIM_{{ basket_element.getRecord(app).get_serialize_key() }}">
{{ _self.element('basket', basket, basket_element, basket_element.getRecord(), basket_element.getOrd(), user, session) }} {{ _self.element('basket', basket, basket_element, basket_element.getRecord(app), basket_element.getOrd(), user) }}
</span> </span>
{% endfor %} {% endfor %}
{% endmacro %} {% endmacro %}
{% macro display_validation(basket, ordre, user, session) %} {% macro display_validation(app, basket, ordre, user) %}
<div style="margin:5px 0;text-align:center;"> <div style="margin:5px 0;text-align:center;">
<form> <form>
<select name="valid_ord"> <select name="valid_ord">
@@ -309,18 +309,18 @@
</div> </div>
{% for basket_element in basket.getElementsByOrder(ordre) %} {% for basket_element in basket.getElementsByOrder(ordre) %}
<span class="wrapCHIM_{{ basket_element.getRecord().get_serialize_key() }} valid"> <span class="wrapCHIM_{{ basket_element.getRecord(app).get_serialize_key() }} valid">
<table style="width: 100%; min-width: 330px; display: inline-block;"> <table style="width: 100%; min-width: 330px; display: inline-block;">
<tr> <tr>
<td style="width:80px;"> <td style="width:80px;">
{{ _self.element('basket', basket, basket_element, basket_element.getRecord(), basket_element.getOrd(), user, session) }} {{ _self.element('basket', basket, basket_element, basket_element.getRecord(app), basket_element.getOrd(), user) }}
</td> </td>
<td style="width:100%;"> <td style="width:100%;">
<table style=width:100%> <table style=width:100%>
{% for choice in basket_element.getValidationDatas() %} {% for choice in basket_element.getValidationDatas() %}
{% if basket.getValidation().getParticipant(user).getCanSeeOthers() or choice.getParticipant().getUser() == core.getAuthenticatedUser() %} {% if basket.getValidation().getParticipant(user, app).getCanSeeOthers() or choice.getParticipant().getUser(app) == app['phraseanet.user'] %}
<tr> <tr>
<td> {{ choice.getParticipant().getUser().get_display_name() }} </td> <td> {{ choice.getParticipant().getUser(app).get_display_name() }} </td>
<td> <td>
{% if choice.getAgreement() == true %} {% if choice.getAgreement() == true %}
<img style="cursor:help;" src='/skins/lightbox/agree.png' title="{% trans "L'utilisateur approuve ce document" %}" /> <img style="cursor:help;" src='/skins/lightbox/agree.png' title="{% trans "L'utilisateur approuve ce document" %}" />

2
templates/web/prod/WorkZone/Story.html.twig
View File

@@ -73,7 +73,7 @@
{% for record in Story.get_children().get_elements() %} {% for record in Story.get_children().get_elements() %}
<span class="wrapCHIM_{{ record.get_serialize_key() }}"> <span class="wrapCHIM_{{ record.get_serialize_key() }}">
{{ Macros.element('groupings', Story, record, record, record.get_number(), user, session) }} {{ Macros.element('groupings', Story, record, record, record.get_number(), user) }}
</span> </span>
{% endfor %} {% endfor %}
</div> </div>

2
templates/web/prod/WorkZone/WorkZone.html.twig
View File

@@ -1,2 +1,2 @@
{% import 'prod/WorkZone/Macros.html.twig' as WorkZoneMacros %} {% import 'prod/WorkZone/Macros.html.twig' as WorkZoneMacros %}
{{WorkZoneMacros.make_bloc(WorkZone, selected_type, selected_id, srt)}} {{WorkZoneMacros.make_bloc(app, WorkZone, selected_type, selected_id, srt)}}

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

@@ -38,7 +38,7 @@
<table style="width:100%;"> <table style="width:100%;">
<tr> <tr>
<td rowspan="3" style="width:120px;text-align:center;"> <td rowspan="3" style="width:120px;text-align:center;">
{{thumb.format(record.get_thumbnail, 100, 100, "", session, true, false)}} {{thumb.format(record.get_thumbnail, 100, 100, "", true, false)}}
</td> </td>
<td style="width:100px;"> <td style="width:100px;">
{% set name = "title_" ~ record.get_serialize_key() %} {% set name = "title_" ~ record.get_serialize_key() %}

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

@@ -83,7 +83,7 @@
</div> </div>
<br/> <br/>
<div> <div>
{{ element.get_created_on|prettyDate }} {{ app['date-formatter'].getPrettyString(element.get_created_on) }}
{% if element.get_category != '' %} {% if element.get_category != '' %}
{% set category = element.get_category %} {% set category = element.get_category %}

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

@@ -7,7 +7,7 @@
{% for id, record in route.get_elements %} {% for id, record in route.get_elements %}
<div id='pub_record_{{record.get_serialize_key()}}' class="diapo"> <div id='pub_record_{{record.get_serialize_key()}}' class="diapo">
<div class="title">{{ record.get_title() }}</div> <div class="title">{{ record.get_title() }}</div>
{{thumb.format(record.get_thumbnail, 80, 80, "", session, true, false)}} {{thumb.format(record.get_thumbnail, 80, 80, "", true, false)}}
</div> </div>
{% endfor %} {% endfor %}
</div> </div>

6
templates/web/prod/actions/Bridge/records_list.html.twig
View File

@@ -60,7 +60,7 @@
<td> <td>
<input type="hidden" value="{{ element.get_id() }}"/> <input type="hidden" value="{{ element.get_id() }}"/>
<div class="diapo pending_records"> <div class="diapo pending_records">
{{thumb.format(element.get_record().get_thumbnail, 40, 40, "", session, true, false)}} {{thumb.format(element.get_record().get_thumbnail, 40, 40, "", true, false)}}
</div> </div>
</td> </td>
<td> <td>
@@ -91,10 +91,10 @@
{% endif %} {% endif %}
</td> </td>
<td> <td>
{{ element.get_created_on()|prettyDate }} {{ app['date-formatter'].getPrettyString(element.get_created_on()) }}
</td> </td>
<td> <td>
{{ element.get_uploaded_on()|prettyDate }} {{ app['date-formatter'].getPrettyString(element.get_uploaded_on()) }}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}

4
templates/web/prod/actions/Feedback/List-Share.html.twig
View File

@@ -33,7 +33,7 @@
<input type="hidden" name="usr_id" value="{{ owner.getUser().get_id() }}" /> <input type="hidden" name="usr_id" value="{{ owner.getUser().get_id() }}" />
</td> </td>
<td style="padding-right:10px;min-width:100px;"> <td style="padding-right:10px;min-width:100px;">
{% if user.get_id() == owner.getUser(user).get_id() %} {% if user.get_id() == owner.getUser(app).get_id() %}
{% if owner.getRole() == constant('\\Entities\\UsrListOwner::ROLE_ADMIN') %} {% if owner.getRole() == constant('\\Entities\\UsrListOwner::ROLE_ADMIN') %}
{% trans 'You are Admin' %} {% trans 'You are Admin' %}
{% endif %} {% endif %}
@@ -53,7 +53,7 @@
{% endif %} {% endif %}
</td> </td>
<td style="width:15px"> <td style="width:15px">
{% if user.get_id() != owner.getUser(user).get_id() %} {% if user.get_id() != owner.getUser(app).get_id() %}
<a href="#" class="deleter"> <a href="#" class="deleter">
<img src="/skins/prod/Push/close_badge.png" title="{% trans 'Remove' %}"/> <img src="/skins/prod/Push/close_badge.png" title="{% trans 'Remove' %}"/>
</a> </a>

8
templates/web/prod/actions/Feedback/ListsMacros.html.twig
View File

@@ -57,7 +57,7 @@
</thead> </thead>
<tbody> <tbody>
{% for user in results %} {% for user in results %}
<tr class="{% if list.has(user) %} selected {% endif %}{% if loop.index is odd %} odd {% endif %}"> <tr class="{% if list.has(user, app) %} selected {% endif %}{% if loop.index is odd %} odd {% endif %}">
<td> <td>
{{ user.get_login() }} {{ user.get_login() }}
<input name="usr_id" value="{{ user.get_id() }}" type="hidden" /> <input name="usr_id" value="{{ user.get_id() }}" type="hidden" />
@@ -78,7 +78,7 @@
{{ user.get_login() }} {{ user.get_login() }}
</td> </td>
<td> <td>
{{ user.get_creation_date() | formatDate }} {{ app['date-formatter'].getDate(user.get_creation_date()) }}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
@@ -178,7 +178,7 @@
{% macro badgeReadonly(entry, role) %} {% macro badgeReadonly(entry, role) %}
<div class="badge"> <div class="badge">
<input type="hidden" value="{{ entry.getUser().get_id() }}" name="id"> <input type="hidden" value="{{ entry.getUser(app).get_id() }}" name="id">
{% if role >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %} {% if role >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}
<a class="deleter" href="#"> <a class="deleter" href="#">
<img src="/skins/prod/Push/close_badge.png"> <img src="/skins/prod/Push/close_badge.png">
@@ -190,7 +190,7 @@
<img src="/skins/icons/user.png"/> <img src="/skins/icons/user.png"/>
</td> </td>
<td class="infos" > <td class="infos" >
<span class="name">{{ entry.getUser().get_display_name() }}</span> <span class="name">{{ entry.getUser(app).get_display_name() }}</span>
<span class="subtite"></span> <span class="subtite"></span>
</td> </td>
</tr> </tr>

12
templates/web/prod/actions/Feedback/list.html.twig
View File

@@ -5,7 +5,7 @@
<table style="height: 40px;"> <table style="height: 40px;">
<tr> <tr>
<td style="white-space:nowrap;"> <td style="white-space:nowrap;">
{% if list.getOwner(user).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %} {% if list.getOwner(user, app).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}
<form class="form-inline" method="POST" name="SaveName" action="/prod/lists/list/{{ list.getId() }}/update/"> <form class="form-inline" method="POST" name="SaveName" action="/prod/lists/list/{{ list.getId() }}/update/">
<label>{% trans 'List Name' %}</label> <label>{% trans 'List Name' %}</label>
<input type="text" name="name" style="margin: 0 5px;" value="{{ list.getName() }}"/> <input type="text" name="name" style="margin: 0 5px;" value="{{ list.getName() }}"/>
@@ -16,14 +16,14 @@
{% endif %} {% endif %}
</td> </td>
<td style="text-align:right;white-space:nowrap;"> <td style="text-align:right;white-space:nowrap;">
{% if list.getOwner(user).getRole() == constant('\\Entities\\UsrListOwner::ROLE_ADMIN') %} {% if list.getOwner(user, app).getRole() == constant('\\Entities\\UsrListOwner::ROLE_ADMIN') %}
<a href="/prod/lists/list/{{ list.getId() }}/share/" title="{% trans 'Share the list' %}" class="list_sharer"> <a href="/prod/lists/list/{{ list.getId() }}/share/" title="{% trans 'Share the list' %}" class="list_sharer">
<img src="/skins/prod/Push/list-icon.png" /> <img src="/skins/prod/Push/list-icon.png" />
{% trans "Set sharing permission" %} {% trans "Set sharing permission" %}
</a> </a>
{% endif %} {% endif %}
</td> </td>
{% if list.getOwner(user).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_ADMIN') %} {% if list.getOwner(user, app).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_ADMIN') %}
<td style="text-align:right;white-space:nowrap;width:150px;"> <td style="text-align:right;white-space:nowrap;width:150px;">
<button class="deleter btn btn-inverse"> <button class="deleter btn btn-inverse">
{% trans 'Delete' %} {% trans 'Delete' %}
@@ -40,20 +40,20 @@
<p> <p>
{% set length = '<span class="counter current">' ~ list.getEntries().count() ~ '</span>' %} {% set length = '<span class="counter current">' ~ list.getEntries().count() ~ '</span>' %}
{% trans %}{{ length }} peoples{% endtrans %} {% trans %}{{ length }} peoples{% endtrans %}
{% if list.getOwner(user).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %} {% if list.getOwner(user, app).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}
<button class="EditToggle btn btn-inverse">{% trans 'Edit' %}</button> <button class="EditToggle btn btn-inverse">{% trans 'Edit' %}</button>
{% endif %} {% endif %}
</p> </p>
</div> </div>
<div class="PNB" style="top:35px;overflow:auto;"> <div class="PNB" style="top:35px;overflow:auto;">
{% set role = list.getOwner(user).getRole() %} {% set role = list.getOwner(user, app).getRole() %}
{% for entry in list.getEntries() %} {% for entry in list.getEntries() %}
{{ ListsMacros.badgeReadonly(entry, role) }} {{ ListsMacros.badgeReadonly(entry, role) }}
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
</div> </div>
{% if list.getOwner(user).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %} {% if list.getOwner(user, app).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}
<div class="PNB content readwrite grey-bg" style="display:none;top:40px;"> <div class="PNB content readwrite grey-bg" style="display:none;top:40px;">
<form name="list-editor-search" method="POST" action="/prod/push/edit-list/{{ list.getId() }}/"> <form name="list-editor-search" method="POST" action="/prod/push/edit-list/{{ list.getId() }}/">
<div class="PNB10" style="height:160px;"> <div class="PNB10" style="height:160px;">

2
templates/web/prod/actions/Feedback/lists-all.html.twig
View File

@@ -14,7 +14,7 @@
{% set length = '<span class="counter">' ~ list.getEntries().count() ~ '</span>' %} {% set length = '<span class="counter">' ~ list.getEntries().count() ~ '</span>' %}
<li class="list" style="padding:2px;"> <li class="list" style="padding:2px;">
<a href="/prod/push/edit-list/{{ list.getId() }}/" class="list_link"> <a href="/prod/push/edit-list/{{ list.getId() }}/" class="list_link">
{% if list.getOwner(user).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %} {% if list.getOwner(user, app).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}
<img src="/skins/prod/Push/list-icon.png" /> <img src="/skins/prod/Push/list-icon.png" />
{% else %} {% else %}
<img src="/skins/icons/SHARE16.png" /> <img src="/skins/icons/SHARE16.png" />

2
templates/web/prod/actions/Push.html.twig
View File

@@ -48,7 +48,7 @@
{% for list in lists %} {% for list in lists %}
<li class="list" style="padding:2px;"> <li class="list" style="padding:2px;">
<a class="list_loader" href="/prod/push/list/{{ list.getId() }}/"> <a class="list_loader" href="/prod/push/list/{{ list.getId() }}/">
{% if list.getOwner(user).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %} {% if list.getOwner(user, app).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}
<img src="/skins/prod/Push/list-icon.png" /> <img src="/skins/prod/Push/list-icon.png" />
{% else %} {% else %}
<img src="/skins/icons/SHARE16.png" /> <img src="/skins/icons/SHARE16.png" />

6
templates/web/prod/actions/edit_default.html.twig
View File

@@ -294,11 +294,11 @@
<input type="checkbox" class="checkbox" id="EditSROptionRX" value="regexp" onchange="changeReplaceMode(this);"> <input type="checkbox" class="checkbox" id="EditSROptionRX" value="regexp" onchange="changeReplaceMode(this);">
{% trans 'prod::editing:remplace::option : utiliser une expression reguliere' %} {% trans 'prod::editing:remplace::option : utiliser une expression reguliere' %}
{% set help_link = 'https://secure.wikimedia.org/wikipedia/en/wiki/Regular_expression' %} {% set help_link = 'https://secure.wikimedia.org/wikipedia/en/wiki/Regular_expression' %}
{% if session.get_I18n == 'de' %} {% if app['locale.I18n'] == 'de' %}
{% set help_link = 'https://secure.wikimedia.org/wikipedia/de/wiki/Regul%C3%A4rer_Ausdruck' %} {% set help_link = 'https://secure.wikimedia.org/wikipedia/de/wiki/Regul%C3%A4rer_Ausdruck' %}
{% elseif session.get_I18n == 'fr' %} {% elseif app['locale.I18n'] == 'fr' %}
{% set help_link = 'https://secure.wikimedia.org/wikipedia/fr/wiki/Expression_rationnelle' %} {% set help_link = 'https://secure.wikimedia.org/wikipedia/fr/wiki/Expression_rationnelle' %}
{% elseif session.get_I18n == 'ar' %} {% elseif app['locale.I18n'] == 'ar' %}
{% set help_link = 'https://secure.wikimedia.org/wikipedia/ar/wiki/%D8%AA%D8%B9%D8%A7%D8%A8%D9%8A%D8%B1_%D9%86%D9%85%D8%B7%D9%8A%D8%A9' %} {% set help_link = 'https://secure.wikimedia.org/wikipedia/ar/wiki/%D8%AA%D8%B9%D8%A7%D8%A8%D9%8A%D8%B1_%D9%86%D9%85%D8%B7%D9%8A%D8%A9' %}
{% endif %} {% endif %}
<a href="{{help_link}}" target="_blank"> <a href="{{help_link}}" target="_blank">

6
templates/web/prod/actions/publish/publish.html.twig
View File

@@ -1,7 +1,7 @@
{% macro format_diapo(record, session) %} {% macro format_diapo(record) %}
{% import 'common/thumbnail.html.twig' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
<div class="diapo"> <div class="diapo">
{{thumbnail.format(record.get_thumbnail(), 100, 100, '', session, true, false)}} {{thumbnail.format(record.get_thumbnail(), 100, 100, '', true, false)}}
</div> </div>
{% endmacro %} {% endmacro %}
@@ -18,7 +18,7 @@
<div class="PNB10 record_list" style="overflow:auto;"> <div class="PNB10 record_list" style="overflow:auto;">
{% for record in publishing %} {% for record in publishing %}
<div class="sortable" style="position:relative;float:left;"> <div class="sortable" style="position:relative;float:left;">
{{ _self.format_diapo(record, session) }} {{ _self.format_diapo(record) }}
<form> <form>
<input type="hidden" name="sbas_id" value="{{record.get_sbas_id()}}" /> <input type="hidden" name="sbas_id" value="{{record.get_sbas_id()}}" />
<input type="hidden" name="record_id" value="{{record.get_record_id()}}" /> <input type="hidden" name="record_id" value="{{record.get_record_id()}}" />

6
templates/web/prod/actions/publish/publish_edit.html.twig
View File

@@ -1,8 +1,8 @@
{% macro format_diapo(record, session) %} {% macro format_diapo(record) %}
{% import 'common/thumbnail.html.twig' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
<div class="diapo"> <div class="diapo">
{{thumbnail.format(record.get_thumbnail(), 100, 100, '', session, true, false)}} {{thumbnail.format(record.get_thumbnail(), 100, 100, '', true, false)}}
</div> </div>
{% endmacro %} {% endmacro %}
@@ -18,7 +18,7 @@
<div class="PNB10 record_list" style="overflow:auto;"> <div class="PNB10 record_list" style="overflow:auto;">
{% for content in entry.get_content() %} {% for content in entry.get_content() %}
<div class="sortable" style="position:relative;float:left;"> <div class="sortable" style="position:relative;float:left;">
{{ _self.format_diapo(content.get_record(), session) }} {{ _self.format_diapo(content.get_record()) }}
<form> <form>
<input type="hidden" name="item_id" value="{{content.get_id()}}" /> <input type="hidden" name="item_id" value="{{content.get_id()}}" />
</form> </form>

2
templates/web/prod/feeds/entry.html.twig
View File

@@ -1,2 +1,2 @@
{% import 'prod/feeds/entry_macro.html.twig' as _entry %} {% import 'prod/feeds/entry_macro.html.twig' as _entry %}
{{ _entry.format(entry.get_feed(), entry, user, session) }} {{ _entry.format(entry.get_feed(), entry, user) }}

8
templates/web/prod/feeds/entry_macro.html.twig
View File

@@ -1,4 +1,4 @@
{% macro format(feed, entry, user, session)%} {% macro format(feed, entry, user)%}
{% import 'prod/results/record.html.twig' as record_format %} {% import 'prod/results/record.html.twig' as record_format %}
<div class="entry ui-corner-all" id="entry_{{ entry.get_id() }}"> <div class="entry ui-corner-all" id="entry_{{ entry.get_id() }}">
@@ -27,8 +27,8 @@
</tr> </tr>
</table> </table>
<div class="post_date"> <div class="post_date">
{% set updated_on = entry.get_updated_on() | prettyDate %} {% set updated_on = app['date-formatter'].getPrettyString(entry.get_updated_on()) %}
{% set created_on = entry.get_created_on() | prettyDate %} {% set created_on = app['date-formatter'].getPrettyString(entry.get_created_on()) %}
<span class="created_on"> <span class="created_on">
{{ created_on }} {{ created_on }}
</span> </span>
@@ -56,7 +56,7 @@
{% for item in entry.get_content() %} {% for item in entry.get_content() %}
{% set record = item.get_record() %} {% set record = item.get_record() %}
{% set prefix = 'PUBLI_' ~ item.get_id() %} {% set prefix = 'PUBLI_' ~ item.get_id() %}
{{record_format.block(record, user, session, false, null, prefix, entry.get_id())}} {{record_format.block(record, user, false, null, prefix, entry.get_id())}}
{% endfor %} {% endfor %}
</div> </div>
</div> </div>

2
templates/web/prod/feeds/feeds.html.twig
View File

@@ -54,7 +54,7 @@
{% set entries = feed.get_entries(offset_start,5).get_entries() %} {% set entries = feed.get_entries(offset_start,5).get_entries() %}
{% for entry in entries %} {% for entry in entries %}
{{ _entry.format(feed, entry, user, session) }} {{ _entry.format(feed, entry, user) }}
{% endfor %} {% endfor %}
{% if entries|length == 0 %} {% if entries|length == 0 %}
<p>{% trans 'Aucune entree pour le moment' %}</p> <p>{% trans 'Aucune entree pour le moment' %}</p>

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

@@ -6,7 +6,7 @@
<input type="hidden" name="reference" value="{{sbas_id}}"/> <input type="hidden" name="reference" value="{{sbas_id}}"/>
<div class="clksbas" style="text-align: center;"> <div class="clksbas" style="text-align: center;">
<label class="checkbox" for="sbasChkr_{{sbas_id}}_{{unique_id}}" onclick="clksbas({{sbas_id}}, $('#sbasChkr_{{sbas_id}}_{{unique_id}}')); return false;"> <label class="checkbox" for="sbasChkr_{{sbas_id}}_{{unique_id}}" onclick="clksbas({{sbas_id}}, $('#sbasChkr_{{sbas_id}}_{{unique_id}}')); return false;">
<span>{{sbas_id|sbas_names}}</span> <span>{{sbas_id|sbas_names(app)}}</span>
<span class="infos_sbas_{{sbas_id}}"> <span class="infos_sbas_{{sbas_id}}">
{{base["collections"]|length}}/{{base['collections']|length}} {{base["collections"]|length}}/{{base['collections']|length}}
</span> </span>
@@ -20,7 +20,7 @@
<li class="clkbas"> <li class="clkbas">
<label style="line-height: 18px;" onclick="infoSbas($('#ck_{{base_id}}_{{unique_id}}'),{{sbas_id}}, false, event); return false;" <label style="line-height: 18px;" onclick="infoSbas($('#ck_{{base_id}}_{{unique_id}}'),{{sbas_id}}, false, event); return false;"
for="ck_{{base_id}}_{{unique_id}}" class="ck_{{base_id}} {% if collection["selected"] %}selected{% endif %} checkbox"> for="ck_{{base_id}}_{{unique_id}}" class="ck_{{base_id}} {% if collection["selected"] %}selected{% endif %} checkbox">
{{base_id|get_collection_logo|raw}} {{base_id|bas_names}} {{base_id|get_collection_logo(app)|raw}} {{base_id|bas_names(app)}}
<input class="ck_{{collection["base_id"]}} checkbas" style="*margin-top:-18px;" <input class="ck_{{collection["base_id"]}} checkbas" style="*margin-top:-18px;"
onclick="cancelEvent(event);return false;" onclick="cancelEvent(event);return false;"
onmousedown="infoSbas(this, {{sbas_id}}, false, event); return false;" onmousedown="infoSbas(this, {{sbas_id}}, false, event); return false;"
@@ -168,7 +168,7 @@
</ul> </ul>
<div id="baskets" class="PNB ui-tabs-panel ui-accordion" style="top:52px;"> <div id="baskets" class="PNB ui-tabs-panel ui-accordion" style="top:52px;">
{% import 'prod/WorkZone/Macros.html.twig' as WorkZoneMacros %} {% import 'prod/WorkZone/Macros.html.twig' as WorkZoneMacros %}
{{WorkZoneMacros.make_bloc(WorkZone)}} {{WorkZoneMacros.make_bloc(app, WorkZone)}}
</div> </div>
{% if GV_thesaurus %} {% if GV_thesaurus %}
<div id="proposals" class="PNB ui-tabs-panel ui-tabs-hide" style="top:52px;" <div id="proposals" class="PNB ui-tabs-panel ui-tabs-hide" style="top:52px;"
@@ -207,7 +207,7 @@
{% if base['thesaurus'] %} {% if base['thesaurus'] %}
<li id="TX_P.{{base['sbas_id']}}.T" class="expandable{% if loop.last %} last{% endif %}"> <li id="TX_P.{{base['sbas_id']}}.T" class="expandable{% if loop.last %} last{% endif %}">
<div class="hitarea expandable-hitarea"></div> <div class="hitarea expandable-hitarea"></div>
<span>{{base['sbas_id']|sbas_names}}</span> <span>{{base['sbas_id']|sbas_names(app)}}</span>
<ul style="display:none">{% trans 'chargement' %}</ul> <ul style="display:none">{% trans 'chargement' %}</ul>
</li> </li>
{% endif %} {% endif %}
@@ -225,7 +225,7 @@
{% if base['cterms'] %} {% if base['cterms'] %}
<li id="CX_P.{{base['sbas_id']}}.C" class="expandable{% if loop.last %} last{% endif %}"> <li id="CX_P.{{base['sbas_id']}}.C" class="expandable{% if loop.last %} last{% endif %}">
<div class="hitarea expandable-hitarea"></div> <div class="hitarea expandable-hitarea"></div>
<span>{{base['sbas_id']|sbas_names}}</span> <span>{{base['sbas_id']|sbas_names(app)}}</span>
<ul style="display:none">{% trans 'chargement' %}</ul> <ul style="display:none">{% trans 'chargement' %}</ul>
</li> </li>
{% endif %} {% endif %}
@@ -1048,7 +1048,7 @@
dataType: "json", dataType: "json",
data: { data: {
app : 1, app : 1,
usr : {{session.get_usr_id()}} usr : {{app['phraseanet.user'].get_id()}}
}, },
error: function(){ error: function(){
window.setTimeout("sessionactive();", 10000); window.setTimeout("sessionactive();", 10000);

8
templates/web/prod/orders/order_box.html.twig
View File

@@ -1,5 +1,5 @@
{% set success = app.request.query.get('success') %} {% set success = app['request'].query.get('success') %}
{% set action = app.request.query.get('action') %} {% set action = app['request'].query.get('action') %}
<div id="order_manager"> <div id="order_manager">
{% if success == '1' %} {% if success == '1' %}
@@ -40,10 +40,10 @@
</thead> </thead>
<tbody> <tbody>
{% for order in orders %} {% for order in orders %}
{% set deadline = order.get_deadline() | prettyDate %} {% set deadline = app['date-formatter'].getPrettyString(order.get_deadline()) %}
<tr id="order_{{ order.get_order_id() }}" class="order_row" {{ current_date > order.get_deadline() ? "style=color:#777": "" }}> <tr id="order_{{ order.get_order_id() }}" class="order_row" {{ current_date > order.get_deadline() ? "style=color:#777": "" }}>
<td>{{ order.get_user().get_display_name() }}</td> <td>{{ order.get_user().get_display_name() }}</td>
<td>{{ order.get_created_on() | prettyDate }}</td> <td>{{ app['date-formatter'].getPrettyString(order.get_created_on()) }}</td>
<td> <td>
{% if deadline != '' %} {% if deadline != '' %}
{{deadline}} {{deadline}}

10
templates/web/prod/orders/order_item.html.twig
View File

@@ -6,8 +6,8 @@
</div> </div>
<div id="order_manager"> <div id="order_manager">
{% set success = app.request.query.get('success') %} {% set success = app['request'].query.get('success') %}
{% set action = app.request.query.get('action') %} {% set action = app['request'].query.get('action') %}
{% if success == '1' %} {% if success == '1' %}
<div class="alert alert-success"> <div class="alert alert-success">
@@ -33,11 +33,11 @@
</tr> </tr>
<tr> <tr>
<td>{% trans 'Date de commande' %}</td> <td>{% trans 'Date de commande' %}</td>
<td>{{ order.get_created_on() | prettyDate }}</td> <td>{{ app['date-formatter'].getPrettyString(order.get_created_on()) }}</td>
</tr> </tr>
<tr> <tr>
<td>{% trans 'Deadline' %}</td> <td>{% trans 'Deadline' %}</td>
<td>{{ order.get_deadline() | prettyDate }}</td> <td>{{ app['date-formatter'].getPrettyString(order.get_deadline()) }}</td>
</tr> </tr>
<tr> <tr>
<td>{% trans 'Utilisation prevue' %}</td> <td>{% trans 'Utilisation prevue' %}</td>
@@ -58,7 +58,7 @@
{% for order_element_id,element in order %} {% for order_element_id,element in order %}
<li> <li>
<div id="order_wrapper_{{order.get_order_id()}}_{{element.get_base_id()}}_{{element.get_record_id()}}" class="order_wrapper {% if element.get_order_master_id() == false %}selectable{% endif %}"> <div id="order_wrapper_{{order.get_order_id()}}_{{element.get_base_id()}}_{{element.get_record_id()}}" class="order_wrapper {% if element.get_order_master_id() == false %}selectable{% endif %}">
{{ thumbnail.format(element.get_thumbnail() ,80, 80, '', session, true, false) }} {{ thumbnail.format(element.get_thumbnail() ,80, 80, '', true, false) }}
{% if element.get_order_master_id() %} {% if element.get_order_master_id() %}
{% set name = element.get_order_master_name() %} {% set name = element.get_order_master_name() %}
{% if element.get_deny() == 1 %} {% if element.get_deny() == 1 %}

Some files were not shown because too many files have changed in this diff Show More