Skip to content
Snippets Groups Projects
Commit c1e0e54b authored by Andreas Åkre Solberg's avatar Andreas Åkre Solberg
Browse files

Update special theme login page to be somewhat more appealing 

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2229 44740490-163a-0410-bde0-09ae8108e29a
parent 4048d4a8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
modules/themefeidernd/themes/feidernd/core/loginuserpass.php
+ 87
− 22
View file @ c1e0e54b
...@@ -4,13 +4,9 @@ ...@@ -4,13 +4,9 @@
<title><?php echo $this->t('{login:user_pass_header}'); ?></title> <title><?php echo $this->t('{login:user_pass_header}'); ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel='stylesheet' href="/<?php echo $this->data['baseurlpath']; ?>resources/feidernd.css" type='text/css' /> <link rel='stylesheet' href="<?php echo SimpleSAML_Module::getModuleURL('themefeidernd/feidernd.css'); ?>" type='text/css' />
<!--[if IE]><style type="text/css">#login h1 a { margin-top: 35px; } #login #login_error { margin-bottom: 10px; }</style><![endif]--><!-- Curse you, IE! --> <!--[if IE]><style type="text/css">#login h1 a { margin-top: 35px; } #login #login_error { margin-bottom: 10px; }</style><![endif]--><!-- Curse you, IE! -->
<style>
input {
border: 1px solid #005;
}
</style>
<script type="text/javascript"> <script type="text/javascript">
function focusit() { function focusit() {
document.getElementById('username').focus(); document.getElementById('username').focus();
...@@ -19,12 +15,13 @@ ...@@ -19,12 +15,13 @@
</script> </script>
</head> </head>
<body class="login"> <body class="login">
<div id="login"> <div id="login">
<h1>
<a href="http://feide.no/" title="Go to Feide.no">Feide</a>
</h1>
<form name="loginform" id="loginform" action="?" method="post"> <form name="loginform" id="loginform" action="?" method="post">
<img alt="logo" src="<?php echo SimpleSAML_Module::getModuleURL('themefeidernd/ssplogo-fish-only-s.png') ?>" style="float: right" />
<p> <p>
<label><?php echo $this->t('{login:username}'); ?><br /> <label><?php echo $this->t('{login:username}'); ?><br />
<input type="text" name="username" id="username" class="input" <?php if (isset($this->data['username'])) { <input type="text" name="username" id="username" class="input" <?php if (isset($this->data['username'])) {
...@@ -46,19 +43,33 @@ ...@@ -46,19 +43,33 @@
<?php <?php
if ($this->data['errorcode'] !== NULL) { if ($this->data['errorcode'] !== NULL) {
?> ?>
<div style="border: 1px solid #500; background: #880b17; "> <div id="error">
<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" style="float: left; margin: 15px " /> <img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" style="float: right; margin: 15px " />
<h2><?php echo $this->t('{login:error_header}'); ?></h2> <h2><?php echo $this->t('{login:error_header}'); ?></h2>
<p><b><?php echo $this->t('{errors:title_' . $this->data['errorcode'] . '}'); ?></b></p> <p style="clear: both"><b><?php echo $this->t('{errors:title_' . $this->data['errorcode'] . '}'); ?></b></p>
<p><?php echo $this->t('{errors:descr_' . $this->data['errorcode'] . '}'); ?></p> <p><?php echo $this->t('{errors:descr_' . $this->data['errorcode'] . '}'); ?></p>
</div> </div>
<?php <?php
} }
if(!empty($this->data['links'])) {
echo '<ul class="links" style="margin-top: 2em">';
foreach($this->data['links'] AS $l) {
echo '<li><a href="' . htmlspecialchars($l['href']) . '">' . htmlspecialchars($this->t($l['text'])) . '</a></li>';
}
echo '</ul>';
}
?> ?>
<!-- <!--
<?php if (isset($this->data['error'])) { ?> <?php if (isset($this->data['error'])) { ?>
<div style="border: 1px solid #500; background: #880b17; "> <div id="error">
<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" style="float: left; margin: 15px " /> <img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" style="float: left; margin: 15px " />
<h2><?php echo $this->t('{error:error_header}'); ?></h2> <h2><?php echo $this->t('{error:error_header}'); ?></h2>
...@@ -71,9 +82,9 @@ if ($this->data['errorcode'] !== NULL) { ...@@ -71,9 +82,9 @@ if ($this->data['errorcode'] !== NULL) {
<?php <?php
if ($this->data['errorcode'] !== NULL) { if ($this->data['errorcode'] !== NULL) {
?> ?>
<div style="border-left: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8; background: #f5f5f5"> <div id="error">
<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" style="float: left; margin: 15px " /> <img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" style="float: left; margin: 15px " />
<h2><?php echo $this->t('{login:error_header}'); ?></h2> <h2><?php echo $this->t('{login:error_header}'); ?>sdfsdf</h2>
<p><b><?php echo $this->t('{errors:title_' . $this->data['errorcode'] . '}'); ?></b></p> <p><b><?php echo $this->t('{errors:title_' . $this->data['errorcode'] . '}'); ?></b></p>
<p><?php echo $this->t('{errors:descr_' . $this->data['errorcode'] . '}'); ?></p> <p><?php echo $this->t('{errors:descr_' . $this->data['errorcode'] . '}'); ?></p>
</div> </div>
...@@ -97,15 +108,69 @@ foreach ($this->data['stateparams'] as $name => $value) { ...@@ -97,15 +108,69 @@ foreach ($this->data['stateparams'] as $name => $value) {
</div> </div>
<?php
<ul> $includeLanguageBar = TRUE;
<li><a href="http://rnd.feide.no/" title="Feide RnD">» Feide RnD</a></li> if (!empty($_POST))
</ul> $includeLanguageBar = FALSE;
<!-- if (isset($this->data['hideLanguageBar']) && $this->data['hideLanguageBar'] === TRUE)
<h2><?php echo $this->t('help_header'); ?></h2> $includeLanguageBar = FALSE;
if ($includeLanguageBar) {
echo '<div id="languagebar">';
// echo '<form action="' . SimpleSAML_Utilities::selfURL() . '" method="get">';
// echo '<select name="language">';
// echo '</select>';
// echo '</form>';
<p><?php echo $this->t('help_text'); ?></p>
-->
$languages = $this->getLanguageList();
$langnames = array(
'no' => 'Bokmål',
'nn' => 'Nynorsk',
'se' => 'Sámi',
'da' => 'Dansk',
'en' => 'English',
'de' => 'Deutsch',
'sv' => 'Svenska',
'fi' => 'Suomeksi',
'es' => 'Español',
'eu' => 'Euskara',
'fr' => 'Français',
'nl' => 'Nederlands',
'lb' => 'Luxembourgish',
'cs' => 'Czech',
'sl' => 'Slovenščina', // Slovensk
'hr' => 'Hrvatski', // Croatian
'hu' => 'Magyar', // Hungarian
'pl' => 'Język polski', // Polish
'pt' => 'Português', // Portuguese
'pt-BR' => 'Português brasileiro', // Portuguese
'tr' => 'Türkçe',
);
$textarray = array();
foreach ($languages AS $lang => $current) {
if ($current) {
$textarray[] = $langnames[$lang];
} else {
$textarray[] = '<a href="' . htmlspecialchars(
SimpleSAML_Utilities::addURLparameter(
SimpleSAML_Utilities::selfURL(), array('language' => $lang)
)
) . '">' . $langnames[$lang] . '</a>';
}
}
echo join(' | ', $textarray);
echo '</div>';
}
?>
</body> </body>
</html> </html>
\ No newline at end of file
modules/themefeidernd/www/feidernd.css 0 → 100644
+ 105
− 0
View file @ c1e0e54b
body {
font-family: 'Lucida Grande', arial, sans-serif;
background: #eee;
}
.error {
background: #FFEFF7;
border: 1px solid #c69;
margin: 1em 5% 10px;
padding: 0 1em 0 1em;
}
#login input.input {
width: 200px;
font-size: large;
}
#login input {
/* opacity: 0.6;*/
}
#login h1 {
color: #777;
}
#login input#wp-submit {
font-size: large;
padding: 4px 10px;
}
#languagebar a {
color: #aaa;
}
#languagebar {
color: #eee;
font-size: 80%;
margin: 0em auto 1em;
padding: 0px 40px;
color: #000;
width: 425px;
}
div#error {
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
border: 1px solid #999999;
background: #fff;
margin: 10px auto 1em;
padding: 8px 20px;
color: #000;
}
#login {
-webkit-box-shadow:0px 3px 6px #333333;
-moz-box-shadow:0px 3px 6px #333333;
box-shadow:0px 3px 6px #333333;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
border: 0px solid #999999;
background: #F2F2F2 -webkit-gradient(linear, 0% 70%, 0% 100%, from(#fefefe), to(#ddd), color-stop(.6,#f0f0f0));
background: #F2F2F2 -moz-linear-gradient(0% 100% 90deg,#dddddd, #f0f0f0, #FEFEFE 31%);
margin: 5em auto 1em;
padding: 20px 40px;
color: #000;
width: 425px;
}
#login ul.links a {
text-decoration: none;
color: #666;
}
#login ul.links a:hover {
color: #111;
}
#login ul.links {
/* border: 1px solid #111;*/
font-family: 'Lucida Grande', arial, sans-serif;
padding: 0px;
font-size: 85%;
list-style-type:square;
list-style-position: inside;
}
#login ul.links li {
margin-top: .3em;
}
#login p label {
font-size: medium;
color: #222;
font-weight: bold;
}
modules/themefeidernd/www/ssplogo-fish-only-s.png 0 → 100644
+ 0
− 0
View file @ c1e0e54b
modules/themefeidernd/www/ssplogo-fish-only-s.png

13.8 KiB

www/resources/feidernd.css deleted 100644 → 0
+ 0
− 178
View file @ 4048d4a8
body {
font-family: Verdana, Arial, sans-serif;
}
.error {
background: #FFEFF7;
border: 1px solid #c69;
margin: 1em 5% 10px;
padding: 0 1em 0 1em;
}
.wrap {
background: #fff;
border: 1px solid #ccc;
clear: both;
margin: 15px 5%;
padding: 1em;
}
.narrow {
width: 450px;
margin: auto;
}
.narrow p {
line-height: 150%;
}
.wrap h2 {
margin: 0 0 .5em;
clear: both;
}
* html .wrap h2 {
margin-top: 1em;
}
table .vers {
text-align: center;
}
textarea.all-options, input.all-options {
width: 250px;
}
input.disabled, textarea.disabled {
background: #ccc;
}
#content {
margin: 0;
width: 100%;
}
#login input {
filter:alpha(opacity=50);
-moz-opacity:0.5;
-khtml-opacity: 0.5;
opacity: 0.5;
}
#login {
position: relative;
background: url('login-bkg-tile.png') no-repeat top center;
color: #fff;
margin: 5em auto 1em;
padding: 20px 0 0;
width: 425px;
_width: 390px;
}
#login form {
background: url('login-bkg-bottom.png') no-repeat bottom center;
padding: 0 50px 25px;
_width: 325px;
_margin: 0 auto;
min-height: 200px;
height: auto !important; /* min-height fast hack */
height: 200px;
}
#login #login_error {
background: #0e3350;
border: 1px solid #2571ab;
color: #ebcd4e;
font-size: 11px;
font-weight: bold;
padding: .6em;
width: 310px;
margin: 0 50px;
text-align: center;
}
#login p {
font-size: 12px;
}
#login p.message {
width: 310px;
margin: 0 auto 1em;
}
#login #login_error a {
color: #ebcd4e;
border-color: #ebcd4e;
}
#login #send {
color: #fff;
text-align: left;
font-weight: normal;
font-size: 1.1em;
_width: 325px;
_margin: 0 auto 15px;
}
#login h1 a {
margin: 0 auto;
height: 88px;
width: 320px;
display: block;
border-bottom: none;
text-indent: -9999px;
}
#login .message {
font-size: 10pt;
text-align: center;
}
#login .register {
font-size: 20px;
}
#login input {
padding: 4px;
}
.login ul, #protected #login .bottom {
list-style: none;
width: 325px;
margin: 0 auto;
padding: 0;
line-height: 1.2;
}
.login ul li {
font-size: 11px;
}
.login ul li a {
color: #0d324f;
border: none;
}
#login ul li a:hover {
color: #fff;
}
#login .input {
font-size: 1.8em;
margin-top: 3px;
width: 97%;
}
#login p label {
font-size: 11px;
}
#login #submit {
margin: 0;
font-size: 15px;
}
.plugins p {
}
#login .fullwidth {
width: 320px;
}
www/resources/login-bkg-bottom.png deleted 100644 → 0
+ 0
− 0
View file @ 4048d4a8
www/resources/login-bkg-bottom.png

3.38 KiB

www/resources/login-bkg-tile.png deleted 100644 → 0
+ 0
− 0
View file @ 4048d4a8
www/resources/login-bkg-tile.png

74.2 KiB

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