customizing content for quilime

diff --git a/content/cat1/test_post b/content/cat1/test_post
deleted file mode 100644 (file)
index 4a6a223..0000000
--- a/content/cat1/test_post
+++ /dev/null
@@ -1,20 +0,0 @@
-title = test post
-date = 2010-07-07
-tags = test post tag1 tag2
---
-
-This is a test post. Hello world!
-
-*ooo*  
-**ahh**  
-***eee***  
-
-some inline code `some code` woo
-    
-    fn(test) { code };
-    some more <pre> code
-    // a comment perhaps
-
-line    
-------
-break

diff --git a/content/cat2/test_post b/content/cat2/test_post
deleted file mode 100644 (file)
index 63f03f9..0000000
--- a/content/cat2/test_post
+++ /dev/null
@@ -1,8 +0,0 @@
-title = another test post
-date = 2010-07-01
-tags = with different tags
---
-
-this is an older test post!
-
-`some code`

diff --git a/lib/init.php b/lib/init.php
index e45c4645216624bf8e006ec88ef54d0d5df5dc6c..7e2b8f59b235b6e9dd1b4c19d19866756ec3066c 100644 (file)
--- a/lib/init.php
+++ b/lib/init.php
@@ -4,9 +4,9 @@
     
        ini_set('include_path', ini_get('include_path') . PATH_SEPARATOR . dirname(realpath(__FILE__)));
 
-       define ('SITE_TITLE', 'plog');
-       define ('LOCAL_ROOT', '/local/plog/root/');
-       define ('WEB_ROOT', 'http://webroot.com/');
+       define ('SITE_TITLE', 'quilime');
+       define ('LOCAL_ROOT', '/home/quilime/quilime-site/' );
+       define ('WEB_ROOT', 'http://py.quilime.com/' );
        
        define ('CONTENT_DIR', 'content');
        define ('TEMPLATE_DIR', 'templates');

diff --git a/pages/about b/pages/about
index bdfa8cd8e119b1b3f3ec084ed1405cc842483ed5..4d30f204c2e56c597b28fee31d216d7f6dd2175d 100644 (file)
--- a/pages/about
+++ b/pages/about
@@ -1,3 +1,12 @@
 title = about
 --
-all about the about
\ No newline at end of file
+a codification of exploration, resources, and creativity.
+
+**author**: gabriel dunne ([email](mailto:gdunne@quilime.com), [www](http://gabrieldunne.com))  
+**elsewhere**: 
+[flickr](http://flickr.com/photos/quilime/), 
+[delicious](http://delicious.com/quilime/), 
+[vimeo](http://vimeo.com/quilime/), 
+[github](http://github.com/quilime/)
+
+[rss](http://quilime.com/.rss)
\ No newline at end of file

diff --git a/pages/links b/pages/links
index 42637b7a2b75ddc0e0d5ee69a1ba0a8b9db3343f..908153e08a5f95459d62e8dda2942f6910a88edc 100644 (file)
--- a/pages/links
+++ b/pages/links
@@ -1,4 +1,22 @@
 title = links
+type = page
+markdown = true
 --
-+ [quilime](http://quilime.com) →
-+ [gabriel dunne](http://gabrieldunne.com) →
\ No newline at end of file
++ [stephanie sherriff](http://ssherriff.com) →
++ [ryan alexander](http://onecm.com) →
++ [daniel massey](http://oddsympathy.com) →
++ [joshua nimoy](http://jtnimoy.net) →
++ [keith pasko](http://keithpasko.com) →
++ [jeff lubow](http://dabkitsch.com/jml/) →
++ [carbon workshop (gustavo huber & shelly brown)](http://carbonworkshop.com) →
++ [sascha pohflepp](http://pohflepp.com) →
++ [mylinh trieu](http://mylinhtrieu.com) →
++ [aaron meyers](http://universaloscillation.com) →
++ [tom carden](http://tom-carden.co.uk) →
++ [michal migurski](http://mike.teczno.com) →
++ [adam roth](http://ripevessel.com) →
++ [david rager](http://davidrager.org) →
++ [marc nimoy](http://digitanalog.net) →
++ [matthew gale](http://makaga.com) →
++ [frédéric eyl](http://fredericeyl.de) →
++ [the green eyl](http://thegreeneyl.com) →
\ No newline at end of file

diff --git a/public/index.php b/public/index.php
index 204b88c645baeb82737195a519b4c27fb9e3ca88..da0c655a0e16966eb8e4644a2791db8f19715091 100644 (file)
--- a/public/index.php
+++ b/public/index.php
@@ -23,8 +23,9 @@
        }
        # page
        else if (is_file( LOCAL_ROOT . PAGE_DIR . DIRECTORY_SEPARATOR . $url_parts['filename'] )) {
-               $t->assign('data', parse_file(LOCAL_ROOT . PAGE_DIR . DIRECTORY_SEPARATOR . $url_parts['filename']));
-               $template = 'page.' . $response_format . '.tpl';
+               $page = parse_file(LOCAL_ROOT . PAGE_DIR . DIRECTORY_SEPARATOR . $url_parts['filename']);
+               $t->assign('data', $page);
+               $template = $page['template'] ? $page['template'] . '.' . $response_format . '.tpl' : 'page.' . $response_format . '.tpl';
        }
        # direct template
        else if (is_file( LOCAL_ROOT . TEMPLATE_DIR . DIRECTORY_SEPARATOR . $url_parts['filename'] .'.'. $response_format . '.tpl')) {

diff --git a/templates/head-inc.html.tpl b/templates/head-inc.html.tpl
index 413686a456792ecdd52d9e9682d3d4bef5b87575..a2045104e56d1d3c30b49f1bac197c32d2ab9c3a 100644 (file)
--- a/templates/head-inc.html.tpl
+++ b/templates/head-inc.html.tpl
@@ -1,4 +1,17 @@
 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link rel="alternate" type="application/rss+xml" title="RSS" href="<?= get_base_dir(); ?>/.rss" />
+
 <link rel="stylesheet" href="<?= get_base_dir(); ?>/css/style.css" type="text/css">
+<link href="<?= get_base_dir(); ?>/js/prettify/prettify.css" type="text/css" rel="stylesheet" />
+
+<script type="text/javascript" src="<?= get_base_dir(); ?>/js/jquery-1.3.2.min.js"></script>
+<script type="text/javascript" src="<?= get_base_dir(); ?>/js/prettify/prettify.js"></script>
+
+
+
+<script>
+$(document).ready(function() {
+       prettyPrint();
+});
+</script>

diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl
index 53d8efdc39b3e8688c6879b664b47550bed3e706..2291480ccb5a49aea2cab004d0cc21dcf8033989 100644 (file)
--- a/templates/nav.html.tpl
+++ b/templates/nav.html.tpl
@@ -4,8 +4,6 @@
        
        <br />
        
-       <h3>categories</h3>
-       
        <? $categories = get_content_folders(); ?>
        <? foreach($categories as $cat) : ?>
        <li><a href="<?=$cat['url']?>"><?=$cat['title']?></a></li>
@@ -13,11 +11,8 @@
        
        <br />
        
-       <h3>pages</h3>
-       
-       <? $pages = get_pages(); ?>
-       <? foreach($pages as $page) : ?>
-       <li><a href="<?=$page['url']?>"><?=$page['title']?></a></li>
-       <? endforeach; ?>
+       <li><a href="/agg/">aggregate</a></li>
+       <li><a href="/links/">links</a></li>    
+       <li><a href="/about/">about</a></li>
 
 </ul>  

diff --git a/templates/page.html.tpl b/templates/page.html.tpl
index 346fdef11d3a27daab24b133db1e966c416bb1c1..159c659502245bfbd0de8801c1bdcca2627e5c75 100644 (file)
--- a/templates/page.html.tpl
+++ b/templates/page.html.tpl
@@ -12,8 +12,6 @@
     
 <div id="content">
        
-       <h1><?=$data['title']?></h1>
-
        <?=$data['content'];?>
        
 </div>