diff --git a/html/class_passwordRecovery.inc b/html/class_passwordRecovery.inc
index 779915d3ffce3337e6876fa7aa93cf1d69a0b649..fade230c9a1e44ca1a0f675bd894be6d9ec75f88 100644
--- a/html/class_passwordRecovery.inc
+++ b/html/class_passwordRecovery.inc
@@ -212,6 +212,7 @@ class passwordRecovery {
$smarty->assign("delay_allowed", $this->delay_allowed);
$smarty->assign("activated", $this->activated);
+ $smarty->append ('css_files', get_template_path('login.css'));
$smarty->display(get_template_path('recovery.tpl'));
exit();
diff --git a/html/main.php b/html/main.php
index e666d94b82561a92b2a08d07cf2d2ce8f23715a4..a180681a5973d803b5414c58bf2a19671341991d 100644
--- a/html/main.php
+++ b/html/main.php
@@ -309,7 +309,6 @@ if ($ui->ignore_acl_for_current_user()) {
} else {
$smarty->assign ("username", $ui->username);
}
-$smarty->assign ("go_logo", get_template_path('images/go_logo.png'));
$smarty->assign ("go_base", get_template_path('images/dtree.png'));
$smarty->assign ("go_home", get_template_path('images/gohome.png'));
$smarty->assign ("go_out", get_template_path('images/logout.png'));
diff --git a/html/setup.php b/html/setup.php
index 915952662784332d3bff3d615e5dfc945ae31d6e..db2b05da914ace09400629408ccf538e435be346 100644
--- a/html/setup.php
+++ b/html/setup.php
@@ -110,7 +110,7 @@ $display = "";
require_once("../setup/main.inc");
$smarty->assign("date", date("l, dS F Y H:i:s O"));
-$header = $smarty->fetch(get_template_path('setup_headers.tpl'));
+$header = $smarty->fetch(get_template_path('headers.tpl'));
diff --git a/html/themes/default/login.css b/html/themes/default/login.css
index 37de8d98a4eb270be793be13d3382b11286bf667..4467a5c229950b1eb1e1fc12b3faa7ccdcbcf926 100644
--- a/html/themes/default/login.css
+++ b/html/themes/default/login.css
@@ -34,21 +34,76 @@ font-weight:bold;
font-size:12px;
}
-div#login_window {
+div#window_container {
+text-align:center;
+}
+
+div#window_div {
min-width:50%;
margin-top:100px;
border:1px solid #AAAAAA;background-color:white;
display:inline-block;
}
-div#login_container {
+div#window_titlebar {
text-align:center;
+border-bottom:1px solid #AAAAAA;
+padding:8px;
+background-color:#DBE6C6;
+}
+
+div#window_titlebar > p {
+margin:0;
+padding:0;
+font-size:24px;
+font-weight:bold;
+}
+
+div#window_content {
+}
+
+div#window_content > div {
+padding:10px;
+}
+
+div#window_footer {
+padding:0;
+}
+
+div#window_footer > div {
+display:inline-block;
+width:47%;
+padding:1%;
+text-align:left;
+}
+
+div#window_footer > div:nth-child(1) {
+text-align:left;
+color:red;
+font-weight:bold;
+}
+
+div#window_footer > div:nth-child(2) {
+text-align:right;
}
/* On small screens */
@media (max-width: 640px) {
- div#login_window {
+ div#window_div {
+ min-width:70%;
margin-top:10px;
}
+ div#window_footer > div {
+ display:block;
+ width:auto;
+ padding:5px;
+ }
+ div#window_footer.plugbottom > div:nth-child(2) > input[type=submit] {
+ width:100% !important;
+ }
+ p.gosaLoginWarning {
+ margin-top:0px;
+ margin-bottom:0px;
+ }
}
diff --git a/ihtml/themes/default/headers.tpl b/ihtml/themes/default/headers.tpl
index d73d4cbc2373f4f8a32894a89989b7bf32be36d6..18cf304e69ccbe45433b8daaab68a02426422e72 100644
--- a/ihtml/themes/default/headers.tpl
+++ b/ihtml/themes/default/headers.tpl
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
diff --git a/ihtml/themes/default/login.tpl b/ihtml/themes/default/login.tpl
index 2ce1f6621558c50582dbabfb2e2b10945601e672..38eaf79e10b9fcdc81a0046a513a9f69cd0e5841 100644
--- a/ihtml/themes/default/login.tpl
+++ b/ihtml/themes/default/login.tpl
@@ -1,52 +1,44 @@
-<body style="background-color:white;background-image:none;">
+<body>
-{$php_errors}
-<div>
- <div class='setup_header'>
- <div style="float:left;"><img src='themes/default/images/fd_logo.png' class='center' alt='FusionDirectory' /></div>
- <div style="padding-top:8px;text-align:right;height:38px;color:#000000;font-size:20px">{$version}</div>
- </div>
-</div>
+ {$php_errors}
+ {include file={filePath file="setup_header.tpl"}}
{* FusionDirectory login - smarty template *}
-<div id="login_container">
+<div id="window_container">
-<div id="login_window">
+<div id="window_div">
<form action='index.php' method='post' name='mainform' onSubmit='js_check(this);return true;'>
{$msg_dialogs}
- <div style='border-bottom:1px solid #AAAAAA'>
- <div style='padding:3px; background-color:#DBE6C6'>
- <p class="center" style="margin:0px 0px 0px 5px;padding:5px;font-size:24px;font-weight:bold;">
+ <div id="window_titlebar">
+ <p>
{t}Login screen{/t}
</p>
- </div>
</div>
- <div style='border-bottom:1px solid #AAAAAA'>
-
- <div class="optional" style='padding:12px;text-align:center;'>
- {t}Please use your username and your password to log into the site administration system.{/t}<br />
- {if $ssl}<b>{$ssl}</b>{/if}
- {if $lifetime}<b><font style="color:red";>{$lifetime}</font></b>{/if}
- </div>
+ <div id="window_content">
+ <div class="optional">
+ {t}Please use your username and your password to log into the site administration system.{/t}<br />
+ {if $ssl}<b>{$ssl}</b>{/if}
+ {if $lifetime}<b><font style="color:red";>{$lifetime}</font></b>{/if}
+ </div>
- <input id="focus" name="focus" type="image" src="images/empty.png" style="width:0px; height:0px;" />
- <div style="text-align:center; padding:10px;">
- <label for="username"><img class="center" align="middle" src="{$personal_img}" alt="{t}Username{/t}" title="{t}Username{/t}"/> </label>
- <input type="text" name="username" id="username" maxlength="40" value="{$username}"
+ <input id="focus" name="focus" type="image" src="images/empty.png" style="width:0px; height:0px;" />
+ <div>
+ <label for="username"><img class="center" align="middle" src="{$personal_img}" alt="{t}Username{/t}" title="{t}Username{/t}"/> </label>
+ <input type="text" name="username" id="username" maxlength="40" value="{$username}"
title="{t}Username{/t}" onFocus="nextfield= 'password';" />
- <br />
- <br />
- <label for="password"><img class="center" align="middle" src="{$password_img}" alt="{t}Password{/t}" title="{t}Password{/t}" /> </label>
- <input type="password" name="password" id="password" maxlength="40" value=""
- title="{t}Password{/t}" onFocus="nextfield= 'login';" />
- <br />
- <a href="recovery.php">{t}I forgot my password{/t}</a>
+ <br />
+ <br />
+ <label for="password"><img class="center" align="middle" src="{$password_img}" alt="{t}Password{/t}" title="{t}Password{/t}" /> </label>
+ <input type="password" name="password" id="password" maxlength="40" value=""
+ title="{t}Password{/t}" onFocus="nextfield= 'login';" />
+ <br />
+ <a href="recovery.php">{t}I forgot my password{/t}</a>
</div>
- <div style="text-align:center; padding:15px;">
- <img class="center" align="middle" src="{$directory_img}" alt="{t}Directory{/t}" title="{t}Directory{/t}" />
+ <div>
+ <img class="center" align="middle" src="{$directory_img}" alt="{t}Directory{/t}" title="{t}Directory{/t}" />
<select name="server" title="{t}Directory{/t}" onchange="javascript:document.mainform.submit();">
{html_options options=$server_options selected=$server_id}
</select>
@@ -55,28 +47,27 @@
<!-- check, if cookies are enabled -->
<p class="gosaLoginWarning">
<script language="JavaScript" type="text/javascript">
- <!--
+ <!--
document.cookie = "gosatest=empty;path=/";
if (document.cookie.indexOf( "gosatest=") > -1 )
- document.cookie = "gosatest=empty;path=/;expires=Thu, 01-Jan-1970 00:00:01 GMT";
+ document.cookie = "gosatest=empty;path=/;expires=Thu, 01-Jan-1970 00:00:01 GMT";
else
- document.write("{$cookies}");
- -->
+ document.write("{$cookies}");
+ -->
</script>
</p>
</div>
- <div style="padding:10px;">
- <div style="float:left; color:red; font-weight:bold">
+ <div id="window_footer" class="plugbottom">
+ <div>
{$message}
</div>
- <div style="float:right; text-align:right;">
+ <div>
<!-- Display error message on demand -->
- <input type="submit" name="login" value="{t}Sign in{/t}"
- title="{t}Click here to log in{/t}" onFocus="nextfield='login';" />
+ <input type="submit" name="login" value="{t}Sign in{/t}"
+ title="{t}Click here to log in{/t}" onFocus="nextfield='login';" />
<input type="hidden" name="javascript" value="false" />
<input type="hidden" name="login" value="{t}Sign in{/t}" />
</div>
- <div style="clear:both"></div>
</div>
</form>
diff --git a/ihtml/themes/default/recovery.tpl b/ihtml/themes/default/recovery.tpl
index da5b638cd187ab498c5556626c44345552c5c405..d5fea6be1b664ca45dae53f279581345746d02f5 100644
--- a/ihtml/themes/default/recovery.tpl
+++ b/ihtml/themes/default/recovery.tpl
@@ -1,30 +1,25 @@
-<body style='height:100%; width:100%;'>
+<body onLoad="javascript:$$('div.debug_div').each(function (a) { a.hide(); });">
{* FusionDirectory recovery - smarty template *}
{$php_errors}
<div>
- <div class='setup_header'>
- <div style="float:left;"><img src='themes/default/images/go_logo.png' class='center' alt='FusionDirectory' /></div>
- <div style="padding-top:8px;text-align:right;height:38px;color:#FFFFFF">{$version}</div>
- </div>
- <div class='setup_menu'>
- <b>{t}FusionDirectory password recovery{/t}</b>
- </div>
+ {include file={filePath file="setup_header.tpl"}}
+ <div class='setup_menu'>
+ <b>{t}FusionDirectory password recovery{/t}</b>
+ </div>
</div>
- <!-- Spacer for some browsers -->
- <div class='gosaLoginSpacer'></div>
+<div id="window_container">
- <div style='float:left; width:25%;'> </div>
- <div style='float:left; width:50%; border:1px solid #AAAAAA;background-color:white'>
+<div id="window_div">
<form action='recovery.php{$params}' method='post' name='mainform' onSubmit='js_check(this);return true;'>
-{$msg_dialogs}
- <div style='padding:3px; background-color:#F8F8F8;border-bottom:1px solid #AAAAAA'>
- <p class="center" style="margin:0px 0px 0px 5px;padding:5px;font-size:24px;font-weight:bold;">
- <img class="center" src="images/password.png" alt="{t}Password{/t}" title="{t}Password{/t}">
- {t}Lost password{/t}
- </p>
+ {$msg_dialogs}
+ <div id="window_titlebar">
+ <p>
+ <img class="center" src="images/password.png" alt="{t}Password{/t}" title="{t}Password{/t}"/>
+ {t}Lost password{/t}
+ </p>
</div>
{if $activated}
<div style="padding-left:10px;padding-right:10px;">
@@ -160,6 +155,8 @@
{/if}
</div>
</form>
+</div>
+</div>
<!-- Place cursor in username field -->
<script language="JavaScript" type="text/javascript">
diff --git a/ihtml/themes/default/setup_headers.tpl b/ihtml/themes/default/setup_headers.tpl
deleted file mode 100644
index 1aeb2c3232b099156eaeaeaec2655185f4d76b0e..0000000000000000000000000000000000000000
--- a/ihtml/themes/default/setup_headers.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
- <title>{if isset($title)}{$title}{else}FusionDirectory{/if}</title>
-
- <meta name="generator" content="my hands">
- <meta name="description" content="FusionDirectory - Login">
- <meta name="author" lang="de" content="FusionDirectory Project">
-
- <meta http-equiv="Expires" content="Mon, 26 Jul 1997 05:00:00 GMT">
- <meta http-equiv="Last-Modified" content="{$date} GMT">
- <meta http-equiv="Cache-Control" content="no-cache">
- <meta http-equiv="Pragma" content="no-cache">
- <meta http-equiv="Cache-Control" content="post-check=0, pre-check=0">
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
- <style type="text/css">@import url('themes/default/style.css');</style>
- <link rel="shortcut icon" href="favicon.ico">
-
- <script language="javascript" src="include/prototype.js" type="text/javascript"></script>
- <script language="javascript" src="include/fusiondirectory.js" type="text/javascript"></script>
-</head>
diff --git a/setup/setup_frame.tpl b/setup/setup_frame.tpl
index b27973f67ae25d97dffc0842a8bc3686887179e3..62b460b7b24899ba5f149a8f0e4234aa71ad46fc 100644
--- a/setup/setup_frame.tpl
+++ b/setup/setup_frame.tpl
@@ -4,10 +4,7 @@
{$msg_dialogs}
<input id='focus' name='focus' type='image' src='images/empty.png' style='width:0px; height:0px;' >
<div class='setup_dialog'>
- <div class='setup_header'>
- <div style="float:left;"><img src='themes/default/images/go_logo.png' class='center' alt='FusionDirectory'></div>
- <div style="padding-top:8px;text-align:right;height:38px;color:#FFFFFF">{$version}</div>
- </div>
+ {include file={filePath file="setup_header.tpl"}}
<div class='setup_menu'>
<b>{t}FusionDirectory setup wizard{/t}</b>
</div>
@@ -18,9 +15,9 @@
<div style='padding:4px'>
<img src='images/setup/fai.png' class='center' alt='{t}Installation{/t}'> <font style="font-size:24px;">{t}Setup{/t}</font>
</div>
- {$navigation}
+ {$navigation}
</div>
-
+
<div class='setup_contents'>
<div style='border-bottom:1px dashed #AAAAAA'>
{$errors}