From c5287114311f4f2e8e7891e52ea8db5249b473ea Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Mon, 17 Feb 2020 15:15:31 +0400
Subject: [PATCH] fix logo

---
 .../META-INF/resources/basicTemplate.xhtml     |  7 ++-----
 .../resources/META-INF/resources/css/style.css |  5 +++++
 .../META-INF/resources/paper/papers.xhtml      | 18 +++++++++---------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/META-INF/resources/basicTemplate.xhtml b/src/main/resources/META-INF/resources/basicTemplate.xhtml
index 7bcfa8b..cca4fd7 100644
--- a/src/main/resources/META-INF/resources/basicTemplate.xhtml
+++ b/src/main/resources/META-INF/resources/basicTemplate.xhtml
@@ -9,6 +9,7 @@
 <h:head>
     <title><ui:insert name="header">NG-Tracker</ui:insert></title>
     <h:outputStylesheet name="css/style.css"/>
+    <h:outputStylesheet name="css/google/kaushan.css"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
 </h:head>
 
@@ -23,11 +24,7 @@
             <div class="ui-g-12 ui-md-2"></div>
             <div class="ui-g-12 ui-md-8">
                 <p:menubar>
-                    <p:menuitem>
-                        <h:link outcome="#{page.INDEX}">
-                            <h:graphicImage name="img/logo.png" height="30"/>
-                        </h:link>
-                    </p:menuitem>
+                    <p:menuitem class="navbar-brand" value="NG-Tracker" url="#{page.INDEX}"/>
                     <p:submenu label="Статьи" icon="fa fa-file-text-o">
                         <p:menuitem value="Мои статьи" icon="fa fa-calendar" url="#{page.DASHBOARD}"/>
                         <p:menuitem value="Все статьи" icon="fa fa-file-o" url="#{page.PAPER_LIST}"/>
diff --git a/src/main/resources/META-INF/resources/css/style.css b/src/main/resources/META-INF/resources/css/style.css
index 8c36076..d5e56f5 100644
--- a/src/main/resources/META-INF/resources/css/style.css
+++ b/src/main/resources/META-INF/resources/css/style.css
@@ -42,3 +42,8 @@
 .text-failed {
     color: #A38831 !important;
 }
+
+.navbar-brand {
+    color: #fed136 !important;
+    font-family: 'Kaushan Script', 'Helvetica Neue', Helvetica, Arial, cursive;
+}
diff --git a/src/main/resources/META-INF/resources/paper/papers.xhtml b/src/main/resources/META-INF/resources/paper/papers.xhtml
index f0225fc..4f4f8e5 100644
--- a/src/main/resources/META-INF/resources/paper/papers.xhtml
+++ b/src/main/resources/META-INF/resources/paper/papers.xhtml
@@ -12,13 +12,19 @@
         </style>
         <div class="ui-fluid">
             <div class="ui-g">
-                <div class="ui-md-3 ui-g-12">
+                <div class="ui-md-5 ui-g-12">
+                    <p:inputText placeholder="Создать новую статью" value="#{papersView.newPaperTitle}"/>
+                </div>
+                <div class="ui-md-2 ui-g-12">
                     <p:commandButton action="#{papersView.create}" value="Создать" ajax="true" process="@form"
-                                     update="messages @form mainForm:papersTable" style="display: none"/>
+                                     update="messages @form mainForm:papersTable"/>
+
+                </div>
+                <div class="ui-md-3 ui-g-12">
                     <p:commandButton value="Удалить выделенные" id="papersRemoveButton"
                                      disabled="#{papersView.selectedPapers.isEmpty()}"
                                      action="#{papersView.deleteSelected}" ajax="true" process="@form"
-                                     update="messages @form" >
+                                     update="messages @form">
                         <p:confirm header="Подтверждение" message="Удалить выделенные статьи?"
                                    icon="pi pi-exclamation-triangle"/>
                     </p:commandButton>
@@ -27,12 +33,6 @@
                     <p:commandButton value="Да" type="button" styleClass="ui-confirmdialog-yes" icon="pi pi-check"/>
                     <p:commandButton value="Нет" type="button" styleClass="ui-confirmdialog-no" icon="pi pi-times"/>
                 </p:confirmDialog>
-
-                <div class="ui-md-5 ui-g-12">
-                    <p:inputText placeholder="Создать новую статью" value="#{papersView.newPaperTitle}"/>
-                </div>
-                <div class="ui-md-2 ui-g-12">
-                </div>
             </div>
 
             <p:dataTable value="#{papersView.papers}" var="paper" paginator="true" paginatorPosition="bottom"