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

wip - refactor ui of push screen

Browse Source
This commit is contained in:
Mike Ng
2018-06-14 17:25:38 +04:00
parent 7bd24324b8
commit bc103637cd
19 changed files with 4112 additions and 9077 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11974
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@@ -66,7 +66,7 @@
"normalize-css": "^2.1.0",
"npm": "^6.0.0",
"npm-modernizr": "^2.8.3",
"phraseanet-production-client": "^0.33.0",
"phraseanet-production-client": "../Phraseanet-production-client",
"requirejs": "^2.3.5",
"tinymce": "^4.0.28",
"underscore": "^1.8.3",

BIN
resources/www/common/images/icons/Info-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 928 B

BIN
resources/www/common/images/icons/blue-plus.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 261 B

BIN
resources/www/common/images/icons/blue-save.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
resources/www/common/images/icons/blue-search.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
resources/www/common/images/icons/download-blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 387 B

BIN
resources/www/common/images/icons/download-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 372 B

BIN
resources/www/common/images/icons/hand-grey.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
resources/www/common/images/icons/info-grey.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
resources/www/common/images/icons/list-grey.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
resources/www/common/images/icons/manage-list-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 805 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 879 B

BIN
resources/www/common/images/icons/white-plus.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 256 B

BIN
resources/www/common/images/icons/white-save.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 923 B

BIN
resources/www/common/images/icons/white-search.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 892 B

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

@@ -15,20 +15,22 @@
<div class="PNB PushBox" id="PushBox" >
<div class="PNB" style="width:205px;">
<div class="PNB10 LeftColumn">
<div class="PNB" style="height:130px; text-align:center;">
<div class="PNB" style="text-align:center;">
{% if context == 'Push' %}
<img style="margin:30px 0;" src="/assets/common/images/icons/push64.png"/>
<img style="width: 36px; height: 36px" src="/assets/common/images/icons/push64.png"/>
{% else %}
<img style="margin:30px 0;" src="/assets/common/images/icons/Feedback60.png"/>
<img style="width: 36px; height: 36px" src="/assets/common/images/icons/Feedback60.png"/>
{% endif %}
</div>
<div class="PNB content" style="top:150px; overflow-y:auto;">
<div class="PNB content" style="top:45px; overflow-y:auto;">
<div style="padding:10px">
<h1>{{ 'Grant rights' | trans }}</h1>
<span class="main-title"><img
src="/assets/common/images/icons/hand-grey.png"/>{{ 'Grant rights' | trans }}</span>
<ul class="general_togglers">
{% if context == 'Feedback' %}
<li>
<button type="button" class="general_toggler btn btn-inverse" feature="agree">
<img/>
{{ 'Contributor' | trans }}
</button>
</li>
@@ -39,34 +41,27 @@
</li>
{% endif %}
<li>
<button type="button" class="general_toggler btn btn-inverse" feature="HD">
<button type="button" class="general_toggler" feature="HD">
<img src="/assets/common/images/icons/download-blue.png"/>
{{ 'HD Download' | trans }}
</button>
</li>
</ul>
</div>
<div style="padding:10px;">
<h1>{{ 'Lists' | trans }}</h1>
<span style="width:100%; display:block; text-align:center;">
<a href="#" class="btn btn-inverse list_manager">
<b>{{ 'List Manager' | trans }}</b>
</a>
</span>
<form class="list_saver">
<div class="btn-toolbar">
<input type="text" name="name" placeholder="{{ 'Save this list' | trans }}" />
<button class="btn"><img src="/assets/prod/images/Push/save_list_as.png" /></button>
</div>
</form>
<div class="list-container">
<span class="main-title"><img
src="/assets/common/images/icons/list-grey.png"/>{{ 'Lists' | trans }}</span>
<ul class="list">
{% for list in lists %}
<li class="list" style="padding:2px;">
<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 %}
<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>
@@ -74,23 +69,23 @@
{% 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>
</div>
</div>
</div>
</div>
<div class="PNB" style="left:205px;">
<div class="PNB" style="height:150px;bottom:auto;line-height:26px">
<div class="PNB" style="height:56px;bottom:auto;line-height:26px">
<div class="PNB10">
<table>
<tr style="vertical-align:top;">
<td>
<div style="float: left;">
<div id="find-user">
<input class="search" name="users-search" placeholder="{{ 'Users' | trans }}" type="text" style="width:210px;"/>
<br/>
{{ 'Select a user in the list' | trans }} <br/>
{% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANADMIN')) %}
{{ 'or' | trans }}
<a href="#" class="push-add-user btn btn-mini">{{ 'Add user' | trans }}</a>
{% endif %}
<input class="search" name="users-search" placeholder="{{ 'Users' | trans }}" type="text"
style="width:210px;"/>
</div>
<p id="recommanded-users">
{% set recommendation = '' %}
@@ -149,9 +144,15 @@
{% endfor %}
</table>
</div>
</td>
<td style="width:10px;"></td>
<td>
</div>
<div style="float: left;">
{% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANADMIN')) %}
<a href="#" class="push-add-user btn"><img
src="/assets/common/images/icons/blue-plus.png"><span>{{ 'Add user' | trans }}</span></a>
{% 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 }}
@@ -159,17 +160,16 @@
{{ 'Push::une validation est une demande d\'appreciation a d\'autres personnes' | trans }}
{% endif %}
</p>
</td>
</tr>
</table>
</div>
</div>
<div class="PNB" style="top:150px;">
</div>
<div class="PNB" style="top:45px;">
<div class="PNB10 content user_content grey-bg">
<div class="PNB10 header">
<table style="table-layout:auto;">
<tr>
<td>
<span class="text">
{% if 'Push' == context %}
{% set nb_push_items = push.get_count_actionable() %}
{% if push.get_count_not_actionable() == 0 %}
@@ -187,10 +187,11 @@
{% trans with {'%nb_push_items%' : nb_push_items, '%nb_not_available%' : nb_not_available} %}You are about to ask for feedback for %nb_push_items% records, %nb_not_available% records can not be processed.{% endtrans %}
{% endif %}
{% endif %}
</span>
</td>
<td class="options">
<button class="select-all btn btn-inverse">{{ 'Select all' | trans }}</button>
<button class="unselect-all btn btn-inverse">{{ 'Deselect all' | trans }}</button>
<button class="select-all round-blue-border-btn">{{ 'Select all' | trans }}</button>
<button class="unselect-all round-blue-border-btn">{{ 'Deselect all' | trans }}</button>
</td>
</tr>
</table>
@@ -212,7 +213,15 @@
<div class="PNB badges"></div>
</form>
<div class="PNB10 footer">
<button class="FeedbackSend btn btn-inverse">{{ "Send" | trans }}</button>
<form class="list_saver">
<div class="btn-toolbar">
<input type="text" name="name" placeholder="{{ 'Save this list' | trans }}"/>
<button class="saveList"><img
src="/assets/common/images/icons/blue-save.png"/><span>{{ "prod:push:save list" | trans }}</span>
</button>
</div>
</form>
<button class="FeedbackSend">{{ "Send" | trans }}</button>
</div>
</div>
</div>

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

@@ -4,7 +4,7 @@
<table>
<tr>
<td class="icon">
<img src="/assets/common/images/icons/user.png"/>
<img src="/assets/common/images/icons/user-white.png"/>
</td>
<td class="infos">
<div style="margin:5px 10px 5px;">
@@ -72,7 +72,7 @@
<table>
<tr>
<td class="icon">
<img src="/assets/common/images/icons/user.png"/>
<img src="/assets/common/images/icons/user-white.png"/>
</td>
<td class="infos">
<div>
@@ -100,8 +100,10 @@
<input type="hidden" name="participants[<%= user.usr_id %>][see_others]" value="0" />
</td>
<td class="toggle status_off toggle_HD">
<img title="{% trans %}User can download HD{% endtrans %}" class="toggle_off" src="/assets/prod/images/Push/download_off_badge.png" />
<img title="{% trans %}User can download HD{% endtrans %}" class="toggle_on" src="/assets/prod/images/Push/download_badge.png" />
<img title="{% trans %}User can download HD{% endtrans %}" class="toggle_off"
src="/assets/prod/images/icons/download-white.png"/>
<img title="{% trans %}User can download HD{% endtrans %}" class="toggle_on"
src="/assets/prod/images/Push/download_blue.png"/>
<input type="hidden" name="participants[<%= user.usr_id %>][HD]" value="0" />
</td>
</tr>
@@ -180,13 +182,13 @@
<script type="text/template" id="push_badge_tpl">
<div class="badge badge_<%= user.usr_id %>">
<a href="#" class="deleter">
<img src="/assets/prod/images/Push/close_badge.png"/>
<i class="fa fa-times-circle"></i>
</a>
<input name="id" value="<%= user.usr_id %>" type="hidden" />
<table>
<tr>
<td class="icon">
<img src="/assets/common/images/icons/user.png"/>
<img src="/assets/common/images/icons/user-white.png"/>
</td>
<td class="infos">
<div>
@@ -204,8 +206,10 @@
</tr>
<tr class="toggles">
<td class="toggle status_off toggle_HD">
<img title="{% trans %}User can download HD{% endtrans %}" class="toggle_off" src="/assets/prod/images/Push/download_off_badge.png" />
<img title="{% trans %}User can download HD{% endtrans %}" class="toggle_on" src="/assets/prod/images/Push/download_badge.png" />
<img title="{% trans %}User can download HD{% endtrans %}" class="toggle_off"
src="/assets/common/images/icons/download-white.png"/>
<img title="{% trans %}User can download HD{% endtrans %}" class="toggle_on"
src="/assets/common/images/icons/download-blue.png"/>
<input type="hidden" name="participants[<%= user.usr_id %>][HD]" value="0" />
</td>
</tr>

930
yarn.lock
View File

File diff suppressed because it is too large Load Diff