Couple of upstream/bootstrap items missed in rebase
This commit is contained in:
parent
b5e18ce62c
commit
abe082c1d6
|
@ -498,32 +498,32 @@ END;
|
||||||
|
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
|
|
||||||
[% IF eval.flake %]
|
[% IF eval.flake %]
|
||||||
|
|
||||||
<p>If you have <a href='https://nixos.org/nix/download.html'>Nix
|
<p>If you have <a href='https://nixos.org/nix/download.html'>Nix
|
||||||
installed</a>, you can reproduce this build on your own machine by
|
installed</a>, you can reproduce this build on your own machine by
|
||||||
running the following command:</p>
|
running the following command:</p>
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<span class="shell-prompt"># </span>nix build [% HTML.escape(eval.flake) %]#hydraJobs.[% HTML.escape(job) %]
|
<span class="shell-prompt"># </span>nix build [% HTML.escape(eval.flake) %]#hydraJobs.[% HTML.escape(job) %]
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
[% ELSE %]
|
[% ELSE %]
|
||||||
|
|
||||||
<p>If you have <a href='https://nixos.org/nix/download.html'>Nix
|
<p>If you have <a href='https://nixos.org/nix/download.html'>Nix
|
||||||
installed</a>, you can reproduce this build on your own machine by
|
installed</a>, you can reproduce this build on your own machine by
|
||||||
downloading <a [% HTML.attributes(href => url) %]>a script</a>
|
downloading <a [% HTML.attributes(href => url) %]>a script</a>
|
||||||
that checks out all inputs of the build and then invokes Nix to
|
that checks out all inputs of the build and then invokes Nix to
|
||||||
perform the build.</p>
|
perform the build.</p>
|
||||||
|
|
||||||
<p>To download and execute the script from the command line, run the
|
<p>To download and execute the script from the command line, run the
|
||||||
following command:</p>
|
following command:</p>
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<span class="shell-prompt"># </span>curl <a [% HTML.attributes(href => url) %]>[% HTML.escape(url) %]</a> | bash
|
<span class="shell-prompt"># </span>curl <a [% HTML.attributes(href => url) %]>[% HTML.escape(url) %]</a> | bash
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
[% END %]
|
[% END %]
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -92,10 +92,10 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<label class="col-sm-3" for="editjobsettype">Type</label>
|
<label class="col-form-label col-sm-3" for="editjobsettype">Type</label>
|
||||||
<div class="btn-group btn-group-toggle col-sm-9" data-toggle="buttons">
|
<div class="btn-group btn-group-toggle col-sm-9" data-toggle="buttons">
|
||||||
<label id="type-flake" class="btn btn-secondary[% IF jobset.type == 1 %] active[% END %]">
|
<label id="type-flake" class="btn btn-secondary[% IF jobset.type == 1 %] active[% END %]">
|
||||||
<input type="radio" name="type" value="1" [% IF jobset.type == 1 %]checked[% END %]>Flake</button>
|
<input type="radio" id="editjobsettype" name="type" value="1" [% IF jobset.type == 1 %]checked[% END %]>Flake</button>
|
||||||
</label>
|
</label>
|
||||||
<label id="type-legacy" class="btn btn-secondary[% IF jobset.type == 0 %] active[% END %]">
|
<label id="type-legacy" class="btn btn-secondary[% IF jobset.type == 0 %] active[% END %]">
|
||||||
<input type="radio" name="type" value="0" [% IF jobset.type == 0 %]checked[% END %]>Legacy</button>
|
<input type="radio" name="type" value="0" [% IF jobset.type == 0 %]checked[% END %]>Legacy</button>
|
||||||
|
@ -113,9 +113,7 @@
|
||||||
<div class="form-group row show-on-flake">
|
<div class="form-group row show-on-flake">
|
||||||
<label class="col-form-label col-sm-3" for="editjobsetflakeref">Flake URI</label>
|
<label class="col-form-label col-sm-3" for="editjobsetflakeref">Flake URI</label>
|
||||||
<div class="col-sm-9">
|
<div class="col-sm-9">
|
||||||
<div class="input-group">
|
<input type="text" class="form-control" id="editjobsetflakeref" name="flakeref" [% HTML.attributes(value => jobset.flake) %]/>
|
||||||
<input type="text" class="form-control" id="editjobsetflakeref" name="flakeref" [% HTML.attributes(value => jobset.flake) %]/>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<label class="col-sm-3" for="editprojectenabled">Enabled</label>
|
<label class="col-sm-3" for="editprojectenabled">Enabled</label>
|
||||||
<div class="col-sm-9">
|
<div class="col-sm-9">
|
||||||
<input type="checkbox" id="editprojectenabled" name="enabled" [% IF project.enabled %] checked="checked" [% END %]/>
|
<input type="checkbox" id="editprojectenabled" name="enabled" [% IF create || project.enabled %] checked="checked" [% END %]/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue