Commented a bug.

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

index 2d3b3ab..faa2980 100644 (file)
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,18 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<title>::title_html::</title>
-::if(is_old_version)::<meta name="robots" content="noindex,nofollow"/>::end::
-::if(has_description)::<meta name="description" content="::description_html_tag::" />::end::
-<meta name="author" content="http://www.merjis.com/" />
-<link rel="stylesheet" href="::theme_css_html_tag::" type="text/css" title="Standard"/>
-<link rel="alternate stylesheet" href="/_css/easytoread.css" type="text/css" title="High contrast, big fonts"/>
-::if(has_host_css)::<link rel="stylesheet" href="/_global.css" type="text/css" title="Standard"/>::end::
-::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><span>::title_html::</span></h1>
-
  ::if(navigation)::<div id="navigation_space_div"></div>::end::
  
  ::if(redirected)::
@@ -55,7 +40,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>
@@ -96,14 +81,6 @@
  </ul>
  </div>
  
-::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(navigation)::
  <div id="navigation_div">
  <h2>Navigation</h2>
@@ -124,6 +101,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::<span>::brand_html::</span>::if(is_homepage)::::else::</a>::end::</h2>
+::if(has_brand_tagline)::<p id="brand_tagline">::if(is_homepage)::::else::<a href="/">::end::<span>::brand_tagline_html::</span>::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/>