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

Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-859_validation_special_characters_status

Browse Source
This commit is contained in:
Mike Ng
2018-05-24 15:25:51 +04:00
parent 70c12a7086 50feb78c12
commit 9183bdb6c5
18 changed files with 3302 additions and 3027 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,7 @@ $(function () {
$('#fileupload').fileupload({
dataType: 'html',
add: function(e, data) {
if( ! /(\.|\/)(csv|rtf)$/i.test(data.files[0].type)) {
if( ! /(\.|\/)(csv|rtf)$/i.test(data.files[0].name)) {
{% set supported_file_types = ['csv', 'rtf']|join(' | ') %}
alert("{{ 'Invalid file type, only (%supported_file_types%) file formats are supported' | trans({'%supported_file_types%' : supported_file_types}) | e('js') }}");

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

@@ -93,9 +93,9 @@
{% set terms = [] %}
{% for data in field.values %}
{% if data.from_thesaurus and bounceable %}
{% set value = data.value|e|bounce(field.name, data.qjs, field.sbas_id) %}
{% set value = data.value|e|bounce(field.name, data.qjs, field.sbas_id)|parseColor %}
{% else %}
{% set value = data.value|e %}
{% set value = data.value|e|parseColor %}
{% endif %}
{% set terms = [value]|merge(terms) %}
{% endfor %}
@@ -126,10 +126,10 @@
{% macro caption(record, can_see_business, display_exif, limitedWidth = false) %}
<dl class="{% if limitedWidth %}{% else %}dl-horizontal{% endif %}">
{% for field in record.get_caption().get_highlight_fields(null, can_see_business) %}
<dt>{{ field.label_name }}</dt>
<dd>{{ _self.caption_value(field, bounceable|default(true))|highlight|linkify }}</dd>
{% endfor %}
{% for name, value in record.getCaption(caption_field_order(record, can_see_business)) %}
<dt>{{ caption_field_label(record, name) }}</dt>
<dd>{{ caption_field(record, name, value)|e|highlight|linkify|parseColor }}</dd>
{% endfor %}
</dl>
{% if display_exif|default(true) and app.getAuthenticator().user is not none and user_setting('technical_display') == 'group' %}
<hr/>

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

@@ -128,7 +128,7 @@
{% else %}
<a target="_blank" href="{{ path('account') }}" title="{{ 'login:: Mon compte' | trans }}">
<span>
{{app.getAuthenticatedUser().getLogin()}}
{{ app.getAuthenticatedUser().getDisplayName() }}
</span>
</a>
{% endif %}

4
templates/web/prod/actions/printer_default.html.twig
View File

@@ -18,6 +18,10 @@
<input type="radio" name="lay" value="previewCaptionTdm" id="RADI_PRE_TDM" />
{{ 'print:: image de choix et description avec planche contact' | trans }}
</label>
<label for="RADI_CAP" class="radio">
<input type="radio" name="lay" value="caption" id="RADI_CAP" />
{{ 'print:: description' | trans }}
</label>
</div>
{% endif %}
{% if printer.get_count_thumbnail() > 0 %}

2
templates/web/prod/results/record.html.twig
View File

@@ -24,7 +24,7 @@
{% set can_see_business = granted_on_collection(record.baseId, [constant('\\ACL::CANMODIFRECORD')]) %}
<div class="thumb captionTips"
{% if settings.rollover_thumbnail == 'caption' %}tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId, 'context' : 'answer', 'number' : record.position|default(0) }) }}"{% endif %}
{% if settings.rollover_thumbnail == 'caption' %}title="{{ macro.caption(record, can_see_business, false) | e }}"{% endif %}
{% if settings.rollover_thumbnail == 'preview' %}tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}"{% endif %}
style="height:{{ settings.images_size }}px; z-index:90;">
<div class="doc_infos">