q/thirdculture-werc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reorg headers, http headers now are echo-ed from werc.rc instead of being part of headers.tpl.

Browse source 
This fixes some bugs in the handling HEAD and makes things a bit more clear.
This commit is contained in:
Uriel 2009-03-13 13:04:25 +01:00
parent 77ecde8fa2
commit 673bdaf664
6 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/default_master.tpl
View file

@ -1,4 +1,3 @@
<div id="header">
<div class="superHeader">
% cat `{ get_lib_file top_bar.inc }

16
lib/headers.tpl
View file

@ -1,8 +1,3 @@
% for(h in $extraHttpHeaders) echo $h
Content-Type: text/html
% if(~ $REQUEST_METHOD HEAD)
% exit
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@ -11,7 +6,13 @@ Content-Type: text/html
<title>%($pageTitle%)</title>
<link rel="stylesheet" href="/pub/style/style.css" type="text/css" media="screen, handheld" title="default" />
<link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
% if(test -f $sitedir/_werc/pub/style.css)
% echo ' <link rel="stylesheet" href="/_werc/pub/style.css" type="text/css" media="screen" title="default" />'
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="author" content="k" />
% if(! ~ $#meta_description 0)
@ -19,11 +20,6 @@ Content-Type: text/html
% if(! ~ $#meta_keywords 0)
% echo ' <meta name="keywords" content="'$"meta_keywords'" />'
<link rel="stylesheet" href="/pub/style/style.css" type="text/css" media="screen, handheld" title="default" />
<link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
% if(test -f $sitedir/_werc/pub/style.css)
% echo ' <link rel="stylesheet" href="/_werc/pub/style.css" type="text/css" media="screen" title="default" />'
% h = `{get_lib_file headers.inc}
% if(! ~ $#h 0)
% cat $h