git.annexia.org
/
cocanwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed to match ChriS's API changes to mod_caml.
[cocanwiki.git]
/
scripts
/
lib
/
cocanwiki_ok.ml
diff --git
a/scripts/lib/cocanwiki_ok.ml
b/scripts/lib/cocanwiki_ok.ml
index
70ac52f
..
4a1ca08
100644
(file)
--- a/
scripts/lib/cocanwiki_ok.ml
+++ b/
scripts/lib/cocanwiki_ok.ml
@@
-1,7
+1,7
@@
(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: cocanwiki_ok.ml,v 1.
1 2004/10/21 11:42
:05 rich Exp $
+ * $Id: cocanwiki_ok.ml,v 1.
2 2005/03/31 14:24
:05 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
*
* 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
@@
-26,7
+26,7
@@
open Printf
open Cocanwiki_template
open Cocanwiki_template
-(* Override
StdPages.ok and StdPages.error with out
our versions.
+(* Override
Template.StdPages.ok and Template.StdPages.error with
our versions.
* Also have some standard buttons around.
*)
let ok_error_template = _get_template "ok_error.html"
* Also have some standard buttons around.
*)
let ok_error_template = _get_template "ok_error.html"
@@
-35,15
+35,15
@@
let error ?cookie ?cookies ?title ?(icon = "/_graphics/error.png")
?icon_alt ?back_button ?close_button q message =
(* Set the status so scripts can determine if the request failed. *)
Request.set_status q#request cHTTP_BAD_REQUEST;
?icon_alt ?back_button ?close_button q message =
(* Set the status so scripts can determine if the request failed. *)
Request.set_status q#request cHTTP_BAD_REQUEST;
- StdPages.error ?cookie ?cookies ~template:ok_error_template
+
Template.
StdPages.error ?cookie ?cookies ~template:ok_error_template
?title ~icon ?icon_alt ?back_button ?close_button q message
let ok ?cookie ?cookies ?title ?(icon = "/_graphics/ok.png")
?icon_alt ?back_button ?close_button ?buttons q message =
?title ~icon ?icon_alt ?back_button ?close_button q message
let ok ?cookie ?cookies ?title ?(icon = "/_graphics/ok.png")
?icon_alt ?back_button ?close_button ?buttons q message =
- StdPages.ok ?cookie ?cookies ~template:ok_error_template
+
Template.
StdPages.ok ?cookie ?cookies ~template:ok_error_template
?title ~icon ?icon_alt ?back_button ?close_button ?buttons q message
?title ~icon ?icon_alt ?back_button ?close_button ?buttons q message
-let ok_button url = { StdPages.label = " OK ";
- StdPages.link = url;
- StdPages.method_ = None;
- StdPages.params = [] }
+let ok_button url = {
Template.
StdPages.label = " OK ";
+
Template.
StdPages.link = url;
+
Template.
StdPages.method_ = None;
+
Template.
StdPages.params = [] }