diff --git a/pom.xml b/pom.xml index 08b1e839..a4f2ecb7 100644 --- a/pom.xml +++ b/pom.xml @@ -55,6 +55,11 @@ org.springframework.boot spring-boot-starter-web + + nz.net.ultraq.thymeleaf + thymeleaf-layout-dialect + 3.2.0 + org.springframework.boot diff --git a/src/main/java/io/hexlet/typoreporter/config/thymeleaf/ThymeleafAutoConfiguration.java b/src/main/java/io/hexlet/typoreporter/config/thymeleaf/ThymeleafAutoConfiguration.java index e548214a..d64bfe92 100644 --- a/src/main/java/io/hexlet/typoreporter/config/thymeleaf/ThymeleafAutoConfiguration.java +++ b/src/main/java/io/hexlet/typoreporter/config/thymeleaf/ThymeleafAutoConfiguration.java @@ -4,6 +4,7 @@ import org.springframework.context.annotation.Configuration; import org.thymeleaf.dialect.springdata.SpringDataDialect; import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect; +// import nz.net.ultraq.thymeleaf.LayoutDialect; @Configuration public class ThymeleafAutoConfiguration { @@ -12,6 +13,10 @@ public class ThymeleafAutoConfiguration { public SpringDataDialect springDataDialect() { return new SpringDataDialect(); } + // @Bean + // public LayoutDialect layoutDialect() { + // return new LayoutDialect(); + // } // Make available Thymeleaf Spring Security Dialect on the templates @Bean diff --git a/src/main/resources/templates/account/acc-info.html b/src/main/resources/templates/account/acc-info.html index 1e3d3839..38743cc4 100644 --- a/src/main/resources/templates/account/acc-info.html +++ b/src/main/resources/templates/account/acc-info.html @@ -1,6 +1,7 @@ - - +
diff --git a/src/main/resources/templates/account/pass-update.html b/src/main/resources/templates/account/pass-update.html index fc25b57b..5c67eb05 100644 --- a/src/main/resources/templates/account/pass-update.html +++ b/src/main/resources/templates/account/pass-update.html @@ -1,6 +1,7 @@ - - +
diff --git a/src/main/resources/templates/account/prof-update.html b/src/main/resources/templates/account/prof-update.html index e323b5d6..f3f298d4 100644 --- a/src/main/resources/templates/account/prof-update.html +++ b/src/main/resources/templates/account/prof-update.html @@ -1,6 +1,7 @@ - - +
diff --git a/src/main/resources/templates/account/signup.html b/src/main/resources/templates/account/signup.html index 602176e1..6794df58 100644 --- a/src/main/resources/templates/account/signup.html +++ b/src/main/resources/templates/account/signup.html @@ -1,6 +1,7 @@ - - +
diff --git a/src/main/resources/templates/create-workspace.html b/src/main/resources/templates/create-workspace.html index 2a38070e..82a2650d 100644 --- a/src/main/resources/templates/create-workspace.html +++ b/src/main/resources/templates/create-workspace.html @@ -1,6 +1,7 @@ - - +
diff --git a/src/main/resources/templates/error-general.html b/src/main/resources/templates/error-general.html index bf6e7a0f..84b88465 100644 --- a/src/main/resources/templates/error-general.html +++ b/src/main/resources/templates/error-general.html @@ -1,6 +1,7 @@ - - +
Во время работы произошла ошибка. Попробуйте позже. diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html new file mode 100644 index 00000000..1c84c0cd --- /dev/null +++ b/src/main/resources/templates/fragments/footer.html @@ -0,0 +1,100 @@ + + +
+ + +
+ + \ No newline at end of file diff --git a/src/main/resources/templates/fragments/layout.html b/src/main/resources/templates/fragments/layout.html new file mode 100644 index 00000000..ab84572e --- /dev/null +++ b/src/main/resources/templates/fragments/layout.html @@ -0,0 +1,111 @@ + + +
+ + + + + + Hexlet Typo Reporter + + + + + + + + +
+ \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 9e4b8376..880dac4f 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -28,97 +28,97 @@

Hexlet Typo Reporter

- diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index e5e4627a..36f2e687 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -1,6 +1,8 @@ - - +
@@ -28,6 +30,5 @@
- diff --git a/src/main/resources/templates/widget/report-typo-error.html b/src/main/resources/templates/widget/report-typo-error.html index 16972b7e..900dee8d 100755 --- a/src/main/resources/templates/widget/report-typo-error.html +++ b/src/main/resources/templates/widget/report-typo-error.html @@ -1,9 +1,11 @@ - - +
Во время отправки произошла ошибка. Попробуйте позже.
+ diff --git a/src/main/resources/templates/workspace/wks-info.html b/src/main/resources/templates/workspace/wks-info.html index e87ea1de..23011c0c 100644 --- a/src/main/resources/templates/workspace/wks-info.html +++ b/src/main/resources/templates/workspace/wks-info.html @@ -1,6 +1,8 @@ - - + +
diff --git a/src/main/resources/templates/workspace/wks-settings.html b/src/main/resources/templates/workspace/wks-settings.html index 1ab3e9ff..47139b21 100644 --- a/src/main/resources/templates/workspace/wks-settings.html +++ b/src/main/resources/templates/workspace/wks-settings.html @@ -1,6 +1,7 @@ - - +
diff --git a/src/main/resources/templates/workspace/wks-typos.html b/src/main/resources/templates/workspace/wks-typos.html index 15af5e12..8b4c0194 100644 --- a/src/main/resources/templates/workspace/wks-typos.html +++ b/src/main/resources/templates/workspace/wks-typos.html @@ -1,6 +1,8 @@ - - + +
diff --git a/src/main/resources/templates/workspace/wks-update.html b/src/main/resources/templates/workspace/wks-update.html index 71166c4b..881c9853 100644 --- a/src/main/resources/templates/workspace/wks-update.html +++ b/src/main/resources/templates/workspace/wks-update.html @@ -1,6 +1,7 @@ - - +
diff --git a/src/main/resources/templates/workspace/wks-users.html b/src/main/resources/templates/workspace/wks-users.html index 69283171..f0bd275b 100644 --- a/src/main/resources/templates/workspace/wks-users.html +++ b/src/main/resources/templates/workspace/wks-users.html @@ -1,6 +1,8 @@ - - +
diff --git a/src/main/resources/templates/workspaces.html b/src/main/resources/templates/workspaces.html index d12835dd..c6b31351 100644 --- a/src/main/resources/templates/workspaces.html +++ b/src/main/resources/templates/workspaces.html @@ -1,6 +1,7 @@ - - +