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

Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3057-worker-in-core-4-1

Browse Source
This commit is contained in:
aynsix
2020-05-15 21:01:55 +03:00
parent c54a062c64 e066ca19fa
commit 6a7ca08000
21 changed files with 306 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
templates/web/prod/Share/record.html.twig
View File

@@ -65,15 +65,19 @@
<div class="form-group clearfix">
{#{% if type == 'image' %}#}
<label>{% trans %}Embed code{% endtrans %}</label>
{% set embedUrl = subdefList[defKey].embedUrl %}
{% if subdefList[defKey].height == 0 %}
{% set defKey = 'thumbnail' %}
{% endif %}
{% spaceless %}
<textarea class="input-block-level" rows="4" readonly="true" id="embedRecordUrl">
<iframe width="{{ subdefList[defKey].width }}" height="{{ subdefList[defKey].height }}"
src="{{ subdefList[defKey].embedUrl }}" frameborder="0"
<iframe width="{{ subdefList[defKey].width != 0 ?subdefList[defKey].width : 240 }}" height="{{subdefList[defKey].height != 0 ? subdefList[defKey].height : 240 }}"
src="{{ embedUrl }}" frameborder="0"
allowfullscreen></iframe>
</textarea>
{% endspaceless %}
<p class="pull-right">
<a id="embedRecordUrl-link" href="{{ subdefList[defKey].embedUrl }}"
<a id="embedRecordUrl-link" href="{{ embedUrl }}"
target="_blank">{{ 'previewLinkLabel' | trans }}</a> &nbsp;&nbsp;
<a href="#" class="" id="embedCopy">{{ 'copyClipboardLabel' | trans }}</a>
</p>

3
templates/web/prod/WorkZone/Browser/Browser.html.twig
View File

@@ -86,7 +86,8 @@
</div>
<style>
.dialog-Medium {
height: 523px!important;
height: 544px!important;
overflow: hidden!important;
}
.paginator a {
background: none!important;

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

@@ -50,7 +50,7 @@
{% if Basket.getPusher() %}
<p>
{% 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>' %}
{% set user_name = '<a href="/user/' ~ Basket.getPusher().getId() ~ '/" class="UserTips">' ~ Basket.getPusher(app).getDisplayName() ~ '</a>' %}
{% trans with {'%user_name%' : user_name} %}Received from %user_name%{% endtrans %}
</p>
{% endif %}
@@ -65,7 +65,7 @@
{% set list_participants = list_participants ~ ', ' %}
{% endif %}
{% set list_participants = list_participants ~ '<a class="UserTips" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : Participant.getUser().getId() }) ~ '" href="/user/' ~ Participant.getUser().getId() ~ '/">' %}
{% set list_participants = list_participants ~ '<a class="UserTips" href="/user/' ~ Participant.getUser().getId() ~ '/">' %}
{% set list_participants = list_participants ~ Participant.getUser().getDisplayName() %}
{% set list_participants = list_participants ~ '</a>' %}
{% endfor %}
@@ -84,9 +84,8 @@
</div>
</div>
<div class="PNB footer">
<table>
<tr>
<td>
<div class="paginator-wrapper">
<span class="paginator-result">
{% if Total == 0 %}
{{ 'No results' | trans }}
{% elseif Total == 1 %}
@@ -94,19 +93,18 @@
{% else %}
{% trans with {'%Total%' : Total} %}%Total% results{% endtrans %}
{% endif %}
</td>
<td class="paginator">
</span>
<span class="paginator">
{% if Page - 1 > 0 %}
<a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page - 1) }) }}" class="result prev_res icon-round-chevron_left-24px">&nbsp;</a>
<a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page - 1) }) }}" class="result_page prev_res icon-round-chevron_left-24px">&nbsp;</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 next_res icon-round-chevron_right-24px">&nbsp;</a>
<a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page + 1) }) }}" class="result_page next_res icon-round-chevron_right-24px">&nbsp;</a>
{% endif %}
</td>
</tr>
</table>
</span>
</div>
</div>

2
templates/web/prod/actions/Tools/videoEditor.html.twig
View File

@@ -229,7 +229,7 @@
{% endfor %}
],
preferences: {
overlapChapters: {% if overlapChapters != NULL %}{{ overlapChapters }}{% else %}0{% endif %},
overlapChapters: {% if overlapChapters != NULL %}{{ overlapChapters }}{% else %}1{% endif %},
}
};

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

@@ -42,10 +42,12 @@
</label>
<br />
{% endif %}
<label for="feed_add_title"><b>{{ 'publication : titre' | trans }}</b></label>
<label for="feed_add_title"><b>{{ 'publication : titre' | trans }}</b> &nbsp;<span>( {{ 'publication : title warning' | trans }} )</span></label>
<input class="required_text input-block-level" style="max-width:500px" type="text" name="title" id="feed_add_title" value="{{title}}" />
<label for="feed_add_subtitle"><b>{{ 'publication : sous titre' | trans }}</b></label>
<label><span class="feed_title_warning feed_warning">{{ 'publication : title alert' | trans }}</span></label>
<label for="feed_add_subtitle"><b>{{ 'publication : sous titre' | trans }}</b> &nbsp;<span class="feed_subtitle_warning feed_warning">{{ 'publication : subtitle warning' | trans }}</span></label>
<textarea id="feed_add_subtitle" style="max-width:500px" class="input-block-level" name="subtitle" rows="5">{{desc}}</textarea>
<label><span class="feed_subtitle_warning feed_warning">{{ 'publication : subtitle alert' | trans }}</span></label>
<label for="feed_add_author_name"><b>{{ 'publication : autheur' | trans }}</b></label>
<input class="required_text input-block-level" style="max-width:500px" type="text" name="author_name" id="feed_add_author_name" value="{{ app.getAuthenticatedUser().getDisplayName() }}" />
<label for="feed_add_author_mail"><b>{{ 'publication : email autheur' | trans }}</b></label>

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

@@ -27,10 +27,12 @@
<div class="span6">
<h1>{{ 'Editer' | trans }}</h1>
<br />
<label for="feed_add_title"><b>{{ 'publication : titre' | trans }}</b></label>
<label for="feed_add_title"><b>{{ 'publication : titre' | trans }}</b> &nbsp;<span>( {{ 'publication : title warning' | trans }} )</span></label>
<input class="required_text input-block-level" style="max-width:500px" type="text" name="title" id="feed_add_title" value="{{ entry.getTitle() }}" />
<label for="feed_add_subtitle"><b>{{ 'publication : sous titre' | trans }}</b></label>
<label><span class="feed_title_warning feed_warning">{{ 'publication : title alert' | trans }}</span></label>
<label for="feed_add_subtitle"><b>{{ 'publication : sous titre' | trans }}</b> &nbsp;<span>( {{ 'publication : subtitle warning' | trans }} )</span></label>
<textarea id="feed_add_subtitle" style="max-width:500px" class="input-block-level" name="subtitle" rows="5">{{ entry.getSubTitle() }}</textarea>
<label><span class="feed_subtitle_warning feed_warning">{{ 'publication : subtitle alert' | trans }}</span></label>
<label for="feed_add_author_name"><b>{{ 'publication : autheur' | trans }}</b></label>
<input class="required_text input-block-level" style="max-width:500px" type="text" name="author_name" id="feed_add_author_name" value="{{ entry.getAuthorName() }}" />
<label for="feed_add_author_mail"><b>{{ 'publication : email autheur' | trans }}</b></label>

10
templates/web/prod/results/entry.html.twig
View File

@@ -23,11 +23,11 @@
</td>
<td style="width:60px;text-align:right;">
{% if entry.feed.isOwner(app.getAuthenticator().user) or entry.isPublisher(app.getAuthenticator().user) %}
<a class="tools options feed_edit" href="{{ path('prod_feeds_entry_edit', { 'id' : entry.id }) }}">
<img src="/assets/common/images/icons/file-edit.png" title="{{ 'boutton::editer' | trans }}"/>
<a class="options feed_edit" title="{{ 'boutton::editer' | trans }}" href="{{ path('prod_feeds_entry_edit', { 'id' : entry.id }) }}">
<i class="fa fa-edit"></i>
</a>
<a class="tools feed_delete"href="{{ path('prod_feeds_entry_delete', { 'id' : entry.id }) }}">
<img src="/assets/common/images/icons/delete.png" title="{{ 'boutton::supprimer' | trans }}"/>
<a class="feed_delete" title="{{ 'boutton::supprimer' | trans }} href="{{ path('prod_feeds_entry_delete', { 'id' : entry.id }) }}">
<i class="fa fa-times-circle"></i>
</a>
{% endif %}
</td>
@@ -50,7 +50,7 @@
<a class="ajax_answers" href="{{ path('prod_feeds_feed', { 'id' : entry.feed.id }) }}">
{% set feed_name = entry.feed.title %}
{% trans with {'%feed_name%' : feed_name} %}dans %feed_name%{% endtrans %}
<img style="height:16px;" src="{% if entry.feed.iconUrl == false %}/assets/common/images/icons/rss32.gif{% else %}/custom/feed_{{ entry.feed.id }}.jpg{% endif %}"/>
<img style="height:18px;" src="{% if entry.feed.iconUrl == false %}/assets/common/images/icons/rss32.gif{% else %}/custom/feed_{{ entry.feed.id }}.jpg{% endif %}"/>
</a>
{% endif %}
</div>

18
templates/web/prod/results/feeds_entry.html.twig
View File

@@ -4,7 +4,7 @@
<table class="head">
<tr>
<td>
<h1 class="title">
<h1 class="title {% if entry.feed.isOwner(app.getAuthenticator().user) or entry.isPublisher(app.getAuthenticator().user) %}with_btn {% endif %}">
{% if feed.aggregated %}
<img style="height:16px;" src="{% if entry.feed.iconUrl == false %} /assets/common/images/icons/rss32.gif{% else %}/custom/feed_{{ entry.feed.id }}.jpg{% endif %}"/>
{% endif %}
@@ -17,12 +17,14 @@
</td>
<td style="width:60px;text-align:right;">
{% if entry.feed.isOwner(app.getAuthenticator().user) or entry.isPublisher(app.getAuthenticator().user) %}
<a class="tools options feed_edit" href="{{ path('prod_feeds_entry_edit', { 'id' : entry.id }) }}">
<img src="/assets/common/images/icons/file-edit.png" title="{{ 'boutton::editer' | trans }}" width="16" height="16"/>
</a>
<a class="tools feed_delete"href="{{ path('prod_feeds_entry_delete', { 'id' : entry.id }) }}">
<img src="/assets/common/images/icons/delete.png" title="{{ 'boutton::supprimer' | trans }}" width="16" height="16"/>
</a>
<div class="feed_btn_wrapper">
<a class="options feed_edit feed_icon" title="{{ 'boutton::editer' | trans }}" href="{{ path('prod_feeds_entry_edit', { 'id' : entry.id }) }}">
<i class="fa fa-edit"></i>
</a>
<a class="feed_delete feed_icon" title="{{ 'boutton::supprimer' | trans }}" href="{{ path('prod_feeds_entry_delete', { 'id' : entry.id }) }}">
<i class="fa fa-times-circle"></i>
</a>
</div>
{% endif %}
</td>
</tr>
@@ -44,7 +46,7 @@
<a class="ajax_answers" href="{{ path('prod_feeds_feed', { 'id' : entry.feed.id }) }}">
{% set feed_name = entry.feed.title %}
{% trans with {'%feed_name%' : feed_name} %}dans %feed_name%{% endtrans %}
<img style="height:16px;" src="{% if entry.feed.iconUrl == false %}/assets/common/images/icons/rss32.gif{% else %}/custom/feed_{{ entry.feed.id }}.jpg{% endif %}"/>
<img style="height:18px;" src="{% if entry.feed.iconUrl == false %}/assets/common/images/icons/rss32.gif{% else %}/custom/feed_{{ entry.feed.id }}.jpg{% endif %}"/>
</a>
{% endif %}
</div>

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

@@ -44,7 +44,7 @@
{% set extraclass = rollover_gif ? 'rollover-gif-out' : '' %}
{{ thumbnail.format(record.get_thumbnail(), images_size, images_size, extraclass, true, false) }}
{% if rollover_gif %}
{{ thumbnail.format(rollover_gif, images_size, images_size, 'rollover-gif-hover', true, false) }}
{{ thumbnail.format(rollover_gif, images_size, images_size, 'rollover-gif-hover hide', true, false) }}
{% endif %}
</div>
</div>

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

@@ -48,7 +48,7 @@
{{ result_macro.thumbnail(record, settings.images_size, settings.images_size, extraclass) }}
{% if rollover %}
{% set extraclass = 'rollover-gif-hover' %}
{% set extraclass = 'rollover-gif-hover hide' %}
{{ result_macro.thumbnailgif(record, settings.images_size, settings.images_size, extraclass) }}
{% endif %}
</div>