summaryrefslogtreecommitdiffstats
path: root/inc/simplesamlphp/templates
diff options
context:
space:
mode:
authorJérôme Schneider <jschneider@entrouvert.com>2015-03-27 17:15:46 (GMT)
committerJérôme Schneider <jschneider@entrouvert.com>2015-03-27 17:15:46 (GMT)
commitc47b99cede0c135ec4b190acebf6343edca1f944 (patch)
treef443556e57d020cc006689653e7a400a36374384 /inc/simplesamlphp/templates
parent502161d955a871e812022a5a704c9d74d2434b39 (diff)
downloadspip-saml-c47b99cede0c135ec4b190acebf6343edca1f944.zip
spip-saml-c47b99cede0c135ec4b190acebf6343edca1f944.tar.gz
spip-saml-c47b99cede0c135ec4b190acebf6343edca1f944.tar.bz2
simplesamlphp: update to 1.13.2
Diffstat (limited to 'inc/simplesamlphp/templates')
-rw-r--r--inc/simplesamlphp/templates/includes/footer.php16
-rw-r--r--inc/simplesamlphp/templates/includes/header-embed.php2
-rw-r--r--inc/simplesamlphp/templates/includes/header.php108
-rw-r--r--inc/simplesamlphp/templates/login-ldapmulti.php17
-rw-r--r--inc/simplesamlphp/templates/login.php17
-rw-r--r--inc/simplesamlphp/templates/selectidp-dropdown.php12
-rw-r--r--inc/simplesamlphp/templates/selectidp-links.php8
-rw-r--r--inc/simplesamlphp/templates/status.php13
8 files changed, 109 insertions, 84 deletions
diff --git a/inc/simplesamlphp/templates/includes/footer.php b/inc/simplesamlphp/templates/includes/footer.php
index 2837497..3b4d6a8 100644
--- a/inc/simplesamlphp/templates/includes/footer.php
+++ b/inc/simplesamlphp/templates/includes/footer.php
@@ -1,28 +1,22 @@
<?php
-
-
-
if(!empty($this->data['htmlinject']['htmlContentPost'])) {
foreach($this->data['htmlinject']['htmlContentPost'] AS $c) {
echo $c;
}
}
-
-
?>
-
-
-
+ </div><!-- #content -->
+ <div id="footer">
<hr />
<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/ssplogo-fish-small.png" alt="Small fish logo" style="float: right" />
- Copyright &copy; 2007-2010 <a href="http://rnd.feide.no/">Feide RnD</a>
+ Copyright &copy; 2007-2014 <a href="http://rnd.feide.no/">Feide RnD</a>
<br style="clear: right" />
- </div><!-- #content -->
+ </div><!-- #footer -->
</div><!-- #wrap -->
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/inc/simplesamlphp/templates/includes/header-embed.php b/inc/simplesamlphp/templates/includes/header-embed.php
index dce6cba..7666371 100644
--- a/inc/simplesamlphp/templates/includes/header-embed.php
+++ b/inc/simplesamlphp/templates/includes/header-embed.php
@@ -19,5 +19,5 @@ if(array_key_exists('head', $this->data)) {
}
?>
</head>
-<body>
+<body class="body-embed">
diff --git a/inc/simplesamlphp/templates/includes/header.php b/inc/simplesamlphp/templates/includes/header.php
index 6d2e5fc..aadd1d6 100644
--- a/inc/simplesamlphp/templates/includes/header.php
+++ b/inc/simplesamlphp/templates/includes/header.php
@@ -1,4 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<?php
@@ -40,10 +39,11 @@ if (array_key_exists('pageid', $this->data)) {
*/
header('X-Frame-Options: SAMEORIGIN');
-?>
+?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0" />
<script type="text/javascript" src="/<?php echo $this->data['baseurlpath']; ?>resources/script.js"></script>
<title><?php
if(array_key_exists('header', $this->data)) {
@@ -147,59 +147,63 @@ if($onLoad !== '') {
if ($includeLanguageBar) {
-
- echo '<div id="languagebar">';
$languages = $this->getLanguageList();
- $langnames = array(
- 'no' => 'Bokmål',
- 'nn' => 'Nynorsk',
- 'se' => 'Sámegiella',
- 'sam' => 'Åarjelh-saemien giele',
- 'da' => 'Dansk',
- 'en' => 'English',
- 'de' => 'Deutsch',
- 'sv' => 'Svenska',
- 'fi' => 'Suomeksi',
- 'es' => 'Español',
- 'fr' => 'Français',
- 'it' => 'Italiano',
- 'nl' => 'Nederlands',
- 'lb' => 'Luxembourgish',
- 'cs' => 'Czech',
- 'sl' => 'Slovenščina', // Slovensk
- 'lt' => 'Lietuvių kalba', // Lithuanian
- 'hr' => 'Hrvatski', // Croatian
- 'hu' => 'Magyar', // Hungarian
- 'pl' => 'Język polski', // Polish
- 'pt' => 'Português', // Portuguese
- 'pt-br' => 'Português brasileiro', // Portuguese
- 'ru' => 'русский язык', // Russian
- 'et' => 'eesti keel',
- 'tr' => 'Türkçe',
- 'el' => 'ελληνικά',
- 'ja' => '日本語',
- 'zh' => '简体中文', // Chinese (simplified)
- 'zh-tw' => '繁體中文', // Chinese (traditional)
- 'ar' => 'العربية', // Arabic
- 'fa' => 'پارسی', // Persian
- 'ur' => 'اردو', // Urdu
- 'he' => 'עִבְרִית', // Hebrew
- 'id' => 'Bahasa Indonesia', // Indonesian
- 'sr' => 'Srpski',
- );
-
- $textarray = array();
- foreach ($languages AS $lang => $current) {
- $lang = strtolower($lang);
- if ($current) {
- $textarray[] = $langnames[$lang];
- } else {
- $textarray[] = '<a href="' . htmlspecialchars(SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURL(), array('language' => $lang))) . '">' .
- $langnames[$lang] . '</a>';
+ if ( count($languages) > 1 ) {
+ echo '<div id="languagebar">';
+ $langnames = array(
+ 'no' => 'Bokmål', // Norwegian Bokmål
+ 'nn' => 'Nynorsk', // Norwegian Nynorsk
+ 'se' => 'Sámegiella', // Northern Sami
+ 'sam' => 'Åarjelh-saemien giele', // Southern Sami
+ 'da' => 'Dansk', // Danish
+ 'en' => 'English',
+ 'de' => 'Deutsch', // German
+ 'sv' => 'Svenska', // Swedish
+ 'fi' => 'Suomeksi', // Finnish
+ 'es' => 'Español', // Spanish
+ 'fr' => 'Français', // French
+ 'it' => 'Italiano', // Italian
+ 'nl' => 'Nederlands', // Dutch
+ 'lb' => 'Lëtzebuergesch', // Luxembourgish
+ 'cs' => 'Čeština', // Czech
+ 'sl' => 'Slovenščina', // Slovensk
+ 'lt' => 'Lietuvių kalba', // Lithuanian
+ 'hr' => 'Hrvatski', // Croatian
+ 'hu' => 'Magyar', // Hungarian
+ 'pl' => 'Język polski', // Polish
+ 'pt' => 'Português', // Portuguese
+ 'pt-br' => 'Português brasileiro', // Portuguese
+ 'ru' => 'русский язык', // Russian
+ 'et' => 'eesti keel', // Estonian
+ 'tr' => 'Türkçe', // Turkish
+ 'el' => 'ελληνικά', // Greek
+ 'ja' => '日本語', // Japanese
+ 'zh' => '简体中文', // Chinese (simplified)
+ 'zh-tw' => '繁體中文', // Chinese (traditional)
+ 'ar' => 'العربية', // Arabic
+ 'fa' => 'پارسی', // Persian
+ 'ur' => 'اردو', // Urdu
+ 'he' => 'עִבְרִית', // Hebrew
+ 'id' => 'Bahasa Indonesia', // Indonesian
+ 'sr' => 'Srpski', // Serbian
+ 'lv' => 'Latviešu', // Latvian
+ 'ro' => 'Românește', // Romanian
+ 'eu' => 'Euskara', // Basque
+ );
+
+ $textarray = array();
+ foreach ($languages AS $lang => $current) {
+ $lang = strtolower($lang);
+ if ($current) {
+ $textarray[] = $langnames[$lang];
+ } else {
+ $textarray[] = '<a href="' . htmlspecialchars(SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURL(), array($this->languageParameterName => $lang))) . '">' .
+ $langnames[$lang] . '</a>';
+ }
}
+ echo join(' | ', $textarray);
+ echo '</div>';
}
- echo join(' | ', $textarray);
- echo '</div>';
}
diff --git a/inc/simplesamlphp/templates/login-ldapmulti.php b/inc/simplesamlphp/templates/login-ldapmulti.php
index 61a01ab..9e9ae97 100644
--- a/inc/simplesamlphp/templates/login-ldapmulti.php
+++ b/inc/simplesamlphp/templates/login-ldapmulti.php
@@ -5,10 +5,10 @@
<?php if (isset($this->data['error'])) { ?>
<div style="border-left: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8; background: #f5f5f5">
- <img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" class="float-l" style="margin: 15px " />
+ <img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" class="float-l erroricon" style="margin: 15px " />
<h2><?php echo $this->t('error_header'); ?></h2>
- <p><?php echo htmlspecialchars($this->data['error']); ?> </p>
+ <p class="logintext"><?php echo htmlspecialchars($this->data['error']); ?> </p>
</div>
<?php } ?>
@@ -22,7 +22,7 @@
<table>
<tr>
- <td rowspan="3"><img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-authentication.48x48.png" /></td>
+ <td rowspan="3"><img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-authentication.48x48.png" id="loginicon" /></td>
<td style="padding: .3em;"><?php echo $this->t('username'); ?></td>
<td><input type="text" tabindex="1" name="username"
<?php if (isset($this->data['username'])) {
@@ -31,7 +31,7 @@
<td style="padding: .4em;" rowspan="3">
- <input type="submit" tabindex="3" value="Login" />
+ <input type="submit" tabindex="3" id="regularsubmit" value="<?php echo $this->t('login_button'); ?>" />
<input type="hidden" name="RelayState" value="<?php echo htmlspecialchars($this->data['relaystate']); ?>" />
</td>
</tr>
@@ -55,17 +55,20 @@
<td style="padding: .3em;"><?php echo $this->t('password'); ?></td>
<td><input type="password" tabindex="2" name="password" /></td>
</tr>
+ <tr><td></td><td>
+ <input type="submit" tabindex="5" id="mobilesubmit" value="<?php echo $this->t('login_button'); ?>" />
+ </td></tr>
</table>
</form>
- <h2><?php echo $this->t('help_header'); ?>.</h2>
+ <h2 class="logintext"><?php echo $this->t('help_header'); ?>.</h2>
- <p><?php echo $this->t('help_text'); ?>!</p>
+ <p class="logintext"><?php echo $this->t('help_text'); ?>!</p>
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?> \ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
diff --git a/inc/simplesamlphp/templates/login.php b/inc/simplesamlphp/templates/login.php
index a7081b7..83dacd2 100644
--- a/inc/simplesamlphp/templates/login.php
+++ b/inc/simplesamlphp/templates/login.php
@@ -7,7 +7,7 @@
<?php if (isset($this->data['error'])) { ?>
<div style="border-left: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8; background: #f5f5f5">
- <img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" class="float-l" style="margin: 15px " />
+ <img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" class="float-l erroricon" style="margin: 15px" />
<h2><?php echo $this->t('error_header'); ?></h2>
<p><?php echo $this->t($this->data['error']); ?> </p>
@@ -16,13 +16,13 @@
<h2 style="break: both"><?php echo $this->t('user_pass_header'); ?></h2>
- <p><?php echo $this->t('user_pass_text'); ?></p>
+ <p class="logintext"><?php echo $this->t('user_pass_text'); ?></p>
<form action="?" method="post" name="f">
<table>
<tr>
- <td rowspan="2"><img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-authentication.48x48.png" /></td>
+ <td rowspan="2"><img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-authentication.48x48.png" id="loginicon" /></td>
<td style="padding: .3em;"><?php echo $this->t('username'); ?></td>
@@ -45,7 +45,7 @@
</td>
<td style="padding: .4em;" rowspan="2">
- <input type="submit" tabindex="3" value="<?php echo $this->t('login_button'); ?>" />
+ <input type="submit" class="regularsubmit" tabindex="3" value="<?php echo $this->t('login_button'); ?>" />
<input type="hidden" name="RelayState" value="<?php echo htmlspecialchars($this->data['relaystate']); ?>" />
</td>
</tr>
@@ -53,16 +53,19 @@
<td style="padding: .3em;"><?php echo $this->t('password'); ?></td>
<td><input id="password" type="password" tabindex="2" name="password" /></td>
</tr>
+ <tr><td></td><td>
+ <input type="submit" tabindex="5" id="mobilesubmit" value="<?php echo $this->t('login_button'); ?>" />
+ </td></tr>
</table>
</form>
- <h2><?php echo $this->t('help_header'); ?></h2>
+ <h2 class="logintext"><?php echo $this->t('help_header'); ?></h2>
- <p><?php echo $this->t('help_text'); ?></p>
+ <p class="logintext"><?php echo $this->t('help_text'); ?></p>
-<?php $this->includeAtTemplateBase('includes/footer.php'); ?> \ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
diff --git a/inc/simplesamlphp/templates/selectidp-dropdown.php b/inc/simplesamlphp/templates/selectidp-dropdown.php
index c7aaa1c..27fbc36 100644
--- a/inc/simplesamlphp/templates/selectidp-dropdown.php
+++ b/inc/simplesamlphp/templates/selectidp-dropdown.php
@@ -10,12 +10,18 @@ $this->data['autofocus'] = 'dropdownlist';
$this->includeAtTemplateBase('includes/header.php');
foreach ($this->data['idplist'] AS $idpentry) {
- if (isset($idpentry['name'])) {
+ if (!empty($idpentry['UIInfo']['DisplayName'])) {
+ /* TODO: remove this branch, If ['UIInfo']['DisplayName'] is available, it will get through to 'name' in the
+ * metadata parsed with SSP >= 1.13.0, so this code is no longer necessary. Keep it now to avoid breaking
+ * metadata parsed with previous versions.
+ */
+ $this->includeInlineTranslation('idpname_' . $idpentry['entityid'], $idpentry['UIInfo']['DisplayName']);
+ } elseif (!empty($idpentry['name'])) {
$this->includeInlineTranslation('idpname_' . $idpentry['entityid'], $idpentry['name']);
- } elseif (isset($idpentry['OrganizationDisplayName'])) {
+ } elseif (!empty($idpentry['OrganizationDisplayName'])) {
$this->includeInlineTranslation('idpname_' . $idpentry['entityid'], $idpentry['OrganizationDisplayName']);
}
- if (isset($idpentry['description']))
+ if (!empty($idpentry['description']))
$this->includeInlineTranslation('idpdesc_' . $idpentry['entityid'], $idpentry['description']);
}
diff --git a/inc/simplesamlphp/templates/selectidp-links.php b/inc/simplesamlphp/templates/selectidp-links.php
index 85aa3ca..83a9937 100644
--- a/inc/simplesamlphp/templates/selectidp-links.php
+++ b/inc/simplesamlphp/templates/selectidp-links.php
@@ -10,7 +10,13 @@ $this->data['autofocus'] = 'preferredidp';
$this->includeAtTemplateBase('includes/header.php');
foreach ($this->data['idplist'] AS $idpentry) {
- if (isset($idpentry['name'])) {
+ if (isset($idpentry['UIInfo']['DisplayName'])) {
+ /* TODO: remove this branch, If ['UIInfo']['DisplayName'] is available, it will get through to 'name' in the
+ * metadata parsed with SSP >= 1.13.0, so this code is no longer necessary. Keep it now to avoid breaking
+ * metadata parsed with previous versions.
+ */
+ $this->includeInlineTranslation('idpname_' . $idpentry['entityid'], $idpentry['UIInfo']['DisplayName']);
+ } elseif (isset($idpentry['name'])) {
$this->includeInlineTranslation('idpname_' . $idpentry['entityid'], $idpentry['name']);
} elseif (isset($idpentry['OrganizationDisplayName'])) {
$this->includeInlineTranslation('idpname_' . $idpentry['entityid'], $idpentry['OrganizationDisplayName']);
diff --git a/inc/simplesamlphp/templates/status.php b/inc/simplesamlphp/templates/status.php
index 9f369d6..b3bd0e3 100644
--- a/inc/simplesamlphp/templates/status.php
+++ b/inc/simplesamlphp/templates/status.php
@@ -74,7 +74,12 @@ function present_attributes($t, $attributes, $nameParent) {
}
} else {
if (sizeof($value) > 1) {
- $str .= '<tr class="' . $alternate[($i++ % 2)] . '"><td class="attrname">' . htmlspecialchars($name) . '</td><td class="attrvalue"><ul>';
+ $str .= '<tr class="' . $alternate[($i++ % 2)] . '"><td class="attrname">';
+
+ if ($nameraw !== $name)
+ $str .= htmlspecialchars($name).'<br/>';
+ $str .= '<tt>'.htmlspecialchars($nameraw).'</tt>';
+ $str .= '</td><td class="attrvalue"><ul>';
foreach ($value AS $listitem) {
if ($nameraw === 'jpegPhoto') {
$str .= '<li><img src="data:image/jpeg;base64,' . htmlspecialchars($listitem) . '" /></li>';
@@ -84,7 +89,11 @@ function present_attributes($t, $attributes, $nameParent) {
}
$str .= '</ul></td></tr>';
} elseif(isset($value[0])) {
- $str .= '<tr class="' . $alternate[($i++ % 2)] . '"><td class="attrname">' . htmlspecialchars($name) . '</td>';
+ $str .= '<tr class="' . $alternate[($i++ % 2)] . '"><td class="attrname">';
+ if ($nameraw !== $name)
+ $str .= htmlspecialchars($name).'<br/>';
+ $str .= '<tt>'.htmlspecialchars($nameraw).'</tt>';
+ $str .= '</td>';
if ($nameraw === 'jpegPhoto') {
$str .= '<td class="attrvalue"><img src="data:image/jpeg;base64,' . htmlspecialchars($value[0]) . '" /></td></tr>';
} else {