inline title processing

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)

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>
 

templates/web/title.tt2.html

-[% conf.app_name %] 
-  [% IF actions.$action && actions.$action.title %]
-    - 
-[% FILTER encode_utf8 %][% actions.$action.title %][% END %]
-  [% ELSE %]
-  [% END %]