mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 09:53:15 +00:00
Merge branch 'master' into PHRAS-2184-list-manager-email-domain-filter
This commit is contained in:
Nicolas Maillat
@@ -512,7 +512,7 @@
|
||||
{{ 'admin::compte-utilisateur poste' | trans }}
|
||||
</td>
|
||||
<td>
|
||||
<input type="text" name="function" value="{{main_user.getActivity()}}"/>
|
||||
<input type="text" name="function" value="{{main_user.getJob()}}"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -528,7 +528,7 @@
|
||||
{{ 'admin::compte-utilisateur activite' | trans }}
|
||||
</td>
|
||||
<td>
|
||||
<input type="text" name="activite" value="{{main_user.getJob()}}"/>
|
||||
<input type="text" name="activite" value="{{main_user.getActivity()}}"/>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
||||
@@ -42,8 +42,8 @@
|
||||
<select name="like_field" class="input-medium">
|
||||
<option {% if parm['like_field'] == "login" %}selected="selected"{% endif %} value="login">{{ 'Push::filter on login' | trans }}</option>
|
||||
<option {% if parm['like_field'] == "name" %}selected="selected"{% endif %} value="name">{{ 'First/Last Name' | trans }}</option>
|
||||
<option {% if parm['like_field'] == "pays" %}selected="selected"{% endif %} value="pays">{{ 'Push::filter on countries' | trans }}</option>
|
||||
<option {% if parm['like_field'] == "societe" %}selected="selected"{% endif %} value="societe">{{ 'Push::filter on companies' | trans }}</option>
|
||||
<option {% if parm['like_field'] == "country" %}selected="selected"{% endif %} value="country">{{ 'Push::filter on countries' | trans }}</option>
|
||||
<option {% if parm['like_field'] == "company" %}selected="selected"{% endif %} value="company">{{ 'Push::filter on companies' | trans }}</option>
|
||||
<option {% if parm['like_field'] == "email" %}selected="selected"{% endif %} value="email">{{ 'Push::filter on emails' | trans }}</option>
|
||||
</select>
|
||||
<span>{{ 'Push::filter starts' | trans }}</span>
|
||||
|
||||
@@ -25,103 +25,103 @@
|
||||
<div id="nav_menu_container" class="desktopmenu">
|
||||
<div class="arrow-up"></div>
|
||||
<ol class="nav_menu">
|
||||
<li class="menu-bar-item">
|
||||
<a target="_blank" href="{{ path('prod') }}">
|
||||
<img src="/assets/common/images/icons/menu-prod.png" class="mobilemenu"/>
|
||||
<span class="{% if module is defined and module == "prod" %}selected{% endif %}">
|
||||
<li class="menu-bar-item">
|
||||
<a target="_blank" href="{{ path('prod') }}">
|
||||
<img src="/assets/common/images/icons/menu-prod.png" class="mobilemenu"/>
|
||||
<span class="{% if module is defined and module == "prod" %}selected{% endif %}">
|
||||
{{ 'admin::monitor: production' | trans }}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
{% if app['browser'].isNewGeneration and app['conf'].get(['registry', 'modules', 'thesaurus']) == true and app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('thesaurus') %}
|
||||
<li class="menu-bar-item">
|
||||
<a target="_blank" href="{{ path('thesaurus') }}">
|
||||
<img src="/assets/common/images/icons/menu-thesaurus.png" class="mobilemenu"/>
|
||||
<span class="{% if module is defined and module == "thesaurus" %}selected{% endif %}">
|
||||
{% if app['browser'].isNewGeneration and app['conf'].get(['registry', 'modules', 'thesaurus']) == true and app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('thesaurus') %}
|
||||
<li class="menu-bar-item">
|
||||
<a target="_blank" href="{{ path('thesaurus') }}">
|
||||
<img src="/assets/common/images/icons/menu-thesaurus.png" class="mobilemenu"/>
|
||||
<span class="{% if module is defined and module == "thesaurus" %}selected{% endif %}">
|
||||
{{ 'admin::monitor: module thesaurus' | trans }}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
|
||||
{# MODULE #}
|
||||
{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('admin') %}
|
||||
<li class="menu-bar-item">
|
||||
<a target="_blank" href="{{ path('admin') }}">
|
||||
<img src="/assets/common/images/icons/menu-admin.png" class="mobilemenu"/>
|
||||
<span class="{% if module is defined and module == "admin" %}selected{% endif %}">
|
||||
{{ 'admin::monitor: module admin' | trans }}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
{# MODULE #}
|
||||
{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('report') %}
|
||||
<li class="menu-bar-item">
|
||||
<a target="_blank" href="{{ path('report_dashboard') }}">
|
||||
<img src="/assets/common/images/icons/menu-report.png" class="mobilemenu"/>
|
||||
<span class="{% if module is defined and module == "report" %}selected{% endif %}">
|
||||
{{ 'admin::monitor: module report' | trans }}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
{# MODULE #}
|
||||
<li class="menu-bar-item">
|
||||
<a id="validation_link" target="_blank" href="{{ path('lightbox') }}">
|
||||
<img src="/assets/common/images/icons/menu-lightbox.png" class="mobilemenu"/>
|
||||
<span>
|
||||
{{ 'admin::monitor: module validation' | trans }}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
{# MODULE #}
|
||||
{% if module is defined and module == "prod" %}
|
||||
{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('upload') %}
|
||||
<li class="menu-bar-item">
|
||||
{% set link = path('upload_html5_form') %}
|
||||
|
||||
{% if not app['browser'].supportFileAPI() %}
|
||||
{% set link = path('upload_flash_form') %}
|
||||
{% endif %}
|
||||
{# MODULE #}
|
||||
{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('admin') %}
|
||||
<li class="menu-bar-item">
|
||||
<a target="_blank" href="{{ path('admin') }}">
|
||||
<img src="/assets/common/images/icons/menu-admin.png" class="mobilemenu"/>
|
||||
<span class="{% if module is defined and module == "admin" %}selected{% endif %}">
|
||||
{{ 'admin::monitor: module admin' | trans }}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
<a href="{{ link }}" class="uploader-open-action"
|
||||
title="{{ 'Upload' | trans }}">
|
||||
<img src="/assets/common/images/icons/menu-upload.png" class="mobilemenu"/>
|
||||
<span>
|
||||
{# MODULE #}
|
||||
{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('report') %}
|
||||
<li class="menu-bar-item">
|
||||
<a target="_blank" href="{{ path('report_dashboard') }}">
|
||||
<img src="/assets/common/images/icons/menu-report.png" class="mobilemenu"/>
|
||||
<span class="{% if module is defined and module == "report" %}selected{% endif %}">
|
||||
{{ 'admin::monitor: module report' | trans }}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
{# MODULE #}
|
||||
<li class="menu-bar-item">
|
||||
<a id="validation_link" target="_blank" href="{{ path('lightbox') }}">
|
||||
<img src="/assets/common/images/icons/menu-lightbox.png" class="mobilemenu"/>
|
||||
<span>
|
||||
{{ 'admin::monitor: module validation' | trans }}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
{# MODULE #}
|
||||
{% if module is defined and module == "prod" %}
|
||||
{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('upload') %}
|
||||
<li class="menu-bar-item">
|
||||
{% set link = path('upload_html5_form') %}
|
||||
|
||||
{% if not app['browser'].supportFileAPI() %}
|
||||
{% set link = path('upload_flash_form') %}
|
||||
{% endif %}
|
||||
|
||||
<a href="{{ link }}" class="uploader-open-action"
|
||||
title="{{ 'Upload' | trans }}">
|
||||
<img src="/assets/common/images/icons/menu-upload.png" class="mobilemenu"/>
|
||||
<span>
|
||||
{{ 'admin::monitor: module upload' | trans }}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{# MODULE #}
|
||||
{% if module == "prod" %}
|
||||
<li class="menu-bar-item">
|
||||
<a href="#" class="state-navigation" data-state="publication">
|
||||
<img src="/assets/common/images/icons/menu-publication.png" class="mobilemenu"/>
|
||||
<span>
|
||||
{{ 'Publications' | trans }}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% if module is defined and module == "prod" and app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::ORDER_MASTER')) %}
|
||||
<li class="menu-bar-item">
|
||||
<a href="#" class="order-open-action" title="{{ 'Orders manager' | trans }}">
|
||||
{# MODULE #}
|
||||
{% if module == "prod" %}
|
||||
<li class="menu-bar-item">
|
||||
<a href="#" class="state-navigation" data-state="publication">
|
||||
<img src="/assets/common/images/icons/menu-publication.png" class="mobilemenu"/>
|
||||
<span>
|
||||
{{ 'Publications' | trans }}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
{% if module is defined and module == "prod" and app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::ORDER_MASTER')) %}
|
||||
<li class="menu-bar-item">
|
||||
<a href="#" class="order-open-action" title="{{ 'Orders manager' | trans }}">
|
||||
<span>
|
||||
{{ 'Commandes' | trans }}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
</ol>
|
||||
</div>
|
||||
@@ -235,11 +235,10 @@
|
||||
<a target="_blank" href="https://docs.phraseanet.com/4.0/">
|
||||
<span>
|
||||
{{ 'phraseanet:: aide' | trans }}
|
||||
<span style="display:inline-block;cursor:pointer;padding:0;border:none;padding-right:4px;padding-left:4px;"
|
||||
id="help-trigger"> <i class="fa fa-caret-down" aria-hidden="true"></i></span>
|
||||
</span>
|
||||
</a>
|
||||
<table cellspacing="0" cellpadding="0" style="display:none;" class="contextMenu helpcontextmenu">
|
||||
<span id="help-trigger" class="help-trigger"> <i class="fa fa-caret-down" aria-hidden="true"></i></span>
|
||||
<table cellspacing="0" cellpadding="0" class="contextMenu helpcontextmenu context-menu-theme-vistamenu-bar">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>
|
||||
@@ -301,6 +300,10 @@
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function () {
|
||||
$('body').on('click', '#help-trigger', function (event) {
|
||||
$('#mainMenu .helpcontextmenu').toggleClass('shown');
|
||||
console.log('mety');
|
||||
});
|
||||
// var key = 'help';
|
||||
var configurationSettingLinks = {{ configuration|json_encode|raw }};
|
||||
//seperate array based on location of link
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
{% set previewHtml5 = null %}
|
||||
|
||||
{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_subdef(record, 'preview') %}
|
||||
{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_subdef(record, 'preview') and record.has_preview == true %}
|
||||
{% set preview_obj = record.get_preview() %}
|
||||
{% else %}
|
||||
{% set preview_obj = record.get_thumbnail() %}
|
||||
|
||||
@@ -44,6 +44,7 @@
|
||||
{% include "login/common/templates.html.twig" %}
|
||||
<script type="text/javascript" src="/assets/vendors/jquery/jquery{% if not app.debug %}.min{% endif %}.js"></script>
|
||||
<script type="text/javascript" src="/assets/production/commons{% if not app.debug %}.min{% endif %}.js"></script>
|
||||
<script type="text/javascript" src="/assets/vendors/bootstrap/js/bootstrap{% if not app.debug %}.min{% endif %}.js"></script>
|
||||
<script type="text/javascript" src="/assets/production/authenticate{% if not app.debug %}.min{% endif %}.js"></script>
|
||||
{% endblock header_javascript %}
|
||||
{% endblock header %}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<div>
|
||||
<button class="tools-accordion"><span>Actions<i class="fa fa-chevron-right rotate"></i></span></button>
|
||||
<button class="tools-accordion">Actions</button>
|
||||
<div class="tools-panel">
|
||||
<button class="ui-corner-all TOOL_disktt_btn basket_window" data-selection-source="basket">
|
||||
<img src="/assets/common/images/icons/disktt_history.png"/>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
<div class="PNB" id="BasketBrowser">
|
||||
<div class="PNB BasketBrowser" id="BasketBrowser">
|
||||
<div class="PNB10 Browser">
|
||||
<div class="PNB10" style="width:190px;right:auto;">
|
||||
<div class="PNB10 leftBrowser">
|
||||
<form name="BasketBrowser" method="GET" action="{{ path('prod_workzone_search') }}">
|
||||
<input name="Query" class="Query search" placeholder="{{ 'Search baskets' | trans }}" type="text"/>
|
||||
|
||||
@@ -78,9 +78,46 @@
|
||||
</form>
|
||||
|
||||
</div>
|
||||
<div class="PNB results" style="left:220px;">
|
||||
<div class="PNB results rightBrowser">
|
||||
</div>
|
||||
</div>
|
||||
<div class="PNB10 Basket">
|
||||
</div>
|
||||
</div>
|
||||
<style>
|
||||
.dialog-Medium {
|
||||
height: 523px!important;
|
||||
}
|
||||
.paginator a {
|
||||
background: none!important;
|
||||
border: 0;
|
||||
border-radius: 0;
|
||||
padding: 0 9px;
|
||||
font-weight: bold;
|
||||
}
|
||||
.result_loader {
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
top: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
}
|
||||
</style>
|
||||
<script>
|
||||
//load the next result page
|
||||
jQuery(document).ready(function(){
|
||||
jQuery('.next_res').click(function(){
|
||||
jQuery('.results').append('<img class="result_loader" src="/assets/common/images/icons/loading.svg">');
|
||||
jQuery('.results').load($(this).attr('href'));
|
||||
return false;
|
||||
});
|
||||
});
|
||||
//load the prev result page
|
||||
jQuery(document).ready(function(){
|
||||
jQuery('.prev_res').click(function(){
|
||||
jQuery('.results').append('<img class="result_loader" src="/assets/common/images/icons/loading.svg">');
|
||||
jQuery('.results').load($(this).attr('href'));
|
||||
return false;
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
@@ -4,28 +4,9 @@
|
||||
<table>
|
||||
<tr>
|
||||
<td>
|
||||
{% if Total == 0 %}
|
||||
{{ 'No results' | trans }}
|
||||
{% elseif Total == 1 %}
|
||||
{{ '1 result' | trans }}
|
||||
{% else %}
|
||||
{% trans with {'%Total%' : Total} %}%Total% results{% endtrans %}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="paginator">
|
||||
{% if Page - 1 > 0 %}
|
||||
<a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page - 1) }) }}" class="result">
|
||||
<img src="/assets/prod/images/Basket/Browser/left.png" />
|
||||
</a>
|
||||
{% endif %}
|
||||
<span>
|
||||
Page {{ Page }} / {{ MaxPage }}
|
||||
</span>
|
||||
{% if Page + 1 <= MaxPage %}
|
||||
<a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page + 1) }) }}" class="result">
|
||||
<img src="/assets/prod/images/Basket/Browser/right.png" />
|
||||
</a>
|
||||
{% endif %}
|
||||
{% transchoice Total %}
|
||||
{0} No results|{1} Result|]1,Inf[ Results
|
||||
{% endtranschoice %}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@@ -33,43 +14,39 @@
|
||||
<div class="PNB datas">
|
||||
<div class="PNB" style="right:10px">
|
||||
{% for Basket in Baskets %}
|
||||
<div class="result {% if loop.index is odd %}odd{% endif %}">
|
||||
<a href="{{ path('basket_delete', {basket: Basket.getId()}) }}" class="delete-basket close" title="{% trans %}Delete basket{% endtrans %}" style="color:#fff;padding:2px">×</a>
|
||||
<div class="PNB10" style="right:15px;">
|
||||
<table>
|
||||
<tr>
|
||||
<td class="thumbnail">
|
||||
<div class="result {{ Basket.getArchived ? '' : 'unarchived' }}">
|
||||
<a href="{{ path('basket_delete', {basket: Basket.getId()}) }}" class="delete-basket close icon-baseline-close-24px" title="{% trans %}Delete basket{% endtrans %}" style="color:#fff;padding:2px"> </a>
|
||||
<div class="PNB10 rightBrowserInner">
|
||||
<div class="item-table">
|
||||
|
||||
<div class="thumbnail">
|
||||
{% set BasketElement = Basket.getElements().first() %}
|
||||
{% if BasketElement %}
|
||||
{{thumbnail.format(BasketElement.getRecord(app).get_thumbnail(), 80, 80, '', true, false)}}
|
||||
{{thumbnail.format(BasketElement.getRecord(app).get_thumbnail(), 150, 106, '', true, false)}}
|
||||
{% endif %}
|
||||
<div class="counter">
|
||||
{{ Basket.getElements().count() }}
|
||||
</div>
|
||||
</td>
|
||||
<td class="content">
|
||||
</div>
|
||||
<div class="content">
|
||||
<h1 class="title">
|
||||
<img class="loader" src="/assets/prod/images/Basket/Browser/loader.gif" />
|
||||
{% if Basket.getValidation() is empty or Basket.getValidation().isInitiator(app.getAuthenticatedUser()) %}
|
||||
<a href="{{ path('prod_baskets_basket_archive', { 'basket' : Basket.getId(), 'archive' : 1 }) }}" class="archiver archive_toggler" style="display:{{ Basket.getArchived ? 'none' : '' }};">
|
||||
<span>
|
||||
<img src="/assets/prod/images/Basket/Browser/archive.png"/>
|
||||
</span>
|
||||
|
||||
</a>
|
||||
<a href="{{ path('prod_baskets_basket_archive', { 'basket' : Basket.getId(), 'archive' : 0 }) }}" class="unarchiver archive_toggler" style="display:{{ Basket.getArchived ? '' : 'none' }};">
|
||||
<span>
|
||||
<img src="/assets/prod/images/Basket/Browser/archived.png"/>
|
||||
</span>
|
||||
|
||||
</a>
|
||||
{% endif %}
|
||||
<a class="basket_link" href="{{ path('prod_workzone_basket', { basket : Basket.getId() }) }}">
|
||||
{{ Basket.getName() }}
|
||||
</a>
|
||||
<span>{{ Basket.getName() }}</span>
|
||||
<br><span class="basketCount">
|
||||
{{ Basket.getElements().count() }} {{ ' records' }}
|
||||
</span></a>
|
||||
</h1>
|
||||
|
||||
|
||||
{% if Basket.getPusher() %}
|
||||
<p>
|
||||
{% set user_name = '<a href="/user/' ~ Basket.getPusher().get_id() ~ '/" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : Basket.getPusher(app).getId() }) ~ '" class="UserTips">' ~ Basket.getPusher(app).get_display_name() ~ '</a>' %}
|
||||
{% set user_name = '<a href="/user/' ~ Basket.getPusher().getId() ~ '/" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : Basket.getPusher(app).getId() }) ~ '" class="UserTips">' ~ Basket.getPusher(app).getDisplayName() ~ '</a>' %}
|
||||
{% trans with {'%user_name%' : user_name} %}Received from %user_name%{% endtrans %}
|
||||
</p>
|
||||
{% endif %}
|
||||
@@ -92,12 +69,11 @@
|
||||
</p>
|
||||
{% endif %}
|
||||
|
||||
</td>
|
||||
</div>
|
||||
<td>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
@@ -117,19 +93,16 @@
|
||||
</td>
|
||||
<td class="paginator">
|
||||
{% if Page - 1 > 0 %}
|
||||
<a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page - 1) }) }}" class="result">
|
||||
<img src="/assets/prod/images/Basket/Browser/left.png" />
|
||||
</a>
|
||||
<a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page - 1) }) }}" class="result prev_res icon-round-chevron_left-24px"> </a>
|
||||
{% endif %}
|
||||
<span>
|
||||
Page {{ Page }} / {{ MaxPage }}
|
||||
</span>
|
||||
{% if Page + 1 <= MaxPage %}
|
||||
<a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page + 1) }) }}" class="result">
|
||||
<img src="/assets/prod/images/Basket/Browser/right.png" />
|
||||
</a>
|
||||
<a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page + 1) }) }}" class="result next_res icon-round-chevron_right-24px"> </a>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
/>
|
||||
</td>
|
||||
<td>
|
||||
<a class="contextMenuTrigger"></a>
|
||||
<a class="contextMenuTrigger icon-display-grid" href="#"></a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@@ -127,7 +127,7 @@
|
||||
{% endif %}
|
||||
-->
|
||||
<td>
|
||||
<a class="contextMenuTrigger"></a>
|
||||
<a class="contextMenuTrigger icon-display-grid" href="#"></a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@@ -230,7 +230,7 @@
|
||||
<table>
|
||||
<tr>
|
||||
<td>
|
||||
<a class="contextMenuTrigger"></a>
|
||||
<a class="contextMenuTrigger icon-display-grid" href="#"></a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@@ -381,7 +381,10 @@
|
||||
{% for choice in basket_element.getValidationDatas() %}
|
||||
{% if basket.getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or choice.getParticipant().getUser() == app.getAuthenticatedUser() %}
|
||||
<tr>
|
||||
<td> {{ choice.getParticipant().getUser().getDisplayName() }} </td>
|
||||
<td style="position: relative">
|
||||
<span class="feedback_user_name">{{ choice.getParticipant().getUser().getDisplayName() }}</span>
|
||||
<span class="line_separator"></span>
|
||||
</td>
|
||||
<td>
|
||||
{% if choice.getParticipant().getCanAgree() %}
|
||||
{% if choice.getAgreement() == true %}
|
||||
|
||||
@@ -45,23 +45,36 @@
|
||||
{% set dataH = constant('media_subdef::TC_DATA_HEIGHT') %}
|
||||
|
||||
{% set technical_info = record.get_technical_infos %}
|
||||
|
||||
{#Set the preview Ratio #}
|
||||
{% set width = technical_info[dataW].value %}
|
||||
{% set height = technical_info[dataH].value %}
|
||||
{% set prevRatio = '' %}
|
||||
|
||||
{% if width and height %}
|
||||
{% set rawRatio = (width / height)|number_format(3, '.') %}
|
||||
{% set rawRatioLength = rawRatio|length %}
|
||||
{% set ratio = rawRatio|slice(0,rawRatioLength-1) %}
|
||||
{% else %}
|
||||
{% set ratio = '' %}
|
||||
{% set ratio = (width / height)|number_format(2, '.') %}
|
||||
{% endif %}
|
||||
|
||||
<video id="thumb_video" controls="" preload="auto" data-ratio="{{ ratio }}">
|
||||
{#Set the document Ratio #}
|
||||
{% for subdef in previewHtml5 %}
|
||||
|
||||
{% set width = subdef.get_width() %}
|
||||
{% set height = subdef.get_height() %}
|
||||
|
||||
{% if width and height %}
|
||||
{% if subdef.get_name()=='preview' %}
|
||||
{% set prevRatio = (width / height)|number_format(2, '.') %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% endfor %}
|
||||
<video id="thumb_video" controls="" preload="auto" data-ratio="{{ prevRatio }}">
|
||||
{% for subdef in previewHtml5 %}
|
||||
<source type="{{ subdef.get_mime() }}" src="{{ subdef.get_url() }}"/>
|
||||
{% endfor %}
|
||||
{{ 'No preview available' | trans }}
|
||||
</video>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="thumb_camera_button"></div>
|
||||
@@ -109,7 +122,7 @@
|
||||
<canvas data-width="{{ subdef.get_width() }}"
|
||||
data-height="{{ subdef.get_height() }}"
|
||||
data-name="{{ subdef.get_name() }}"
|
||||
class="alt_canvas" id="{{ subdef.get_name() }}"></canvas>
|
||||
class="alt_canvas" id="{{ subdef.get_name() }}" ></canvas>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
|
||||
@@ -196,8 +196,10 @@
|
||||
<div style="position:absolute; top:0px; left:0px; right:70px; height:17px;">
|
||||
<input type='text' style="font-size:15px; position:absolute; top:0px; left:0px; width:100%; height:100%;" id="EditTextMultiValued" value="" />
|
||||
</div>
|
||||
<div style="position:absolute; top:6px; width:60px; right:0px; height:11px;">
|
||||
<img id="EditButAddMultiValued add-multivalued-field-action" style="cursor:pointer" src="/assets/common/images/icons/plus16.png" />
|
||||
<div style="position:absolute; top:4px; width:60px; right:6px; height:24px;">
|
||||
<button type="submit" class="submit-multivalued">
|
||||
<img id="EditButAddMultiValued" style="cursor:pointer" src="/assets/common/images/icons/plus16.png" />
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
<div id="ZTextMultiValued_values"></div>
|
||||
|
||||
@@ -146,7 +146,7 @@
|
||||
$(document).ready(function(){
|
||||
prodApp.appEvents.emit('workzone.doRemoveWarning', "{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), "warning_on_delete_story") %}true{% else %}false{% endif %}");
|
||||
prodApp.appEvents.emit('search.updateFacetData');
|
||||
|
||||
$('body').addClass('{{ cssfile }}');
|
||||
|
||||
});
|
||||
</script>
|
||||
@@ -277,6 +277,9 @@
|
||||
{% endif %}
|
||||
<div id="FIRST_QUERY_CONTAINER" class="last-query" style="display: none" data-format="json">{{ startq | raw }}</div>
|
||||
{% endif %}
|
||||
{#container fetched by js #}
|
||||
<input type="hidden" name="advanced-search-title" id="advanced-search-title" value="{{ 'Advanced Search' | trans }}">
|
||||
|
||||
<form id="searchForm" method="POST" action="{{ path('prod_query') }}" name="phrasea_query" class="phrasea_query">
|
||||
<input id="SENT_query" name="qry" type="hidden" value="{{app['settings'].getUserSetting(app.getAuthenticatedUser(), 'start_page_query')}}">
|
||||
<input type="hidden" name="pag" id="formAnswerPage" value="">
|
||||
@@ -295,7 +298,7 @@
|
||||
{% endif %}
|
||||
<button type="submit" class="btn btn-inverse" style="font-size:14px">{{ 'boutton::rechercher' | trans }}</button>
|
||||
</div>
|
||||
<div class="control-group pull-left">
|
||||
<div class="control-group pull-left search-header-block">
|
||||
{% if GV_multiAndReport %}
|
||||
<label for="mode_type_doc" class="radio inline custom_checkbox_label">
|
||||
<input type="radio" value="0" class="mode_type_doc" name="search_type" {% if GV_defaultQuery_type == 0 %}checked="checked"{% endif %} id="mode_type_doc"/>
|
||||
@@ -454,7 +457,7 @@
|
||||
<hr />
|
||||
<label class="status-section-title">
|
||||
<span class="danger_indicator">{{ 'Date(s) from field(s)' | trans }}</span>
|
||||
<img id="info-box-trigger" src="/assets/common/images/icons/info-white.png" width="18" height="18">
|
||||
<img id="info-box-trigger" src="/assets/common/images/icons/Info-white.png" width="18" height="18">
|
||||
<div id="info-box">
|
||||
<p>
|
||||
{{ 'prod::advancesearch:tooltips:datefield_restriction_explanation' | trans }}
|
||||
|
||||
@@ -67,7 +67,16 @@
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
var $color = "#FFFFFF";
|
||||
if ($('body').hasClass('000000')) {
|
||||
$color = "#FFFFFF";
|
||||
}
|
||||
if ($('body').hasClass('FFFFFF')) {
|
||||
$color = "#000000";
|
||||
}
|
||||
/*if ($('body').hasClass('959595')) {
|
||||
$color = "#000000";
|
||||
}*/
|
||||
function drawChartVisualisation() {
|
||||
var maxValue = statistics.max_views < 4 ? 4 : statistics.max_views;
|
||||
var data = new google.visualization.DataTable();
|
||||
@@ -76,9 +85,10 @@
|
||||
|
||||
data.addRows(arrayViews);
|
||||
|
||||
|
||||
var options = {
|
||||
titleTextStyle: {
|
||||
color: 'white',
|
||||
color: $color,
|
||||
fontSize: 13
|
||||
},
|
||||
colors: ['#FF9900'],
|
||||
@@ -87,28 +97,28 @@
|
||||
hAxis: {
|
||||
title: '{{ 'preview::date' | trans }}',
|
||||
titleTextStyle: {
|
||||
color: 'white',
|
||||
color: $color,
|
||||
fontSize: 11
|
||||
},
|
||||
textStyle:{color: '#FFF'},
|
||||
textStyle:{color: $color},
|
||||
format: 'd/M/yy',
|
||||
gridlines: {color: 'none'},
|
||||
min: new Date(statistics.from),
|
||||
max: new Date(statistics.to),
|
||||
baselineColor: '#FFF'
|
||||
baselineColor: $color
|
||||
},
|
||||
vAxis: {
|
||||
title: '{{ 'preview::visualisation' | trans }}',
|
||||
titleTextStyle: {
|
||||
color: 'white',
|
||||
color: $color,
|
||||
fontSize: 11
|
||||
},
|
||||
textStyle:{color: '#FFF'},
|
||||
textStyle:{color: $color},
|
||||
minValue: 0,
|
||||
maxValue: maxValue,
|
||||
baselineColor: '#FFF'
|
||||
baselineColor: $color
|
||||
},
|
||||
legend: {position: 'top', textStyle: {color: 'white'}},
|
||||
legend: {position: 'top', textStyle: {color: $color}},
|
||||
};
|
||||
|
||||
var chart = new google.visualization.ColumnChart(
|
||||
@@ -128,7 +138,7 @@
|
||||
|
||||
var options = {
|
||||
titleTextStyle: {
|
||||
color: 'white',
|
||||
color: $color,
|
||||
fontSize: 13
|
||||
},
|
||||
colors: ['#FF9900'],
|
||||
@@ -137,29 +147,29 @@
|
||||
hAxis: {
|
||||
title: '{{ 'preview::date' | trans }}',
|
||||
titleTextStyle: {
|
||||
color: 'white',
|
||||
color: $color,
|
||||
fontSize: 11
|
||||
},
|
||||
textStyle:{color: '#FFF'},
|
||||
textStyle:{color: $color},
|
||||
format: 'd/M/yy',
|
||||
gridlines: {color: 'none'},
|
||||
min: new Date(statistics.from),
|
||||
max: new Date(statistics.to),
|
||||
baselineColor: '#FFF'
|
||||
baselineColor: $color
|
||||
},
|
||||
vAxis: {
|
||||
title: '{{ 'preview::downloads' | trans }}',
|
||||
titleTextStyle: {
|
||||
color: 'white',
|
||||
color: $color,
|
||||
fontSize: 11
|
||||
},
|
||||
textStyle:{color: '#FFF'},
|
||||
textStyle:{color: $color},
|
||||
minValue: 0,
|
||||
maxValue: maxValue,
|
||||
baselineColor: '#FFF',
|
||||
baselineColor: $color,
|
||||
format: '0'
|
||||
},
|
||||
legend: {position: 'top', textStyle: {color: 'white'}},
|
||||
legend: {position: 'top', textStyle: {color: $color}},
|
||||
};
|
||||
|
||||
var chart = new google.visualization.ColumnChart(
|
||||
@@ -175,7 +185,7 @@
|
||||
'backgroundColor': 'transparent',
|
||||
is3D: true,
|
||||
colors:['#FF9900','#3FDFFD', '#14CAB5', '#CAA514', '#97853C'],
|
||||
legend: {position: 'right', textStyle: {color: 'white'}},
|
||||
legend: {position: 'right', textStyle: {color: $color}},
|
||||
chartArea: {width:'90%',height:'70%'}
|
||||
};
|
||||
|
||||
@@ -199,4 +209,4 @@
|
||||
});
|
||||
|
||||
|
||||
</script>
|
||||
</script>
|
||||
|
||||
@@ -80,32 +80,32 @@
|
||||
{% if record_subdef_url(record, 'preview') is not null and has_access_subdef(record, 'preview') %}
|
||||
<span class="fa-stack fa-lg previewTips"
|
||||
tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}">
|
||||
<i class="icomoon icon-pastille-carre fa-stack-2x" aria-hidden="true"></i>
|
||||
<i class="icomoon icon-picto-search-new white fa-stack-1x " aria-hidden="true"></i>
|
||||
<i class="icomoon icon-rectangular-curve fa-stack-2x" aria-hidden="true"></i>
|
||||
<i class="icomoon icon-search white fa-stack-1x " aria-hidden="true"></i>
|
||||
</span>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if settings.rollover_thumbnail == 'preview' %}
|
||||
<span class="fa-stack fa-lg captionRolloverTips" title="{{ macro.caption(record, can_see_business, false) | e }}"
|
||||
tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId, 'context' : 'answer', 'number' : record.position|default(0) }) }}">
|
||||
<i class="icomoon icon-pastille-carre fa-stack-2x" aria-hidden="true"></i>
|
||||
<i class="icomoon icon-picto-point-list white fa-stack-1x " aria-hidden="true"></i>
|
||||
<i class="icomoon icon-rectangular-curve fa-stack-2x" aria-hidden="true"></i>
|
||||
<i class="icomoon icon-round-list-24px white fa-stack-1x " aria-hidden="true"></i>
|
||||
</span>
|
||||
{% endif %}
|
||||
|
||||
{% if settings.technical_display == '1' %}
|
||||
<span class="fa-stack infoTips"
|
||||
tooltipsrc="{{ path('prod_tooltip_technical_data', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}">
|
||||
<i class="icomoon icon-pastille-carre fa-stack-2x" aria-hidden="true"></i>
|
||||
<i class="icomoon icon-picto-information white fa-stack-1x " aria-hidden="true"></i>
|
||||
<i class="icomoon icon-rectangular-curve fa-stack-2x" aria-hidden="true"></i>
|
||||
<i class="icomoon icon-i-information white fa-stack-1x " aria-hidden="true"></i>
|
||||
</span>
|
||||
{% endif %}
|
||||
|
||||
{% if settings.show_context_menu %}
|
||||
<span class="fa-stack contextMenuTrigger" id="contextTrigger_{{ record.id }}"
|
||||
tooltipsrc="{{ path('prod_tooltip_technical_data', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}">
|
||||
<i class="icomoon icon-pastille-rond fa-stack-2x" aria-hidden="true"></i>
|
||||
<i class="icomoon icon-picto-three-little-point white fa-stack-1x fa-inverse" aria-hidden="true"></i>
|
||||
<i class="icomoon icon-circle fa-stack-2x" aria-hidden="true"></i>
|
||||
<i class="icomoon icon-round-more_horiz-24px white fa-stack-1x fa-inverse" aria-hidden="true"></i>
|
||||
</span>
|
||||
<table cellspacing="0" cellpadding="0" style="display:none;" id="answerContext_{{record.id}}" class="contextMenu answercontextmenu">
|
||||
<tbody>
|
||||
|
||||
@@ -166,9 +166,7 @@
|
||||
{% if action.icon %}
|
||||
<img src="{{ plugin_asset(plugin.PluginName, action.icon) }}" height="16" width="16" class="btn-image"/>
|
||||
{% endif %}
|
||||
|
||||
{% set label = action.label %}
|
||||
{% trans from plugin.PluginLocale %}label{% endtrans %}
|
||||
{{ action.label|trans({}, plugin.PluginLocale) }}
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
@@ -201,9 +199,7 @@
|
||||
{% if action.icon %}
|
||||
<img src="{{ plugin_asset(plugin.PluginName, action.icon) }}" height="16" width="16" class="btn-image"/>
|
||||
{% endif %}
|
||||
|
||||
{% set label = action.label %}
|
||||
{% trans from plugin.PluginLocale %}label{% endtrans %}
|
||||
{{ action.label|trans({}, plugin.PluginLocale) }}
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
@@ -237,9 +233,7 @@
|
||||
<img src="{{ plugin_asset(plugin.PluginName, action.icon) }}"
|
||||
height="16" width="16" class="btn-image"/>
|
||||
{% endif %}
|
||||
|
||||
{% set label = action.label %}
|
||||
{% trans from plugin.PluginLocale %}label{% endtrans %}
|
||||
{{ action.label|trans({}, plugin.PluginLocale) }}
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
@@ -260,8 +254,7 @@
|
||||
{% if action.icon %}
|
||||
<img src="{{ plugin_asset(plugin.PluginName, action.icon) }}" height="16" width="16"/>
|
||||
{% endif %}
|
||||
{% set label = action.label %}
|
||||
{% trans from plugin.PluginLocale %}label{% endtrans %}
|
||||
{{ action.label|trans({}, plugin.PluginLocale) }}
|
||||
</a>
|
||||
</button>
|
||||
{% if not (loop.last and loop.parent.loop.last) %}
|
||||
@@ -275,8 +268,7 @@
|
||||
{% if action.icon %}
|
||||
<img src="{{ plugin_asset(plugin.PluginName, action.icon) }}" height="16" width="16" class="btn-image"/>
|
||||
{% endif %}
|
||||
{% set label = action.label %}
|
||||
{% trans from plugin.PluginLocale %}label{% endtrans %}
|
||||
{{ action.label|trans({}, plugin.PluginLocale) }}
|
||||
</a>
|
||||
</li>
|
||||
{% else %}
|
||||
@@ -311,3 +303,11 @@
|
||||
</span>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
{% block toolbarJS %}
|
||||
{% if plugins.actionbar is not empty %}
|
||||
{% for plugin in plugins.actionbar %}
|
||||
{{ (plugin.JS|default(''))|raw }}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
Reference in New Issue
Block a user