From 11f3b93b9d12086f628a42dceaf528d3439b5a4e Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Sat, 27 Mar 2021 11:13:42 +0400
Subject: [PATCH] #15 -- Fix collapsible

---
 .../ulstu/extractor/mvc/model/RepoForm.java   |  4 +-
 src/main/resources/templates/newRepo.html     | 65 ++++++++++++-------
 2 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/src/main/java/ru/ulstu/extractor/mvc/model/RepoForm.java b/src/main/java/ru/ulstu/extractor/mvc/model/RepoForm.java
index 72b2b11..73a6b8a 100644
--- a/src/main/java/ru/ulstu/extractor/mvc/model/RepoForm.java
+++ b/src/main/java/ru/ulstu/extractor/mvc/model/RepoForm.java
@@ -2,7 +2,6 @@ package ru.ulstu.extractor.mvc.model;
 
 public class RepoForm {
     private String repo;
-
     private String branch;
 
     public String getRepo() {
@@ -24,7 +23,8 @@ public class RepoForm {
     @Override
     public String toString() {
         return "RepoForm{" +
-                "subject='" + repo +
+                "repo='" + repo + '\'' +
+                ", branch='" + branch + '\'' +
                 '}';
     }
 }
diff --git a/src/main/resources/templates/newRepo.html b/src/main/resources/templates/newRepo.html
index 8d0e811..b2a2062 100644
--- a/src/main/resources/templates/newRepo.html
+++ b/src/main/resources/templates/newRepo.html
@@ -9,32 +9,49 @@
 <div class="container" layout:fragment="content">
     <form action="#" th:action="@{/newRepo}" th:object="${repoForm}" method="post">
         <p style="color:red" th:text="${error}"></p>
-        <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="Индексировать"/>
+        <button class="btn btn-outline-dark dropdown-toggle" type="button" data-toggle="collapse"
+                data-target="#collapseOne" aria-expanded="false" aria-controls="collapseExample"
+                th:if="${repoForm.repo != null}"
+                th:text="${repoForm.repo == null ? 'Репозиторий' : repoForm.repo}">
+            Button with data-target
+        </button>
+        <div id="collapseOne" th:class="${repoForm.repo == null ? 'collapse show' : 'collapse'}"
+             aria-labelledby="headingOne">
+            <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 class="form-group" th:if="${repoForm.repo != null}">
-            <label for="select-branch">Ветки:</label>
-            <div class="row">
-                <div class="col-md-8 col-sm-12">
-                    <select id="select-branch" class="selectpicker" data-live-search="true" th:field="*{branch}"
-                            data-width="90%">
-                        <option th:each="branch : ${branches}"
-                                th:value="${branch.name}"
-                                th:utext="${branch.name}"/>
-                        </option>
-                    </select>
-                </div>
-                <div class="col-md-4 col-sm-12">
-                    <input type="submit" class="btn btn-outline-success w-100" name="next" value="Продолжить"/>
+        <div id="collapseTwo" class="collapse show" aria-labelledby="headingOne" th:if="${repoForm.repo != null}">
+            <div class="card-body">
+                <div class="form-group">
+                    <label for="select-branch">Ветки:</label>
+                    <div class="row">
+                        <div class="col-md-8 col-sm-12">
+                            <select id="select-branch" class="selectpicker" data-live-search="true" th:field="*{branch}"
+                                    data-width="90%">
+                                <option th:each="branch : ${branches}"
+                                        th:value="${branch.name}"
+                                        th:utext="${branch.name}"/>
+                                </option>
+                            </select>
+                        </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>
@@ -49,5 +66,7 @@
 
 
 
+
+
 </script>
 </html>