Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3084_admin_user-edit_Add_button_to_select_all

templates/web/admin/tree.html.twig

@@ -18,12 +18,13 @@
   {% if app.getAclForUser(app.getAuthenticatedUser()).is_admin() %}
   <li>
     <a target="right" href="{{ path('setup_display_globals') }}" class="ajax">
-      <img src="/assets/admin/images/Setup.png" />
+      <img width="16" src="/assets/admin/images/tools-solid.svg" />
       <span>{% trans %}Setup{% endtrans %}</span>
     </a>
   </li>
   <li>
     <a target="right" href="{{ path('admin_searchengine_form') }}">
+      <img width="16" src="/assets/admin/images/searchengin.svg" />
       <span>{{ 'SearchEngine settings' | trans }}</span>
     </a>
   </li>
@@ -79,7 +80,7 @@
   {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::TASKMANAGER')) %}
     <li class="{% if feature == 'workermanager' %}selected{% endif %}">
       <a target="right" href="{{ path('worker_admin') }}" class="ajax">
-        <img src="/assets/admin/images/TaskManager.png" />
+        <img width="16" src="/assets/admin/images/cogs-solid.svg" />
         <span>{{ 'Worker Manager' | trans }}</span>
       </a>
     </li>

templates/web/admin/worker-manager/index.html.twig

@@ -7,32 +7,32 @@
 
             <li class="worker-configuration" role="presentation">
                 <a href="#worker-configuration" aria-controls="worker-configuration" role="tab" data-toggle="tab" data-url="/admin/worker-manager/configuration">
-                    {{ "Configuration" | trans }}
+                    {{ "admin::workermanager:tab:configuration: title" | trans }}
                 </a>
             </li>
             <li class="worker-info active" role="presentation">
                 <a href="#worker-info" aria-controls="worker-info" role="tab" data-toggle="tab" data-url="/admin/worker-manager/info">
-                    {{ "Working info" | trans }}
+                    {{ 'admin::workermanager:tab:workerinfo: title' |trans }}
                 </a>
             </li>
             <li class="worker-searchengine" role="presentation">
                 <a href="#worker-searchengine" aria-controls="worker-searchengine" role="tab" data-toggle="tab" data-url="/admin/worker-manager/searchengine">
-                    {{ "Searchengine" | trans }}
+                    {{ 'admin::workermanager:tab:searchengine: title' |trans }}
                 </a>
             </li>
             <li class="worker-pull-assets" role="presentation">
                 <a href="#worker-pull-assets" aria-controls="worker-pull-assets" role="tab" data-toggle="tab" data-url="/admin/worker-manager/pull-assets">
-                    {{ "Pull Assets" | trans }}
+                    {{ 'admin::workermanager:tab:pullassets: title' |trans }}
                 </a>
             </li>
             <li class="worker-subview" role="presentation">
                 <a href="#worker-subview" aria-controls="worker-subview" role="tab" data-toggle="tab" data-url="/admin/worker-manager/subview">
-                    {{ "Subview" | trans }}
+                    {{ 'admin::workermanager:tab:subview: title' |trans }}
                 </a>
             </li>
             <li class="worker-metadata" role="presentation">
                 <a href="#worker-metadata" aria-controls="worker-metadata" role="tab" data-toggle="tab" data-url="/admin/worker-manager/metadata">
-                    {{ "Metadata" | trans }}
+                    {{ 'admin::workermanager:tab:metadata: title' |trans }}
                 </a>
             </li>
 
@@ -86,6 +86,6 @@
     </script>
 {% else %}
     <h1 class="alert alert-danger">
-        Error! can't load rabbit config. Check rabbit config to use worker.
+        {{ 'admin::workermanager: Rabbit config error' |trans }}
     </h1>
 {% endif %}

templates/web/admin/worker-manager/worker_configuration.html.twig

@@ -1,7 +1,6 @@
-<h3> Config Worker queue retry</h3>
+<h1>{{ 'admin::workermanager:tab:workerconfig: title' |trans }}</h1>
 <p class="alert alert-danger">
-    <strong>Warning!</strong>
-    When applied, it's re-initialize and purge "retry" and "delayed" queue!
+    {{ 'admin::workermanager:tab:workerconfig: warning' |trans }}
 </p>
 
 <p>Set up the delay between two attempts per queue! (if not set, default 10000 millisecond)</p>
@@ -48,7 +47,7 @@
 
 
 <div class="control-group">
-    <input type="submit" class="btn btn-primary" value={{ "Apply in queue"|trans }} />
+    <input type="submit" class="btn btn-primary" value={{ "admin::workermanager:tab:workerconfig:Apply in queue"|trans }} />
 </div>
 
 

templates/web/admin/worker-manager/worker_info.html.twig

@@ -1,56 +1,60 @@
 {% if not reload %}
 
-<h1> worker information</h1>
-
+<h1>{{ 'admin::workermanager:tab:workerinfo: description' |trans }}</h1>
+<div class="worker-info-block">
 <form action="{{ path("worker_admin_truncate") }}" method="POST">
-    <p class="alert alert-danger">
-        <strong>Warning!</strong>
-        {{ "It's delete all work information !" |trans }}
-    </p>
-    <button class="btn btn-primary">
-        {{ 'Erase all information' |trans }}
-    </button>
+    <p>
+        <button class="btn btn-primary">
+            {{ 'admin::workermanager:tab:workerinfo: Erase all information' |trans }}
+        </button>
+        <span class="alert alert-danger">
+            {{ "admin::workermanager:tab:workerinfo: Warning! Erase all information" |trans }}
+        </span>
+        </p>
 </form>
 
 <form action="{{ path("worker_admin_delete_finished") }}" method="POST">
-    <p class="alert alert-danger">
-        <strong>Warning!</strong>
-        {{ "It's delete all finished works !"|trans }}
-    </p>
-    <button class="btn btn-primary">
-        {{ 'Erase all finished' | trans }}
-    </button>
-</form>
+    <p>
+        <button class="btn btn-primary">
+            {{ 'admin::workermanager:tab:workerinfo: Erase all finished' | trans }}
+        </button>
+        <span class="alert alert-danger">
+            {{ "admin::workermanager:tab:workerinfo: Warning! Erase all finished"|trans }}
+        </span>
 
+    </p>
+</form>
+<br><br>
     <button id="refresh-list" class="btn btn-success">
-        {{ 'Refresh list' |trans }}
+        {{ 'admin::workermanager:tab:workerinfo: Refresh list' |trans }}
     </button>
 
     <div class="controls">
         <label class="checkbox inline">
-            <input class="running-work" type="checkbox"  value="1" checked> {{ 'Display running work' | trans }}
+            <input class="running-work" type="checkbox"  value="1" checked> {{ 'admin::workermanager:tab:workerinfo: Display running work' | trans }}
         </label>
         <label class="checkbox inline">
-            <input class="finished-work" type="checkbox"  value="1" checked> {{ 'Display finished work' | trans }}
+            <input class="finished-work" type="checkbox"  value="1" checked> {{ 'admin::workermanager:tab:workerinfo: Display finished work' | trans }}
         </label>
     </div>
 
+</div>
 <table class="admintable">
     <thead>
     <tr>
-        <th class="sortable">databox_id</th>
-        <th class="sortable">record_id</th>
-        <th class="sortable">work</th>
-        <th class="sortable">work_on</th>
-        <th class="sortable">created</th>
-        <th class="sortable">published</th>
-        <th class="sortable">status</th>
+        <th class="sortable">{{ 'admin::workermanager:tab:workerinfo: databox_id' | trans }}</th>
+        <th class="sortable">{{ 'admin::workermanager:tab:workerinfo: record_id' | trans }}</th>
+        <th class="sortable">{{ 'admin::workermanager:tab:workerinfo: work' | trans }}</th>
+        <th class="sortable">{{ 'admin::workermanager:tab:workerinfo: work_on' | trans }}</th>
+        <th class="sortable">{{ 'admin::workermanager:tab:workerinfo: created' | trans }}</th>
+        <th class="sortable">{{ 'admin::workermanager:tab:workerinfo: published' | trans }}</th>
+        <th class="sortable">{{ 'admin::workermanager:tab:workerinfo: status' | trans }}</th>
     </tr>
     </thead>
         <tbody class="work-list">
 {% endif %}
 
-    {% for workerRow in workerRunningJob %}
+{% for workerRow in workerRunningJob | sort | reverse %}
     <tr>
         <td>{{ workerRow.databoxId }}</td>
         <td>{{ workerRow.recordId }}</td>
@@ -59,9 +63,8 @@
         <td>{{ workerRow.created|date('Y-m-d H:i:s') }}</td>
         <td>{{ workerRow.published|date('Y-m-d H:i:s') }}</td>
         <td>{{ workerRow.status }}</td>
-
     </tr>
-    {% endfor %}
+{% endfor %}
 
 {% if not reload %}
         </tbody>

templates/web/admin/worker-manager/worker_metadata.html.twig

@@ -1 +1 @@
-<h1>Write metadata setting</h1>
+<h1>{{ 'admin::workermanager:tab:metadata: description' |trans }}</h1>

templates/web/admin/worker-manager/worker_pull_assets.html.twig

@@ -1,4 +1,4 @@
-<h1>Pull Assets from uploader setting</h1>
+<h1>{{ 'admin::workermanager:tab:pullassets: description' |trans }}</h1>
 
 {{ form_start(form, {'action': path('worker_admin_pullAssets')}) }}
 
@@ -23,7 +23,7 @@
 </div>
 
 <div class="control-group">
-    <input type="submit" class="btn btn-primary" value={{ "Initialize pull assets"|trans }} />
+    <input type="submit" class="btn btn-primary" value={{ "admin::workermanager:tab:pullassets: Initialize pull assets"|trans }} />
 </div>
 
 {{ form_end(form) }}

templates/web/admin/worker-manager/worker_searchengine.html.twig

@@ -1,4 +1,4 @@
-<h1>Populate elasticsearch index</h1>
+<h1>{{ 'admin::workermanager:tab:searchengine: description' |trans }}</h1>
 
 {{ form_start(form, {'action': path('worker_admin_searchengine')}) }}
 
@@ -15,7 +15,7 @@
 </div>
 
 <div class="control-group">
-    <label class="control-label"> {{ 'Databox to populate' | trans }}</label>
+    <label class="control-label"> {{ 'admin::workermanager:tab:searchengine: Databox to populate' | trans }}</label>
     <div class="controls">
         <label class="checkbox inline">
             <input class="subdef_sbas" type="checkbox"  value="0"> {{ 'All' | trans }}
@@ -32,7 +32,7 @@
 
 <div class="control-group">
     <button type="submit" class="btn btn-primary btn-trigger " id="populateButton" form="worker_searchengine">
-        {{ "Populate" |trans }}
+        {{ "admin::workermanager:tab:searchengine: Populate" |trans }}
     </button>
 </div>
 
@@ -86,7 +86,7 @@
                             }
                         });
                     } else {
-                        alert("Worker is in process to indexing one of the selected databox!!");
+                        alert({{ "admin::workermanager:tab:searchengine: Warning Worker is in process to indexing one of the selected databox" |trans }});
                     }
                 }
             });

templates/web/admin/worker-manager/worker_subview.html.twig

@@ -1 +1 @@
-<h1>Subview setting</h1>
+<h1>{{ 'admin::workermanager:tab:subview: description' |trans }}</h1>