From 9d1ae10c1260bc58ee5f198cafdb7cc16f76322c Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Mon, 6 Nov 2017 16:30:39 +0100
Subject: [PATCH] inline title processing
---
templates/Makefile.am | 1 -
templates/web/index.tt2.html | 4 ++--
templates/web/title.tt2.html | 6 ------
3 files changed, 2 insertions(+), 9 deletions(-)
delete mode 100644 templates/web/title.tt2.html
diff --git a/templates/Makefile.am b/templates/Makefile.am
index a4d0c84..b157184 100644
--- a/templates/Makefile.am
+++ b/templates/Makefile.am
@@ -22,7 +22,6 @@ nobase_templates_DATA = \
web/index-nobanner.tt2.html \
web/notices.tt2.html \
web/select_sp.tt2.html \
- web/title.tt2.html \
web/validate_token.tt2.html
EXTRA_DIST = $(nobase_templates_DATA)
diff --git a/templates/web/index.tt2.html b/templates/web/index.tt2.html
index 1f52ff3..4726654 100644
--- a/templates/web/index.tt2.html
+++ b/templates/web/index.tt2.html
@@ -185,7 +185,7 @@ jQuery(function($){
</SCRIPT>
-<title> [% PROCESS 'web/title.tt2.html' %] </title>
+<title>[% IF subtitle %][% title %] - [% subtitle %][% ELSE %][% title %][% END %]</title>
</head>
@@ -197,7 +197,7 @@ jQuery(function($){
<li class="logo align-right"><a href="http://www.geant.net" title="Geant home page" target="_blank"><img alt="GEANT logo" width="100" src="images/geant_logo_rgb_300dpi.jpg"/></a></li>
</ul>
<div class="title">
- <span class=""><h1>[% PROCESS 'web/title.tt2.html' %]</h1></span>
+ <span class=""><h1>[% IF subtitle %][% title %] - [% subtitle %][% ELSE %][% title %][% END %]</h1></span>
</div>
</header>
diff --git a/templates/web/title.tt2.html b/templates/web/title.tt2.html
deleted file mode 100644
index 1a5f00f..0000000
--- a/templates/web/title.tt2.html
+++ /dev/null
@@ -1,6 +0,0 @@
-[% conf.app_name %]
- [% IF actions.$action && actions.$action.title %]
- -
-[% FILTER encode_utf8 %][% actions.$action.title %][% END %]
- [% ELSE %]
- [% END %]
--
GitLab