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 #2738 from filipx/PHRAS-2222_list_manager_advance_mode__corrections

Browse Source 
PHRAS-2222_list_manager_advance_mode__corrections
This commit is contained in:
Nicolas Maillat
2018-09-17 22:32:41 +00:00
committed by GitHub
parent b004eef2db c8ce9ce322
commit 7fb2ab4456
2 changed files with 68 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
{% macro ResultTable(query, results, list, sort, ord) %} {% macro ResultTable(query, results, list, sort, ord) %}
<div id="list-editor-search-results" class="list-editor-results PNB"> <div id="list-editor-search-results" class="list-editor-results PNB">
<div class="PNB" style="overflow-y:scroll;overflow-x:hidden;bottom:20px;"> <div class="PNB" style="overflow-x:hidden;bottom:20px;padding-bottom:20px;">
<table style="width:100%;table-layout:fixed;"> <table style="width:100%;table-layout:fixed;">
<thead> <thead>
<tr> <tr>
@@ -85,13 +85,15 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="PNB" style="top:auto;height:20px;text-align:right;line-height:20px;"> <div class="PNB list_editor_results_footer" style="top:auto;height:20px;text-align:right;line-height:20px;">
<span class="textinfo">
{{ query.get_page() }} / {{ query.get_total_page() }} {{ 'Pages' | trans }}
</span>
{% if query.get_page() > 1 %} {% if query.get_page() > 1 %}
<a class="prev" value="{{ query.get_page() - 1 }}" href="#">&laquo; {{ 'Previous' | trans }}</a> <a class="prev" value="{{ query.get_page() - 1 }}" href="#"><span></span> {{ 'Previous' | trans }}</a>
{% endif %} {% endif %}
{{ query.get_page() }} / {{ query.get_total_page() }}
{% if query.get_page() < query.get_total_page() %} {% if query.get_page() < query.get_total_page() %}
<a class="next" value="{{ query.get_page() + 1 }}" href="#">{{ 'Next' | trans }} &raquo;</a> <a class="next" value="{{ query.get_page() + 1 }}" href="#">{{ 'Next' | trans }} <span></span></a>
{% endif %} {% endif %}
</div> </div>
</div> </div>

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

@@ -97,7 +97,7 @@
{% 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') %}
<form class="form-inline" method="POST" name="SaveName" action="{{ path('prod_lists_list_update', { 'list_id' : list.getId() }) }}"> <form class="form-inline" method="POST" name="SaveName" action="{{ path('prod_lists_list_update', { 'list_id' : list.getId() }) }}">
<label style="margin-right: 45px;">{{ 'List Name' | trans }}</label> <label style="margin-right: 45px;">{{ 'List Name' | trans }}</label>
<input type="text" name="name" class="text_input_white orange_text" style="margin: 0 5px;" value="{{ list.getName() }}"/> <input type="text" name="name" class="text_input_white orange_text" style="margin: 0 5px 0 0;" value="{{ list.getName() }}"/>
{% set length = list.getEntries().count() %} {% set length = list.getEntries().count() %}
<span class="counter current"> <span class="counter current">
{% trans with {'%length%' : length} %}%length% peoples{% endtrans %} {% trans with {'%length%' : length} %}%length% peoples{% endtrans %}
@@ -163,73 +163,85 @@
<div class="PNB list_editor_selector" style="top:40px;height:120px;bottom:auto;"> <div class="PNB list_editor_selector" style="top:40px;height:120px;bottom:auto;">
<table style="table-layout:fixed;width:100%;"> <table style="table-layout:fixed;width:100%;">
<tr> <tr>
<td> <th>
<label>{{ 'E-mail domain' | trans }}</label> <label>{{ 'E-mail domain' | trans }}</label>
</td> </th>
<td> <th>
<label>{{ 'Activity' | trans }}</label> <label>{{ 'Activity' | trans }}</label>
</td> </th>
<td > <th>
<label>{{ 'Company' | trans }}</label> <label>{{ 'Company' | trans }}</label>
</td> </th>
<td > <th>
<label>{{ 'Position' | trans }}</label> <label>{{ 'Position' | trans }}</label>
</td> </th>
<td > <th>
<label>{{ 'Country' | trans }}</label> <label>{{ 'Country' | trans }}</label>
</td> </th>
<td > <th>
<label>{{ 'Models' | trans }}</label> <label>{{ 'Models' | trans }}</label>
</td> </th>
</tr> </tr>
<tr> <tr>
<td> <td>
<select size="5" multiple="multiple" name="Email[]" style="width:95%;"> <div class="list_editor_selector_filter_holder">
<option value="">{{ 'All' | trans }}</option> <select size="5" multiple="multiple" name="Email[]" style="width:100%;">
{% for Email in query.getRelatedActivities() %} <option value="">{{ 'All' | trans }}</option>
<option value="{{ Email }}">{{ Email }}</option> {% for Email in query.getRelatedActivities() %}
{% endfor %} <option value="{{ Email }}">{{ Email }}</option>
</select> {% endfor %}
</select>
</div>
</td> </td>
<td> <td>
<select size="5" multiple="multiple" name="Activity[]" style="width:95%;"> <div class="list_editor_selector_filter_holder">
<option value="">{{ 'All' | trans }}</option> <select size="5" multiple="multiple" name="Activity[]" style="width:100%;">
{% for Activity in query.getRelatedActivities() %} <option value="">{{ 'All' | trans }}</option>
<option value="{{ Activity }}">{{ Activity }}</option> {% for Activity in query.getRelatedActivities() %}
{% endfor %} <option value="{{ Activity }}">{{ Activity }}</option>
</select> {% endfor %}
</select>
<div>
</td> </td>
<td> <td>
<select size="5" multiple="multiple" name="Company[]" style="width:95%;"> <div class="list_editor_selector_filter_holder">
<option value="">{{ 'All' | trans }}</option> <select size="5" multiple="multiple" name="Company[]" style="width:100%;">
{% for Company in query.getRelatedCompanies() %} <option value="">{{ 'All' | trans }}</option>
<option value="{{ Company }}">{{ Company }}</option> {% for Company in query.getRelatedCompanies() %}
{% endfor %} <option value="{{ Company }}">{{ Company }}</option>
</select> {% endfor %}
</select>
</div>
</td> </td>
<td> <td>
<select size="5" multiple="multiple" name="Position[]" style="width:95%;"> <div class="list_editor_selector_filter_holder">
<option value="">{{ 'All' | trans }}</option> <select size="5" multiple="multiple" name="Position[]" style="width:100%;">
{% for Position in query.getRelatedPositions() %} <option value="">{{ 'All' | trans }}</option>
<option value="{{ Position }}">{{ Position }}</option> {% for Position in query.getRelatedPositions() %}
{% endfor %} <option value="{{ Position }}">{{ Position }}</option>
</select> {% endfor %}
</select>
</div>
</td> </td>
<td> <td>
<select size="5" multiple="multiple" name="Country[]" style="width:95%;"> <div class="list_editor_selector_filter_holder">
<option value="">{{ 'All' | trans }}</option> <select size="5" multiple="multiple" name="Country[]" style="width:100%;">
{% for Code, Country in query.getRelatedCountries() %} <option value="">{{ 'All' | trans }}</option>
<option value="{{ Code }}">{{ Country }}</option> {% for Code, Country in query.getRelatedCountries() %}
{% endfor %} <option value="{{ Code }}">{{ Country }}</option>
</select> {% endfor %}
</select>
</div>
</td> </td>
<td> <td>
<select size="5" multiple="multiple" name="Template[]" style="width:95%;"> <div class="list_editor_selector_filter_holder">
<option value="">{{ 'All' | trans }}</option> <select size="5" multiple="multiple" name="Template[]" style="width:100%;">
{% for Template in query.getRelatedTemplates() %} <option value="">{{ 'All' | trans }}</option>
<option value="{{ Template }}">{{ Template }}</option> {% for Template in query.getRelatedTemplates() %}
{% endfor %} <option value="{{ Template }}">{{ Template }}</option>
</select> {% endfor %}
</select>
</div>
</td> </td>
</tr> </tr>
</table> </table>