diff --git a/resources/www/admin/images/cogs-solid.svg b/resources/www/admin/images/cogs-solid.svg new file mode 100644 index 0000000000..61192b97b2 --- /dev/null +++ b/resources/www/admin/images/cogs-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/www/admin/images/searchengin.svg b/resources/www/admin/images/searchengin.svg new file mode 100644 index 0000000000..289aad5ffe --- /dev/null +++ b/resources/www/admin/images/searchengin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/www/admin/images/tools-solid.svg b/resources/www/admin/images/tools-solid.svg new file mode 100644 index 0000000000..5f5e5a3a1d --- /dev/null +++ b/resources/www/admin/images/tools-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/www/admin/styles/main.scss b/resources/www/admin/styles/main.scss index cff7851f82..21beb65782 100644 --- a/resources/www/admin/styles/main.scss +++ b/resources/www/admin/styles/main.scss @@ -912,6 +912,12 @@ span.simplecolorpicker.picker { .ui-dialog-titlebar-close { text-indent: -9999999px; } +.worker-info-block { + .btn-primary { + min-width: 161px; + margin-right: 15px; + } +} @import './databases'; @import './fields'; @import './tables'; diff --git a/templates/web/admin/tree.html.twig b/templates/web/admin/tree.html.twig index 08da90f9b7..3d6416deaa 100644 --- a/templates/web/admin/tree.html.twig +++ b/templates/web/admin/tree.html.twig @@ -18,12 +18,13 @@ {% if app.getAclForUser(app.getAuthenticatedUser()).is_admin() %}
  • - + {% trans %}Setup{% endtrans %}
  • + {{ 'SearchEngine settings' | trans }}
  • @@ -79,7 +80,7 @@ {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::TASKMANAGER')) %}
  • - + {{ 'Worker Manager' | trans }}
  • diff --git a/templates/web/admin/worker-manager/worker_configuration.html.twig b/templates/web/admin/worker-manager/worker_configuration.html.twig index 34ca537f93..90f49f0cc6 100644 --- a/templates/web/admin/worker-manager/worker_configuration.html.twig +++ b/templates/web/admin/worker-manager/worker_configuration.html.twig @@ -1,7 +1,6 @@ -

    Config Worker queue retry

    +

    {{ 'admin::workermanager:tab:workerconfig: title' |trans }}

    - Warning! - When applied, it's re-initialize and purge "retry" and "delayed" queue! + {{ 'admin::workermanager:tab:workerconfig: warning' |trans }}

    Set up the delay between two attempts per queue! (if not set, default 10000 millisecond)

    @@ -48,7 +47,7 @@
    - +
    diff --git a/templates/web/admin/worker-manager/worker_info.html.twig b/templates/web/admin/worker-manager/worker_info.html.twig index 78864573e3..daad6ab8d3 100644 --- a/templates/web/admin/worker-manager/worker_info.html.twig +++ b/templates/web/admin/worker-manager/worker_info.html.twig @@ -1,40 +1,44 @@ {% if not reload %} -

    worker information

    - +

    {{ 'admin::workermanager:tab:workerinfo: title' |trans }}

    +
    -

    - Warning! - {{ "It's delete all work information !" |trans }} -

    - +

    + + + {{ "admin::workermanager:tab:workerinfo: Warning! Erase all information" |trans }} + +

    -

    - Warning! - {{ "It's delete all finished works !"|trans }} +

    + + + {{ "admin::workermanager:tab:workerinfo: Warning! Erase all finished"|trans }} + +

    -
    +
    @@ -50,7 +54,7 @@ {% endif %} - {% for workerRow in workerRunningJob %} +{% for workerRow in workerRunningJob | sort | reverse %} @@ -59,9 +63,8 @@ - - {% endfor %} +{% endfor %} {% if not reload %} diff --git a/templates/web/admin/worker-manager/worker_metadata.html.twig b/templates/web/admin/worker-manager/worker_metadata.html.twig index ec122fe8e8..0193dbdb53 100644 --- a/templates/web/admin/worker-manager/worker_metadata.html.twig +++ b/templates/web/admin/worker-manager/worker_metadata.html.twig @@ -1 +1 @@ -

    Write metadata setting

    +

    admin::workermanager:tab:metadata: title

    diff --git a/templates/web/admin/worker-manager/worker_pull_assets.html.twig b/templates/web/admin/worker-manager/worker_pull_assets.html.twig index 11a8dfdb77..1e2d3fd68a 100644 --- a/templates/web/admin/worker-manager/worker_pull_assets.html.twig +++ b/templates/web/admin/worker-manager/worker_pull_assets.html.twig @@ -1,4 +1,4 @@ -

    Pull Assets from uploader setting

    +

    {{ 'admin::workermanager:tab:pullassets: title' |trans }}

    {{ form_start(form, {'action': path('worker_admin_pullAssets')}) }} @@ -23,7 +23,7 @@
    - +
    {{ form_end(form) }} diff --git a/templates/web/admin/worker-manager/worker_searchengine.html.twig b/templates/web/admin/worker-manager/worker_searchengine.html.twig index f2c770aa68..1a30042c98 100644 --- a/templates/web/admin/worker-manager/worker_searchengine.html.twig +++ b/templates/web/admin/worker-manager/worker_searchengine.html.twig @@ -1,4 +1,4 @@ -

    Populate elasticsearch index

    +

    {{ 'admin::workermanager:tab:searchengine: title' |trans }}

    {{ form_start(form, {'action': path('worker_admin_searchengine')}) }} @@ -15,7 +15,7 @@
    - +
    {{ workerRow.databoxId }} {{ workerRow.recordId }}{{ workerRow.created|date('Y-m-d H:i:s') }} {{ workerRow.published|date('Y-m-d H:i:s') }} {{ workerRow.status }}