From 3baab509535f86834b559464c5d4c1263a03fb66 Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Mon, 28 Nov 2011 00:49:22 +0100
Subject: [PATCH] Last changes before release.

---
 README.md                       |  6 +++---
 src/_h5ai/config.js             |  2 +-
 src/_h5ai/header.php            |  3 ---
 src/_h5ai/php/inc/Customize.php | 11 +++++++----
 src/_h5ai/php/inc/Tree.php      |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 5a5e2d69..644e8af5 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@ Don't use files from this repository (`src` folder) for installation.
 They need to be preprocessed/compiled to work correctly. You'll find a
 precompiled package on the [project page](http://larsjung.de/h5ai).
 
-Please create [a new issue](http://github.com/lrsjng/h5ai/issues/new)
-to report a bug or make a feature request.
+To report a bug or make a feature request
+please create [a new issue](http://github.com/lrsjng/h5ai/issues/new).
 
 * Website with download, docs and demo: <http://larsjung.de/h5ai>
 * Sources: <http://github.com/lrsjng/h5ai>
@@ -27,7 +27,7 @@ h5ai is provided under the terms of the [MIT License](http://github.com/lrsjng/h
 
 ## Changelog
 
-### v0.17 · *2011-11-??*
+### v0.17 · *2011-11-28*
 
 * h5ai is now located in `_h5ai` to reduce collisions
 * switches from HTML5 Boilerplate reset to normalization
diff --git a/src/_h5ai/config.js b/src/_h5ai/config.js
index 54f02963..0a004027 100644
--- a/src/_h5ai/config.js
+++ b/src/_h5ai/config.js
@@ -5,7 +5,7 @@
  * options, types and localization
  */
 
-H5AI_CONFIG = {
+var H5AI_CONFIG = {
 
     "options": {
 
diff --git a/src/_h5ai/header.php b/src/_h5ai/header.php
index 75d1e7b5..03ad2cc7 100644
--- a/src/_h5ai/header.php
+++ b/src/_h5ai/header.php
@@ -29,9 +29,6 @@
         <?php echo $customize->getHeader(); ?>
         <?php echo $extended->toHtml(); ?>
         <?php echo $customize->getFooter(); ?>
-        <?php echo $h5ai->getDocRoot() . "<br/>"; ?>
-        <?php echo $h5ai->getH5aiRoot() . "<br/>"; ?>
-        <?php echo $h5ai->getHrefRoot() . "<br/>"; ?>
     </section>
     <footer class="clearfix">
         <span class="left">
diff --git a/src/_h5ai/php/inc/Customize.php b/src/_h5ai/php/inc/Customize.php
index f64e6b49..593bc931 100644
--- a/src/_h5ai/php/inc/Customize.php
+++ b/src/_h5ai/php/inc/Customize.php
@@ -1,21 +1,24 @@
 <?php
 
 class Customize {
-    private $h5ai;
+    private $customHeader, $customFooter;
 
     public function __construct($h5ai) {
 
-        $this->h5ai = $h5ai;
+        $absPath = $h5ai->getAbsPath();
+        $options = $h5ai->getOptions();
+        $this->customHeader = $absPath . "/" . $options["customHeader"];
+        $this->customFooter = $absPath . "/" . $options["customFooter"];
     }
 
     public function getHeader() {
 
-        return $this->getContent($this->h5ai->getAbsPath() . "/h5ai.header.html", "header");
+        return $this->getContent($this->customHeader, "header");
     }
 
     public function getFooter() {
 
-        return $this->getContent($this->h5ai->getAbsPath() . "/h5ai.footer.html", "footer");
+        return $this->getContent($this->customFooter, "footer");
     }
 
     private function getContent($file, $tag) {
diff --git a/src/_h5ai/php/inc/Tree.php b/src/_h5ai/php/inc/Tree.php
index 659e53e2..2d0f51f0 100644
--- a/src/_h5ai/php/inc/Tree.php
+++ b/src/_h5ai/php/inc/Tree.php
@@ -114,7 +114,7 @@ class TreeEntry {
 
         $tree = new TreeEntry($this->h5ai, dirname($this->absPath), dirname($this->absHref));
         $tree->loadContent();
-        $tree->content[ $this->absPath ] = $this;
+        $tree->content[$this->absPath] = $this;
 
         return $tree->getRoot();
     }