mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-24 02:13:15 +00:00
PHRAS-2219_push_window__corrections
This commit is contained in:
Filip Vilic
@@ -56,137 +56,134 @@
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div style="padding:10px;">
|
<div style="padding: 10px 10px 0;">
|
||||||
<div class="list-container">
|
<span class="main-title">
|
||||||
<span class="main-title">
|
<img src="/assets/common/images/icons/list-grey.png"/>{{ 'Lists' | trans }}
|
||||||
<img src="/assets/common/images/icons/list-grey.png"/>{{ 'Lists' | trans }}</span>
|
|
||||||
<ul class="lists">
|
|
||||||
{% for list in lists %}
|
|
||||||
<li class="list" style="padding:6px 2px;position: relative;"
|
|
||||||
data-list-id= {{ list.getId() }}>
|
|
||||||
<a class="list_loader"
|
|
||||||
href="{{ path('prod_push_lists_list', { 'list_id' : list.getId() }) }}">
|
|
||||||
{#{% if list.getOwner(app.getAuthenticatedUser()).getRole() >= constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_EDITOR') %}#}
|
|
||||||
{#<img src="/assets/prod/images/Push/list-icon.png" />#}
|
|
||||||
{#{% else %}#}
|
|
||||||
{#<img src="/assets/common/images/icons/SHARE16.png" />#}
|
|
||||||
{#{% endif %}#}
|
|
||||||
{{ list.getName() }}
|
|
||||||
({{ list.getEntries().count() }})
|
|
||||||
</a>
|
|
||||||
<button class="list-trash-btn">
|
|
||||||
<img src="/assets/common/images/icons/delete-black.png" class="image-normal"/>
|
|
||||||
<img src="/assets/common/images/icons/delete-white.png" class="image-hover"/>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
<span style="width:100%; display:block; text-align:center;">
|
|
||||||
<a href="#" class="btn btn-inverse list_manager">
|
|
||||||
<img src="/assets/common/images/icons/manage-list-icon.png"/>
|
|
||||||
<b>{{ 'List Manager' | trans }}</b>
|
|
||||||
</a>
|
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
<ul class="lists">
|
||||||
|
{% for list in lists %}
|
||||||
|
<li class="list" style="padding: 0; position: relative;"
|
||||||
|
data-list-id= {{ list.getId() }}>
|
||||||
|
<a class="list_push_loader list_link"
|
||||||
|
href="{{ path('prod_push_lists_list', { 'list_id' : list.getId() }) }}">
|
||||||
|
{#{% if list.getOwner(app.getAuthenticatedUser()).getRole() >= constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_EDITOR') %}#}
|
||||||
|
{#<img src="/assets/prod/images/Push/list-icon.png" />#}
|
||||||
|
{#{% else %}#}
|
||||||
|
{#<img src="/assets/common/images/icons/SHARE16.png" />#}
|
||||||
|
{#{% endif %}#}
|
||||||
|
{{ list.getName() }}
|
||||||
|
({{ list.getEntries().count() }})
|
||||||
|
</a>
|
||||||
|
<button class="list-trash-btn" style="display: none;">
|
||||||
|
<img src="/assets/common/images/icons/delete-black.png" class="image-normal"/>
|
||||||
|
<img src="/assets/common/images/icons/delete-white.png" class="image-hover"/>
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
<span style="width:100%; display:block; text-align:center;">
|
||||||
|
<a href="#" class="btn btn-inverse list_manager">
|
||||||
|
<img src="/assets/common/images/icons/manage-list-icon.png"/>
|
||||||
|
<b>{{ 'List Manager' | trans }}</b>
|
||||||
|
</a>
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="PNB" style="left:220px;">
|
<div class="PNB" style="left:220px;">
|
||||||
<div class="PNB" style="height:56px;bottom:auto;line-height:26px">
|
<div class="PNB10" style="height:46px;bottom:auto;line-height:26px;padding:0 20px 0 18px;">
|
||||||
<div class="PNB10">
|
<div style="float: left;">
|
||||||
<div style="float: left;">
|
<div id="find-user">
|
||||||
<div id="find-user">
|
<input class="search" name="users-search" placeholder="{{ 'Users' | trans }}" type="text"
|
||||||
<input class="search" name="users-search" placeholder="{{ 'Users' | trans }}" type="text"
|
style="width:210px;"/>
|
||||||
style="width:210px;"/>
|
|
||||||
</div>
|
|
||||||
<p id="recommanded-users">
|
|
||||||
{% set recommendation = '' %}
|
|
||||||
{% set total = RecommendedUsers|length %}
|
|
||||||
|
|
||||||
{% for user in RecommendedUsers %}
|
|
||||||
{% if total <= 4 or loop.index <= 4 %}
|
|
||||||
{% if recommendation != '' and not loop.last %}
|
|
||||||
{% set recommendation = recommendation ~ ', ' %}
|
|
||||||
{% elseif recommendation != '' and loop.last %}
|
|
||||||
{% set recommendation = recommendation %}
|
|
||||||
{% endif %}
|
|
||||||
{% set recommendation = recommendation
|
|
||||||
~ ' <a href="#" class="recommended_users UserTips" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : user.getId() }) ~ '">'
|
|
||||||
~ '<input type="hidden" name="usr_id" value="' ~ user.getId() ~ '" />'
|
|
||||||
~ user.getDisplayName()
|
|
||||||
~ '</a>' %}
|
|
||||||
{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
|
|
||||||
{% if total > 4 %}
|
|
||||||
{% set n = total - 4 %}
|
|
||||||
{% set and_many_more %}
|
|
||||||
{% trans with {'%n%' : n} %}and %n% more peoples{% endtrans %}
|
|
||||||
{% endset %}
|
|
||||||
{% set recommendation = recommendation
|
|
||||||
~ '<a href="#" class="recommended_users_list">'
|
|
||||||
~ and_many_more ~ '</a>' %}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if recommendation != '' %}
|
|
||||||
{% set recommendation = '<br/>' ~ recommendation %}
|
|
||||||
{% if context == 'Push' %}
|
|
||||||
{% trans with {'%recommendation%' : recommendation} %}Please consider send this push to the following users : %recommendation%{% endtrans %}
|
|
||||||
{% else %}
|
|
||||||
{% trans with {'%recommendation%' : recommendation} %}Please consider send this validation to the following users : %recommendation%{% endtrans %}
|
|
||||||
{% endif %}
|
|
||||||
{% endif %}
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<div style="display:none;" id="push_user_recommendations" title="{{ 'Users suggestion' | trans }}">
|
|
||||||
<table class="users" style="width:100%;">
|
|
||||||
{% for user in RecommendedUsers %}
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
<img src="/assets/common/images/icons/user.png"/>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
{{ user.getDisplayName() }}
|
|
||||||
<input type="hidden" name="usr_id" value="{{ user.getId() }}"/>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<a href="#" class="adder">{{ 'Add' | trans }}</a>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{% endfor %}
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div style="float: left;">
|
<p id="recommanded-users">
|
||||||
{% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANADMIN')) %}
|
{% set recommendation = '' %}
|
||||||
|
{% set total = RecommendedUsers|length %}
|
||||||
|
|
||||||
|
{% for user in RecommendedUsers %}
|
||||||
|
{% if total <= 4 or loop.index <= 4 %}
|
||||||
|
{% if recommendation != '' and not loop.last %}
|
||||||
|
{% set recommendation = recommendation ~ ', ' %}
|
||||||
|
{% elseif recommendation != '' and loop.last %}
|
||||||
|
{% set recommendation = recommendation %}
|
||||||
|
{% endif %}
|
||||||
|
{% set recommendation = recommendation
|
||||||
|
~ ' <a href="#" class="recommended_users UserTips" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : user.getId() }) ~ '">'
|
||||||
|
~ '<input type="hidden" name="usr_id" value="' ~ user.getId() ~ '" />'
|
||||||
|
~ user.getDisplayName()
|
||||||
|
~ '</a>' %}
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
{% if total > 4 %}
|
||||||
|
{% set n = total - 4 %}
|
||||||
|
{% set and_many_more %}
|
||||||
|
{% trans with {'%n%' : n} %}and %n% more peoples{% endtrans %}
|
||||||
|
{% endset %}
|
||||||
|
{% set recommendation = recommendation
|
||||||
|
~ '<a href="#" class="recommended_users_list">'
|
||||||
|
~ and_many_more ~ '</a>' %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if recommendation != '' %}
|
||||||
|
{% set recommendation = '<br/>' ~ recommendation %}
|
||||||
{% if context == 'Push' %}
|
{% if context == 'Push' %}
|
||||||
<a href="#" class="push-add-user btn">
|
{% trans with {'%recommendation%' : recommendation} %}Please consider send this push to the following users : %recommendation%{% endtrans %}
|
||||||
<img src="/assets/common/images/icons/blue-plus.png" class="image-normal">
|
|
||||||
<img src="/assets/common/images/icons/white-plus.png" class="image-hover">
|
|
||||||
<span>{{ 'Add user' | trans }}</span></a>
|
|
||||||
{% else %}
|
{% else %}
|
||||||
<a href="#" class="push-add-user btn validation">
|
{% trans with {'%recommendation%' : recommendation} %}Please consider send this validation to the following users : %recommendation%{% endtrans %}
|
||||||
<img src="/assets/common/images/icons/green-plus.png" class="image-normal">
|
|
||||||
<img src="/assets/common/images/icons/white-plus.png" class="image-hover">
|
|
||||||
<span>{{ 'Add user' | trans }}</span></a>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</p>
|
||||||
<img id="info-box-trigger" src="/assets/common/images/icons/info-white.png" width="18" height="18">
|
|
||||||
<div id="info-box" style="display: none">
|
<div style="display:none;" id="push_user_recommendations" title="{{ 'Users suggestion' | trans }}">
|
||||||
<p>
|
<table class="users" style="width:100%;">
|
||||||
{% if context == 'Push' %}
|
{% for user in RecommendedUsers %}
|
||||||
{{ 'Push::unpush permet d\'envoyer un lot d\'image a des destinataires' | trans }}
|
<tr>
|
||||||
{% else %}
|
<td>
|
||||||
{{ 'Push::une validation est une demande d\'appreciation a d\'autres personnes' | trans }}
|
<img src="/assets/common/images/icons/user.png"/>
|
||||||
{% endif %}
|
</td>
|
||||||
</p>
|
<td>
|
||||||
|
{{ user.getDisplayName() }}
|
||||||
|
<input type="hidden" name="usr_id" value="{{ user.getId() }}"/>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<a href="#" class="adder">{{ 'Add' | trans }}</a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div style="float: left;">
|
||||||
|
{% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANADMIN')) %}
|
||||||
|
{% if context == 'Push' %}
|
||||||
|
<a href="#" class="push-add-user btn">
|
||||||
|
<img src="/assets/common/images/icons/blue-plus.png" class="image-normal">
|
||||||
|
<img src="/assets/common/images/icons/white-plus.png" class="image-hover">
|
||||||
|
<span>{{ 'Add user' | trans }}</span></a>
|
||||||
|
{% else %}
|
||||||
|
<a href="#" class="push-add-user btn validation">
|
||||||
|
<img src="/assets/common/images/icons/green-plus.png" class="image-normal">
|
||||||
|
<img src="/assets/common/images/icons/white-plus.png" class="image-hover">
|
||||||
|
<span>{{ 'Add user' | trans }}</span></a>
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
<img id="info-box-trigger" src="/assets/common/images/icons/Info-white.png" width="18" height="18">
|
||||||
|
<div id="info-box" style="display: none">
|
||||||
|
<p>
|
||||||
|
{% if context == 'Push' %}
|
||||||
|
{{ 'Push::unpush permet d\'envoyer un lot d\'image a des destinataires' | trans }}
|
||||||
|
{% else %}
|
||||||
|
{{ 'Push::une validation est une demande d\'appreciation a d\'autres personnes' | trans }}
|
||||||
|
{% endif %}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="PNB" style="top:45px;">
|
<div class="PNB10" style="top:55px;">
|
||||||
<div class="PNB10 content user_content grey-bg">
|
<div class="PNB content user_content grey-bg">
|
||||||
<div class="PNB10 header">
|
<div class="PNB10 header">
|
||||||
<table style="table-layout:auto;">
|
<table style="table-layout:auto;">
|
||||||
<tr>
|
<tr>
|
||||||
@@ -212,8 +209,8 @@
|
|||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
<td class="options">
|
<td class="options">
|
||||||
<button class="select-all round-blue-border-btn">{{ 'Select all' | trans }}</button>
|
<button class="select-all round-blue-border-btn" style="width: 128px; margin-right: 10px;">{{ 'Select all' | trans }}</button>
|
||||||
<button class="unselect-all round-blue-border-btn">{{ 'Deselect all' | trans }}</button>
|
<button class="unselect-all round-blue-border-btn" style="width: 128px;">{{ 'Deselect all' | trans }}</button>
|
||||||
<button class="delete-selection btn btn-inverse">{{ 'prod:push: delete selection' | trans }}</button>
|
<button class="delete-selection btn btn-inverse">{{ 'prod:push: delete selection' | trans }}</button>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -233,20 +230,19 @@
|
|||||||
<input type="hidden" name="duration" value=""/>
|
<input type="hidden" name="duration" value=""/>
|
||||||
<input type="checkbox" value="1" name="recept" style="display:none;"/>
|
<input type="checkbox" value="1" name="recept" style="display:none;"/>
|
||||||
<input type="checkbox" value="1" name="force_authentication" style="display:none;"/>
|
<input type="checkbox" value="1" name="force_authentication" style="display:none;"/>
|
||||||
<div class="PNB badges"></div>
|
<div class="PNB10 badges"></div>
|
||||||
</form>
|
</form>
|
||||||
<div class="PNB10 footer">
|
<div class="PNB10 footer">
|
||||||
<form class="list_saver">
|
<form class="list_saver">
|
||||||
<div class="btn-toolbar">
|
<div class="btn-toolbar">
|
||||||
<input type="text" name="name" placeholder="{{ 'Save this list' | trans }}"/>
|
<input type="text" name="name" placeholder="{{ 'Save this list' | trans }}"/>
|
||||||
<button class="saveList">
|
<button class="saveList">
|
||||||
{% if context == 'Push' %}
|
<img src="/assets/common/images/icons/white-save.png"/>
|
||||||
<img src="/assets/common/images/icons/blue-save.png" class="image-normal"/>
|
{# {% if context == 'Push' %}
|
||||||
|
<img src="/assets/common/images/icons/blue-save.png" class="image-hover"/>
|
||||||
{% else %}
|
{% else %}
|
||||||
<img src="/assets/common/images/icons/green-save.png" class="image-normal"/>
|
<img src="/assets/common/images/icons/green-save.png" class="image-hover"/>
|
||||||
{% endif %}
|
{% endif %} #}
|
||||||
<img src="/assets/common/images/icons/white-save.png" class="image-hover"/>
|
|
||||||
<span>{{ "prod:push:save list" | trans }}</span>
|
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
Reference in New Issue
Block a user