Tidy up:

 * This is version 1.1.0
 * Updated deps.
 * Updated MANIFEST.
 * Fixed one remaining script with wrong calling convention.

diff --git a/MANIFEST b/MANIFEST
index dc0f32a..8e9fbcf 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -9,11 +9,14 @@ conf/cocanwiki.conf
 html/_bin/.cvsignore
 html/_css/admin.css
 html/_css/create.css
+html/_css/easyweb.css
 html/_css/editor.css
 html/_css/files.css
 html/_css/images.css
+html/_css/login.css
 html/_css/markup.css
 html/_css/standard.css
+html/_css/users.css
 html/_graphics/.cvsignore
 html/_graphics/arrow-down.png
 html/_graphics/arrow-up.png
@@ -25,11 +28,13 @@ html/_graphics/mailto.png
 html/_graphics/markup-preview.png
 html/_graphics/newpage.png
 html/_graphics/ok.png
+html/_graphics/tick.png
 html/_js/editor.js
 html/_static/markup.html
 html/robots.txt
 scripts/.cvsignore
 scripts/.depend
+scripts/00-TEMPLATE.ml
 scripts/Makefile
 scripts/admin/.cvsignore
 scripts/admin/admin.ml
@@ -44,9 +49,16 @@ scripts/admin/edit_hostnames_form.ml
 scripts/admin/host.ml
 scripts/cgi_expires.ml
 scripts/cocanwiki.ml
+scripts/cocanwiki_date.ml
 scripts/cocanwiki_diff.ml
 scripts/cocanwiki_emailnotify.ml
+scripts/cocanwiki_files.ml
+scripts/cocanwiki_images.ml
+scripts/cocanwiki_images.mli
 scripts/cocanwiki_ok.ml
+scripts/cocanwiki_strings.ml
+scripts/cocanwiki_template.ml
+scripts/cocanwiki_template.mli
 scripts/cocanwiki_version.ml.in
 scripts/create.ml
 scripts/create_form.ml
@@ -58,14 +70,20 @@ scripts/diff.ml
 scripts/edit.ml
 scripts/edit_page_css.ml
 scripts/edit_page_css_form.ml
+scripts/edit_sitemenu.ml
+scripts/edit_user.ml
+scripts/edit_user_form.ml
 scripts/file.ml
 scripts/files.ml
+scripts/forgot_password.ml
+scripts/forgot_password_form.ml
 scripts/history.ml
 scripts/hoststyle.ml
 scripts/image.ml
 scripts/images.ml
-scripts/merjisforwiki.ml
-scripts/merjisforwiki.mli
+scripts/login.ml
+scripts/login_form.ml
+scripts/logout.ml
 scripts/page.ml
 scripts/pagestyle.ml
 scripts/preview.ml
@@ -73,6 +91,7 @@ scripts/recent.ml
 scripts/restore.ml
 scripts/restore_form.ml
 scripts/search.ml
+scripts/signup.ml
 scripts/sitemap.ml
 scripts/undelete_file.ml
 scripts/undelete_file_form.ml
@@ -82,8 +101,10 @@ scripts/upload_file.ml
 scripts/upload_file_form.ml
 scripts/upload_image.ml
 scripts/upload_image_form.ml
+scripts/users.ml
 scripts/wikilib.ml
 scripts/wikilib.mli
+templates/00-TEMPLATE.html
 templates/admin/admin.html
 templates/admin/create_host_form.html
 templates/admin/edit_emails_form.html
@@ -97,9 +118,13 @@ templates/diff.html
 templates/edit.html
 templates/edit_conflict.html
 templates/edit_page_css_form.html
+templates/edit_sitemenu.html
+templates/edit_user_form.html
 templates/files.html
+templates/forgot_password_form.html
 templates/history.html
 templates/images.html
+templates/login_form.html
 templates/ok_error.html
 templates/page.html
 templates/page_404.html
@@ -110,3 +135,4 @@ templates/undelete_file_form.html
 templates/undelete_image_form.html
 templates/upload_file_form.html
 templates/upload_image_form.html
+templates/users.html

diff --git a/Makefile.config b/Makefile.config
index 2a6cd8f..aa3d97d 100644 (file)
--- a/Makefile.config
+++ b/Makefile.config
@@ -1,7 +1,7 @@
-# $Id: Makefile.config,v 1.2 2004/09/07 10:37:41 rich Exp $
+# $Id: Makefile.config,v 1.3 2004/09/09 12:07:10 rich Exp $
 
 PACKAGE := cocanwiki
-VERSION := 1.0.0-rc1
+VERSION := 1.1.0
 
 # Normally ignored.  However, if you are installing centrally (using
 # 'make pkg-install'), then the components are installed in the

diff --git a/scripts/.depend b/scripts/.depend
index d2335d3..c7c4a9f 100644 (file)
--- a/scripts/.depend
+++ b/scripts/.depend
@@ -1,3 +1,5 @@
+00-TEMPLATE.cmo: cocanwiki.cmo cocanwiki_template.cmi 
+00-TEMPLATE.cmx: cocanwiki.cmx cocanwiki_template.cmx 
 cgi_expires.cmo: cocanwiki_date.cmo 
 cgi_expires.cmx: cocanwiki_date.cmx 
 cocanwiki.cmo: cocanwiki_ok.cmo 
@@ -10,8 +12,10 @@ cocanwiki_images.cmx: cocanwiki_files.cmx cocanwiki_strings.cmx \
     cocanwiki_images.cmi 
 cocanwiki_ok.cmo: cocanwiki_template.cmi 
 cocanwiki_ok.cmx: cocanwiki_template.cmx 
-cocanwiki_template.cmo: cocanwiki_files.cmo cocanwiki_template.cmi 
-cocanwiki_template.cmx: cocanwiki_files.cmx cocanwiki_template.cmi 
+cocanwiki_template.cmo: cocanwiki_files.cmo cocanwiki_version.cmo \
+    cocanwiki_template.cmi 
+cocanwiki_template.cmx: cocanwiki_files.cmx cocanwiki_version.cmx \
+    cocanwiki_template.cmi 
 create.cmo: cocanwiki.cmo cocanwiki_emailnotify.cmo cocanwiki_ok.cmo \
     wikilib.cmi 
 create.cmx: cocanwiki.cmx cocanwiki_emailnotify.cmx cocanwiki_ok.cmx \
@@ -71,9 +75,9 @@ login_form.cmx: cocanwiki.cmx cocanwiki_strings.cmx cocanwiki_template.cmx
 logout.cmo: cocanwiki.cmo cocanwiki_ok.cmo 
 logout.cmx: cocanwiki.cmx cocanwiki_ok.cmx 
 page.cmo: cocanwiki.cmo cocanwiki_date.cmo cocanwiki_ok.cmo \
-    cocanwiki_template.cmi cocanwiki_version.cmo wikilib.cmi 
+    cocanwiki_template.cmi wikilib.cmi 
 page.cmx: cocanwiki.cmx cocanwiki_date.cmx cocanwiki_ok.cmx \
-    cocanwiki_template.cmx cocanwiki_version.cmx wikilib.cmx 
+    cocanwiki_template.cmx wikilib.cmx 
 pagestyle.cmo: cgi_expires.cmo cocanwiki.cmo 
 pagestyle.cmx: cgi_expires.cmx cocanwiki.cmx 
 preview.cmo: cocanwiki.cmo wikilib.cmi 

diff --git a/scripts/00-TEMPLATE.ml b/scripts/00-TEMPLATE.ml
index 50a4c41..986fd0a 100644 (file)
--- a/scripts/00-TEMPLATE.ml
+++ b/scripts/00-TEMPLATE.ml
@@ -1,7 +1,7 @@
 (* COCANWIKI scripts.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: 00-TEMPLATE.ml,v 1.1 2004/09/08 17:07:24 rich Exp $
+ * $Id: 00-TEMPLATE.ml,v 1.2 2004/09/09 12:07:10 rich Exp $
  *)
 
 open Apache
@@ -12,7 +12,7 @@ open Printf
 open Cocanwiki
 open Cocanwiki_template
 
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
   let template = get_template dbh hostid "00-TEMPLATE.html" in