romanov73/git-extractor
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

#15 -- Fix collapsible

Browse Source
This commit is contained in:
Anton Romanov 2021-03-27 11:13:42 +04:00
parent 5bc65ea8d9
commit 11f3b93b9d
2 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/ru/ulstu/extractor/mvc/model/RepoForm.java
View File

@ -2,7 +2,6 @@ package ru.ulstu.extractor.mvc.model;
public class RepoForm { public class RepoForm {
private String repo; private String repo;
private String branch; private String branch;
public String getRepo() { public String getRepo() {
@ -24,7 +23,8 @@ public class RepoForm {
@Override @Override
public String toString() { public String toString() {
return "RepoForm{" + return "RepoForm{" +
"subject='" + repo + "repo='" + repo + '\'' +
", branch='" + branch + '\'' +
'}'; '}';
} }
} }

65
src/main/resources/templates/newRepo.html
View File

@ -9,32 +9,49 @@
<div class="container" layout:fragment="content"> <div class="container" layout:fragment="content">
<form action="#" th:action="@{/newRepo}" th:object="${repoForm}" method="post"> <form action="#" th:action="@{/newRepo}" th:object="${repoForm}" method="post">
<p style="color:red" th:text="${error}"></p> <p style="color:red" th:text="${error}"></p>
<div class="form-group"> <button class="btn btn-outline-dark dropdown-toggle" type="button" data-toggle="collapse"
<label for="repoUrl">Ваш git репозиторий (https url):</label> data-target="#collapseOne" aria-expanded="false" aria-controls="collapseExample"
<div class="row"> th:if="${repoForm.repo != null}"
<div class="col-md-8 col-sm-12"> th:text="${repoForm.repo == null ? 'Репозиторий' : repoForm.repo}">
<input id="repoUrl" type="text" class="form-control" aria-label="Ваш git репозиторий (https url)" Button with data-target
th:field="*{repo}"> </button>
</div> <div id="collapseOne" th:class="${repoForm.repo == null ? 'collapse show' : 'collapse'}"
<div class="col-md-4 col-sm-12"> aria-labelledby="headingOne">
<input type="submit" class="btn btn-outline-primary w-100" name="send" value="Индексировать"/> <div class="card-body">
<div class="form-group">
<label for="repoUrl">Ваш git репозиторий (https url):</label>
<div class="row">
<div class="col-md-8 col-sm-12">
<input id="repoUrl" type="text" class="form-control"
aria-label="Ваш git репозиторий (https url)"
th:field="*{repo}">
</div>
<div class="col-md-4 col-sm-12">
<input type="submit" class="btn btn-outline-primary w-100" name="send"
value="Индексировать"/>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group" th:if="${repoForm.repo != null}"> <div id="collapseTwo" class="collapse show" aria-labelledby="headingOne" th:if="${repoForm.repo != null}">
<label for="select-branch">Ветки:</label> <div class="card-body">
<div class="row"> <div class="form-group">
<div class="col-md-8 col-sm-12"> <label for="select-branch">Ветки:</label>
<select id="select-branch" class="selectpicker" data-live-search="true" th:field="*{branch}" <div class="row">
data-width="90%"> <div class="col-md-8 col-sm-12">
<option th:each="branch : ${branches}" <select id="select-branch" class="selectpicker" data-live-search="true" th:field="*{branch}"
th:value="${branch.name}" data-width="90%">
th:utext="${branch.name}"/> <option th:each="branch : ${branches}"
</option> th:value="${branch.name}"
</select> th:utext="${branch.name}"/>
</div> </option>
<div class="col-md-4 col-sm-12"> </select>
<input type="submit" class="btn btn-outline-success w-100" name="next" value="Продолжить"/> </div>
<div class="col-md-4 col-sm-12">
<input type="submit" class="btn btn-outline-success w-100" name="next" value="Продолжить"/>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -49,5 +66,7 @@
</script> </script>
</html> </html>