From c8ce9ce3224f8484270e3bfd96abd28dca08bc88 Mon Sep 17 00:00:00 2001
From: Filip Vilic <filip.t.vilic@gmail.com>
Date: Mon, 17 Sep 2018 15:08:41 +0200
Subject: [PATCH] PHRAS-2222_list_manager_advance_mode__corrections

---
 .../actions/Feedback/ListsMacros.html.twig    |  12 +-
 .../web/prod/actions/Feedback/list.html.twig  | 110 ++++++++++--------
 2 files changed, 68 insertions(+), 54 deletions(-)

diff --git a/templates/web/prod/actions/Feedback/ListsMacros.html.twig b/templates/web/prod/actions/Feedback/ListsMacros.html.twig
index f9c894a543..3049bc0c64 100644
--- a/templates/web/prod/actions/Feedback/ListsMacros.html.twig
+++ b/templates/web/prod/actions/Feedback/ListsMacros.html.twig
@@ -1,6 +1,6 @@
 {% macro ResultTable(query, results, list, sort, ord) %}
 <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;">
         <thead>
           <tr>
@@ -85,13 +85,15 @@
         </tbody>
     </table>
   </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 %}
-      <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 %}
-    {{ 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 %}
   </div>
 </div>
diff --git a/templates/web/prod/actions/Feedback/list.html.twig b/templates/web/prod/actions/Feedback/list.html.twig
index aabc8ea27a..d895355e24 100644
--- a/templates/web/prod/actions/Feedback/list.html.twig
+++ b/templates/web/prod/actions/Feedback/list.html.twig
@@ -101,7 +101,7 @@
                             {% 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() }) }}">
                                     <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() %}
                                     <span class="counter current">
                                         {% trans with {'%length%' : length} %}%length% peoples{% endtrans %}
@@ -167,73 +167,85 @@
                     <div class="PNB list_editor_selector" style="top:40px;height:120px;bottom:auto;">
                         <table style="table-layout:fixed;width:100%;">
                             <tr>
-                                <td>
+                                <th>
                                     <label>{{ 'E-mail domain' | trans }}</label>
-                                </td>
-                                <td>
+                                </th>
+                                <th>
                                     <label>{{ 'Activity' | trans }}</label>
-                                </td>
-                                <td >
+                                </th>
+                                <th>
                                     <label>{{ 'Company' | trans }}</label>
-                                </td>
-                                <td >
+                                </th>
+                                <th>
                                     <label>{{ 'Position' | trans }}</label>
-                                </td>
-                                <td >
+                                </th>
+                                <th>
                                     <label>{{ 'Country' | trans }}</label>
-                                </td>
-                                <td >
+                                </th>
+                                <th>
                                     <label>{{ 'Models' | trans }}</label>
-                                </td>
+                                </th>
                             </tr>
                             <tr>
                                 <td>
-                                    <select size="5" multiple="multiple" name="Email[]" style="width:95%;">
-                                        <option value="">{{ 'All' | trans }}</option>
-                                        {% for Email in query.getRelatedActivities() %}
-                                            <option value="{{ Email }}">{{ Email }}</option>
-                                        {% endfor %}
-                                    </select>
+                                    <div class="list_editor_selector_filter_holder">
+                                        <select size="5" multiple="multiple" name="Email[]" style="width:100%;">
+                                            <option value="">{{ 'All' | trans }}</option>
+                                            {% for Email in query.getRelatedActivities() %}
+                                                <option value="{{ Email }}">{{ Email }}</option>
+                                            {% endfor %}
+                                        </select>
+                                    </div>
                                 </td>
                                 <td>
-                                    <select size="5" multiple="multiple" name="Activity[]" style="width:95%;">
-                                        <option value="">{{ 'All' | trans }}</option>
-                                        {% for Activity in query.getRelatedActivities() %}
-                                            <option value="{{ Activity }}">{{ Activity }}</option>
-                                        {% endfor %}
-                                    </select>
+                                    <div class="list_editor_selector_filter_holder">
+                                        <select size="5" multiple="multiple" name="Activity[]" style="width:100%;">
+                                            <option value="">{{ 'All' | trans }}</option>
+                                            {% for Activity in query.getRelatedActivities() %}
+                                                <option value="{{ Activity }}">{{ Activity }}</option>
+                                            {% endfor %}
+                                        </select>
+                                    <div>
                                 </td>
                                 <td>
-                                    <select size="5" multiple="multiple" name="Company[]" style="width:95%;">
-                                        <option value="">{{ 'All' | trans }}</option>
-                                        {% for Company in query.getRelatedCompanies() %}
-                                            <option value="{{ Company }}">{{ Company }}</option>
-                                        {% endfor %}
-                                    </select>
+                                    <div class="list_editor_selector_filter_holder">
+                                        <select size="5" multiple="multiple" name="Company[]" style="width:100%;">
+                                            <option value="">{{ 'All' | trans }}</option>
+                                            {% for Company in query.getRelatedCompanies() %}
+                                                <option value="{{ Company }}">{{ Company }}</option>
+                                            {% endfor %}
+                                        </select>
+                                    </div>
                                 </td>
                                 <td>
-                                    <select size="5" multiple="multiple" name="Position[]" style="width:95%;">
-                                        <option value="">{{ 'All' | trans }}</option>
-                                        {% for Position in query.getRelatedPositions() %}
-                                            <option value="{{ Position }}">{{ Position }}</option>
-                                        {% endfor %}
-                                    </select>
+                                    <div class="list_editor_selector_filter_holder">
+                                        <select size="5" multiple="multiple" name="Position[]" style="width:100%;">
+                                            <option value="">{{ 'All' | trans }}</option>
+                                            {% for Position in query.getRelatedPositions() %}
+                                                <option value="{{ Position }}">{{ Position }}</option>
+                                            {% endfor %}
+                                        </select>
+                                    </div>
                                 </td>
                                 <td>
-                                    <select size="5" multiple="multiple" name="Country[]" style="width:95%;">
-                                        <option value="">{{ 'All' | trans }}</option>
-                                        {% for Code, Country in query.getRelatedCountries() %}
-                                            <option value="{{ Code }}">{{ Country }}</option>
-                                        {% endfor %}
-                                    </select>
+                                    <div class="list_editor_selector_filter_holder">
+                                        <select size="5" multiple="multiple" name="Country[]" style="width:100%;">
+                                            <option value="">{{ 'All' | trans }}</option>
+                                            {% for Code, Country in query.getRelatedCountries() %}
+                                                <option value="{{ Code }}">{{ Country }}</option>
+                                            {% endfor %}
+                                        </select>
+                                    </div>
                                 </td>
                                 <td>
-                                    <select size="5" multiple="multiple" name="Template[]" style="width:95%;">
-                                        <option value="">{{ 'All' | trans }}</option>
-                                        {% for Template in query.getRelatedTemplates() %}
-                                            <option value="{{ Template }}">{{ Template }}</option>
-                                        {% endfor %}
-                                    </select>
+                                    <div class="list_editor_selector_filter_holder">
+                                        <select size="5" multiple="multiple" name="Template[]" style="width:100%;">
+                                            <option value="">{{ 'All' | trans }}</option>
+                                            {% for Template in query.getRelatedTemplates() %}
+                                                <option value="{{ Template }}">{{ Template }}</option>
+                                            {% endfor %}
+                                        </select>
+                                    </div>
                                 </td>
                             </tr>
                         </table>