Added optional branding <div> to sites.

[cocanwiki.git] / templates / page.html
diff --git a/templates/page.html b/templates/page.html

index 92d4a29..799db6c 100644 (file)
--- a/templates/page.html
+++ b/templates/page.html
@@ -11,7 +11,7 @@
  ::if(has_page_css)::<link rel="stylesheet" href="/::page_html_tag::/styles.css::if(is_old_version)::?version=::old_version::::end::" type="text/css" title="Standard"/>::end::
  </head><body>
  
-<h1>::title_html::</h1>
+<h1><span>::title_html::</span></h1>
  
  ::if(navigation)::<div id="navigation_space_div"></div>::end::
  
@@ -35,7 +35,7 @@
  
  <div id="content_div">
  ::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::::if(has_sectionname)::<a name="::linkname_html_tag::"></a><h2>::sectionname_html::</h2>::end::
+::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="::linkname_html_tag::"></a><h2><span>::sectionname_html::</span></h2>::end::
  ::content::
  ::if(has_divname)::</div>::end::::end::
  </div>
@@ -54,10 +54,10 @@
  
  <div id="menu_div">
  <ul id="bottommenu" class="menu">
-<li id="index_li" class="first"> ::if(is_homepage)::::else::<a href="/">::end::Home&nbsp;page::if(is_homepage)::::else::</a>::end:: </li>
-::table(sitemenu)::<li id="::url::_li"> ::if(is_linked)::<a href="/::url_html_tag::">::end::::label_html::::if(is_linked)::</a>::end:: </li>
+<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="::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">Sitemap</a> </li>
+<li id="sitemap_li"> <a href="/_sitemap"><span>Sitemap</span></a> </li>
  </ul>
  
  <ul id="editmenu" class="menu">
@@ -96,14 +96,6 @@
  </ul>
  </div>
  
-::if(search_box)::
-<div id="search_div">
-<form method="get" action="/_bin/search.cmo">
-<input name="q" value=""/><input type="submit" value="Search"/>
-</form>
-</div>
-::end::
-
  ::if(navigation)::
  <div id="navigation_div">
  <h2>Navigation</h2>
@@ -124,6 +116,22 @@
  </div>
  ::end::
  
+::if(search_box)::
+<form method="get" action="/_search">
+<div id="search_div">
+<input name="q" value=""/><input type="submit" value="Search"/>
+</div>
+</form>
+::end::
+
+::if(branding)::
+<div id="branding_div">
+<h2>::if(is_homepage)::::else::<a href="/">::end::::brand_html::::if(is_homepage)::::else::</a>::end::</h2>
+::if(has_brand_tagline)::<p id="brand_tagline">::if(is_homepage)::::else::<a href="/">::end::::brand_tagline_html::::if(is_homepage)::::else::</a>::end::</p>::end::
+::if(has_brand_description)::<p id="brand_description">::brand_description_html::</p>::end::
+</div>
+::end::
+
  <div id="footer_div">
  <hr/>