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 pull request #2712 from filipx/PHRAS-2186_list_manager_add_user

Browse Source 
PHRAS-2186_list_manager_add_user
This commit is contained in:
Nicolas Maillat
2018-09-06 12:17:59 +00:00
committed by GitHub
parent a1390dc5b6 2994bbf890
commit 9e17f72dd7
3 changed files with 2772 additions and 12637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,15 +2,15 @@
<div class="PNB10" style="height: 46px;bottom:auto;line-height:26px;">
<div class="pull-left">
<div id="find-user">
<input class="search" name="users-search" placeholder="{{ list.getName() }}" type="text" style="width:210px;"/>
<input class="search" name="users-search" placeholder="{{ 'Users' | trans }}" type="text" style="width:210px;"/>
</div>
<p id="recommanded-users">
</p>
</div>
<div class="pull-left">
{% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANADMIN')) %}
<a href="#" class="push-add-user btn btn-push-orange" style="width:120px;margin-left:30px;margin-top:2px;">
<a href="#" class="push-add-user push-add-user-listmanager btn btn-push-orange" style="width:120px;margin-left:30px;margin-top:2px;">
<img src="/assets/common/images/icons/orange-plus.png" class="image-normal">
<img src="/assets/common/images/icons/white-plus.png" class="image-hover">
{{ 'Create a user' | trans }}
@@ -58,11 +58,11 @@
</div>
<div class="options pull-left">
<div class="pull-left">
<button class="select-all push-add-user btn btn-push-orange orange-border"
<button class="select-all btn btn-push-orange orange-border"
style="margin-right: 8px;">
{{ 'Select all' | trans }}
</button>
<button class="unselect-all push-add-user btn btn-push-orange orange-border">
<button class="unselect-all btn btn-push-orange orange-border">
{{ 'Deselect all' | trans }}
</button>
</div>
@@ -78,7 +78,7 @@
</div>
</div>
</div>
<div class="PNB" style="top:80px;overflow:auto;">
<div class="PNB badges" style="top:80px;overflow:auto;">
{% set role = list.getOwner(app.getAuthenticatedUser()).getRole() %}
{% for entry in list.getEntries() %}
{{ ListsMacros.badgeReadonly(entry, role) }}

38
templates/web/prod/templates/push.html.twig
View File

@@ -224,4 +224,42 @@
</table>
</div>
</script>
<script type="text/template" id="list_manager_badge_tpl">
<div class="badge badge_<%= user.usr_id %> listmanager_badge">
<input type="hidden" value="<%= user.usr_id %>" name="id">
<table>
<tr>
<td class="listmanager_badge_img">
<img src="/assets/common/images/icons/user-white.png"/>
</td>
<td class="infos">
<div>
<input type="hidden" name="participants[<%= user.usr_id %>][usr_id]" value="<%= user.usr_id %>" />
<table>
<tr>
<td colspan="3">
<span class="name"><%= user.display_name %></span>
</td>
</tr>
<tr>
<td colspan="3">
<span class="subtite"><%= user.subtitle || '' %></span>
</td>
</tr>
<tr class="toggles">
<td class="toggle status_off toggle_HD">
<img title="{% trans %}User can download HD{% endtrans %}" class="toggle_off"
src="/assets/common/images/icons/download-grey.png"/>
<img title="{% trans %}User can download HD{% endtrans %}" class="toggle_on"
src="/assets/common/images/icons/dark-blue-download.png"/>
<input type="hidden" name="participants[<%= user.usr_id %>][HD]" value="0" />
</td>
</tr>
</table>
</div>
</td>
</tr>
</table>
</div>
</script>