From d3557f9bd3206abf075c1714215ab2dbf3e563e6 Mon Sep 17 00:00:00 2001
From: Gabriel Dunne <gdunne@quilime.com>
Date: Thu, 1 Jul 2010 19:01:24 -0700
Subject: [PATCH] template editing, major editing to index file

---
 index.php                                     | 83 ++++++++++---------
 lib/data.php                                  | 30 +++++--
 lib/output.php                                |  4 +-
 lib/template.php                              | 10 ++-
 templates/about.html.tpl                      |  2 +-
 templates/code.html.tpl                       | 46 ++++------
 .../{index.html.tpl => default.html.tpl}      |  9 +-
 .../{index.json.tpl => default.json.tpl}      |  0
 templates/entry.html.tpl                      |  2 +-
 templates/index.html                          | 18 ----
 templates/links.html.tpl                      |  8 +-
 templates/log.html.tpl                        | 51 ++++--------
 12 files changed, 119 insertions(+), 144 deletions(-)
 rename templates/{index.html.tpl => default.html.tpl} (67%)
 rename templates/{index.json.tpl => default.json.tpl} (100%)
 delete mode 100644 templates/index.html

diff --git a/index.php b/index.php
index 7df8b0b..9058549 100644
--- a/index.php
+++ b/index.php
@@ -4,55 +4,56 @@
 
     $url_parts = get_url();
 
-//	print_r($url_parts);
-	
-//	echo "<br/><br/>";
-
 	list($response_format, $response_mime_type) = parse_format($url_parts['extension'], 'html');	
 	
 	$t = get_template_instance();	
-	
-	$view = isset($_GET['v']) ? $_GET['v'] : 'inline';
-
-    if (is_string($url_parts['basename'])) 
-	{
-
-		# base content folder
-		if (is_dir  ( CONTENT_DIR . DIRECTORY_SEPARATOR . $url_parts['basename'])) {
-			
-			list($items, $total) = get_data(array($url_parts['basename']));			
-			$t->assign('items', $items);
-			$t->assign('total', $total);
-			$t->assign('view', $view);
-			$t->render($url_parts['basename'] . '.' . $response_format . '.tpl');
-            exit;
-        }
+	$t->response_format = $response_format;
 
-		# single entry
-        else if ($url_parts['dirname'] != '.' && is_dir(CONTENT_DIR . $url_parts['dirname'])) {
+	$t->assign('view', $_GET['v']);
+	
+	
+	# content folder
+	if (is_dir(CONTENT_DIR . DIRECTORY_SEPARATOR . $url_parts['url']) && $url_parts['basename']) {
+		list($data, $total) = get_data(array($url_parts['basename']));			
+		$t->assign('data', $data);				
+		$template = $url_parts['basename'] . '.' . $response_format . '.tpl';
+	}
 	
-			$t->assign('single', true);
-			$t->assign('item', parse_config(CONTENT_DIR . $url_parts['dirname'] . DIRECTORY_SEPARATOR . $url_parts['filename']));
-			$t->assign('content', $url_parts['dirname'] . DIRECTORY_SEPARATOR . $url_parts['filename']);
-			
-			$t->render($url_parts['dirname'] . '.' . $response_format . '.tpl');	
-            exit;
-        }
+	
+	# single file
+	else if (is_file( CONTENT_DIR . $url_parts['dirname'] . DIRECTORY_SEPARATOR . $url_parts['filename'])) {
+		$t->assign('single', true);
+		$t->assign('data', parse_config(CONTENT_DIR . $url_parts['dirname'] . DIRECTORY_SEPARATOR . $url_parts['filename']));
+		$t->assign('content', $url_parts['dirname'] . DIRECTORY_SEPARATOR . $url_parts['filename']);	
+		$template = $url_parts['dirname'] . '.' . $response_format . '.tpl';	
+	}
+	
+		
+	# direct template
+	else if (is_file( TEMPLATE_DIR . DIRECTORY_SEPARATOR . $url_parts['filename'] .'.'. $response_format . '.tpl'))
+	{
+		$template = $url_parts['filename'] . '.' . $response_format . '.tpl';
+	}
 
-		# not found
-        else  {
-			$t->render('404.'.$response_format.'.tpl');
-            exit;
-        }
 
-    }
+	# 404
+	else if ($url_parts['basename']) {	
+		$template = '404.'.$response_format.'.tpl';
+	}
 
 
-	# render all entries inline
-	list($entries, $total) = get_inline_entries(array('log', 'code'));	
+	# default (index)
+	else {
+		list($data, $total) = get_data();
+		$t->assign('data', $data);
+		$template = 'default.'.$response_format.'.tpl';
+	}
 	
-	$t->assign('entries', $entries);
-	$t->assign('total', $total);
-	$t->render('index.'.$response_format.'.tpl');
-
+	
+	
+	
+	# render template
+	$t->assign('total', $total);	
+    header("Content-Type: {$response_mime_type}; charset=UTF-8");
+	$t->render($template);
 ?>
diff --git a/lib/data.php b/lib/data.php
index 20ecec1..bd8d3d3 100644
--- a/lib/data.php
+++ b/lib/data.php
@@ -1,15 +1,24 @@
 <?php
 
-
-# parse inline content
-function get_data( $sources,  $params = array() )
+// parse inline content
+function get_data( $sources = array(),  $params  = array())
 {
+	// if no set sources, grab everything in content folder
+	if (sizeof($sources) == 0)
+		$sources = glob(LOCAL_ROOT . CONTENT_DIR . DIRECTORY_SEPARATOR . '/*');
+	
 	$result = array();
 	$result_total = 0;
 	foreach ($sources as $dir) {
+		
+		$dir = basename($dir);
+		
 		$contents = glob(LOCAL_ROOT . CONTENT_DIR . DIRECTORY_SEPARATOR . $dir . '/*');
+		
+		if (sizeof($contents) <= 0) continue;
+				
 		foreach ($contents as $f) {
-			if (!is_dir($f)) {
+			if (is_file($f)) {
 				
 				if ($params['name']) {					
 					if (basename($f) != $params['name'])
@@ -30,9 +39,12 @@ function get_data( $sources,  $params = array() )
 				}
 				
 				$config = parse_ini_string($cc);
+								
+				if ($config['draft'])
+					continue;
 				
 				$config['url'] = WEB_ROOT . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR . basename($f);
-				$config['timestamp'] = mktime($config['date']);
+				$config['timestamp'] = $config['date'] ? mktime($config['date']) : mktime(filemtime($f));
 				$config['category'] = $dir;
 				$config['content'] = $content;
 				$config['tags'] = explode(' ', $config['tags']);
@@ -45,16 +57,16 @@ function get_data( $sources,  $params = array() )
 	
 	// order by date
 	foreach ($result as $key => $row) {
-	    $time[$key]  = $row['date'];
+	    $time[$key] = $row['timestamp'];
 	}
-	array_multisort($time, SORT_DESC, $result);
+	if ($time)
+		array_multisort($time, SORT_DESC, $result);
 	
 	return array($result, $result_total);
 }
 
 
 
-
 function list_content($path, $args="")
 {
     list($list, $total) = get_content($path, $args);
@@ -105,7 +117,7 @@ function parse_config ($config_file)
         }
         
         if ($break) {
-            $config['inline_content'] .= $c;                
+            $config['inline_content'] .= $c . "\n";                
         }
         else {
             $conf = explode("=", $c);
diff --git a/lib/output.php b/lib/output.php
index 112c083..caf3ce1 100644
--- a/lib/output.php
+++ b/lib/output.php
@@ -61,7 +61,9 @@
     
     function get_url()
     {
-        return pathinfo($_SERVER['SCRIPT_URL']); //substr($_SERVER['SCRIPT_URL'], strlen(get_base_dir() . '/'));
+		$path_info = pathinfo($_SERVER['SCRIPT_URL']);
+		$path_info['url'] = $_SERVER['SCRIPT_URL'];
+        return $path_info; //substr($_SERVER['SCRIPT_URL'], strlen(get_base_dir() . '/'));
     }
     
     
diff --git a/lib/template.php b/lib/template.php
index 5be035b..31598da 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -3,6 +3,7 @@
 class Template
 {
 	var $template_dir = 'templates';
+	var $response_format = 'html';
 	
 	var $_tpl_vars = array();
 
@@ -35,8 +36,13 @@ class Template
 
 	public function render( $template )
 	{
-		extract( $this->_tpl_vars );	
-		include( $this->template_dir . DIRECTORY_SEPARATOR  . $template );
+		extract( $this->_tpl_vars );
+		
+		if (is_file($this->template_dir . DIRECTORY_SEPARATOR . $template))
+			include( $this->template_dir . DIRECTORY_SEPARATOR . $template );
+		else
+			include( $this->template_dir . DIRECTORY_SEPARATOR . 'default.'.$this->response_format.'.tpl' );		
+			
 	}
 }
 
diff --git a/templates/about.html.tpl b/templates/about.html.tpl
index 21784ec..341913c 100644
--- a/templates/about.html.tpl
+++ b/templates/about.html.tpl
@@ -2,7 +2,7 @@
 
 <head>
 
-    <?php include_template( 'header-src.html' ); ?>
+    <?php $this->include_template( 'head-inc.html.tpl' ); ?>
         
     <title><?php echo SITE_TITLE ?> - about</title>
     
diff --git a/templates/code.html.tpl b/templates/code.html.tpl
index 2502d79..852a18a 100644
--- a/templates/code.html.tpl
+++ b/templates/code.html.tpl
@@ -1,33 +1,19 @@
-<?php
-
-
-    $items = array();
-    $single = false;
-    
-    if (is_dir(CONTENT_DIR . $url_string) && !is_file(CONTENT_DIR . $url_string . '/config') ) {
-		list($items, $total) = get_inline_entries(array('code'));	
-    //    list($items_list, $total) = get_content(basename($url_string));
-    }
-    else {
-		list($items, $total) = get_inline_entries(array('code'), array('name'=>basename($url_string)));		
-		$items = $items[0];
-        $single = true;
-    }
-
-	$inline = isset($_GET['inline']) ? true : false;
-	
-	$page = "code";
-
-
-?>
 <html>
 
 <head>
-    <?php include_template('header-src.html'); ?>
-    <script src="/js/jquery-1.3.2.min.js"></script>
-    
-    <title><?php echo SITE_TITLE; ?> - code<?php if (sizeof($items) > 0 ) : ?>: <?echo strtolower($items['title']); ?> [<?php echo $items['medium']; ?>]<?php endif; ?></title>
+	
+    <? $this->include_template('head-inc.html.tpl') ?>
         
+    <title>
+        <?=SITE_TITLE; ?>
+        <? if ($single): ?> 
+			- code: <?= $data['title']; ?> 
+			[<?=date("Y M d", strtotime($data['date']));?>]
+		<? else: ?>
+		 	- code
+		<? endif; ?>
+	</title>
+
 </head>
 
 <body>
@@ -40,11 +26,11 @@
 	
         <?php if ($single) : ?>
 
-			<h2><?=$items['title']?> [<?=$items['date']?>]</h2>
+			<h2><?=$data['title']?> [<?=$data['date']?>]</h2>
 
             <div class="content">
                 <?php 
-                    print ($items['content']);
+                    echo ($data['inline_content']);
                 ?>
             </div>
 	
@@ -53,7 +39,7 @@
 <div class="func"><a href="/code/">list</a></div>		
 	
             <ul class="inline_content">
-            <?php foreach($items_list as $items): ?>
+            <?php foreach($data as $items): ?>
         	    <li>
         	        <h3>
     			    <a href="<?php echo $items['href']?>"><?php echo $items['title']; ?></a>
@@ -85,7 +71,7 @@
 
                 <?php
                 $c = 1; 
-                foreach($items as $item): 
+                foreach($data as $item): 
 				
 //				print_r($item);
 
diff --git a/templates/index.html.tpl b/templates/default.html.tpl
similarity index 67%
rename from templates/index.html.tpl
rename to templates/default.html.tpl
index 0342c64..698ed55 100644
--- a/templates/index.html.tpl
+++ b/templates/default.html.tpl
@@ -12,12 +12,19 @@
     
 <div id="content">
 
-	<? foreach($entries as $entry): ?>
+	<? foreach($data as $entry): ?>
 	<? $this->include_template('entry.html.tpl', array('entry' => $entry)); ?>
 	<? endforeach; ?>
 	
+	<? if ($view == "archive") : ?>
+		<a href="<?=$list_url?>">view list</a>
+	<? else : ?>
+		<a href="<?=$archive_url?>">view archive</a>
+	<? endif; ?>	
+	
 </div>
 
+
 	<? $this->include_template('footer.html.tpl') ?>
 
 </body>
diff --git a/templates/index.json.tpl b/templates/default.json.tpl
similarity index 100%
rename from templates/index.json.tpl
rename to templates/default.json.tpl
diff --git a/templates/entry.html.tpl b/templates/entry.html.tpl
index d60ee65..168b730 100644
--- a/templates/entry.html.tpl
+++ b/templates/entry.html.tpl
@@ -1,4 +1,3 @@
-
 <div class="entry">
 	
 	<h2>
@@ -10,4 +9,5 @@
 	<?=$entry['content']?>
 	
 	</div>
+	
 </div>
diff --git a/templates/index.html b/templates/index.html
deleted file mode 100644
index 07d581d..0000000
--- a/templates/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-
-<head>
-    
-    <?php include_template('header-src.html'); ?>
-    
-    <title><?php echo SITE_TITLE; ?></title>
-    
-</head>
-
-<body>
-    
-    <? include_template('nav.html'); ?>
-    
-<div id="content">
-<--- nav    
-</body>
-</html>
diff --git a/templates/links.html.tpl b/templates/links.html.tpl
index ef7e0dd..112ef3d 100644
--- a/templates/links.html.tpl
+++ b/templates/links.html.tpl
@@ -6,7 +6,7 @@
 
 <head>
 
-    <?php include_template('header-src.html'); ?>
+    <?php $this->include_template('header-src.html'); ?>
 
     <title><?php echo SITE_TITLE ?> - links</title>
 
@@ -25,7 +25,7 @@
             function linklist($links)
             { ?>
                 <?php foreach($links as $l) : ?>
-                <li><a href="http://<?php echo $l[0];?>"><?php echo $l[1];?></a></li>
+                <li><a href="http://<?php echo $l[0];?>"><?php echo $l[1];?></a> &rarr;</li>
                 <?php endforeach; ?>
             <?php
             }
@@ -49,8 +49,8 @@
                     array('digitanalog.net', 'marc nimoy'),
                     array('makaga.com', 'matthew gale'),
                     array('fredericeyl.de', 'frédéric eyl'),
-                    array('thegreeneyl.com', 'the green eyl'),
-					array('local.wasp.uwa.edu.au/~pbourke/', '')
+                    array('thegreeneyl.com', 'the green eyl')
+//					array('local.wasp.uwa.edu.au/~pbourke/', '')
                     );
         ?>
 
diff --git a/templates/log.html.tpl b/templates/log.html.tpl
index aea4be9..02ebf5f 100644
--- a/templates/log.html.tpl
+++ b/templates/log.html.tpl
@@ -1,24 +1,3 @@
-<?php
-/*
-    $items = array();
-    $single = false;
-    
-    if (is_dir(CONTENT_DIR . $url_string) && !is_file(CONTENT_DIR . $url_string . '/config') ) {
-        list($items, $total) = get_inline_entries(array('log'));
-        //list($log_list, $total) = get_content(basename($url_string), "type=flat");
-    }
-    else {
-        $config = parse_config(CONTENT_DIR . $url_string);
-        $log = $config;
-        $base_dir = $log['base_dir'];        
-        $single = true;        
-    }
-    
-    $list = isset($_GET['list']) ? $_GET['list'] : false;
-
-	$page = "/log";
-*/
-?>
 <html>
 
 <head>
@@ -28,8 +7,8 @@
     <title>
         <?=SITE_TITLE; ?>
         <? if ($single): ?> 
-			- log: <?= $entry['title']; ?> 
-			[<?=date("Y M d", strtotime($entry['date']));?>]
+			- log: <?= $data['title']; ?> 
+			[<?=date("Y M d", strtotime($data['date']));?>]
 		<? else: ?>
 		 	- log
 		<? endif; ?>
@@ -39,24 +18,24 @@
 
 <body>
     
-    <?php include('nav.html'); ?>
+    <?php $this->include_template('nav.html'); ?>
 
     <div id="content">
 
         <?php if ($single) : ?>
+	
+			<? //$this->include_template('entry.html.tpl', array('entry' => $item)); ?>		
 
 	        <h2>
-	            <a title="posted <?php echo get_relative_time($item['timestamp']); ?>" href="<?php echo $item['url'];?>">
-	                <?php echo $item['title']; ?>
-				</a><small>[<?php echo date("Y M d", strtotime($item['date']));?>]</small>
-	        </h2>
-	
-			
+	            <a title="posted <?php echo get_relative_time($data['timestamp']); ?>" href="<?php echo $data['url'];?>">
+	                <?php echo $data['title']; ?>
+				</a><small>[<?php echo date("Y M d", strtotime($data['date']));?>]</small>
+	        </h2>		
 	
             <div class="content">
-            <?=$item['inline_content'];?>
-            </div>
-                                
+            <?=$data['inline_content'];?>
+            </div>			
+
         <?php elseif ($view == 'archive'): ?>
         
            <table class="archive" cellspacing="0" cellpadding="0">
@@ -68,7 +47,7 @@
                 </td>
                 <?php 
                     $c = 1; 
-                    foreach($items as $log): 
+                    foreach($data as $log): 
                 ?>
                 <tr>
                 <td style="text-align:right; padding-right:1em;">
@@ -76,7 +55,7 @@
                 </td>
                 <td>
                     <strong>
-				    <a onmouseout="$('.c_pop').hide();" onmouseover="$('.c_pop').hide(); $('#c_<?php echo $c; ?>').show();" href="<?php echo $log['href']?>"><?php echo $log['title']; ?></a>
+				    <a onmouseout="$('.c_pop').hide();" onmouseover="$('.c_pop').hide(); $('#c_<?php echo $c; ?>').show();" href="<?php echo $log['url']?>"><?php echo $log['title']; ?></a>
 			        </strong>
                     <div id="c_<?php echo $c; ?>" class="c_pop">
                     <?=$log['content']; ?>
@@ -97,7 +76,7 @@
         <?php else: ?>
 	
             <ul class="inline_content log">
-            <?php foreach($items as $log): ?>
+            <?php foreach($data as $log): ?>
         	    <li>
         	        <h3>
         	                
-- 
2.34.1