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

PHRAS-2221_list_manager_UI__corrections

Browse Source
This commit is contained in:
Filip Vilic
2018-09-17 10:54:29 +02:00
parent 934adda4f4
commit e40a524365
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/www/common/images/icons/user-orange.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 742 B

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

@@ -1,5 +1,5 @@
{% import 'prod/actions/Feedback/ListsMacros.html.twig' as ListsMacros %} {% import 'prod/actions/Feedback/ListsMacros.html.twig' as ListsMacros %}
<div class="PNB10 editor_header" style="height: 46px;bottom:auto;line-height:26px;"> <div class="PNB10 editor_header" style="height: 46px;bottom:auto;line-height:26px;padding:0 20px 0 18px;">
<div class="pull-left"> <div class="pull-left">
<div id="find-user"> <div id="find-user">
<input class="search" name="users-search" placeholder="{{ 'Users' | trans }}" type="text" style="width:210px;"/> <input class="search" name="users-search" placeholder="{{ 'Users' | trans }}" type="text" style="width:210px;"/>
@@ -45,11 +45,7 @@
<div class="pull-right"> <div class="pull-right">
<div class="pull-left" style="margin-right:45px;"> <div class="pull-left" style="margin-right:45px;">
{% if list.getOwner(app.getAuthenticatedUser()).getRole() >= constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_EDITOR') %} {% if list.getOwner(app.getAuthenticatedUser()).getRole() >= constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_EDITOR') %}
<button class="EditToggle btn btn-push-orange btn-orange-inverse" style="line-height: 22px;"> <button class="EditToggle btn btn-push-orange btn-orange-inverse" style="line-height: 22px; width:128px;">
<span>
<img src="/assets/common/images/icons/orange-pen.png" class="image-normal" style="margin-right: 10px;">
<img src="/assets/common/images/icons/white-pen.png" class="image-hover" style="margin-right: 10px;">
</span>
{{ 'Advanced mode' | trans }} {{ 'Advanced mode' | trans }}
</button> </button>
{% endif %} {% endif %}
@@ -57,10 +53,10 @@
<div class="options pull-left"> <div class="options pull-left">
<div class="pull-left"> <div class="pull-left">
<button class="select-all btn btn-push-orange orange-border" <button class="select-all btn btn-push-orange orange-border"
style="margin-right: 8px;"> style="margin-right: 8px; width:128px;">
{{ 'Select all' | trans }} {{ 'Select all' | trans }}
</button> </button>
<button class="unselect-all btn btn-push-orange orange-border"> <button class="unselect-all btn btn-push-orange orange-border" style="width:128px;">
{{ 'Deselect all' | trans }} {{ 'Deselect all' | trans }}
</button> </button>
</div> </div>
@@ -76,7 +72,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="PNB badges" style="top:80px;overflow:auto;"> <div class="PNB10 badges" style="top:80px;overflow:auto;margin-left:3px;">
{# {% set role = list.getOwner(app.getAuthenticatedUser()).getRole() %} {# {% set role = list.getOwner(app.getAuthenticatedUser()).getRole() %}
{% for entry in list.getEntries() %} {% for entry in list.getEntries() %}
{{ ListsMacros.badgeReadonly(entry, role) }} {{ ListsMacros.badgeReadonly(entry, role) }}

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

@@ -4,7 +4,8 @@
<table> <table>
<tr> <tr>
<td class="icon"> <td class="icon">
<img src="/assets/common/images/icons/user-white.png"/> <img src="/assets/common/images/icons/user-white.png" class="image-normal"/>
<img src="/assets/common/images/icons/user-orange.png" class="image-hover"/>
</td> </td>
<td class="infos"> <td class="infos">
<div style="margin:5px 10px 5px;"> <div style="margin:5px 10px 5px;">
@@ -127,9 +128,9 @@
</script> </script>
<script type="text/template" id="list_editor_dialog_delete_tpl"> <script type="text/template" id="list_editor_dialog_delete_tpl">
<p> <span>
{% trans %}Are you sure you want to delete this list ?{% endtrans %} {% trans %}Are you sure you want to delete this list ?{% endtrans %}
</p> </span>
</script> </script>
<script type="text/template" id="feedback_sendform_tpl"> <script type="text/template" id="feedback_sendform_tpl">