diff options
| author | Deryck Hodge <deryck@samba.org> | 2005-07-14 18:11:07 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:23:07 -0500 |
| commit | 3b18fe06d6001bfd9ad67f3b903a26720f628a4a (patch) | |
| tree | fd7a7852c10b71043eb17d28bc32b20c461f0a0d | |
| parent | 65b8c54fc277a9f147f3fcfe542406cbc063d222 (diff) | |
| download | samba-3b18fe06d6001bfd9ad67f3b903a26720f628a4a.tar.gz samba-3b18fe06d6001bfd9ad67f3b903a26720f628a4a.tar.xz samba-3b18fe06d6001bfd9ad67f3b903a26720f628a4a.zip | |
r8477: Simplify header/footer handling. esp variables allow
for individual page titles, so we don't need the split
header/footer here like we do on samba.org.
deryck
(This used to be commit af893fe83346f516402d0d6271533eedefa0ce4b)
| -rw-r--r-- | swat/scripting/footer.esp | 1 | ||||
| -rw-r--r-- | swat/scripting/footer_columns.esp | 2 | ||||
| -rw-r--r-- | swat/scripting/footer_plain.esp | 2 | ||||
| -rw-r--r-- | swat/scripting/header.esp | 4 | ||||
| -rw-r--r-- | swat/scripting/header_columns.esp | 7 | ||||
| -rw-r--r-- | swat/scripting/header_plain.esp | 7 |
6 files changed, 12 insertions, 11 deletions
diff --git a/swat/scripting/footer.esp b/swat/scripting/footer.esp deleted file mode 100644 index 5f85cabb08..0000000000 --- a/swat/scripting/footer.esp +++ /dev/null @@ -1 +0,0 @@ -</html> diff --git a/swat/scripting/footer_columns.esp b/swat/scripting/footer_columns.esp index 29b06a4caa..7b5baaf0c8 100644 --- a/swat/scripting/footer_columns.esp +++ b/swat/scripting/footer_columns.esp @@ -4,4 +4,4 @@ </div> </div> </body> -<% include("/scripting/footer.esp"); %> +</html> diff --git a/swat/scripting/footer_plain.esp b/swat/scripting/footer_plain.esp index ea0a3f7816..31ef8dd4ee 100644 --- a/swat/scripting/footer_plain.esp +++ b/swat/scripting/footer_plain.esp @@ -4,4 +4,4 @@ </div> </div> </body> -<% include("/scripting/footer.esp"); %> +</html> diff --git a/swat/scripting/header.esp b/swat/scripting/header.esp deleted file mode 100644 index 1630b2be04..0000000000 --- a/swat/scripting/header.esp +++ /dev/null @@ -1,4 +0,0 @@ -<!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" xml:lang="en" lang="en"> -<head> diff --git a/swat/scripting/header_columns.esp b/swat/scripting/header_columns.esp index 3bcdc4abe9..3d92bb9522 100644 --- a/swat/scripting/header_columns.esp +++ b/swat/scripting/header_columns.esp @@ -1,6 +1,9 @@ -<% include("/scripting/header.esp"); %> +<!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" xml:lang="en" lang="en"> +<head> -<title>@@global.page.title</title> + <title>@@global.page.title</title> <link rel="stylesheet" href="/style/common.css" type="text/css" media="all" /> <link rel="stylesheet" href="/style/main.css" type="text/css" media="all" /> diff --git a/swat/scripting/header_plain.esp b/swat/scripting/header_plain.esp index 69bd0cd718..f9eaae9b96 100644 --- a/swat/scripting/header_plain.esp +++ b/swat/scripting/header_plain.esp @@ -1,6 +1,9 @@ -<% include("/scripting/header.esp"); %> +<!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" xml:lang="en" lang="en"> +<head> -<title>@@global.page.title</title> + <title>@@global.page.title</title> <link rel="stylesheet" href="/style/common.css" type="text/css" media="all" /> <link rel="stylesheet" href="/style/main.css" type="text/css" media="all" /> |