roundabout,
created on Wednesday, 17 July 2024, 11:58:56 (1721217536),
received on Wednesday, 31 July 2024, 06:54:51 (1722408891)
Author identity: vlad <vlad.muntoiu@gmail.com>
755fb666c7f0086eb8c8267dcfa6d97ceab6c3e3
templates/task-monitor.html
@@ -5,13 +5,6 @@
{% block breadcrumbs %}
<li><a href="/task/{{ result.id }}">{% trans result_id=result.id %}Task {{ result_id }}{% endtrans %}</a></li>
{% endblock %}
{% block favicon %}
{% if result.ready() %}
<link rel="shortcut icon" href="/static/logo-ready.svg">
{% else %}
<link rel="shortcut icon" href="/static/logo-wait.svg">
{% endif %}
{% endblock %}
{% block content %}
{# Update every 5 seconds #}
<x-frame style="--width: 896px;" class="flexible-space" {% if not result.ready() %}hx-swap="outerHTML" hx-get={{ modify_query(partial=1) }} hx-trigger="load delay:{{ delay }}ms"{% endif %}>
@@ -21,9 +14,17 @@
{% if result.ready() %}
<iconify-icon icon="mdi:check" style="font-size: 2em; color: var(--color-success);"></iconify-icon>
{% trans %}Done{% endtrans %}
<script>
// Update the favicon
document.querySelector("link[rel='shortcut icon']").setAttribute("href", "/static/logo-ready.svg");
</script>
{% else %}
<iconify-icon icon="material-symbols:autorenew" style="font-size: 2em; color: var(--color-info);"></iconify-icon>
{% trans %}Running...{% endtrans %}
<script>
// Update the favicon
document.querySelector("link[rel='shortcut icon']").setAttribute("href", "/static/logo-wait.svg");
</script>
{% endif %}
</x-hbox>
@@ -59,22 +60,22 @@
</p>
{% if result.get()[3] != result.get()[5] %}
<pre>
<span class="decorative-dollar">git remote add UPSTREAM {{ result.get()[3] }}</span>
<span class="decorative-dollar">git remote update</span>
<span class="decorative-dollar">git checkout {{ result.get()[6] }}</span>
<span class="decorative-dollar">git merge --allow-unrelated-histories UPSTREAM/{{ result.get()[4] }}</span></pre>
<span class="decorative-dollar">git remote add UPSTREAM {{ result.get()[3] }}</span>
<span class="decorative-dollar">git remote update</span>
<span class="decorative-dollar">git checkout {{ result.get()[6] }}</span>
<span class="decorative-dollar">git merge --allow-unrelated-histories UPSTREAM/{{ result.get()[4] }}</span></pre>
<p>
{% trans %}Then fix your conflicts, merge, and finally, run:{% endtrans %}
</p>
<pre>
<span class="decorative-dollar">git remote rm UPSTREAM</span></pre>
<span class="decorative-dollar">git remote rm UPSTREAM</span></pre>
<p>
{% trans %}and push the changes.{% endtrans %}
</p>
{% else %}
<pre>
<span class="decorative-dollar">git checkout {{ result.get()[6] }}</span>
<span class="decorative-dollar">git merge {{ result.get()[4] }}</span></pre>
<span class="decorative-dollar">git checkout {{ result.get()[6] }}</span>
<span class="decorative-dollar">git merge {{ result.get()[4] }}</span></pre>
<p>
{% trans %}Resolve your conflicts and merge, then push.{% endtrans %}
</p>