diff --git a/bin/account-manager-web.pl b/bin/account-manager-web.pl
index 546e99a349fd70c09ffdaf796d224ef73724e0cb..e5a20f9eb56357c8ccd63102f5013feaf7f1ed7c 100755
--- a/bin/account-manager-web.pl
+++ b/bin/account-manager-web.pl
@@ -1,7 +1,7 @@
#!/usr/bin/perl
## 15/09/2014, Olivier Salaün
-## Web interface for the eduGAIN Test IdP Account Manager
+## Web interface for the eduGAIN Access Check Account Manager
use strict vars;
use utf8;
@@ -37,7 +37,7 @@ my %actions = ('select_sp' => {'title_en' => 'Select your Service Provider' }
'account_wizard' => {'title_en' => 'Select your Service Provider' },
'generate_token' => {'title_en' => 'Generate an authentication token'},
'validate_token' => {'title_en' => 'Complete Email Challenge'},
- 'home' => {'title_en' => 'eduGAIN Test Identity Provider'},
+ 'home' => {'title_en' => $Conf::global{'app_name'}},
);
## Gives writes for the group
diff --git a/conf/default-Conf.pm b/conf/default-Conf.pm
index abdb936c2d326fc8992e012e18cec98a68abd68e..c246ee4d438384583a5e511e4b157c3787a5860f 100644
--- a/conf/default-Conf.pm
+++ b/conf/default-Conf.pm
@@ -9,7 +9,7 @@ our %global = (
'version' => 'closed Beta 1',
## Name of the application used in web pages, mail notices
- 'app_name' => 'eduGAIN Test Account Manager',
+ 'app_name' => 'eduGAIN Access Check',
## URL of the application
'app_url' => 'https://my.fqdn/accountmanager',
@@ -20,14 +20,14 @@ our %global = (
## Token validity period, in hours
'tokens_validity_period' => 2,
- ## Scope used by the Test IdP
+ ## Scope used by the associated IdP
'idp_scope' => 'my.fqdn',
## EntityID of the IdP
'idp_entityid' => 'https://my.fqdn/simplesaml/saml2/idp/metadata.php',
## Name of the IdP
- 'idp_displayname' => 'eduGAIN Test Identity Provider',
+ 'idp_displayname' => 'eduGAIN Access Check',
## Root simpleSamlPhp directory
'root_ssp_dir' => '/opt/testidp/simplesamlphp',
@@ -75,7 +75,7 @@ our %global = (
'dev_sp_contact' => 'john@my.fqdn,sarah@my.fqdn',
## From field use by the account manager
- 'notice_from' => 'testidpaccountmanager@my.fqdn',
+ 'notice_from' => 'edugain-access-check.fqdn',
## federation metadata local copy path
'federation_metadata_file_path' => '/opt/testidp/IdPAccountManager/conf/edugain-md.xml',
diff --git a/templates/web/home.tt2.html b/templates/web/home.tt2.html
index 258ed716c0d4f1ceb7495610495c607d95726c59..c1df6f97f73d71562235379cbac182a827b7cd89 100644
--- a/templates/web/home.tt2.html
+++ b/templates/web/home.tt2.html
@@ -11,8 +11,8 @@ $(function() {
<div class="row">
-<h2>eduGAIN Test Identity Provider?</h2>
-<p>The eduGAIN Test Identity Provider allows administrators of a Service
+<h2>[% conf.app_name %]?</h2>
+<p>[% conf.app_name %] allows administrators of a Service
Provider (SP) registered in <a href="http://www.geant.net/service/eduGAIN/Pages/home.aspx">eduGAIN</a> to create test
accounts with different profiles to validate the behaviour and test
federated login. The test accounts can only be used to access own services.
@@ -24,12 +24,12 @@ Service Provider you are administrator for.
</p>
<p class="align-center"><button id="start_testing">Go on testing the service</button></p>
-<h3>The eduGAIN Test IdP Basics</h3>
+<h3>[% conf.app_name %] Basics</h3>
<p>
-<br/><img alt="The eduGAIN Test IdP Basics" src="/resources/images/edugain_test_idp_basics.png"/>
+<br/><img alt="[% conf.app_name %] Basics" src="/resources/images/edugain_test_idp_basics.png"/>
</p>
<h3>How is it ensured that users can only test their own service?</h3>
-<p>The eduGAIN Test Identity Provider exclusively allows creating test
+<p>[% conf.app_name %] exclusively allows creating test
accounts only to users who can receive challenge emails for email
addresses listed in the eduGAIN metadata for a particular Service Provider.
The test accounts can only be used to access one single service for
diff --git a/templates/web/index.tt2.html b/templates/web/index.tt2.html
index cd8fcf59608c9ba719f1f223eefb114e8431509f..6c931539ba8f6de6b1463847449718f93e2494b7 100644
--- a/templates/web/index.tt2.html
+++ b/templates/web/index.tt2.html
@@ -192,7 +192,7 @@ jQuery(function($){
<body>
<div id="header">
<ul>
- <li class="logo align-left"><a href="/accountmanager" title="eduGAIN Test Identity Provider home page"><img alt="eduGAIN logo" width="200" src="/resources/images/edugain_logo.png "/></a></li>
+ <li class="logo align-left"><a href="/accountmanager" title="[% conf.app_name %] home page"><img alt="eduGAIN logo" width="200" src="/resources/images/edugain_logo.png "/></a></li>
<li> </li>
<li class="logo align-right"><a href="http://www.geant.net" title="Géant home page" target="_blank"><img alt="GEANT logo" width="100" src="/resources/images/geant_logo_rgb_300dpi.jpg"/></a></li>
</ul>
@@ -243,7 +243,7 @@ DUMP :<br>
<div id="footer">
<div class="row align-center">
- <span>Test Account Manager [% conf.version %]</span>
+ <span>[% conf.app_name %] [% conf.version %]</span>
</div>
</div>
</div>
diff --git a/templates/web/title.tt2.html b/templates/web/title.tt2.html
index 80302a00d4cc7db07e8d7d40797d65b384318920..1a5f00f0a642323bfaa9563bb04adcc8f94f69b8 100644
--- a/templates/web/title.tt2.html
+++ b/templates/web/title.tt2.html
@@ -1,6 +1,6 @@
-[% conf.app_name %] -
-
- [% IF actions.$action %]
- [% FILTER encode_utf8 %][% actions.$action.title %][% END %]
+[% conf.app_name %]
+ [% IF actions.$action && actions.$action.title %]
+ -
+[% FILTER encode_utf8 %][% actions.$action.title %][% END %]
[% ELSE %]
[% END %]
diff --git a/templates/web/validate_token.tt2.html b/templates/web/validate_token.tt2.html
index da68e48f9633fe8d90459c8d58c6bd591ab3e1f9..89258eff6f301dcac77fd299deb2b3a482ab0fe7 100644
--- a/templates/web/validate_token.tt2.html
+++ b/templates/web/validate_token.tt2.html
@@ -42,7 +42,7 @@
<div class="accounts_profile reveal-modal" data-reveal id="account_details_[% account.get('id') %]"> <!-- old version : class="account_details"-->
<h3>List of user attributes associated</h3>
<p>Below is the list of user attributes associated to this test account. After a successfull authentication process these attributes are transmited
- via the SAML protocol from the Test Identity Provider to your Service Provider.</p>
+ via the SAML protocol from [% conf.app_name %] Identity Provider to your Service Provider.</p>
<div>
<table>
<caption>List of user attributes</caption>