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

Merge pull request #2740 from filipx/PHRAS-2219_push_window__corrections

Browse Source 
PHRAS-2219_push_window__corrections
This commit is contained in:
Nicolas Maillat
2018-09-19 21:27:47 +00:00
committed by GitHub
parent 03057c8c2a 04590f4acb
commit d3bb93f8b0
2 changed files with 124 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@
</div>
<div class="pull-left">
{% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANADMIN')) %}
<a href="#" class="push-add-user push-add-user-listmanager btn btn-push-orange" style="width:120px;margin-left:30px;margin-top:2px;">
<a href="#" class="push-add-user listmanager-add-user btn btn-push-orange">
<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 }}
@@ -45,7 +45,7 @@
<div class="pull-right">
<div class="pull-left" style="margin-right:45px;">
{% 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; width:128px;">
<button class="EditToggle btn btn-push-orange btn-orange-inverse" style="line-height: 19px; width:128px;">
{{ 'Advanced mode' | trans }}
</button>
{% endif %}

42
templates/web/prod/actions/Push.html.twig
View File

@@ -56,15 +56,16 @@
</li>
</ul>
</div>
<div style="padding:10px;">
<div class="list-container">
<div style="padding: 10px 10px 0;">
<span class="main-title">
<img src="/assets/common/images/icons/list-grey.png"/>{{ 'Lists' | trans }}</span>
<img src="/assets/common/images/icons/list-grey.png"/>{{ 'Lists' | trans }}
</span>
</div>
<ul class="lists">
{% for list in lists %}
<li class="list" style="padding:6px 2px;position: relative;"
<li class="list" style="padding: 0; position: relative;"
data-list-id= {{ list.getId() }}>
<a class="list_loader"
<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" />#}
@@ -74,14 +75,13 @@
{{ list.getName() }}
({{ list.getEntries().count() }})
</a>
<button class="list-trash-btn">
<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>
</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"/>
@@ -91,10 +91,8 @@
</div>
</div>
</div>
</div>
<div class="PNB" style="left:220px;">
<div class="PNB" style="height:56px;bottom:auto;line-height:26px">
<div class="PNB10">
<div class="PNB10" style="height:46px;bottom:auto;line-height:26px;padding:0 20px 0 18px;">
<div style="float: left;">
<div id="find-user">
<input class="search" name="users-search" placeholder="{{ 'Users' | trans }}" type="text"
@@ -173,7 +171,7 @@
{% endif %}
{% endif %}
</div>
<img id="info-box-trigger" src="/assets/common/images/icons/info-white.png" width="18" height="18">
<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' %}
@@ -184,9 +182,8 @@
</p>
</div>
</div>
</div>
<div class="PNB" style="top:45px;">
<div class="PNB10 content user_content grey-bg">
<div class="PNB10" style="top:55px;">
<div class="PNB content user_content grey-bg">
<div class="PNB10 header">
<table style="table-layout:auto;">
<tr>
@@ -212,8 +209,8 @@
</span>
</td>
<td class="options">
<button class="select-all round-blue-border-btn">{{ 'Select all' | trans }}</button>
<button class="unselect-all round-blue-border-btn">{{ 'Deselect 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" style="width: 128px;">{{ 'Deselect all' | trans }}</button>
<button class="delete-selection btn btn-inverse">{{ 'prod:push: delete selection' | trans }}</button>
</td>
</tr>
@@ -233,20 +230,19 @@
<input type="hidden" name="duration" value=""/>
<input type="checkbox" value="1" name="recept" 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>
<div class="PNB10 footer">
<form class="list_saver">
<div class="btn-toolbar">
<input type="text" name="name" placeholder="{{ 'Save this list' | trans }}"/>
<button class="saveList">
{% if context == 'Push' %}
<img src="/assets/common/images/icons/blue-save.png" class="image-normal"/>
<img src="/assets/common/images/icons/white-save.png"/>
{# {% if context == 'Push' %}
<img src="/assets/common/images/icons/blue-save.png" class="image-hover"/>
{% else %}
<img src="/assets/common/images/icons/green-save.png" class="image-normal"/>
{% endif %}
<img src="/assets/common/images/icons/white-save.png" class="image-hover"/>
<span>{{ "prod:push:save list" | trans }}</span>
<img src="/assets/common/images/icons/green-save.png" class="image-hover"/>
{% endif %} #}
</button>
</div>
</form>