From cec13bb677393979867fba875829a35bf0046dc4 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Sun, 30 Dec 2018 19:23:11 +0400
Subject: [PATCH] some layout fix

---
 .../resources/templates/papers/paper.html     | 76 ++++++++++++-------
 1 file changed, 49 insertions(+), 27 deletions(-)

diff --git a/src/main/resources/templates/papers/paper.html b/src/main/resources/templates/papers/paper.html
index 811e522..a5ff6b5 100644
--- a/src/main/resources/templates/papers/paper.html
+++ b/src/main/resources/templates/papers/paper.html
@@ -17,12 +17,13 @@
                     <div th:replace="papers/fragments/paperNavigationFragment"/>
                 </div>
             </div>
+            <hr/>
             <div class="row">
                 <div class="col-lg-12">
                     <form id="paper-form" method="post" th:action="@{'/papers/paper?id='+ *{id == null ? '' : id} + ''}"
                           th:object="${paperDto}">
                         <div class="row">
-                            <div class="col-md-6 col-sm-12">
+                            <div class="col-md-7 col-sm-12">
                                 <input type="hidden" name="id" th:field="*{id}"/>
                                 <div class="form-group">
                                     <label for="title">Название:</label>
@@ -74,10 +75,22 @@
                                        class="alert alert-danger">Incorrect title</p>
                                 </div>
                                 <div class="form-group">
-                                    <input type="submit" id="addDeadline" name="addDeadline" class="btn btn-primary" value="Добавить
+                                    <input type="submit" id="addDeadline" name="addDeadline" class="btn btn-primary"
+                                           value="Добавить
                                     дедлайн"/>
                                 </div>
-
+                                <div class="form-group">
+                                    <label>Авторы:</label>
+                                    <select class="selectpicker form-control" multiple="true" data-live-search="true"
+                                            title="-- Выберите авторов --"
+                                            th:field="*{authorIds}">
+                                        <option th:each="author: ${allAuthors}" th:value="${author.id}"
+                                                th:text="${author.lastName}">Status
+                                        </option>
+                                    </select>
+                                    <p th:if="${#fields.hasErrors('authorIds')}" th:errors="*{authorIds}"
+                                       class="alert alert-danger">Incorrect title</p>
+                                </div>
                                 <div class="form-check">
                                     <input type="checkbox" class="form-check-input" id="locked"
                                            th:field="*{locked}"/>
@@ -89,30 +102,37 @@
 
                                     </div>
                                 </div>
-                                <div class="form-group">
-                                    <label>Дата создания:</label>
-                                    <span th:text="${paperDto.createDate == null ? '' : #dates.format(paperDto.createDate, 'dd.MM.yyyy HH:mm')}">text</span>
-                                </div>
-                                <div class="form-group">
-                                    <label>Последнее изменение:</label>
-                                    <span th:text="${paperDto.updateDate == null ? '' : #dates.format(paperDto.updateDate, 'dd.MM.yyyy HH:mm')}">text</span>
-                                </div>
-                                <div class="form-group">
-                                    <label>Редактировать авторов статьи:</label>
-                                    <select class="selectpicker form-control" multiple="true" data-live-search="true"
-                                            title="-- Выберите авторов --"
-                                            th:field="*{authorIds}">
-                                        <option th:each="author: ${allAuthors}" th:value="${author.id}"
-                                                th:text="${author.lastName}">Status
-                                        </option>
-                                    </select>
-                                    <p th:if="${#fields.hasErrors('authorIds')}" th:errors="*{authorIds}"
-                                       class="alert alert-danger">Incorrect title</p>
-                                </div>
                             </div>
-                            <div class="col-md-3 offset-md-3 col-sm-12 offset-sm-0">
+                            <div class="col-md-4 offset-md-1 col-sm-12 offset-sm-0">
                                 <div class="form-group">
-                                    <button id="pingButton" class="btn btn-primary text-uppercase" type="button">
+                                    <div class="row">
+                                        <div class="col">
+                                            <h6 class="my-0">Дата создания:</h6>
+                                        </div>
+                                        <div class="col">
+                                            <small class="text-muted"
+                                                   th:text="${paperDto.createDate == null ? '' : #dates.format(paperDto.createDate, 'dd.MM.yyyy HH:mm')}">
+                                                text
+                                            </small>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <div class="row">
+                                        <div class="col">
+                                            <h6 class="my-0">Дата изменения:</h6>
+                                        </div>
+                                        <div class="col">
+                                            <small class="text-muted"
+                                                   th:text="${paperDto.updateDate == null ? '' : #dates.format(paperDto.updateDate, 'dd.MM.yyyy HH:mm')}">
+                                                text
+                                            </small>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <button id="pingButton" class="btn btn-primary text-uppercase"
+                                            type="button">
                                         Ping авторам
                                     </button>
                                 </div>
@@ -121,11 +141,13 @@
                             <div class="clearfix"></div>
                             <div class="col-lg-12">
                                 <div class="form-group">
-                                    <button id="sendMessageButton" name="save" class="btn btn-success text-uppercase"
+                                    <button id="sendMessageButton" name="save"
+                                            class="btn btn-success text-uppercase"
                                             type="submit">
                                         Сохранить
                                     </button>
-                                    <a id="cancelButton" class="btn btn-default text-uppercase" href="/papers/papers">
+                                    <a id="cancelButton" class="btn btn-default text-uppercase"
+                                       href="/papers/papers">
                                         Отмена
                                     </a>
                                 </div>