Site menu now has properly generated <li> labels.

Edit sitemenu redirects back to sitewide settings page.
Bumped version for release.

diff --git a/debian/changelog b/debian/changelog
index 01fd502..1928605 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cocanwiki (1.3.7-3) unstable; urgency=low
+cocanwiki (1.3.7-4) unstable; urgency=low
 
   * Initial Release.
 

diff --git a/scripts/edit_sitemenu.ml b/scripts/edit_sitemenu.ml
index 975ee71..c283178 100644 (file)
--- a/scripts/edit_sitemenu.ml
+++ b/scripts/edit_sitemenu.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.
- * $Id: edit_sitemenu.ml,v 1.6 2004/10/21 19:54:29 rich Exp $
+ * $Id: edit_sitemenu.ml,v 1.7 2004/11/03 11:15:45 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
@@ -275,7 +275,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
 
       email_notify ~body ~subject ~user dbh hostid;
 
-      let buttons = [ ok_button "/" ] in
+      let buttons = [ ok_button "/_bin/host_menu.cmo" ] in
       ok ~title:"Saved" ~buttons
         q "The site menu was saved."
     );
@@ -284,7 +284,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
   in
 
   let cancel () =
-    q#redirect ("http://" ^ hostname ^ "/")
+    q#redirect ("http://" ^ hostname ^ "/_bin/host_menu.cmo")
   in
 
   (* This codes decides where we are in the current editing cycle.

diff --git a/templates/page.html b/templates/page.html
index 2d3b3ab..a9073b4 100644 (file)
--- a/templates/page.html
+++ b/templates/page.html
@@ -55,7 +55,7 @@
 <div id="menu_div">
 <ul id="bottommenu" class="menu">
 <li id="index_li" class="first"> ::if(is_homepage)::::else::<a href="/">::end::<span>Home&nbsp;page</span>::if(is_homepage)::::else::</a>::end:: </li>
-::table(sitemenu)::<li id="::url::_li"> ::if(is_linked)::<a href="/::url_html_tag::">::end::<span>::label_html::</span>::if(is_linked)::</a>::end:: </li>
+::table(sitemenu)::<li id="::id::_li"> ::if(is_linked)::<a href="/::url_html_tag::">::end::<span>::label_html::</span>::if(is_linked)::</a>::end:: </li>
 ::end::
 <li id="sitemap_li"> <a href="/_sitemap"><span>Sitemap</span></a> </li>
 </ul>