updates with new lib

diff --cc content-drafts/2010-08-09_name
index 68e3eae919cc82c5c2257137b538082ac05d8be1,0000000000000000000000000000000000000000..029162631c0222f033943c3e77006c95fbc33639
mode 100644,000000..100644
--- 1/content/log/2010-08-09_name
--- /dev/null
+++ b/content-drafts/2010-08-09_name
@@@ -1,5 -1,0 +1,4 @@@
- hidden = true
 +title = name
 +data = 2010-08-09
 +--
 +Hiding my identity sometimes feels like I'm purposely limiting my success, or not proud of what I'm doing. I hide behind the pseudonym to save myself from judgement, critique. Posting under a pseudonym "[quilime](http://quilime.com)" feels safe. I am trying to relax, be loose, and allow myself to be myself. I still vacillate -- I'm still in the process of realizing my own crippling judgement of myself is the hardest thing to shake. What a nasty, destructive, selfish force.

diff --cc lib/data.php
index 3e0613efacf3ad8472e2f5357cdbc2bdddcfaf78,9bee7eaebffe9ec0d5e941d65fe0c3c07b8d5add..b9f0d111c1a6d983ca99d1a22aad2190ae26dd33
--- 1/lib/data.php
--- 2/lib/data.php
+++ b/lib/data.php
@@@ -10,8 -10,8 +10,8 @@@ function get_entries( $path = "", $arg
        $recursive = isset($args['recursive']) ? $args['recursive'] : 1;
        $order_by = empty($args['order_by']) ? null : $args['order_by'];
        $order = empty($args['order']) ? SORT_DESC : $args['order'];
- 
 -      
        $path = LOCAL_ROOT . CONTENT_DIR . $path;
++      
        if ($recursive) {
                $iterator = new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::KEY_AS_PATHNAME);
                $dir_iterator = new RecursiveIteratorIterator($iterator, RecursiveIteratorIterator::SELF_FIRST);
@@@ -96,7 -96,6 +96,8 @@@ function parse_entry($fileInfo, $page 
  {
        $config = "";
        $content = "";
 +    $content_short = "";
++    
        $passed_config = false;
        $file_contents = file($fileInfo->getRealPath(), FILE_USE_INCLUDE_PATH);
        foreach ( $file_contents as $line ) {
@@@ -133,5 -124,5 +134,4 @@@
        return $file;
  }
  
--
  ?>

diff --cc lib/init.php
index 3fea4beeb6a79bd9c2e5d60eb359e32bcabe38f4,78cc78841fc3356466d4feb8155e33bce268949d..9d57bc01b6a213e42bbc7aa60a70479007232eb3
--- 1/lib/init.php
--- 2/lib/init.php
+++ b/lib/init.php
@@@ -3,10 -3,10 +3,10 @@@
      putenv("TZ=America/Los_Angeles");
      
        ini_set('include_path', ini_get('include_path') . PATH_SEPARATOR . dirname(realpath(__FILE__)));
 -      define ('LOCAL_ROOT', join(array_slice(split( "/", dirname(realpath(__FILE__))),0,-1),"/").'/');
 -      
 -      define ('SITE_TITLE', 'plog');  
 -      define ('WEB_ROOT', 'http://dev.quilime.com/');
 +
++      define ('LOCAL_ROOT', join(array_slice(split( "/", dirname(realpath(__FILE__))),0,-1),"/").'/');        
 +      define ('SITE_TITLE', 'gabriel dunne');
-       define ('LOCAL_ROOT', '/home/quilime/gabrieldunne-site/');
 +      define ('WEB_ROOT', 'http://dev.gabrieldunne.com/');
        
        define ('CONTENT_DIR', 'content');
        define ('TEMPLATE_DIR', 'templates');

diff --cc templates/index.html.tpl
index 463a3c9c8b096014b0eb41a459128bf21af88c11,964b92ddba6e1789f9797df10e8935add922bc80..952f19f950d0ac18b0fb4414058e1fd19e731deb
--- 1/templates/index.html.tpl
--- 2/templates/index.html.tpl
+++ b/templates/index.html.tpl
@@@ -11,8 -11,8 +11,8 @@@
      <? $this->include_template('nav.html.tpl') ?>
      
  <div id="content">
-       
 -
 -      this is the index template
++      
 +      <img src="<?=get_base_dir();?>/media/splash/wawa.jpg" />
        
  </div>
  

diff --cc templates/nav.html.tpl
index e9f1b76d4ffa2612426cc07732e0be6d79ff8b1a,4d0aa9960e7c5b88eb2cc2025fe44ee4c5b7883f..ec8ec38c604255dde3b053ef5d0a86d72d78db3d
--- 1/templates/nav.html.tpl
--- 2/templates/nav.html.tpl
+++ b/templates/nav.html.tpl
@@@ -1,10 -1,23 +1,11 @@@
  <ul class="nav">         
  
 -      <li><h2><a href="/"><?=SITE_TITLE;?></a></h2></li>
 +    <? $dirs = get_dirs("", array('recursive' => 1)); ?>
 +    <? foreach($dirs as $dir) : ?>
 +    <li><a href="<?=$dir['url']?>"><?=$dir['name']?></a></li>
 +    <? endforeach; ?>
        
 -      <br />
 -      
 -      <h3>content</h3>
 -      
 -      <? $dirs = get_dirs(); ?>
 -      <? foreach($dirs as $dir) : ?>
 -      <li><a href="<?=$dir['url']?>"><?=$dir['name']?></a></li>
 -      <? endforeach; ?>
 -      
 -      <br />
 -      
 -      <h3>pages</h3>
 -      
 -      <? $pages = get_pages(); ?>
 -      <? foreach($pages as $page) : ?>
 -      <li><a href="<?=$page['url']?>"><?=$page['title']?></a></li>
 -      <? endforeach; ?>
 +      <li><a href="/contact/">contact</a></li>
++      <li><a href="/cv/">cv</a></li>  
  
  </ul> 

diff --cc templates/single.html.tpl
index 65093519d4d6f7fe5627fc6ba1d275e1ef7087fc,91a416ff850592211133e44eb87112af0eaa5573..88e1713cda81aa1bdfd470342b50ad749f853ab5
--- 1/templates/single.html.tpl
--- 2/templates/single.html.tpl
+++ b/templates/single.html.tpl
@@@ -3,7 -3,7 +3,11 @@@
      
      <? $this->include_template('head-inc.html.tpl') ?>
      
++<<<<<<< HEAD
 +    <title><?=SITE_TITLE?>: <?=$data['title'];?></title>
++=======
+     <title><?=SITE_TITLE?><?=TITLE_DELIMITER?> <?=$data['title'];?></title>
++>>>>>>> master
      
  </head>
  <body>