#247 -- Fix html

src/main/resources/public/css/agency.css

@@ -677,7 +677,7 @@ section#contact .section-heading {
     color: #fff;
 }
 
-section#contact .form-group {
+.form-group {
     margin-bottom: 25px;
 }
 

src/main/resources/public/css/base.css

@@ -1,3 +0,0 @@
-.loader {
-    padding-left: 50%
-}

src/main/resources/public/css/odin.css

@@ -1,225 +0,0 @@
-.odin-unselectable {
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-}
-
-.odin-kill-padding {
-    padding: 0;
-}
-
-.odin-input-group {
-    padding-left: 15px !important;
-    padding-right: 15px !important;
-}
-
-.odin-closable .fa {
-    font-size: 1.5em;
-    margin-top: -1px;
-}
-
-.odin-closable .fa:hover:before {
-    content: "\f057";
-}
-
-/*
-    Odin Toolbar
-*/
-.odin-toolbar {
-    padding-left: 1px;
-    padding-bottom: 4px;
-}
-
-.odin-toolbar .odin-btn {
-    float: none !important;
-}
-
-.odin-btn {
-    min-width: 112px;
-    margin-right: 3px;
-}
-
-@media (min-width: 768px) {
-    .odin-btn {
-        min-width: 150px;
-    }
-}
-
-/*
-    Odin Paginator
-*/
-.odin-paginator {
-    margin: 5px 0 0;
-    text-align: center;
-}
-
-.odin-paginator-content {
-    display: inline-block;
-}
-
-.odin-paginator-content a {
-    cursor: pointer;
-    color: black;
-    float: left;
-    padding: 6px 16px;
-    text-decoration: none;
-    transition: background-color .3s;
-    border-radius: 4px;
-}
-
-.odin-paginator-content i {
-    color: black;
-    float: left;
-    padding: 6px 16px;
-}
-
-.odin-paginator-content a.active {
-    background-color: #4CAF50;
-    color: white;
-}
-
-.odin-paginator-content a:hover:not(.active) {
-    background-color: #ddd;
-}
-
-/*
-    Odin Formatters
-*/
-.odin-negative {
-    color: red;
-    font-weight: bold;
-}
-
-/*
-    Odin Table
-*/
-.odin-table {
-    min-height: 324px;
-    border: 1px solid #ddd;
-    padding: 0;
-    margin: 0 0 0 1px;
-    background-color: #f8f8f8;
-}
-
-.odin-table > table {
-    margin-bottom: 0;
-}
-
-.odin-table > table > tbody > tr {
-    background-color: #fff;
-}
-
-.odin-table-pointed-line {
-    cursor: pointer;
-}
-
-.odin-table-selected-line {
-    background-color: #5bc0de !important;
-}
-
-.odin-table-selected-line:hover {
-    background-color: #6bd0ee !important;
-}
-
-/*
-    Odin Form
- */
-.odin-form {
-    display: none;
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    z-index: 1500;
-    background: rgba(0, 0, 0, 0.5);
-}
-
-.odin-form .panel {
-    position: relative;
-    max-height: 95%;
-    max-width: 95%;
-    overflow: auto;
-}
-
-@media (min-width: 768px) {
-    .odin-form .panel {
-        max-width: 55%;
-    }
-}
-
-.odin-form .panel-footer {
-    padding: 5px 7px;
-}
-
-.odin-form .odin-btn {
-    float: right;
-}
-
-.odin-checkbox {
-    width: 20px;
-    height: 20px;
-}
-
-.odin-form .tab-pane {
-    padding-top: 5px;
-}
-
-/*
-    Odin Confirm Box
- */
-.odin-confirm-box {
-    display: none;
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    z-index: 2000;
-    background: rgba(0, 0, 0, 0.5);
-}
-
-.odin-confirm-box .panel {
-    position: relative;
-    max-width: 95%;
-}
-
-.odin-confirm-box .panel-footer {
-    text-align: center;
-}
-
-@media (min-width: 768px) {
-    .odin-confirm-box .panel {
-        max-width: 25%;
-    }
-}
-
-.odin-confirm-box .panel-body {
-    text-align: center;
-}
-
-/*
-    Odin Table Box
- */
-.odin-table-box {
-    z-index: 2500;
-}
-
-/*
-    Odin Simple Box
- */
-
-@media (min-width: 768px) {
-    .odin-simple-form .panel {
-        max-width: 35%;
-    }
-}

src/main/resources/templates/default.html

@@ -11,8 +11,8 @@
     <title>NG-Tracker</title>
 
     <!-- Bootstrap core CSS -->
-    <link rel="stylesheet" href="/webjars/bootstrap/4.1.0/css/bootstrap.min.css"/>
+    <link rel="stylesheet" href="/webjars/bootstrap/5.3.3/css/bootstrap.min.css"/>
-    <link rel="stylesheet" href="/webjars/bootstrap-select/1.13.3/css/bootstrap-select.min.css"/>
+    <!--    <link rel="stylesheet" href="/webjars/bootstrap-select/1.4.2/css/bootstrap-select.min.css"/>-->
     <link rel="stylesheet" href="/webjars/font-awesome/4.7.0/css/font-awesome.min.css"/>
 
     <!-- Custom fonts for this template -->
@@ -23,14 +23,13 @@
 
     <!-- Custom styles for this template -->
     <link rel="stylesheet" href="/css/agency.css"/>
-    <link rel="stylesheet" href="/css/odin.css"/>
     <!-- Bootstrap core JavaScript -->
-    <script src="/webjars/jquery/3.3.1-1/jquery.min.js"></script>
+    <script src="/webjars/jquery/3.7.1/jquery.min.js"></script>
-    <script src="/webjars/bootstrap/4.1.0/js/bootstrap.bundle.min.js"></script>
+    <script src="/webjars/bootstrap/5.3.3/js/bootstrap.bundle.min.js"></script>
-    <script src="/webjars/bootstrap-select/1.13.3/js/bootstrap-select.min.js"></script>
+    <!--    <script src="/webjars/bootstrap-select/1.4.2/js/bootstrap-select.min.js"></script>-->
 
     <!-- Plugin JavaScript -->
-    <script src="/webjars/jquery.easing/1.4.1/jquery.easing.js"></script>
+    <!--    <script src="/webjars/jquery.easing/1.4.1/jquery.easing.js"></script>-->
 
 </head>
 
@@ -109,7 +108,6 @@
 
 <script src="/js/core.js"></script>
 <script src="/js/config.js"></script>
-<script src="/js/odin.js"></script>
 <script src="/js/users.js"></script>
 <script th:inline="javascript">
 
@@ -126,37 +124,24 @@
 </th:block>
 <!-- Yandex.Metrika counter -->
 <script type="text/javascript">
-    (function (d, w, c) {
+    (function(m,e,t,r,i,k,a){m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)};
-        (w[c] = w[c] || []).push(function () {
+    m[i].l=1*new Date();
-            try {
+    for (var j = 0; j < document.scripts.length; j++) {if (document.scripts[j].src === r) { return; }}
-                w.yaCounter49387279 = new Ya.Metrika2({
+    k=e.createElement(t),a=e.getElementsByTagName(t)[0],k.async=1,k.src=r,a.parentNode.insertBefore(k,a)})
-                    id: 49387279,
+    (window, document, "script", "https://mc.yandex.ru/metrika/tag.js", "ym");
+
+    ym(97182066, "init", {
          clickmap:true,
          trackLinks:true,
          accurateTrackBounce:true,
          webvisor:true
     });
-            } catch (e) {
-            }
-        });
-
-        var n = d.getElementsByTagName("script")[0],
-            s = d.createElement("script"),
-            f = function () {
-                n.parentNode.insertBefore(s, n);
-            };
-        s.type = "text/javascript";
-        s.async = true;
-        s.src = "https://mc.yandex.ru/metrika/tag.js";
-
-        if (w.opera == "[object Opera]") {
-            d.addEventListener("DOMContentLoaded", f, false);
-        } else {
-            f();
-        }
-    })(document, window, "yandex_metrika_callbacks2");
-
 </script>
+<noscript>
+    <div><img src="https://mc.yandex.ru/watch/97182066" style="position:absolute; left:-9999px;" alt=""/></div>
+</noscript>
+<!-- /Yandex.Metrika counter -->
+
 <noscript>
     <div><img src="https://mc.yandex.ru/watch/49387279" style="position:absolute; left:-9999px;" alt=""/></div>
 </noscript>

src/main/resources/templates/papers/paper.html

@@ -1,7 +1,9 @@
 <!DOCTYPE html>
 <html lang="en"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorate="~{default}" xmlns:th="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/html">
+      xmlns:th="http://www.thymeleaf.org"
+      layout:decorate="~{default}"
+      xmlns="http://www.w3.org/1999/html">
 <head>
     <link rel="stylesheet" href="../css/paper.css"/>
 
@@ -65,7 +67,7 @@
                                 </div>
 
                                 <div class="form-group">
-                                    <label for="title">Ссылка на сайт конференции:</label>
+                                    <label for="url">Ссылка на сайт конференции:</label>
                                     <input class="form-control" id="url" type="text"
                                            placeholder="Url"
                                            th:field="*{url}"/>
@@ -89,8 +91,8 @@
                                             <a class="btn btn-danger float-right"
                                                th:onclick="|$('#deadlines${rowStat.index}\\.description').val('');
                                                 $('#deadlines${rowStat.index}\\.date').val('');
-                                                $('#addDeadline').click();|"><span
+                                                $('#addDeadline').click();|">
-                                                    aria-hidden="true"><i class="fa fa-times"/></span>
+                                                <i class="fa fa-times"></i>
                                             </a>
                                         </div>
                                     </div>
@@ -100,8 +102,7 @@
                                 <div class="form-group">
                                     <input type="submit" id="addDeadline" name="addDeadline"
                                            class="btn btn-primary"
-                                           value="Добавить
+                                           value="Добавить дедлайн"/>
-                                    дедлайн"/>
                                 </div>
                                 <div class="form-group">
                                     <label>Авторы:</label>
@@ -117,26 +118,15 @@
                                        class="alert alert-danger">Incorrect title</p>
                                 </div>
 
-                                <div class="form-group files-list" id="files-list">
-                                    <label>Файлы:</label>
-
-                                    <div th:replace="~{papers/fragments/paperFilesListFragment :: filesList(isLatexAttach = ${false})}"/>
-
-                                </div>
-
                                 <div class="form-check">
+                                    <div class="form-group">
                                         <input type="checkbox" class="form-check-input" id="locked"
                                                th:field="*{locked}"/>
                                         <label class="form-check-label" for="locked">Заблокирована</label>
                                     </div>
-                                <div class="form-group">
-                                    <label for="loader">Загрузить статью:</label>
-                                    <div id="loader">
-
-                                    </div>
-                                </div>
                                 </div>
 
+                            </div>
                             <div class="col-md-4 offset-md-1 col-sm-12 offset-sm-0">
                                 <div class="form-group">
                                     <div class="row">

src/test/java/ru/ulstu/test/StreamApiUtilsTest.java

@@ -16,12 +16,4 @@ public class StreamApiUtilsTest {
 
         assertEquals(integersInitial, integers);
     }
-
-    @Test
-    public void filedTestMappingByDay() {
-        List<Integer> integersInitial = List.of(1);
-        List<Integer> integers = StreamApiUtils.convert(List.of("1", "2"), Integer::valueOf);
-
-        assertEquals(integersInitial, integers);
-    }
 }