From 362a4212848b28c91258c2762076c4401c0a7dac Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 15 Jan 2017 11:57:58 +0300 Subject: [PATCH] Freemarker - alternative syntax --- src/main/webapp/WEB-INF/header.inc.html | 7 ++-- src/main/webapp/WEB-INF/index.html | 33 ++++++++++--------- src/main/webapp/WEB-INF/player.html | 5 +-- .../webapp/WEB-INF/simple_template/about.html | 5 +-- 4 files changed, 27 insertions(+), 23 deletions(-) diff --git a/src/main/webapp/WEB-INF/header.inc.html b/src/main/webapp/WEB-INF/header.inc.html index 52eeeb9..0f8d6ea 100644 --- a/src/main/webapp/WEB-INF/header.inc.html +++ b/src/main/webapp/WEB-INF/header.inc.html @@ -1,4 +1,5 @@ - +[#ftl] + @@ -19,13 +20,13 @@

${rutext}

- +
- checked> +
diff --git a/src/main/webapp/WEB-INF/index.html b/src/main/webapp/WEB-INF/index.html index f2de89e..800b48d 100644 --- a/src/main/webapp/WEB-INF/index.html +++ b/src/main/webapp/WEB-INF/index.html @@ -1,5 +1,6 @@ -<#include "/header.inc.html"> - <#if resultsearch??> +[#ftl] +[#include "/header.inc.html"] + [#if resultsearch??]
- <#if resultsearch?has_content> - <#list resultsearch as kino> - <#if kino.getClass().getSimpleName() == "KinoGroup"> + [#if resultsearch?has_content] + [#list resultsearch as kino] + [#if kino.getClass().getSimpleName() == "KinoGroup"]
 ${kino.name}
- <#list kino.kinolist as kino_groupped> + [#list kino.kinolist as kino_groupped]
${kino_groupped.name}
@@ -32,11 +33,11 @@
- + [/#list]
- <#else> + [#else]
${kino.name}
@@ -50,12 +51,12 @@
- - - <#else> + [/#if] + [/#list] + [#else]

Ничего не найдено =(

- - <#else> - <#include "/news.inc.html"> - -<#include "/fother.inc.html"> \ No newline at end of file + [/#if] + [#else] + [#include "/news.inc.html"] + [/#if] +[#include "/fother.inc.html"] \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/player.html b/src/main/webapp/WEB-INF/player.html index 25d3b20..b25d1b4 100644 --- a/src/main/webapp/WEB-INF/player.html +++ b/src/main/webapp/WEB-INF/player.html @@ -1,4 +1,5 @@ -<#include "/header.inc.html"> +[#ftl] +[#include "/header.inc.html"]