From c36876f7e753c945ed421f18e37ff3bb758a78c5 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Mon, 10 Feb 2020 10:45:43 +0400
Subject: [PATCH] style

---
 build.gradle                                              | 2 +-
 src/main/resources/META-INF/resources/basicTemplate.xhtml | 2 +-
 src/main/resources/META-INF/resources/css/style.css       | 4 ++++
 src/main/resources/META-INF/resources/error/404.xhtml     | 4 ++--
 src/main/resources/META-INF/resources/login.xhtml         | 3 ++-
 src/main/resources/application.properties                 | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 184a395..cc89c71 100644
--- a/build.gradle
+++ b/build.gradle
@@ -118,7 +118,7 @@ dependencies {
     //primefaces
     compile group: 'org.primefaces', name: 'primefaces', version: '7.0'
     compile group: 'net.bootsfaces', name: 'bootsfaces', version: '1.4.2'
-    compile group: 'org.joinfaces', name: 'jsf-spring-boot-starter', version: '4.0.8'
+    compile group: 'org.joinfaces', name: 'jsf-spring-boot-starter', version: '4.1.2'
     compile group: 'org.javassist', name: 'javassist', version: '3.25.0-GA'
     compile group: 'org.primefaces.themes', name: 'all-themes', version: '1.0.10'
 
diff --git a/src/main/resources/META-INF/resources/basicTemplate.xhtml b/src/main/resources/META-INF/resources/basicTemplate.xhtml
index 94df42c..7cab72a 100644
--- a/src/main/resources/META-INF/resources/basicTemplate.xhtml
+++ b/src/main/resources/META-INF/resources/basicTemplate.xhtml
@@ -12,7 +12,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
 </h:head>
 
-<h:body>
+<h:body class="black">
     <style type="text/css">
         body {
             font-size: 11px;
diff --git a/src/main/resources/META-INF/resources/css/style.css b/src/main/resources/META-INF/resources/css/style.css
index cb7b6b4..8c36076 100644
--- a/src/main/resources/META-INF/resources/css/style.css
+++ b/src/main/resources/META-INF/resources/css/style.css
@@ -1,3 +1,7 @@
+.black {
+    background-color: #383838 !important;
+}
+
 .ui-picklist-list-wrapper {
     width: 50% !important;
 }
diff --git a/src/main/resources/META-INF/resources/error/404.xhtml b/src/main/resources/META-INF/resources/error/404.xhtml
index cd6856d..c19d4f4 100644
--- a/src/main/resources/META-INF/resources/error/404.xhtml
+++ b/src/main/resources/META-INF/resources/error/404.xhtml
@@ -13,11 +13,11 @@
         <div class="ui-g-5"></div>
         <div class="ui-g-2">
             <p:panel header="Страница не найдена" style="margin-bottom:20px">
-                <h:link outcome="#{page.MAIN}" styleClass="btn btn-primary">
+                <h:link outcome="#{page.INDEX}" styleClass="btn btn-primary">
                     <i class="fa fa-home fa-4"></i> Вернуться на главную
                 </h:link>
             </p:panel>
         </div>
     </div>
 </h:body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/resources/META-INF/resources/login.xhtml b/src/main/resources/META-INF/resources/login.xhtml
index 2cc141b..d0f1026 100644
--- a/src/main/resources/META-INF/resources/login.xhtml
+++ b/src/main/resources/META-INF/resources/login.xhtml
@@ -6,9 +6,10 @@
 <h:head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
+    <h:outputStylesheet name="css/style.css"/>
     <title>Вход в систему</title>
 </h:head>
-<h:body>
+<h:body class="black">
     <div class="ui-g">
         <div class="ui-g-5"></div>
         <div class="ui-g-2">
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1e8d7a3..60afbc3 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -16,7 +16,8 @@ logging.level.ru.ulstu=DEBUG
 #HtmlUnit
 logging.level.com.gargoylesoftware.htmlunit=ERROR
 #jsf
-joinfaces.primefaces.theme=casablanca
+#joinfaces.primefaces.theme=casablanca
+joinfaces.primefaces.theme=afterdark
 joinfaces.primefaces.font-awesome=true
 joinfaces.mojarra.enable-restore-view11-compatibility=true
 # Mail Settings