Bumbed version to 1.15

Updated specific language instructions
Renamed some language strings

README

@@ -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 
    SWITCHwayf is installed
 2. Get the compressed archive of the new version and move it into the directory
@@ -143,19 +143,29 @@ Update in general:
 4. Have a look at config.dist.php and compare this file with your current
    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:
-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 
-Windows environment, the path to this file probably has to be adapted.
+  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 
+  Windows environment, the path to this file probably has to be adapted.
 
 
 Update from versions before 1.8:
-This version has a slightly different structure than previous versions. 
-Therefore, it is recommended to start with a clean installation. 
-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 
-customized look and feel.
-
+  This version has a slightly different structure than previous versions. 
+  Therefore, it is recommended to start with a clean installation. 
+  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 
+  customized look and feel.
 
 -------------------------------------------------------------------------------
 
@@ -396,8 +406,11 @@ For category entries, only Type, (local) Name and Index are relevant.
 
 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
+        - 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
         - Invalid values for width and height are now defaulted to auto for
           Embedded WAYF

WAYF

@@ -3,7 +3,7 @@
 /*
 ******************************************************************************
 SWITCHwayf
-Version: 1.14.4
+Version: 1.15
 Contact:  aai@switch.ch
 Web site: http://www.switch.ch/aai/wayf
 ******************************************************************************

css/default-styles.css

+/*  Copyright (c) 2011, SWITCH - Serving Swiss Universities  */
 h1 {
 	font-family:Verdana, sans-serif;
 	font-size: 13px;
@@ -13,25 +14,25 @@ p {
 }
 
 a {
-    color: #00247D;
-    text-decoration: underline;
+	color: #00247D;
+	text-decoration: underline;
 }
 
 a:visited {
-    color: #00247D;
-    text-decoration: underline;
+	color: #00247D;
+	text-decoration: underline;
 }
 
 a:focus, a:hover, a:active {
-    color: #F39800;
-    text-decoration: underline;
+	color: #F39800;
+	text-decoration: underline;
 }
 
 select {
 	max-width: 480px;
 }
 
-.outer_container {
+.container {
 	position: absolute;
 	left: 50%;
 	top: 50%;
@@ -39,7 +40,7 @@ select {
 	margin-top: -200px; 
 }
 
-.wayf_box {
+.box {
 	width:600px;
 	text-align: center;
 	background-color: #FFFFFF;
@@ -52,13 +53,13 @@ select {
 	overflow: hidden;
 	padding: 24px;
 	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=90, Strength=5)
-	    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=225, Strength=4)
-	    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=45, Strength=4)
+		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=180, Strength=5)
+		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=305, Strength=4);
 }
 
 .header {
@@ -67,7 +68,7 @@ select {
 
 .menu {
 	width: 100%;
-    padding-left: 2px;
+	padding-left: 2px;
 	margin-top: 10px;
 	margin-left: 0;
 	float: left;
@@ -97,19 +98,19 @@ select {
 	float:left;
 }
 
-.aai_logo {
+.federationLogo {
 	float:left;
 	margin-top: 32px;
 	margin-left: 2px;
 	border:0;
 }
 
-.switch_logo {
+.organisationLogo {
 	float:right;
 	border:0;
 }
 
-.login_field {
+.userInputArea {
 	width: 100%;
 	margin-left: auto;
 	margin-right: auto;

default-body.php

@@ -3,7 +3,7 @@
 <!-- Identity Provider Selection: Start -->
 <h1><?php echo getLocalString('header'); ?></h1> 
 <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>
 			<td>
 				<p><?php echo $promptMessage ?></p>

default-header.php

@@ -60,14 +60,14 @@ function checkForm(){
 -->
 </script>
 
-<div class="outer_container">
-	<div class="wayf_box">
+<div class="container">
+	<div class="box">
 		<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 class="content">
 			<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/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>

default-notice.php

@@ -3,7 +3,7 @@
 <!-- Identity Provider Selection: Start -->
 <h1><?php echo getLocalString('settings'); ?></h1> 
 <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>
 			<td>
 				<p><?php echo getLocalString('permanent_cookie_notice'); ?></p>

default-settings.php

@@ -3,7 +3,7 @@
 <!-- Identity Provider Selection: Start -->
 <h1><?php echo getLocalString('permanent_select_header'); ?></h1> 
 <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>
 			<td>
 				<!-- Value permanent must be a number which is equivalent to the days the cookie shall be valid -->

languages.php

@@ -10,8 +10,8 @@
 $langStrings['en'] = array (
 'title' => 'Home Organisation Selection',
 'header' => 'Select your Home Organisation',
-'about_aai' => 'About AAI',
-'about_switch' => 'About SWITCH',
+'about_federation' => 'About AAI',
+'about_organisation' => 'About SWITCH',
 'faq' => 'FAQ',
 'help' => 'Help',
 'privacy' => 'Privacy',
@@ -53,8 +53,8 @@ $langStrings['en'] = array (
 $langStrings['de'] = array (
 'title' => 'Auswahl der Home Organisation',
 'header' => 'Home Organisation auswählen',
-'about_aai' => 'Über AAI',
-'about_switch' => 'Über SWITCH',
+'about_federation' => 'Über AAI',
+'about_organisation' => 'Über SWITCH',
 'faq' => 'FAQ',
 'help' => 'Hilfe',
 'privacy' => 'Datenschutz',
@@ -96,8 +96,8 @@ $langStrings['de'] = array (
 $langStrings['fr'] =  array (
 'title' => 'Sélection de votre Home Organisation',
 'header' => 'Sélectionnez votre Home Organisation',
-'about_aai' => 'À propos de l\'AAI',
-'about_switch' => 'À propos de SWITCH',
+'about_federation' => 'À propos de l\'AAI',
+'about_organisation' => 'À propos de SWITCH',
 'faq' => 'FAQ',
 'help' => 'Aide',
 'privacy' => 'Protection des données',
@@ -136,8 +136,8 @@ $langStrings['fr'] =  array (
 $langStrings['it'] = array (
 'title' => 'Selezione della vostra Home Organisation',
 'header' => 'Selezioni la sua Home Organisation',
-'about_aai' => 'Informazioni su AAI',
-'about_switch' => 'Informazioni su SWITCH',
+'about_federation' => 'Informazioni su AAI',
+'about_organisation' => 'Informazioni su SWITCH',
 'faq' => 'FAQ',
 'help' => 'Aiuto',
 'privacy' => 'Protezione dei dati',
@@ -175,8 +175,8 @@ $langStrings['it'] = array (
 $langStrings['pt'] = array (
 'title' => 'SWITCHaai: Selecção de Instituição de Origem',
 'header' => 'Seleccione a sua Instituição de Origem',
-'about_aai' => 'Sobre AAI',
-'about_switch' => 'Sobre a Switch',
+'about_federation' => 'Sobre AAI',
+'about_organisation' => 'Sobre a Switch',
 'faq' => 'FAQ',
 'help' => 'Ajuda',
 'privacy' => 'Privacidade',