From 4125de82088a9db3483df4b93cae7a4c07bb43d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sat, 2 Aug 2025 17:27:34 +0200 Subject: [PATCH] templates: Make whitespace in [% %] consistent --- src/root/build.tt | 6 +++--- src/root/common.tt | 8 ++++---- src/root/edit-jobset.tt | 2 +- src/root/edit-project.tt | 2 +- src/root/job-metrics-tab.tt | 2 +- src/root/jobset-eval.tt | 2 +- src/root/log.tt | 2 +- src/root/product-list.tt | 2 +- src/root/runcommand-log.tt | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/root/build.tt b/src/root/build.tt index 818763bd..46a949fa 100644 --- a/src/root/build.tt +++ b/src/root/build.tt @@ -132,7 +132,7 @@ END; [% IF steps.size() > 0 %][% END %] - [% IF build.dependents %][% END%] + [% IF build.dependents %][% END %] [% IF drvAvailable %][% END %] [% IF localStore && available %][% END %] [% IF runcommandlogProblem || runcommandlogs.size() > 0 %][% END %] @@ -412,8 +412,8 @@ END; [% FOREACH metric IN build.buildmetrics %] - c.uri_for('/job' project.name jobset.name job 'metric' metric.name)) %]">[%metric.name | html%] - [%HTML.escape(metric.value)%] + c.uri_for('/job' project.name jobset.name job 'metric' metric.name)) %]">[% metric.name | html %] + [% HTML.escape(metric.value) %] [% HTML.escape(metric.unit) %] [% END %] diff --git a/src/root/common.tt b/src/root/common.tt index beee86ca..455629c3 100644 --- a/src/root/common.tt +++ b/src/root/common.tt @@ -143,7 +143,7 @@ BLOCK renderBuildListBody; link) %]>[% build.id %] [% IF !hideJobName %] - link) %]>[% IF !hideJobsetName %][%build.jobset.get_column("project")%]:[%build.jobset.get_column("name")%]:[% END %][%build.get_column("job")%] + link) %]>[% IF !hideJobsetName %][% build.jobset.get_column("project") %]:[% build.jobset.get_column("name") %]:[% END %][% build.get_column("job") %] [% IF showStepName %] [% INCLUDE renderDrvInfo step=build.buildsteps releasename=build.nixname %] [% END %] @@ -695,12 +695,12 @@ BLOCK renderYesNo %] BLOCK createChart %] -
-
+
+
diff --git a/src/root/edit-jobset.tt b/src/root/edit-jobset.tt index 61e3636f..429ab546 100644 --- a/src/root/edit-jobset.tt +++ b/src/root/edit-jobset.tt @@ -195,7 +195,7 @@ [% INCLUDE renderJobsetInputs %] - + [% INCLUDE renderJobsetInput input="" extraClass="template" id="input-template" baseName="input-template" %] diff --git a/src/root/edit-project.tt b/src/root/edit-project.tt index bb850e5c..7ee5331b 100644 --- a/src/root/edit-project.tt +++ b/src/root/edit-project.tt @@ -86,7 +86,7 @@ diff --git a/src/root/job-metrics-tab.tt b/src/root/job-metrics-tab.tt index 123a00f1..c7433264 100644 --- a/src/root/job-metrics-tab.tt +++ b/src/root/job-metrics-tab.tt @@ -16,7 +16,7 @@ [% FOREACH metric IN metrics %] -

Metric: c.uri_for('/job' project.name jobset.name job 'metric' metric.name)) %]>[%HTML.escape(metric.name)%]

+

Metric: c.uri_for('/job' project.name jobset.name job 'metric' metric.name)) %]>[% HTML.escape(metric.name) %]

[% id = metricDivId(metric.name); INCLUDE createChart dataUrl=c.uri_for('/job' project.name jobset.name job 'metric' metric.name); %] diff --git a/src/root/jobset-eval.tt b/src/root/jobset-eval.tt index bd29525d..265f472e 100644 --- a/src/root/jobset-eval.tt +++ b/src/root/jobset-eval.tt @@ -21,7 +21,7 @@

This evaluation was performed [% IF eval.flake %]from the flake -[%HTML.escape(eval.flake)%][%END%] on [% INCLUDE renderDateTime +[% HTML.escape(eval.flake) %][% END %] on [% INCLUDE renderDateTime timestamp=eval.timestamp %]. Fetching the dependencies took [% eval.checkouttime %]s and evaluation took [% eval.evaltime %]s.

diff --git a/src/root/log.tt b/src/root/log.tt index ffb2df36..d5eb18e0 100644 --- a/src/root/log.tt +++ b/src/root/log.tt @@ -37,7 +37,7 @@ [% IF tail %] /* The server may give us a full log (e.g. if the log is in S3). So extract the last lines. */ - log_data = log_data.split("\n").slice(-[%tail%]).join("\n"); + log_data = log_data.split("\n").slice(-[% tail %]).join("\n"); [% END %] $("#contents").text(log_data); diff --git a/src/root/product-list.tt b/src/root/product-list.tt index 97fe6141..4a745850 100644 --- a/src/root/product-list.tt +++ b/src/root/product-list.tt @@ -81,7 +81,7 @@ %]

You can install this package using the Nix package manager from the command-line:

-
$ nix-env -i [%HTML.escape(product.path)%][% IF binaryCachePublicUri %] --option binary-caches [% HTML.escape(binaryCachePublicUri) %][% END %]
+
$ nix-env -i [% HTML.escape(product.path) %][% IF binaryCachePublicUri %] --option binary-caches [% HTML.escape(binaryCachePublicUri) %][% END %]
[% END %] [% IF localStore %] contents) %]>Contents diff --git a/src/root/runcommand-log.tt b/src/root/runcommand-log.tt index d6fc0b70..b71e0026 100644 --- a/src/root/runcommand-log.tt +++ b/src/root/runcommand-log.tt @@ -33,7 +33,7 @@ [% IF tail %] /* The server may give us a full log (e.g. if the log is in S3). So extract the last lines. */ - log_data = log_data.split("\n").slice(-[%tail%]).join("\n"); + log_data = log_data.split("\n").slice(-[% tail %]).join("\n"); [% END %] $("#contents").text(log_data);