X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=templates%2Fpage.html;h=ece27870f33d20ba2fcb4fd882f1827a6de233a7;hb=9d4e9816fce5ab91c6ca815d17ae916d8e9d19e1;hp=22bfbd150c712229fcfd1bb9126b20682874d05b;hpb=1f125fd7a6794f352f30de71a3905d5356a07008;p=cocanwiki.git

diff --git a/templates/page.html b/templates/page.html
index 22bfbd1..ece2787 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -31,7 +31,7 @@
 ::end::
 
 ::table(sections)::
-::if(has_divname)::<div id="::divname_html_tag::">::end::::if(can_edit)::<p class="edit_link">[<a href="/::page_html_tag::/edit#::ordering::" title="Edit this section">edit</a>]</p>::end::<a name="::sectionname_html_tag::"></a><h2>::sectionname_html::</h2>
+::if(has_divname)::<div id="::divname_html_tag::">::end::::if(can_edit)::<p class="edit_link">[<a href="/::page_html_tag::/edit#::ordering::" title="Edit this section">edit</a>]</p>::end::::if(has_sectionname)::<a name="::sectionname_html_tag::"></a><h2>::sectionname_html::</h2>::end::
 ::content::
 ::if(has_divname)::</div>::end::::end::
 
@@ -47,6 +47,7 @@
 ::end::
 </ul>
 
+<div id="menu_div">
 <ul id="bottommenu" class="menu">
 <li class="first"> <a href="/">Home&nbsp;page</a> </li>
 ::table(sitemenu)::<li> <a href="/::url_html_tag::">::label_html::</a> </li>
@@ -55,24 +56,29 @@
 </ul>
 
 <ul id="editmenu" class="menu">
-<li class="first"> ::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>
+<li class="first"> ::if(user_logged_in):: ::username_html:: <a href="/_logout">(logout)</a> ::else:: <a href="/_login">Create account or log in</a> ::end:: </li>
 ::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="/::page_html_tag::/edit"><strong>Edit this page</strong></a> </li>
+<li> <a href="/_recent">Recent changes</a> </li>
+<li> <a href="/::page_html_tag::/history">Versions of this page</a> </li>
 <li> <a href="/_images">Images</a> </li>
 <li> <a href="/_files">Files</a> </li>
-<li> <a href="/::page_html_tag::/editcss">Edit&nbsp;stylesheet&nbsp;for&nbsp;this&nbsp;page</a> </li>
-<li> <a href="/_bin/edit_sitemenu.cmo">Edit&nbsp;site&nbsp;menu</a> </li>
+<li> <a href="/::page_html_tag::/editcss">Edit stylesheet for this page</a> </li>
+<li> <a href="/_bin/edit_sitemenu.cmo">Edit site menu</a> </li>
 ::end::
 ::if(can_manage_users)::
-<li> <a href="/_users">Manage&nbsp;users</a> </li>
+<li> <a href="/_users">Manage users</a> </li>
+::end::
+::if(can_manage_contacts)::
+<li> <a href="/_bin/contacts.cmo">Contact forms</a> </li>
 ::end::
 ::if(can_edit)::
-<li> <a href="/_bin/admin/admin.cmo">Server&nbsp;administration</a> </li>
+<li> <a href="/_admin">Server administration</a> </li>
 ::end::
 </ul>
+</div>
 
+<div id="footer_div">
 <hr/>
 
 <ul id="footer" class="menu">
@@ -80,6 +86,7 @@
 <li> <a href="/copyright">Copyright &copy; ::year::</a> </li>
 <li> Powered by <a href="http://sandbox.merjis.com/">::cocanwiki_package_html:: ::cocanwiki_version_html::</a> </li>
 </ul>
+</div>
 
 </body>
 </html>
\ No newline at end of file