Commit e1fb97fb authored by haemmer's avatar haemmer

Bumbed version to 1.15

Updated specific language instructions
Renamed some language strings
parent fa6ce414
...@@ -132,7 +132,7 @@ a2enmod headers ...@@ -132,7 +132,7 @@ a2enmod headers
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Update in general: General Update Instructions:
1. Make a backup of the directory where the currently active version of the 1. Make a backup of the directory where the currently active version of the
SWITCHwayf is installed SWITCHwayf is installed
2. Get the compressed archive of the new version and move it into the directory 2. Get the compressed archive of the new version and move it into the directory
...@@ -143,19 +143,29 @@ Update in general: ...@@ -143,19 +143,29 @@ Update in general:
4. Have a look at config.dist.php and compare this file with your current 4. Have a look at config.dist.php and compare this file with your current
config.php in order to identify new configuration options. config.php in order to identify new configuration options.
-------------------------------------------------------------------------------
Specific Update Instructions:
Updates from versions before 1.15
The keys of the following languages strings were renamed and should be
adapted in your custom languages.php file:
- 'about_aai' was renamed to 'about_federation'
- 'about_switch' was renamed to 'about_organisation'
Update from versions before 1.4.3: Update from versions before 1.4.3:
The new setting '$metadataLockFile' was introduced in config.php. It allows The new setting '$metadataLockFile' was introduced in config.php. It allows
configuring the location of the lock file. When the SWITCHwayf is used in a configuring the location of the lock file. When the SWITCHwayf is used in a
Windows environment, the path to this file probably has to be adapted. Windows environment, the path to this file probably has to be adapted.
Update from versions before 1.8: Update from versions before 1.8:
This version has a slightly different structure than previous versions. This version has a slightly different structure than previous versions.
Therefore, it is recommended to start with a clean installation. Therefore, it is recommended to start with a clean installation.
However, you should be able to take over most of your old config.php However, you should be able to take over most of your old config.php
functions and use them in the new template.php file again to keep your functions and use them in the new template.php file again to keep your
customized look and feel. customized look and feel.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
...@@ -396,8 +406,11 @@ For category entries, only Type, (local) Name and Index are relevant. ...@@ -396,8 +406,11 @@ For category entries, only Type, (local) Name and Index are relevant.
Version History: Version History:
1.14.4 Release data: August 2011 1.15 Release data: August 2011
- A default and custom CSS file can now be used
- Graphical design now is based new SWITCH harmos elements - Graphical design now is based new SWITCH harmos elements
- Renamed some string keys to make them independent from SWITCH.
Please review the 'Specific Update Instructions' in this document
- Focus on submit button works better with different browsers - Focus on submit button works better with different browsers
- Invalid values for width and height are now defaulted to auto for - Invalid values for width and height are now defaulted to auto for
Embedded WAYF Embedded WAYF
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
/* /*
****************************************************************************** ******************************************************************************
SWITCHwayf SWITCHwayf
Version: 1.14.4 Version: 1.15
Contact: aai@switch.ch Contact: aai@switch.ch
Web site: http://www.switch.ch/aai/wayf Web site: http://www.switch.ch/aai/wayf
****************************************************************************** ******************************************************************************
......
/* Copyright (c) 2011, SWITCH - Serving Swiss Universities */
h1 { h1 {
font-family:Verdana, sans-serif; font-family:Verdana, sans-serif;
font-size: 13px; font-size: 13px;
...@@ -13,25 +14,25 @@ p { ...@@ -13,25 +14,25 @@ p {
} }
a { a {
color: #00247D; color: #00247D;
text-decoration: underline; text-decoration: underline;
} }
a:visited { a:visited {
color: #00247D; color: #00247D;
text-decoration: underline; text-decoration: underline;
} }
a:focus, a:hover, a:active { a:focus, a:hover, a:active {
color: #F39800; color: #F39800;
text-decoration: underline; text-decoration: underline;
} }
select { select {
max-width: 480px; max-width: 480px;
} }
.outer_container { .container {
position: absolute; position: absolute;
left: 50%; left: 50%;
top: 50%; top: 50%;
...@@ -39,7 +40,7 @@ select { ...@@ -39,7 +40,7 @@ select {
margin-top: -200px; margin-top: -200px;
} }
.wayf_box { .box {
width:600px; width:600px;
text-align: center; text-align: center;
background-color: #FFFFFF; background-color: #FFFFFF;
...@@ -52,13 +53,13 @@ select { ...@@ -52,13 +53,13 @@ select {
overflow: hidden; overflow: hidden;
padding: 24px; padding: 24px;
filter: progid:DXImageTransform.Microsoft.Shadow(color='#CCCCCC', Direction=0, Strength=5) filter: progid:DXImageTransform.Microsoft.Shadow(color='#CCCCCC', Direction=0, Strength=5)
progid:DXImageTransform.Microsoft.Shadow(color='#CCCCCC', Direction=45, Strength=4) progid:DXImageTransform.Microsoft.Shadow(color='#CCCCCC', Direction=45, Strength=4)
progid:DXImageTransform.Microsoft.Shadow(color='#CCCCCC', Direction=90, Strength=5) progid:DXImageTransform.Microsoft.Shadow(color='#CCCCCC', Direction=90, Strength=5)
progid:DXImageTransform.Microsoft.Shadow(color='#CCCCCC', Direction=135, Strength=4) progid:DXImageTransform.Microsoft.Shadow(color='#CCCCCC', Direction=135, Strength=4)
progid:DXImageTransform.Microsoft.Shadow(color='#CCCCCC', Direction=180, Strength=5) progid:DXImageTransform.Microsoft.Shadow(color='#CCCCCC', Direction=180, Strength=5)
progid:DXImageTransform.Microsoft.Shadow(color='#CCCCCC', Direction=225, Strength=4) progid:DXImageTransform.Microsoft.Shadow(color='#CCCCCC', Direction=225, Strength=4)
progid:DXImageTransform.Microsoft.Shadow(color='#CCCCCC', Direction=260, Strength=5) progid:DXImageTransform.Microsoft.Shadow(color='#CCCCCC', Direction=260, Strength=5)
progid:DXImageTransform.Microsoft.Shadow(color='#CCCCCC', Direction=305, Strength=4); progid:DXImageTransform.Microsoft.Shadow(color='#CCCCCC', Direction=305, Strength=4);
} }
.header { .header {
...@@ -67,7 +68,7 @@ select { ...@@ -67,7 +68,7 @@ select {
.menu { .menu {
width: 100%; width: 100%;
padding-left: 2px; padding-left: 2px;
margin-top: 10px; margin-top: 10px;
margin-left: 0; margin-left: 0;
float: left; float: left;
...@@ -97,19 +98,19 @@ select { ...@@ -97,19 +98,19 @@ select {
float:left; float:left;
} }
.aai_logo { .federationLogo {
float:left; float:left;
margin-top: 32px; margin-top: 32px;
margin-left: 2px; margin-left: 2px;
border:0; border:0;
} }
.switch_logo { .organisationLogo {
float:right; float:right;
border:0; border:0;
} }
.login_field { .userInputArea {
width: 100%; width: 100%;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<!-- Identity Provider Selection: Start --> <!-- Identity Provider Selection: Start -->
<h1><?php echo getLocalString('header'); ?></h1> <h1><?php echo getLocalString('header'); ?></h1>
<form id="IdPList" name="IdPList" method="post" onSubmit="return checkForm()" action="<?php echo $actionURL ?>"> <form id="IdPList" name="IdPList" method="post" onSubmit="return checkForm()" action="<?php echo $actionURL ?>">
<table class="login_field" width="500"> <table class="userInputArea" width="500">
<tr> <tr>
<td> <td>
<p><?php echo $promptMessage ?></p> <p><?php echo $promptMessage ?></p>
......
...@@ -60,14 +60,14 @@ function checkForm(){ ...@@ -60,14 +60,14 @@ function checkForm(){
--> -->
</script> </script>
<div class="outer_container"> <div class="container">
<div class="wayf_box"> <div class="box">
<div class="header"> <div class="header">
<a href="http://www.switch.ch/aai"><img src="<?php echo $imageURL ?>/switchaai-logo.png" alt="SWITCHaai" class="aai_logo"></a><a href="http://www.switch.ch/"><img src="<?php echo $imageURL ?>/switch-logo.png" alt="SWITCH" class="switch_logo" align="right"></a> <a href="http://www.switch.ch/aai"><img src="<?php echo $imageURL ?>/switchaai-logo.png" alt="SWITCHaai" class="federationLogo"></a><a href="http://www.switch.ch/"><img src="<?php echo $imageURL ?>/switch-logo.png" alt="SWITCH" class="organisationLogo" align="right"></a>
</div> </div>
<div class="content"> <div class="content">
<ul class="menu"> <ul class="menu">
<li><a href="http://www.switch.ch/<?php echo $language ?>/aai/about/"><?php echo getLocalString('about_aai'); ?></a></li> <li><a href="http://www.switch.ch/<?php echo $language ?>/aai/about/"><?php echo getLocalString('about_federation'); ?></a></li>
<li class="last"><a href="http://www.switch.ch/<?php echo $language ?>/aai/faq/"><?php echo getLocalString('faq') ?></a></li> <li class="last"><a href="http://www.switch.ch/<?php echo $language ?>/aai/faq/"><?php echo getLocalString('faq') ?></a></li>
<li class="last"><a href="http://www.switch.ch/<?php echo $language ?>/aai/help/"><?php echo getLocalString('help') ?></a></li> <li class="last"><a href="http://www.switch.ch/<?php echo $language ?>/aai/help/"><?php echo getLocalString('help') ?></a></li>
<li class="last"><a href="http://www.switch.ch/<?php echo $language ?>/aai/privacy/"><?php echo getLocalString('privacy') ?></a></li> <li class="last"><a href="http://www.switch.ch/<?php echo $language ?>/aai/privacy/"><?php echo getLocalString('privacy') ?></a></li>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<!-- Identity Provider Selection: Start --> <!-- Identity Provider Selection: Start -->
<h1><?php echo getLocalString('settings'); ?></h1> <h1><?php echo getLocalString('settings'); ?></h1>
<form id="IdPList" name="IdPList" method="post" onSubmit="return checkForm()" action="<?php echo $actionURL ?>"> <form id="IdPList" name="IdPList" method="post" onSubmit="return checkForm()" action="<?php echo $actionURL ?>">
<table class="login_field" width="500"> <table class="userInputArea" width="500">
<tr> <tr>
<td> <td>
<p><?php echo getLocalString('permanent_cookie_notice'); ?></p> <p><?php echo getLocalString('permanent_cookie_notice'); ?></p>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<!-- Identity Provider Selection: Start --> <!-- Identity Provider Selection: Start -->
<h1><?php echo getLocalString('permanent_select_header'); ?></h1> <h1><?php echo getLocalString('permanent_select_header'); ?></h1>
<form id="IdPList" name="IdPList" method="post" onSubmit="return checkForm()" action="<?php echo $actionURL ?>"> <form id="IdPList" name="IdPList" method="post" onSubmit="return checkForm()" action="<?php echo $actionURL ?>">
<table class="login_field" width="500"> <table class="userInputArea" width="500">
<tr> <tr>
<td> <td>
<!-- Value permanent must be a number which is equivalent to the days the cookie shall be valid --> <!-- Value permanent must be a number which is equivalent to the days the cookie shall be valid -->
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
$langStrings['en'] = array ( $langStrings['en'] = array (
'title' => 'Home Organisation Selection', 'title' => 'Home Organisation Selection',
'header' => 'Select your Home Organisation', 'header' => 'Select your Home Organisation',
'about_aai' => 'About AAI', 'about_federation' => 'About AAI',
'about_switch' => 'About SWITCH', 'about_organisation' => 'About SWITCH',
'faq' => 'FAQ', 'faq' => 'FAQ',
'help' => 'Help', 'help' => 'Help',
'privacy' => 'Privacy', 'privacy' => 'Privacy',
...@@ -53,8 +53,8 @@ $langStrings['en'] = array ( ...@@ -53,8 +53,8 @@ $langStrings['en'] = array (
$langStrings['de'] = array ( $langStrings['de'] = array (
'title' => 'Auswahl der Home Organisation', 'title' => 'Auswahl der Home Organisation',
'header' => 'Home Organisation ausw&auml;hlen', 'header' => 'Home Organisation ausw&auml;hlen',
'about_aai' => '&Uuml;ber AAI', 'about_federation' => '&Uuml;ber AAI',
'about_switch' => '&Uuml;ber SWITCH', 'about_organisation' => '&Uuml;ber SWITCH',
'faq' => 'FAQ', 'faq' => 'FAQ',
'help' => 'Hilfe', 'help' => 'Hilfe',
'privacy' => 'Datenschutz', 'privacy' => 'Datenschutz',
...@@ -96,8 +96,8 @@ $langStrings['de'] = array ( ...@@ -96,8 +96,8 @@ $langStrings['de'] = array (
$langStrings['fr'] = array ( $langStrings['fr'] = array (
'title' => 'S&eacute;lection de votre Home Organisation', 'title' => 'S&eacute;lection de votre Home Organisation',
'header' => 'S&eacute;lectionnez votre Home Organisation', 'header' => 'S&eacute;lectionnez votre Home Organisation',
'about_aai' => '&Agrave; propos de l\'AAI', 'about_federation' => '&Agrave; propos de l\'AAI',
'about_switch' => '&Agrave; propos de SWITCH', 'about_organisation' => '&Agrave; propos de SWITCH',
'faq' => 'FAQ', 'faq' => 'FAQ',
'help' => 'Aide', 'help' => 'Aide',
'privacy' => 'Protection des donn&eacute;es', 'privacy' => 'Protection des donn&eacute;es',
...@@ -136,8 +136,8 @@ $langStrings['fr'] = array ( ...@@ -136,8 +136,8 @@ $langStrings['fr'] = array (
$langStrings['it'] = array ( $langStrings['it'] = array (
'title' => 'Selezione della vostra Home Organisation', 'title' => 'Selezione della vostra Home Organisation',
'header' => 'Selezioni la sua Home Organisation', 'header' => 'Selezioni la sua Home Organisation',
'about_aai' => 'Informazioni su AAI', 'about_federation' => 'Informazioni su AAI',
'about_switch' => 'Informazioni su SWITCH', 'about_organisation' => 'Informazioni su SWITCH',
'faq' => 'FAQ', 'faq' => 'FAQ',
'help' => 'Aiuto', 'help' => 'Aiuto',
'privacy' => 'Protezione dei dati', 'privacy' => 'Protezione dei dati',
...@@ -175,8 +175,8 @@ $langStrings['it'] = array ( ...@@ -175,8 +175,8 @@ $langStrings['it'] = array (
$langStrings['pt'] = array ( $langStrings['pt'] = array (
'title' => 'SWITCHaai: Selec&ccedil;&atilde;o de Institui&ccedil;&atilde;o de Origem', 'title' => 'SWITCHaai: Selec&ccedil;&atilde;o de Institui&ccedil;&atilde;o de Origem',
'header' => 'Seleccione a sua Institui&ccedil;&atilde;o de Origem', 'header' => 'Seleccione a sua Institui&ccedil;&atilde;o de Origem',
'about_aai' => 'Sobre AAI', 'about_federation' => 'Sobre AAI',
'about_switch' => 'Sobre a Switch', 'about_organisation' => 'Sobre a Switch',
'faq' => 'FAQ', 'faq' => 'FAQ',
'help' => 'Ajuda', 'help' => 'Ajuda',
'privacy' => 'Privacidade', 'privacy' => 'Privacidade',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment