moved <html> tags to templates, Im making the core html compliant, and added a greybar on the rightside

This commit is contained in:
seek3r 2001-01-09 18:58:34 +00:00
parent 235a4d42d0
commit 5fc390a75c
12 changed files with 339 additions and 238 deletions

View File

@ -454,32 +454,10 @@
}
function phpgw_header() {
global $phpgw, $phpgw_info, $HTMLCOMPLAINT;
global $phpgw, $phpgw_info;
echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\"> ";
echo "<HTML LANG=\"en\">";
echo "<HEAD>";
echo "<TITLE>".$phpgw_info["server"]["site_title"]."</TITLE>";
echo "<META http-equiv=\"Content-Type\" content=\"text/html; charset=\"".$phpgw->translation->translate("charset")."\">";
echo "<STYLE type=\"text/css\">";
echo " a {text-decoration:none;}";
echo " <!--";
echo " A:link{text-decoration:none}";
echo " A:visted{text-decoration:none}";
echo " A:active{text-decoration:none}";
echo " body { margin-top: 0px; margin-right: 0px; margin-left: 0px}";
echo " .tablink";
echo " {";
echo " color: #000000;";
echo " }";
echo " -->";
echo "</STYLE>";
echo "</HEAD>";
if ($phpgw_info["server"]["htmlcompliant"]) {
echo ("<BODY BGCOLOR=\"".$phpgw_info["theme"]["bg_color"]."\" ALINK=\"".$phpgw_info["theme"]["alink"]."\" LINK=\"".$phpgw_info["theme"]["link"]."\" VLINK=\"".$phpgw_info["theme"]["vlink"]."\">\n");
} else {
echo ("<BODY BGCOLOR=\"".$phpgw_info["theme"]["bg_color"]."\">\n");
}
include($phpgw_info["server"]["include_root"] . "/phpgwapi/templates/"
. $phpgw_info["server"]["template_set"] . "/head.inc.php");
$this->navbar(False);
include($phpgw_info["server"]["include_root"] . "/phpgwapi/templates/"
. $phpgw_info["server"]["template_set"] . "/navbar.inc.php");

View File

@ -0,0 +1,25 @@
<?php
/**************************************************************************\
* phpGroupWare *
* http://www.phpgroupware.org *
* -------------------------------------------- *
* This program is free software; you can redistribute it and/or modify it *
* under the terms of the GNU General Public License as published by the *
* Free Software Foundation; either version 2 of the License, or (at your *
* option) any later version. *
\**************************************************************************/
/* $Id$ */
if ($phpgw_info["server"]["htmlcompliant"]) {
$bodyheader = "BGCOLOR=\"".$phpgw_info["theme"]["bg_color"]."\" ALINK=\"".$phpgw_info["theme"]["alink"]."\" LINK=\"".$phpgw_info["theme"]["link"]."\" VLINK=\"".$phpgw_info["theme"]["vlink"]."\"";
} else {
$bodyheader = "BGCOLOR=\"".$phpgw_info["theme"]["bg_color"]."\"";
}
$tpl = new Template($phpgw_info["server"]["template_dir"]);
$tpl->set_unknowns("remove");
$tpl->set_file(array("head" => "head.tpl"));
$tpl->set_var("website_title", $phpgw_info["server"]["site_title"]);
$tpl->set_var("body_tags",$bodyheader);
echo $tpl->finish($tpl->parse("out","head"));

View File

@ -0,0 +1,23 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<HTML>
<!-- BEGIN head -->
<HEAD>
<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
<META NAME="description" CONTENT="phpGroupWare">
<META NAME="keywords" CONTENT="phpGroupWare">
<STYLE type="text/css">
a {text-decoration:none;}
<!--
A:link{text-decoration:none}
A:visted{text-decoration:none}
A:active{text-decoration:none}
body { margin-top: 0px; margin-right: 0px; margin-left: 0px}
.tablink { color: #000000; }
-->
</STYLE>
<TITLE>{website_title}</TITLE>
</HEAD>
<BODY {body_tags}>
<!-- END Head -->

View File

@ -1,60 +1,67 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<HTML>
<!-- BEGIN login_form -->
<html>
<head>
<title>{website_title} - Login</title>
</head>
<HEAD>
<body bgcolor="FFFFFF">
<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
<META NAME="description" CONTENT="phpGroupWare login screen">
<META NAME="keywords" CONTENT="phpGroupWare login screen">
<TITLE>{website_title} - Login</TITLE>
</HEAD>
<BODY bgcolor="#FFFFFF">
<p>&nbsp;</p>
<center>{lang_message}</center>
<CENTER>{lang_message}</CENTER>
<p>&nbsp;</p>
<table bgcolor="000000" border="0" cellpadding="0" cellspacing="0" width="40%" align="center">
<tr>
<td>
<table border="0" width="100%" bgcolor="486591" cellpadding="2" cellspacing="1">
<tr bgcolor="486591">
<td align="left" valign="center">
<a href="http://www.phpgroupware.org"><img src="phpgwapi/templates/{template_set}/images/logo.gif" alt="phpGroupWare" border="0"></a>
</td>
</tr>
<tr bgcolor="e6e6e6">
<td valign="baselines">
<TABLE bgcolor="000000" border="0" cellpadding="0" cellspacing="0" width="40%" align="CENTER">
<TR>
<TD>
<TABLE border="0" width="100%" bgcolor="486591" cellpadding="2" cellspacing="1">
<TR bgcolor="486591">
<TD align="LEFT" valign="MIDDLE">
<A href="http://www.phpgroupware.org"><img src="phpgwapi/templates/{template_set}/images/logo.gif" alt="phpGroupWare" border="0"></a>
</TD>
</TR>
<TR bgcolor="e6e6e6">
<TD valign="BASELINE">
<form method="post" action="{login_url}">
<table border="0" align="center" bgcolor="486591" width="100%" cellpadding="0" cellspacing="0">
<tr bgcolor="e6e6e6">
<td colspan="2" align="center">
<FORM method="post" action="{login_url}">
<TABLE border="0" align="CENTER" bgcolor="486591" width="100%" cellpadding="0" cellspacing="0">
<TR bgcolor="e6e6e6">
<TD colspan="2" align="CENTER">
{cd}
</td>
</tr>
<tr bgcolor="e6e6e6">
<td align="right"><font color="000000">{lang_username}:&nbsp;</font></td>
<td><input name="login" value="{cookie}"></td>
</tr>
<tr bgcolor="e6e6e6">
<td align="right"><font color="000000">{lang_password}:&nbsp;</font></td>
<td><input name="passwd" type="password"></td>
</tr>
<tr bgcolor="e6e6e6">
<td colspan="2" align="center">
</TD>
</TR>
<TR bgcolor="e6e6e6">
<TD align="RIGHT"><font color="000000">{lang_username}:&nbsp;</font></TD>
<TD><input name="login" value="{cookie}"></TD>
</TR>
<TR bgcolor="e6e6e6">
<TD align="RIGHT"><font color="000000">{lang_password}:&nbsp;</font></TD>
<TD><input name="passwd" type="password"></TD>
</TR>
<TR bgcolor="e6e6e6">
<TD colspan="2" align="CENTER">
<input type="submit" value="{lang_login}" name="submit">
</td>
</tr>
<tr bgcolor="e6e6e6">
<td colspan="2" align="right">
</TD>
</TR>
<TR bgcolor="e6e6e6">
<TD colspan="2" align="RIGHT">
<font color="000000" size="-1">{version}</font>
</td>
</tr>
</table>
</form>
</TD>
</TR>
</TABLE>
</FORM>
</td>
</tr>
</table>
</td>
</tr>
</table>
</TD>
</TR>
</TABLE>
</TD>
</TR>
</TABLE>
</html>
<!-- END login_form -->
</HTML>

View File

@ -1,14 +1,14 @@
<!-- BEGIN form -->
<body bgcolor="FFFFFF">
<a href="http://www.phpgroupware.org"><img src="phpGroupWare.jpg" alt="phpGroupWare" border="0"></a>
<BODY bgcolor="#FFFFFF">
<A href="http://www.phpgroupware.org"><img src="phpGroupWare.jpg" alt="phpGroupWare" border="0"></a>
<table border="0" height="94%" width="100%">
<tr>
<td align="center">
<TABLE border="0" height="94%" width="100%">
<TR>
<TD align="CENTER">
Opps! You caught us in the middle of a system upgrade.<br>Please, check back with us shortly.
</td>
</tr>
</table>
</TD>
</TR>
</TABLE>
<!-- END form -->

View File

@ -1,63 +1,70 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<HTML>
<!-- BEGIN login_form -->
<html>
<head>
<title>{website_title} - Login</title>
</head>
<HEAD>
<body bgcolor="FFFFFF">
<a href="http://www.phpgroupware.org"><img src="phpGroupWare.jpg" alt="phpGroupWare" border="0"></a>
<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
<META NAME="description" CONTENT="phpGroupWare login screen">
<META NAME="keywords" CONTENT="phpGroupWare login screen">
<TITLE>{website_title} - Login</TITLE>
</HEAD>
<BODY bgcolor="#FFFFFF">
<A href="http://www.phpgroupware.org"><img src="phpGroupWare.jpg" alt="phpGroupWare" border="0"></a>
<p>&nbsp;</p>
<center>{lang_message}</center>
<CENTER>{lang_message}</CENTER>
<p>&nbsp;</p>
<table bgcolor="000000" border="0" cellpadding="0" cellspacing="0" width="60%" align="center">
<tr>
<td>
<table border="0" width="100%" bgcolor="486591" cellpadding="2" cellspacing="1">
<tr bgcolor="486591">
<td align="left">
<TABLE bgcolor="000000" border="0" cellpadding="0" cellspacing="0" width="60%" align="CENTER">
<TR>
<TD>
<TABLE border="0" width="100%" bgcolor="486591" cellpadding="2" cellspacing="1">
<TR bgcolor="486591">
<TD align="LEFT">
<font color="fefefe">&nbsp;{lang_phpgw_login}</font>
</td>
</tr>
<tr bgcolor="e6e6e6">
<td valign="baselines">
</TD>
</TR>
<TR bgcolor="e6e6e6">
<TD valign="BASELINE">
<form method="post" action="{login_url}">
<table border="0" align="center" bgcolor="486591" width="100%" cellpadding="0" cellspacing="0">
<tr bgcolor="e6e6e6">
<td colspan="3" align="center">
<FORM method="post" action="{login_url}">
<TABLE border="0" align="CENTER" bgcolor="486591" width="100%" cellpadding="0" cellspacing="0">
<TR bgcolor="e6e6e6">
<TD colspan="3" align="CENTER">
{cd}
</td>
</tr>
<tr bgcolor="e6e6e6">
<td align="right"><font color="000000">{lang_username}:</font></td>
<td align="right"><input name="login" value="{cookie}"></td>
<td align="left">&nbsp;@&nbsp;<select name="logindomain">{select_domain}</select></td>
</tr>
<tr bgcolor="e6e6e6">
<td align="right"><font color="000000">{lang_password}:</font></td>
<td align="right"><input name="passwd" type="password"></td>
<td>&nbsp;</td>
</tr>
<tr bgcolor="e6e6e6">
<td colspan="3" align="center">
</TD>
</TR>
<TR bgcolor="e6e6e6">
<TD align="RIGHT"><font color="000000">{lang_username}:</font></TD>
<TD align="RIGHT"><input name="login" value="{cookie}"></TD>
<TD align="LEFT">&nbsp;@&nbsp;<select name="logindomain">{select_domain}</select></TD>
</TR>
<TR bgcolor="e6e6e6">
<TD align="RIGHT"><font color="000000">{lang_password}:</font></TD>
<TD align="RIGHT"><input name="passwd" type="password"></TD>
<TD>&nbsp;</TD>
</TR>
<TR bgcolor="e6e6e6">
<TD colspan="3" align="CENTER">
<input type="submit" value="{lang_login}" name="submit">
</td>
</tr>
<tr bgcolor="e6e6e6">
<td colspan="3" align="right">
</TD>
</TR>
<TR bgcolor="e6e6e6">
<TD colspan="3" align="RIGHT">
<font color="000000" size="-1">{version}</font>
</td>
</tr>
</table>
</form>
</TD>
</TR>
</TABLE>
</FORM>
</td>
</tr>
</table>
</td>
</tr>
</table>
</TD>
</TR>
</TABLE>
</TD>
</TR>
</TABLE>
</html>
<!-- END login_form -->
</HTML>

View File

@ -0,0 +1,25 @@
<?php
/**************************************************************************\
* phpGroupWare *
* http://www.phpgroupware.org *
* -------------------------------------------- *
* This program is free software; you can redistribute it and/or modify it *
* under the terms of the GNU General Public License as published by the *
* Free Software Foundation; either version 2 of the License, or (at your *
* option) any later version. *
\**************************************************************************/
/* $Id$ */
if ($phpgw_info["server"]["htmlcompliant"]) {
$bodyheader = "BGCOLOR=\"".$phpgw_info["theme"]["bg_color"]."\" ALINK=\"".$phpgw_info["theme"]["alink"]."\" LINK=\"".$phpgw_info["theme"]["link"]."\" VLINK=\"".$phpgw_info["theme"]["vlink"]."\"";
} else {
$bodyheader = "BGCOLOR=\"".$phpgw_info["theme"]["bg_color"]."\"";
}
$tpl = new Template($phpgw_info["server"]["template_dir"]);
$tpl->set_unknowns("remove");
$tpl->set_file(array("head" => "head.tpl"));
$tpl->set_var("website_title", $phpgw_info["server"]["site_title"]);
$tpl->set_var("body_tags",$bodyheader);
echo $tpl->finish($tpl->parse("out","head"));

View File

@ -0,0 +1,23 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<HTML>
<!-- BEGIN head -->
<HEAD>
<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
<META NAME="description" CONTENT="phpGroupWare">
<META NAME="keywords" CONTENT="phpGroupWare">
<STYLE type="text/css">
a {text-decoration:none;}
<!--
A:link{text-decoration:none}
A:visted{text-decoration:none}
A:active{text-decoration:none}
body { margin-top: 0px; margin-right: 0px; margin-left: 0px}
.tablink { color: #000000; }
-->
</STYLE>
<TITLE>{website_title}</TITLE>
</HEAD>
<BODY {body_tags}>
<!-- END Head -->

Binary file not shown.

After

Width:  |  Height:  |  Size: 105 B

View File

@ -1,61 +1,67 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<HTML>
<!-- BEGIN login_form -->
<html>
<head>
<title>{website_title} - Login</title>
</head>
<HEAD>
<body bgcolor="FFFFFF">
<a href="http://www.phpgroupware.org"><img src="phpGroupWare.jpg" alt="phpGroupWare" border="0"></a>
<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
<META NAME="description" CONTENT="phpGroupWare login screen">
<META NAME="keywords" CONTENT="phpGroupWare login screen">
<TITLE>{website_title} - Login</TITLE>
</HEAD>
<BODY bgcolor="#FFFFFF">
<p>&nbsp;</p>
<center>{lang_message}</center>
<CENTER>{lang_message}</CENTER>
<p>&nbsp;</p>
<table bgcolor="000000" border="0" cellpadding="0" cellspacing="0" width="40%" align="center">
<tr>
<td>
<table border="0" width="100%" bgcolor="486591" cellpadding="2" cellspacing="1">
<tr bgcolor="486591">
<td align="left">
<font color="fefefe">&nbsp;{lang_phpgw_login}</font>
</td>
</tr>
<tr bgcolor="e6e6e6">
<td valign="baselines">
<TABLE bgcolor="000000" border="0" cellpadding="0" cellspacing="0" width="40%" align="CENTER">
<TR>
<TD>
<TABLE border="0" width="100%" bgcolor="486591" cellpadding="2" cellspacing="1">
<TR bgcolor="486591">
<TD align="LEFT" valign="MIDDLE">
<A href="http://www.phpgroupware.org"><img src="phpgwapi/templates/{template_set}/images/logo.gif" alt="phpGroupWare" border="0"></a>
</TD>
</TR>
<TR bgcolor="e6e6e6">
<TD valign="BASELINE">
<form method="post" action="{login_url}">
<table border="0" align="center" bgcolor="486591" width="100%" cellpadding="0" cellspacing="0">
<tr bgcolor="e6e6e6">
<td colspan="2" align="center">
<FORM method="post" action="{login_url}">
<TABLE border="0" align="CENTER" bgcolor="486591" width="100%" cellpadding="0" cellspacing="0">
<TR bgcolor="e6e6e6">
<TD colspan="2" align="CENTER">
{cd}
</td>
</tr>
<tr bgcolor="e6e6e6">
<td align="right"><font color="000000">{lang_username}:&nbsp;</font></td>
<td><input name="login" value="{cookie}"></td>
</tr>
<tr bgcolor="e6e6e6">
<td align="right"><font color="000000">{lang_password}:&nbsp;</font></td>
<td><input name="passwd" type="password"></td>
</tr>
<tr bgcolor="e6e6e6">
<td colspan="2" align="center">
</TD>
</TR>
<TR bgcolor="e6e6e6">
<TD align="RIGHT"><font color="000000">{lang_username}:&nbsp;</font></TD>
<TD><input name="login" value="{cookie}"></TD>
</TR>
<TR bgcolor="e6e6e6">
<TD align="RIGHT"><font color="000000">{lang_password}:&nbsp;</font></TD>
<TD><input name="passwd" type="password"></TD>
</TR>
<TR bgcolor="e6e6e6">
<TD colspan="2" align="CENTER">
<input type="submit" value="{lang_login}" name="submit">
</td>
</tr>
<tr bgcolor="e6e6e6">
<td colspan="2" align="right">
</TD>
</TR>
<TR bgcolor="e6e6e6">
<TD colspan="2" align="RIGHT">
<font color="000000" size="-1">{version}</font>
</td>
</tr>
</table>
</form>
</TD>
</TR>
</TABLE>
</FORM>
</td>
</tr>
</table>
</td>
</tr>
</table>
</TD>
</TR>
</TABLE>
</TD>
</TR>
</TABLE>
</html>
<!-- END login_form -->
</HTML>

View File

@ -1,14 +1,14 @@
<!-- BEGIN form -->
<body bgcolor="FFFFFF">
<a href="http://www.phpgroupware.org"><img src="phpGroupWare.jpg" alt="phpGroupWare" border="0"></a>
<BODY bgcolor="#FFFFFF">
<A href="http://www.phpgroupware.org"><img src="phpGroupWare.jpg" alt="phpGroupWare" border="0"></a>
<table border="0" height="94%" width="100%">
<tr>
<td align="center">
<TABLE border="0" height="94%" width="100%">
<TR>
<TD align="CENTER">
Opps! You caught us in the middle of a system upgrade.<br>Please, check back with us shortly.
</td>
</tr>
</table>
</TD>
</TR>
</TABLE>
<!-- END form -->

View File

@ -1,63 +1,70 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<HTML>
<!-- BEGIN login_form -->
<html>
<head>
<title>{website_title} - Login</title>
</head>
<HEAD>
<body bgcolor="FFFFFF">
<a href="http://www.phpgroupware.org"><img src="phpGroupWare.jpg" alt="phpGroupWare" border="0"></a>
<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
<META NAME="description" CONTENT="phpGroupWare login screen">
<META NAME="keywords" CONTENT="phpGroupWare login screen">
<TITLE>{website_title} - Login</TITLE>
</HEAD>
<BODY bgcolor="#FFFFFF">
<A href="http://www.phpgroupware.org"><img src="phpGroupWare.jpg" alt="phpGroupWare" border="0"></a>
<p>&nbsp;</p>
<center>{lang_message}</center>
<CENTER>{lang_message}</CENTER>
<p>&nbsp;</p>
<table bgcolor="000000" border="0" cellpadding="0" cellspacing="0" width="60%" align="center">
<tr>
<td>
<table border="0" width="100%" bgcolor="486591" cellpadding="2" cellspacing="1">
<tr bgcolor="486591">
<td align="left">
<TABLE bgcolor="000000" border="0" cellpadding="0" cellspacing="0" width="60%" align="CENTER">
<TR>
<TD>
<TABLE border="0" width="100%" bgcolor="486591" cellpadding="2" cellspacing="1">
<TR bgcolor="486591">
<TD align="LEFT">
<font color="fefefe">&nbsp;{lang_phpgw_login}</font>
</td>
</tr>
<tr bgcolor="e6e6e6">
<td valign="baselines">
</TD>
</TR>
<TR bgcolor="e6e6e6">
<TD valign="BASELINE">
<form method="post" action="{login_url}">
<table border="0" align="center" bgcolor="486591" width="100%" cellpadding="0" cellspacing="0">
<tr bgcolor="e6e6e6">
<td colspan="3" align="center">
<FORM method="post" action="{login_url}">
<TABLE border="0" align="CENTER" bgcolor="486591" width="100%" cellpadding="0" cellspacing="0">
<TR bgcolor="e6e6e6">
<TD colspan="3" align="CENTER">
{cd}
</td>
</tr>
<tr bgcolor="e6e6e6">
<td align="right"><font color="000000">{lang_username}:</font></td>
<td align="right"><input name="login" value="{cookie}"></td>
<td align="left">&nbsp;@&nbsp;<select name="logindomain">{select_domain}</select></td>
</tr>
<tr bgcolor="e6e6e6">
<td align="right"><font color="000000">{lang_password}:</font></td>
<td align="right"><input name="passwd" type="password"></td>
<td>&nbsp;</td>
</tr>
<tr bgcolor="e6e6e6">
<td colspan="3" align="center">
</TD>
</TR>
<TR bgcolor="e6e6e6">
<TD align="RIGHT"><font color="000000">{lang_username}:</font></TD>
<TD align="RIGHT"><input name="login" value="{cookie}"></TD>
<TD align="LEFT">&nbsp;@&nbsp;<select name="logindomain">{select_domain}</select></TD>
</TR>
<TR bgcolor="e6e6e6">
<TD align="RIGHT"><font color="000000">{lang_password}:</font></TD>
<TD align="RIGHT"><input name="passwd" type="password"></TD>
<TD>&nbsp;</TD>
</TR>
<TR bgcolor="e6e6e6">
<TD colspan="3" align="CENTER">
<input type="submit" value="{lang_login}" name="submit">
</td>
</tr>
<tr bgcolor="e6e6e6">
<td colspan="3" align="right">
</TD>
</TR>
<TR bgcolor="e6e6e6">
<TD colspan="3" align="RIGHT">
<font color="000000" size="-1">{version}</font>
</td>
</tr>
</table>
</form>
</TD>
</TR>
</TABLE>
</FORM>
</td>
</tr>
</table>
</td>
</tr>
</table>
</TD>
</TR>
</TABLE>
</TD>
</TR>
</TABLE>
</html>
<!-- END login_form -->
</HTML>