This commit is contained in:
Anthony Stirling 2023-12-31 16:01:27 +00:00
parent a5ad9e13fe
commit b74819cf6c
2 changed files with 50 additions and 16 deletions

View file

@ -42,6 +42,7 @@ red=Red
green=Green green=Green
blue=Blue blue=Blue
custom=Custom... custom=Custom...
WorkInProgess=Work in progress, May not work or be buggy, Please report any ploblems!
changedCredsMessage=Credentials changed! changedCredsMessage=Credentials changed!
notAuthenticatedMessage=User not authenticated. notAuthenticatedMessage=User not authenticated.
@ -50,6 +51,27 @@ incorrectPasswordMessage=Current password is incorrect.
usernameExistsMessage=New Username already exists. usernameExistsMessage=New Username already exists.
###############
# Pipeline #
###############
pipeline.header=Pipeline Menu (Alpha)
pipeline.uploadButton=Upload Custom
pipeline.configureButton=Configure
pipeline.defaultOption=Custom
pipeline.submitButton=Submit
######################
# Pipeline Options #
######################
pipelineOptions.header=Pipeline Configuration
pipelineOptions.pipelineNameLabel=Pipeline Name
pipelineOptions.addOperationButton=Add operation
pipelineOptions.pipelineHeader=Pipeline:
pipelineOptions.saveButton=Download
pipelineOptions.validateButton=Validate
############# #############
# NAVBAR # # NAVBAR #

View file

@ -38,13 +38,16 @@
<div class="container"> <div class="container">
<div class="row justify-content-center"> <div class="row justify-content-center">
<h1>(Alpha) Pipeline Menu (Huge work in progress, very buggy!)</h1> <h1 th:text="#{pipeline.header}"></h1>
<h2 th:text="#{WorkInProgess}"> </h2>
<div class="bordered-box"> <div class="bordered-box">
<div class="text-end text-top"> <div class="text-end text-top">
<button id="uploadPipelineBtn" class="btn btn-primary">Upload <button id="uploadPipelineBtn" class="btn btn-primary"
Custom</button> th:text="#{pipeline.uploadButton}"></button>
<button type="button" class="btn btn-primary" <button type="button" class="btn btn-primary"
data-bs-toggle="modal" data-bs-target="#pipelineSettingsModal">Configure</button> data-bs-toggle="modal" data-bs-target="#pipelineSettingsModal"
th:text="#{pipeline.configureButton}"></button>
</div> </div>
<div class="center-element"> <div class="center-element">
@ -52,7 +55,8 @@
<select id="pipelineSelect" class="custom-select"> <select id="pipelineSelect" class="custom-select">
<option <option
value="{&quot;name&quot;:&quot;Custom&quot;,&quot;pipeline&quot;:[],&quot;_examples&quot;:{&quot;outputDir&quot;:&quot;{outputFolder}/{folderName}&quot;,&quot;outputFileName&quot;:&quot;{filename}-{pipelineName}-{date}-{time}&quot;},&quot;outputDir&quot;:&quot;{outputFolder}&quot;,&quot;outputFileName&quot;:&quot;{filename}&quot;}" value="{&quot;name&quot;:&quot;Custom&quot;,&quot;pipeline&quot;:[],&quot;_examples&quot;:{&quot;outputDir&quot;:&quot;{outputFolder}/{folderName}&quot;,&quot;outputFileName&quot;:&quot;{filename}-{pipelineName}-{date}-{time}&quot;},&quot;outputDir&quot;:&quot;{outputFolder}&quot;,&quot;outputFileName&quot;:&quot;{filename}&quot;}"
th:text="Custom"></option> th:text="#{pipeline.defaultOption}"></option>
<th:block th:each="config : ${pipelineConfigsWithNames}"> <th:block th:each="config : ${pipelineConfigsWithNames}">
<option th:value="${config.json}" th:text="${config.name}"></option> <option th:value="${config.json}" th:text="${config.name}"></option>
@ -64,7 +68,9 @@
th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=true)}"></div> th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=true)}"></div>
</div> </div>
<div class="element-margin"> <div class="element-margin">
<button class="btn btn-primary" id="submitConfigBtn">Submit</button> <button class="btn btn-primary" id="submitConfigBtn"
th:text="#{pipeline.submitButton}"></button>
</div> </div>
</div> </div>
</div> </div>
@ -181,18 +187,18 @@
<!-- Modal Header --> <!-- Modal Header -->
<div class="modal-header"> <div class="modal-header">
<h2 class="modal-title">Pipeline Configuration</h2> <h2 class="modal-title" th:text="#{pipelineOptions.header}"></h2>
<button type="button" class="btn-close" data-bs-dismiss="modal" <button type="button" class="btn-close" data-bs-dismiss="modal"
aria-label="Close"></button> aria-label="Close"></button>
</div> </div>
<!-- Modal body --> <!-- Modal body -->
<div class="modal-body"> <div class="modal-body">
<div class="mb-3"> <div class="mb-3">
<label for="pipelineName" class="form-label">Pipeline <label for="pipelineName" class="form-label"
Name</label> <input type="text" id="pipelineName" th:text="#{pipelineOptions.pipelineNameLabel}"></label> <input
class="form-control" placeholder="Enter pipeline name here"> type="text" id="pipelineName" class="form-control"
placeholder="Enter pipeline name here">
</div> </div>
<div class="mb-3"> <div class="mb-3">
<select id="operationsDropdown" class="form-select"> <select id="operationsDropdown" class="form-select">
@ -200,10 +206,13 @@
</select> </select>
</div> </div>
<div class="mb-3"> <div class="mb-3">
<button id="addOperationBtn" class="btn btn-primary">Add <button id="addOperationBtn" class="btn btn-primary"
operation</button> th:text="#{pipelineOptions.addOperationButton}"></button>
</div> </div>
<h3 id="pipelineHeader" style="display: none;">Pipeline:</h3> <h3 id="pipelineHeader" style="display: none;"
th:text="#{pipelineOptions.pipelineHeader}"></h3>
<ol id="pipelineList" class="list-group"> <ol id="pipelineList" class="list-group">
<!-- Pipeline operations will be dynamically populated here --> <!-- Pipeline operations will be dynamically populated here -->
</ol> </ol>
@ -214,8 +223,11 @@
<!-- Modal footer --> <!-- Modal footer -->
<div class="modal-footer"> <div class="modal-footer">
<button id="savePipelineBtn" class="btn btn-success">Download</button> <button id="savePipelineBtn" class="btn btn-success"
<button id="validateButton" class="btn btn-success">Validate</button> th:text="#{pipelineOptions.saveButton}"></button>
<button id="validateButton" class="btn btn-success"
th:text="#{pipelineOptions.validateButton}"></button>
<div class="btn-group"> <div class="btn-group">
<input type="file" id="uploadPipelineInput" accept=".json" <input type="file" id="uploadPipelineInput" accept=".json"
style="display: none;"> style="display: none;">