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

Merge branch 'master' into PHRAS-3116_prod_video-tools-add_subtitle_generation

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-06-11 19:27:56 +04:00
committed by GitHub
parent a758b1efe6 d3619c8780
commit a5f1ba0851
25 changed files with 2540 additions and 1830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/web/admin/worker-manager/index.html.twig
View File

@@ -35,6 +35,11 @@
{{ 'admin::workermanager:tab:metadata: title' |trans }}
</a>
</li>
<li class="worker-queue-monitor" role="presentation">
<a href="#worker-queue-monitor" aria-controls="worker-queue-monitor" role="tab" data-toggle="tab" data-url="/admin/worker-manager/queue-monitor">
{{ 'admin::workermanager:tab:queueMonitor: title' |trans }}
</a>
</li>
</ul>
@@ -48,6 +53,7 @@
<div role="tabpanel" class="tab-pane fade" id="worker-pull-assets"></div>
<div role="tabpanel" class="tab-pane fade" id="worker-subview"></div>
<div role="tabpanel" class="tab-pane fade" id="worker-metadata"></div>
<div role="tabpanel" class="tab-pane fade" id="worker-queue-monitor"></div>
</div>
</div>

4
templates/web/admin/worker-manager/worker_info.html.twig
View File

@@ -42,7 +42,7 @@
<table class="admintable">
<thead>
<tr>
<th class="sortable">{{ 'admin::workermanager:tab:workerinfo: databox_id' | trans }}</th>
<th class="sortable">{{ 'admin::workermanager:tab:workerinfo: databox_name' | 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>
@@ -57,7 +57,7 @@
{% for workerRow in workerRunningJob | sort | reverse %}
<tr>
<td>{{ workerRow.databoxId }}</td>
<td>{{ workerRow.databoxId | sbas_labels(app) }}</td>
<td>{{ workerRow.recordId }}</td>
<td>{{ workerRow.getWorkName }}</td>
<td>{{ workerRow.workOn }}</td>

42
templates/web/admin/worker-manager/worker_queue_monitor.html.twig Normal file
View File

@@ -0,0 +1,42 @@
{% if not reload %}
<h1>{{ 'admin::workermanager:tab:queueMonitor: description' |trans }}</h1>
<button id="refresh-monitor" class="btn btn-success">
{{ 'admin::workermanager:tab:queueMonitor: Refresh list' |trans }}
</button>
<table class="admintable">
<thead>
<tr>
<th></th>
<th>{{ 'admin::workermanager:tab:queueMonitor: Message count' |trans }}</th>
<th>{{ 'admin::workermanager:tab:queueMonitor: Consumer count' |trans }}</th>
</tr>
</thead>
<tbody class="queue-list">
{% endif %}
{% for queueStatus in queuesStatus %}
<tr>
<th>{{ queueStatus.queueName }}</th>
<td>{{ queueStatus.messageCount }}</td>
<td>{{ queueStatus.consumerCount }}</td>
</tr>
{% endfor %}
{% if not reload %}
</tbody>
</table>
<script type="text/javascript">
$("#refresh-monitor").on('click', function () {
$.ajax({
type: "GET",
url: "/admin/worker-manager/queue-monitor?reload=1",
success: function (data) {
$(".queue-list").empty().html(data);
}
});
});
</script>
{% endif %}

2
templates/web/common/menubar.html.twig
View File

@@ -232,7 +232,7 @@
{% endif %}
</li>
<li>
<a target="_blank" href="https://docs.phraseanet.com/4.0/">
<a target="_blank" href="{{ 'https://docs.phraseanet.com/4.1/' ~ app['locale'] }}">
<span>
{{ 'phraseanet:: aide' | trans }}
</span>