git.annexia.org
/
cocanwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
All new templates. Site menu displays basically everywhere.
[cocanwiki.git]
/
scripts
/
edit.ml
diff --git
a/scripts/edit.ml
b/scripts/edit.ml
index
0d22746
..
effef45
100644
(file)
--- a/
scripts/edit.ml
+++ b/
scripts/edit.ml
@@
-1,7
+1,7
@@
(* COCANWIKI scripts.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
(* COCANWIKI scripts.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: edit.ml,v 1.
5 2004/09/08 13:09:05
rich Exp $
+ * $Id: edit.ml,v 1.
7 2004/09/09 09:35:33
rich Exp $
*)
open Apache
*)
open Apache
@@
-18,9
+18,6
@@
open Cocanwiki_emailnotify
open Cocanwiki_diff
open Cocanwiki_strings
open Cocanwiki_diff
open Cocanwiki_strings
-let template = get_template "edit.html"
-let template_conflict = get_template "edit_conflict.html"
-
(* We keep an "internal model" of the page - see build_internal_model ()
* below.
*)
(* We keep an "internal model" of the page - see build_internal_model ()
* below.
*)
@@
-33,7
+30,10
@@
type model_t = {
* for each section. *)
}
* for each section. *)
}
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
+ let template = get_template dbh hostid "edit.html" in
+ let template_conflict = get_template dbh hostid "edit_conflict.html" in
+
(* Workaround bugs in IE, specifically lack of support for <button>
* elements.
*)
(* Workaround bugs in IE, specifically lack of support for <button>
* elements.
*)