Source: cocanwiki
Priority: optional
Maintainer: Richard W.M. Jones <rich@annexia.org>
-Build-Depends: debhelper (>= 4.0.0), libpcre-ocaml-dev, libpgsql-ocaml-dev, libextlib-ocaml-dev, libgregoriandate-ocaml-dev, ocaml-findlib, ocaml-nox-3.08, libapache-mod-caml (>= 1.3.2), libtemplate-ocaml-dev (>= 1.3.2), ocamldsort (>= 0.14.2)
+Build-Depends: debhelper (>= 4.0.0), libpcre-ocaml-dev, libpgsql-ocaml-dev, libextlib-ocaml-dev, libgregoriandate-ocaml-dev, ocaml-findlib, ocaml-nox-3.08, libapache-mod-caml (>= 1.3.3), libtemplate-ocaml-dev (>= 1.3.3), ocamldsort (>= 0.14.2)
Standards-Version: 3.6.1
Package: cocanwiki
Architecture: all
Depends: libpgsql-ocaml, libdbi-ocaml (>= 0.9.9), libpcre-ocaml,
libgregoriandate-ocaml,
- ocaml-base-nox-3.08, libapache-mod-caml (>= 1.3.2),
- libtemplate-ocaml-dev (>= 1.3.2),
+ ocaml-base-nox-3.08, libapache-mod-caml (>= 1.3.3),
+ libtemplate-ocaml-dev (>= 1.3.3),
libocamlnet-ocaml-dev (>= 0.98),
imagemagick, curl (>= 7.12.1)
Suggests: apache
(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: page.ml,v 1.38 2004/11/03 13:36:45 rich Exp $
+ * $Id: page.ml,v 1.39 2004/11/05 11:35:53 rich Exp $
*
* 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
let page = q#param "page" in
let page = if page = "" then "index" else page in
+ (* The main "page" template is split in two to improve the speed of
+ * delivery of the page. The very first part ("page_header.html")
+ * contains the page <head>, crucially including all the links to the
+ * stylesheets. We send this first and flush it out to the client so
+ * that the client can begin requesting stylesheets, background images
+ * and so on. After this we compose the main page ("page.html") and
+ * send it out second.
+ *)
+
+ let template_page_header =
+ get_template ~page dbh hostid "page_header.html" in
let template_page = get_template ~page dbh hostid "page.html" in
+
+ (* This is the simpler template for 404 pages. *)
let template_404 = get_template dbh hostid "page_404.html" in
(* Host-specific fields. *)
let make_page title description pageid last_modified_date has_page_css
version page page' extension =
let t = template_page in
+ let th = template_page_header in
t#set "title" title;
+ th#set "title" title;
t#set "last_modified_date" last_modified_date;
(match description with
- None -> t#conditional "has_description" false
+ None -> th#conditional "has_description" false
| Some description ->
- t#conditional "has_description" true;
- t#set "description" description);
+ th#conditional "has_description" true;
+ th#set "description" description);
if page <> page' then (* redirection *) (
t#set "page" page';
+ th#set "page" page';
t#set "original_page" page; (* XXX title - get it from database *)
t#conditional "redirected" true
) else (
t#set "page" page;
+ th#set "page" page;
t#conditional "redirected" false
);
- t#conditional "has_host_css" has_host_css;
- t#conditional "has_page_css" has_page_css;
+ th#conditional "has_host_css" has_host_css;
+ th#conditional "has_page_css" has_page_css;
+
+ (* Are we showing an old version of the page? If so, warn. *)
+ (match version with
+ None ->
+ t#conditional "is_old_version" false;
+ th#conditional "is_old_version" false
+ | Some pageid ->
+ t#conditional "is_old_version" true;
+ th#conditional "is_old_version" true;
+ t#set "old_version" (string_of_int pageid);
+ th#set "old_version" (string_of_int pageid));
+
+ (* At this point, we can print out the header and flush it back to
+ * the user, allowing the browser to start fetching stylesheets
+ * and background images while we compose the page.
+ *)
+ q#header ();
+ print_string r th#to_string;
+ Request.rflush r;
t#conditional "has_feedback_email" has_feedback_email;
t#conditional "mailing_list" mailing_list;
t#table "sections" sections;
- (* Are we showing an old version of the page? If so, warn. *)
- (match version with
- None ->
- t#conditional "is_old_version" false
- | Some pageid ->
- t#conditional "is_old_version" true;
- t#set "old_version" (string_of_int pageid));
-
(* Login status. *)
(match user with
Anonymous ->
let xhtml = highlight_search_terms xhtml search_terms "search_term" in
(* Deliver the page. *)
- q#header ();
ignore (print_string r xhtml)
with
Not_found ->
(* No referer / no search terms / not a search engine referer. *)
- q#template t
+ ignore (print_string r t#to_string)
in
(* This code generates 404 pages. *)
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<title>::title_html::</title>
-::if(is_old_version)::<meta name="robots" content="noindex,nofollow"/>::end::
-::if(has_description)::<meta name="description" content="::description_html_tag::" />::end::
-<meta name="author" content="http://www.merjis.com/" />
-<link rel="stylesheet" href="::theme_css_html_tag::" type="text/css" title="Standard"/>
-<link rel="alternate stylesheet" href="/_css/easytoread.css" type="text/css" title="High contrast, big fonts"/>
-::if(has_host_css)::<link rel="stylesheet" href="/_global.css" type="text/css" title="Standard"/>::end::
-::if(has_page_css)::<link rel="stylesheet" href="/::page_html_tag::/styles.css::if(is_old_version)::?version=::old_version::::end::" type="text/css" title="Standard"/>::end::
-<link rel="icon" href="/_graphics/favicon.png" type="image/png" />
-<link rel="SHORTCUT ICON" href="/favicon.ico" type="image/x-icon" />
-</head><body>
+<body>
<h1><span>::title_html::</span></h1>
--- /dev/null
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<title>::title_html::</title>
+::if(is_old_version)::<meta name="robots" content="noindex,nofollow"/>::end::
+::if(has_description)::<meta name="description" content="::description_html_tag::" />::end::
+<meta name="author" content="http://www.merjis.com/" />
+<link rel="stylesheet" href="::theme_css_html_tag::" type="text/css" title="Standard"/>
+<link rel="alternate stylesheet" href="/_css/easytoread.css" type="text/css" title="High contrast, big fonts"/>
+::if(has_host_css)::<link rel="stylesheet" href="/_global.css" type="text/css" title="Standard"/>::end::
+::if(has_page_css)::<link rel="stylesheet" href="/::page_html_tag::/styles.css::if(is_old_version)::?version=::old_version::::end::" type="text/css" title="Standard"/>::end::
+<link rel="icon" href="/_graphics/favicon.png" type="image/png" />
+<link rel="SHORTCUT ICON" href="/favicon.ico" type="image/x-icon" />
+</head>
\ No newline at end of file
git.annexia.org / cocanwiki.git / commitdiff