From: Gabriel Dunne <gdunne@quilime.com>
Date: Wed, 29 Sep 2010 22:22:56 +0000 (-0700)
Subject: updates with new lib
X-Git-Url: https://git.quilime.com/?a=commitdiff_plain;h=5ff0c49b4741689a3d25846943be5b48322702b2;p=plog.git

updates with new lib
---

5ff0c49b4741689a3d25846943be5b48322702b2
diff --cc content-drafts/2010-08-09_name
index 68e3eae,0000000..0291626
mode 100644,000000..100644
--- a/content-drafts/2010-08-09_name
+++ b/content-drafts/2010-08-09_name
@@@ -1,5 -1,0 +1,4 @@@
 +title = name
 +data = 2010-08-09
- hidden = true
 +--
 +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 3e0613e,9bee7ea..b9f0d11
--- a/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 3fea4be,78cc788..9d57bc0
--- a/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 463a3c9,964b92d..952f19f
--- a/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 e9f1b76,4d0aa99..ec8ec38
--- a/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 6509351,91a416f..88e1713
--- a/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>