From e05def62569358ff93691b03177abbaa9442bc53 Mon Sep 17 00:00:00 2001 From: toufic ar Date: Fri, 15 May 2026 18:18:58 +0300 Subject: repo branch support, a little webUI polishing --- web/templates/base.html | 14 ++++---------- web/templates/home.html | 17 +++++++++++++++++ web/templates/project.html | 27 +++++++++++++++++++++------ web/templates/run.html | 9 ++++++--- 4 files changed, 48 insertions(+), 19 deletions(-) (limited to 'web/templates') diff --git a/web/templates/base.html b/web/templates/base.html index 81d6a59..03015ff 100644 --- a/web/templates/base.html +++ b/web/templates/base.html @@ -17,10 +17,6 @@ margin: 0; padding: 0; } - html, - body { - height: 100%; - } :root { --primary: #de3163; --secondary: #722f37; @@ -62,13 +58,11 @@ {% block extrastyle %}{% endblock %} -
-
-

makeshiftci{% block path %}{% endblock %}

- {% block headingcontent %}{% endblock %} -
- {% block content %}{% endblock %} +
+

makeshiftci{% block path %}{% endblock %}

+ {% block headingcontent %}{% endblock %}
+
{% block content %}{% endblock %}
diff --git a/web/templates/home.html b/web/templates/home.html index 20ef75a..733f9ef 100644 --- a/web/templates/home.html +++ b/web/templates/home.html @@ -26,9 +26,16 @@ text-decoration: underline; font-style: italic; } + .branchlink a { + color: var(--orange); + text-decoration: none; + font-weight: bolder; + font-style: italic; + } .cronlink a { color: var(--orange); text-decoration: none; + text-decoration: underline; font-weight: bolder; } } @@ -50,6 +57,16 @@ >{{ project[1]['url'] }} +

branch: + + {% if not project[1]['branch'] %} not set {% else %} {{ + project[1]['branch'] }} {% endif %} +

cron: {{ project_path }}{% endblock %} >{{ project.url }}{{ project.url }}::{% if + project.branch %}{{ project.branch }}{% endif %} + {% if project.cron %} + {{ project.cron }}

+ > + {% endif %} + {% endblock %} {% block content %}
@@ -104,7 +117,9 @@ block path %}/{{ project_path }}{% endblock %} >#{{ run.number }}{{ run.date }} + {% if not run.date %} no date {% else %} {{ run.date }} {% endif %} +

- document.getElementById('stdout').textContent = {{ n|tojson }}; - var s = document.currentScript; - s.parentNode.removeChild(s); + if (document.getElementById('stdout').textContent !== {{ n|tojson }}) { + document.getElementById('stdout').textContent = {{ n|tojson }}; + window.scrollTo({ left: 0, top: document.body.scrollHeight, behavior: "smooth" }); + } + var s = document.currentScript; + s.parentNode.removeChild(s); {% endfor %} {% endblock %} -- cgit v1.2.3