Skip to content

Commit

Permalink
Fix capitalization (Closes #41)
Browse files Browse the repository at this point in the history
  • Loading branch information
Galaxy102 committed Feb 13, 2022
1 parent 5672b2c commit d678b08
Show file tree
Hide file tree
Showing 14 changed files with 34 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public class AlignmentSettingFlowController implements SimulationStep {
*/
@Override
public String getName() {
return "Create Alignments";
return "Create alignments";
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class ParameterSettingFlowController implements SimulationStep {
*/
@Override
public String getName() {
return "Set Parameters";
return "Set parameters";
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public class PersonaSettingFlowController implements SimulationStep {
*/
@Override
public String getName() {
return "Select Persona";
return "Select personae";
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class ProfileSettingFlowController implements SimulationStep {
*/
@Override
public String getName() {
return "Select Profile";
return "Select profile";
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class RemarkSettingFlowController implements SimulationStep {
*/
@Override
public String getName() {
return "Set Remark";
return "Set title";
}

/**
Expand Down
10 changes: 5 additions & 5 deletions src/main/resources/templates/bootstrap/datasim/alignment.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<input type="hidden" name="mode" th:value="${mode}">
<div class="form-control mt-3 mb-3">
<div class="row">
<h3 class="mb-3">Add new Component</h3>
<h3 class="mb-3">Add new component</h3>
<div class="col-10">
<div class="mb-3 mt-3 input-group" id="componentSelectBase">
<select class="form-select" onchange="triggerComponentSelect(this);" id="componentSelectType" required>
<option selected value="">Select Alignment Type</option>
<option selected value="">Select alignment type</option>
<option th:each="alignmentType: ${#lists.sort(#lists.toList(possibleAlignments.keySet()))}"
th:text="${alignmentType.getValue()}"
th:value="${alignmentType}"></option>
Expand All @@ -23,7 +23,7 @@ <h3 class="mb-3">Add new Component</h3>
name="component"
th:each="alignmentType: ${#lists.sort(#lists.toList(possibleAlignments.keySet()))}"
th:id="'componentSelect-' + ${alignmentType}">
<option selected value="">Select Component</option>
<option selected value="">Select component</option>
<option th:each="component: ${possibleAlignments.get(alignmentType)}" th:text="${component}"></option>
</select>
</div>
Expand All @@ -40,7 +40,7 @@ <h3 class="mb-3">Add new Component</h3>
<input type="hidden" name="mode" th:value="${mode}">
<!-- see https://getbootstrap.com/docs/5.0/forms/floating-labels/#example on why placeholder is needed -->
<div class="mb-3 form-control">
<h3 class="mb-3">Map Affinities</h3>
<h3 class="mb-3">Map affinities</h3>
<div class="accordion">
<div class="accordion-item" th:each="alignment, loop: ${alignments}">
<div class="accordion-header btn-group d-flex">
Expand All @@ -56,7 +56,7 @@ <h3 class="mb-3">Map Affinities</h3>
<div class="col-6 align-content-center d-flex">
<i class="bi-arrow-left"></i>&nbsp;
less&nbsp;
<span class="flex-fill text-center">Interaction Probability</span>&nbsp;
<span class="flex-fill text-center">Interaction probability</span>&nbsp;
more&nbsp;
<i class="bi-arrow-right"></i>
</div>
Expand Down
12 changes: 6 additions & 6 deletions src/main/resources/templates/bootstrap/datasim/detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<a class="flex-fill d-flex text-reset text-decoration-none" th:href="@{/ui/datasim/new}">
<div class="flex-fill text-center align-self-center">
<i class="bi-file-earmark-plus fs-1 text-success"></i>
<p class="fs-2">Create new Simulation</p>
<p class="fs-2">Create new simulation</p>
</div>
</a>
</div>
Expand All @@ -24,7 +24,7 @@
<a class="flex-fill d-flex text-reset text-decoration-none" th:href="@{/ui/datasim/show}">
<div class="flex-fill text-center align-self-center">
<i class="bi-arrow-left-square-fill fs-1 text-warning"></i>
<p class="fs-2">Back to all Simulations</p>
<p class="fs-2">Back to all simulations</p>
</div>
</a>
</div>
Expand All @@ -47,14 +47,14 @@ <h2>
<i class="bi-magic"></i>
&nbsp;&nbsp;&nbsp;
<span th:unless="${simulation.getProfiles().isEmpty()}" th:text="${simulation.getProfiles().get(0).getName()}"></span><span
th:if="${simulation.getProfiles().isEmpty()}">No</span>&nbsp;Profile
th:if="${simulation.getProfiles().isEmpty()}">No</span>&nbsp;profile
<a th:unless="${simulation.getFinalized().get()}" th:href="'/ui/datasim/edit/profile' + '?flow=' + ${simulation.getId().get()}"
class="float-end text-dark"><i class="bi-pencil"></i></a>
</li>
<li class="list-group-item">
<i class="bi-files"></i>
&nbsp;&nbsp;&nbsp;
<span th:text="${simulation.getParameters().getMax()}"></span>&nbsp;Entries
<span th:text="${simulation.getParameters().getMax()}"></span>&nbsp;entries
<a th:unless="${simulation.getFinalized().get()}" th:href="'/ui/datasim/edit/parameters' + '?flow=' + ${simulation.getId().get()}"
class="float-end text-dark"><i class="bi-pencil"></i></a>
</li>
Expand All @@ -68,14 +68,14 @@ <h2>
<li class="list-group-item">
<i class="bi-people-fill"></i>
&nbsp;&nbsp;&nbsp;
<span th:text="${numPersonae.get(simulation)}"></span>&nbsp;Personae
<span th:text="${numPersonae.get(simulation)}"></span>&nbsp;personae
<a th:unless="${simulation.getFinalized().get()}" th:href="'/ui/datasim/edit/persona' + '?flow=' + ${simulation.getId().get()}"
class="float-end text-dark"><i class="bi-pencil"></i></a>
</li>
<li class="list-group-item">
<i class="bi-align-center"></i>
&nbsp;&nbsp;&nbsp;
<span th:text="${numAligns.get(simulation)}"></span>&nbsp;Alignments
<span th:text="${numAligns.get(simulation)}"></span>&nbsp;alignments
<a th:unless="${simulation.getFinalized().get()}" th:href="'/ui/datasim/edit/alignment' + '?flow=' + ${simulation.getId().get()}"
class="float-end text-dark"><i class="bi-pencil"></i></a>
<a th:if="${simulation.getFinalized().get()}" th:href="'/ui/datasim/show/alignment' + '?flow=' + ${simulation.getId().get()}"
Expand Down
10 changes: 5 additions & 5 deletions src/main/resources/templates/bootstrap/datasim/parameters.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@
<input type="hidden" name="mode" th:value="${mode}">
<input type="hidden" name="id" th:value="${parameters.getId().get()}">
<div class="mt-3 mb-3 form-control">
<h3 class="mb-3">Simulation Parameters</h3>
<h3 class="mb-3">Simulation parameters</h3>
<div class="row mb-3 me-2">
<label for="num" class="col-3">Number of Statements</label>
<label for="num" class="col-3">Number of statements</label>
<input type="number" class="form-control col" id="num" name="max" th:value="${parameters.getMax()}" min="1" required>
</div>
<div class="row mb-3 me-2">
<label for="seed" class="col-3">Simulation Seed</label>
<label for="seed" class="col-3">Simulation seed</label>
<input type="number" class="form-control col" id="seed" name="seed" th:value="${parameters.getSeed()}" min="1" required>
</div>
<div class="row mb-3 me-2">
<label for="start" class="col-3">Simulation Start</label>
<label for="start" class="col-3">Simulation start</label>
<input type="datetime-local" class="form-control col" id="start" name="start" th:value="${parameters.getStart()}" step="1" th:max="${parameters.getEnd().withSecond((parameters.getEnd().getSecond() - 1) % 60)}" required>
</div>
<div class="row mb-3 me-2">
<label for="end" class="col-3">Simulation End</label>
<label for="end" class="col-3">Simulation end</label>
<input type="datetime-local" class="form-control col" id="end" name="end" th:value="${parameters.getEnd()}" step="1" th:min="${parameters.getStart().withSecond((parameters.getStart().getSecond() + 1) % 60)}" required>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/templates/bootstrap/datasim/persona.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
<input type="hidden" name="mode" th:value="${mode}">
<div class="form-control mt-3 mb-3">
<div class="row">
<h3 class="mb-3">Add new Persona</h3>
<h3 class="mb-3">Add new persona</h3>
<div class="col-5">
<div class="mb-3 mt-3 form-floating">
<input type="text" class="form-control" minlength="3" maxlength="255" name="name" id="newPersonaName" placeholder="pseudo" required>
<label for="newPersonaName">Persona Name</label>
<label for="newPersonaName">Persona name</label>
</div>
</div>
<div class="col-5">
<div class="mb-3 mt-3 input-group">
<div class="form-floating form-floating-group flex-grow-1">
<input type="email" class="form-control" minlength="3" maxlength="255" name="mbox" id="newPersonaMbox" placeholder="pseudo" required>
<label for="newPersonaMbox">Persona Mail (without prefixes)</label>
<label for="newPersonaMbox">Persona mail (without prefixes)</label>
</div>
<button class="btn btn-outline-secondary" type="button" onclick="generateEmailAddress(this);"><i class="bi-arrow-repeat"></i></button>
</div>
Expand All @@ -37,7 +37,7 @@ <h3 class="mb-3">Add new Persona</h3>
<input type="hidden" name="mode" th:value="${mode}">
<!-- see https://getbootstrap.com/docs/5.0/forms/floating-labels/#example on why placeholder is needed -->
<div class="mb-3 form-control">
<h3 class="mb-3">Select Personae for Simulation</h3>
<h3 class="mb-3">Select personae for simulation</h3>
<select class="form-select mt-3 mb-3" multiple id="personaInput" name="persona_id" required>
<option th:each="persona: ${personas}" th:value="${persona.getKey().getId()}"
th:text="${persona.getKey().getName()} + ' <' + ${persona.getKey().getMbox()} + '>'"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<select class="form-select" id="profileInput" name="profile_id" required>
<option th:each="profile: ${profiles}" th:value="${profile.getId().get()}" th:text="${profile.getName()}"></option>
</select>
<label for="profileInput">xAPI Profile</label>
<label for="profileInput">xAPI profile</label>
</div>
<div class="row">
<div class="col">
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/bootstrap/datasim/remark.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<!-- see https://getbootstrap.com/docs/5.0/forms/floating-labels/#example on why placeholder is needed -->
<div class="mb-3 mt-3 form-floating">
<input class="form-control" id="remarkInput" name="remark" th:value="${simulationRemark}" minlength="3" maxlength="255" placeholder="pseudo" required/>
<label for="remarkInput">Simulation Title</label>
<label for="remarkInput">Simulation title</label>
</div>
<div class="row">
<div class="col">
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/bootstrap/lrs/detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="container">
<form method="POST" th:action="@{/ui/manage/lrs/{method}(method=${method})}">
<div class="mt-3 mb-3 form-control">
<h3 class="mb-3">Connection Parameters</h3>
<h3 class="mb-3">Connection parameters</h3>
<div class="row mb-3 me-2">
<label for="nameInput" class="col-3">Name</label>
<input th:if="${connection}" class="form-control col" id="nameInput" type="text" minlength="3" maxlength="255" name="name" th:value="${connection.getName()}" required>
Expand All @@ -17,12 +17,12 @@ <h3 class="mb-3">Connection Parameters</h3>
<input th:unless="${connection}" class="form-control col" id="endpointInput" type="url" maxlength="255" name="endpoint" required>
</div>
<div class="row mb-3 me-2">
<label for="keyInput" class="col-3">Client Key</label>
<label for="keyInput" class="col-3">Client key</label>
<input th:if="${connection}" class="form-control col" id="keyInput" type="text" maxlength="255" name="clientKey" th:value="${connection.getClientKey()}" required>
<input th:unless="${connection}" class="form-control col" id="keyInput" type="text" maxlength="255" name="clientKey" required>
</div>
<div class="row mb-3 me-2">
<label for="secretInput" class="col-3">Client Secret</label>
<label for="secretInput" class="col-3">Client secret</label>
<input th:if="${connection}" class="form-control col" id="secretInput" type="text" maxlength="255" name="clientSecret" th:value="${connection.getClientSecret()}" required>
<input th:unless="${connection}" class="form-control col" id="secretInput" type="text" maxlength="255" name="clientSecret" required>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/bootstrap/lrs/show.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<a class="flex-fill d-flex text-reset text-decoration-none" th:href="@{/ui/manage/lrs/add}">
<div class="flex-fill text-center align-self-center">
<i class="bi-file-earmark-plus fs-3 text-success me-2"></i>
<span class="fs-3">Create new Connection</span>
<span class="fs-3">Create new connection</span>
</div>
</a>
</div>
Expand All @@ -21,7 +21,7 @@
<button type="submit" class="btn btn-primary flex-fill">
<span th:unless="${#strings.equals(param.get('active_only'), 'false')}">Also</span>
<span th:if="${#strings.equals(param.get('active_only'), 'false')}">Don't</span>
show inactive Connections
show inactive connections
</button>
</form>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/bootstrap/lrs/statements.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h2 class="card-header">
Import from JSON
</h2>
<div class="card-body">
<h5 class="card-title mb-3">Select File and Destination</h5>
<h5 class="card-title mb-3">Select file and destination</h5>
<div class="mb-2">
<select class="form-select" name="targetLrs" required>
<option value="">Select LRS</option>
Expand All @@ -34,7 +34,7 @@ <h2 class="card-header">
Export to JSON
</h2>
<div class="card-body">
<h5 class="card-title mb-3">Select Source</h5>
<h5 class="card-title mb-3">Select source</h5>
<div class="flex-fill">
<div class="mb-2">
<select class="form-select" name="targetLrs" required>
Expand Down

0 comments on commit d678b08

Please sign in to comment.