Merge branch 'master' into 23-dashboard

# Conflicts: # src/main/resources/templates/papers.html
6 years ago · 5b16ac785c
parent 48d3b57503
commit 5b16ac785c
1 changed files with 9 additions and 5 deletions
--- a/src/main/resources/templates/paper.html
+++ b/src/main/resources/templates/paper.html
@ -3,10 +3,10 @@

 <head>

-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
+    <meta charset="utf-8"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
+    <meta name="description" content=""/>
+    <meta name="author" content=""/>

    <title>NG-Tacker</title>

@ -56,6 +56,7 @@
    </div>
 </nav>

+
 <section id="paper">
    <div class="container">
        <div class="row">
@ -78,7 +79,7 @@
                    <div class="row">
                        <div class="col-md-6">
                            <div class="form-group">
-                                <input class="form-control" id="name" type="text" placeholder="Название статьи" required="" data-validation-required-message="Ввеите название статьи">
+                                <input class="form-control" id="name" type="text" placeholder="Название статьи" required="" data-validation-required-message="Ввеите название статьи"/>
                                <p class="help-block text-danger"></p>
                            </div>
                        </div>
@ -88,6 +89,9 @@
                            <button id="sendMessageButton" class="btn btn-primary btn-xl text-uppercase" type="submit">
                                Сохранить
                            </button>
+                            <button id="cancelButton" class="btn btn-primary btn-xl text-uppercase" type="submit">
+                                Отмена
+                            </button>

                        </div>
                    </div>