Updated MANIFEST.

[cocanwiki.git] / templates / page.html

diff --git a/templates/page.html b/templates/page.html
index 76c8d49..9304b75 100644 (file)
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,12 +1,4 @@
-::if(navigation)::<div id="navigation_space_div"></div>::end::
-
-::if(redirected)::
-<p id="redirected"><em>(Redirected from <a href="/::original_page_html_tag::?no_redirect=1">::original_page_html::</a>)</em></p>
-::end::
-
-::if(is_old_version)::
-<div id="old_version">
-<p>You are seeing an old version of this page.</p>
+::if(navigation)::<div id="navigation_space_div"></div>::end::::if(redirected)::<p id="redirected"><em>(Redirected from <a href="/::original_page_html_tag::?no_redirect=1">::original_page_html::</a>)</em></p>::end::::if(is_old_version)::<div id="old_version"><p>You are seeing an old version of this page.</p>
 <ul>
 <li> Go to the <a href="/::page_html_tag::">live version</a> of this page.</li>
 <li> See other <a href="/::page_html_tag::/history">old versions</a> of this page.</li>
@@ -15,14 +7,10 @@
 <li> <a href="/_bin/restore_form.cmo?page=::page_url::&version=::old_version::">Restore</a> this version live.</li>
 ::end::
 </ul>
-</div>
-::end::
-
-<div id="content_div">
-::table(sections)::
-::if(has_divname)::<div id="::divname_html_tag::"::if(has_jsgo):: onclick="go('/::jsgo_html_tag::')" class="jsgo_div"::end::>::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="::linkname_html_tag::"></a><h2><span>::sectionname_html::</span></h2>::end::
+</div>::end::<div id="content_div">
+::table(sections)::::if(has_div)::<div::if(has_divname):: id="::divname_html_tag::"::end::::if(has_divclass):: class="::divclass_html_tag::"::end::::if(has_jsgo):: onclick="go('/::jsgo_html_tag::')"::end::>::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="::linkname_html_tag::"></a><h2><span>::sectionname_html::</span></h2>::end::
 ::content::
-::if(has_divname)::</div>::end::::end::
+::if(has_div)::</div>::end::::end::
 </div>
 
 <ul id="topmenu" class="menu">