aboutsummaryrefslogtreecommitdiff
path: root/web/templates
diff options
context:
space:
mode:
Diffstat (limited to 'web/templates')
-rw-r--r--web/templates/base.html14
-rw-r--r--web/templates/home.html17
-rw-r--r--web/templates/project.html27
-rw-r--r--web/templates/run.html9
4 files changed, 48 insertions, 19 deletions
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 %}
</head>
<body>
- <div class="content-box">
- <div class="heading">
- <h1><a href="/">makeshiftci</a>{% block path %}{% endblock %}</h1>
- {% block headingcontent %}{% endblock %}
- </div>
- {% block content %}{% endblock %}
+ <div class="heading">
+ <h1><a href="/">makeshiftci</a>{% block path %}{% endblock %}</h1>
+ {% block headingcontent %}{% endblock %}
</div>
+ <div class="content-box"> {% block content %}{% endblock %} </div>
</body>
</html>
<!-- vim: set filetype=jinja: -->
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'] }}</a
></h4
>
+ <h4 class="branchlink"
+ >branch:
+ <a
+ href="{{ project[1]['url'] }}"
+ target="_blank"
+ >
+ {% if not project[1]['branch'] %} not set {% else %} {{
+ project[1]['branch'] }} {% endif %}
+ </a></h4
+ >
<h4 class="cronlink"
>cron:
<a
diff --git a/web/templates/project.html b/web/templates/project.html
index 9b0aa58..7e72a48 100644
--- a/web/templates/project.html
+++ b/web/templates/project.html
@@ -82,15 +82,28 @@ block path %}/<a href="/{{ project_path }}">{{ project_path }}</a>{% endblock %}
><a
href="{{ project.url }}"
target="_blank"
- class="heading-url"
- >{{ project.url }}</a
- ><a
+ style="text-decoration: none"
+ ><span class="heading-url">{{ project.url }}</span
+ ><span style="text-decoration: none; font-weight: normal">::</span>{% if
+ project.branch %}<span
+ style="
+ color: var(--orange);
+ text-decoration: none;
+ font-weight: bolder;
+ font-style: italic;
+ "
+ >{{ project.branch }}</span
+ >{% endif %}</a
+ >
+ {% if project.cron %}
+ <a
href="https://crontab.guru/#{{ project.cron }}"
target="_blank"
class="heading-cron"
>{{ project.cron }}</a
- ></h4
->
+ >
+ {% endif %}
+</h4>
{% endblock %} {% block content %}
<div class="fullbody">
@@ -104,7 +117,9 @@ block path %}/<a href="/{{ project_path }}">{{ project_path }}</a>{% endblock %}
>#{{ run.number }}</a
></span
></span
- ><span class="rundate">{{ run.date }}</span></h3
+ ><span class="rundate">
+ {% if not run.date %} no date {% else %} {{ run.date }} {% endif %}
+ </span></h3
>
<hr style="margin: 5px" />
<h4
diff --git a/web/templates/run.html b/web/templates/run.html
index 77f9f90..92d7843 100644
--- a/web/templates/run.html
+++ b/web/templates/run.html
@@ -10,9 +10,12 @@
{% for n in run %}
<script>
- 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);
</script>
{% endfor %} {% endblock %}