Updated deps.

Separate bottommenu and editmenu.

diff --git a/scripts/.depend b/scripts/.depend
index d4de9ba..2fc976e 100644 (file)
--- a/scripts/.depend
+++ b/scripts/.depend
@@ -40,10 +40,18 @@ edit_page_css.cmx: cocanwiki.cmx cocanwiki_diff.cmx cocanwiki_emailnotify.cmx \
     cocanwiki_ok.cmx cocanwiki_strings.cmx 
 edit_page_css_form.cmo: cocanwiki.cmo cocanwiki_template.cmo 
 edit_page_css_form.cmx: cocanwiki.cmx cocanwiki_template.cmx 
+edit_user.cmo: cocanwiki.cmo cocanwiki_ok.cmo cocanwiki_strings.cmo 
+edit_user.cmx: cocanwiki.cmx cocanwiki_ok.cmx cocanwiki_strings.cmx 
+edit_user_form.cmo: cocanwiki.cmo cocanwiki_date.cmo cocanwiki_template.cmo 
+edit_user_form.cmx: cocanwiki.cmx cocanwiki_date.cmx cocanwiki_template.cmx 
 file.cmo: cgi_expires.cmo cocanwiki.cmo 
 file.cmx: cgi_expires.cmx cocanwiki.cmx 
 files.cmo: cocanwiki.cmo cocanwiki_template.cmo 
 files.cmx: cocanwiki.cmx cocanwiki_template.cmx 
+forgot_password.cmo: cocanwiki.cmo cocanwiki_ok.cmo cocanwiki_strings.cmo 
+forgot_password.cmx: cocanwiki.cmx cocanwiki_ok.cmx cocanwiki_strings.cmx 
+forgot_password_form.cmo: cocanwiki.cmo cocanwiki_template.cmo 
+forgot_password_form.cmx: cocanwiki.cmx cocanwiki_template.cmx 
 history.cmo: cocanwiki.cmo cocanwiki_date.cmo cocanwiki_template.cmo 
 history.cmx: cocanwiki.cmx cocanwiki_date.cmx cocanwiki_template.cmx 
 hoststyle.cmo: cgi_expires.cmo cocanwiki.cmo cocanwiki_template.cmo 
@@ -104,6 +112,8 @@ upload_image.cmx: cocanwiki.cmx cocanwiki_emailnotify.cmx \
     cocanwiki_images.cmx cocanwiki_ok.cmx 
 upload_image_form.cmo: cocanwiki.cmo cocanwiki_template.cmo 
 upload_image_form.cmx: cocanwiki.cmx cocanwiki_template.cmx 
+users.cmo: cocanwiki.cmo cocanwiki_date.cmo cocanwiki_template.cmo 
+users.cmx: cocanwiki.cmx cocanwiki_date.cmx cocanwiki_template.cmx 
 wikilib.cmo: wikilib.cmi 
 wikilib.cmx: wikilib.cmi 
 admin/admin.cmo: cocanwiki.cmo cocanwiki_date.cmo cocanwiki_template.cmo 

diff --git a/templates/page.html b/templates/page.html
index 51876ac..8632ce2 100644 (file)
--- a/templates/page.html
+++ b/templates/page.html
@@ -40,7 +40,7 @@
 <li> <a href="/::page_html_tag::/edit"><strong>Edit&nbsp;this&nbsp;page</strong></a> | </li>
 ::end::
 <li> <a href="/">Home&nbsp;page</a> | </li>
-<li> <a href="/_sitemap">Sitemap</a> | </li>
+<li> <a href="/_sitemap">Sitemap</a> ::if(can_edit)::|::end:: </li>
 ::if(can_edit)::
 <li> <a href="/_recent">Recent&nbsp;changes</a> | </li>
 <li> <a href="/::page_html_tag::/history">Versions&nbsp;of&nbsp;this&nbsp;page</a> </li>
@@ -48,12 +48,13 @@
 </ul>
 
 <ul id="bottommenu" class="menu">
-::if(can_edit)::
-<li> <a href="/::page_html_tag::/edit"><strong>Edit&nbsp;this&nbsp;page</strong></a> | </li>
-::end::
 <li> <a href="/">Home&nbsp;page</a> | </li>
-<li> <a href="/_sitemap">Sitemap</a> | </li>
+<li> <a href="/_sitemap">Sitemap</a> </li>
+</ul>
+
+<ul id="editmenu" class="menu">
 ::if(can_edit)::
+<li> <a href="/::page_html_tag::/edit"><strong>Edit&nbsp;this&nbsp;page</strong></a> | </li>
 <li> <a href="/_recent">Recent&nbsp;changes</a> | </li>
 <li> <a href="/::page_html_tag::/history">Versions&nbsp;of&nbsp;this&nbsp;page</a> | </li>
 <li> <a href="/_images">Images</a> | </li>
@@ -61,10 +62,10 @@
 <li> <a href="/::page_html_tag::/editcss">Edit&nbsp;stylesheet&nbsp;for&nbsp;this&nbsp;page</a> | </li>
 <li> <a href="/_bin/admin/admin.cmo">Wiki&nbsp;administration</a> | </li>
 ::end::
-<li> ::if(user_logged_in):: ::username_html:: <a href="/_logout">(logout)</a> ::else:: <a href="/_login">Create&nbsp;account&nbsp;or&nbsp;log&nbsp;in</a> ::end:: | </li>
 ::if(can_manage_users)::
-<li> <a href="/_users">Manage&nbsp;users</a> </li>
+<li> <a href="/_users">Manage&nbsp;users</a> | </li>
 ::end::
+<li> ::if(user_logged_in):: ::username_html:: <a href="/_logout">(logout)</a> ::else:: <a href="/_login">Create&nbsp;account&nbsp;or&nbsp;log&nbsp;in</a> ::end:: </li>
 </ul>
 
 <hr/>