From 25b7b02a33f0f80f94786f95c82d653bbcd6abe7 Mon Sep 17 00:00:00 2001 From: Gabriel Dunne Date: Fri, 9 Jul 2010 00:10:01 -0700 Subject: [PATCH] customizing content for quilime --- content/cat1/test_post | 20 -------------------- content/cat2/test_post | 8 -------- lib/init.php | 6 +++--- pages/about | 11 ++++++++++- pages/links | 22 ++++++++++++++++++++-- public/index.php | 5 +++-- templates/head-inc.html.tpl | 13 +++++++++++++ templates/nav.html.tpl | 11 +++-------- templates/page.html.tpl | 2 -- 9 files changed, 52 insertions(+), 46 deletions(-) delete mode 100644 content/cat1/test_post delete mode 100644 content/cat2/test_post diff --git a/content/cat1/test_post b/content/cat1/test_post deleted file mode 100644 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 
 code
-    // a comment perhaps
-
-line    
-------
-break
diff --git a/content/cat2/test_post b/content/cat2/test_post
deleted file mode 100644
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 e45c464..7e2b8f5 100644
--- 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 bdfa8cd..4d30f20 100644
--- 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 42637b7..908153e 100644
--- 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 204b88c..da0c655 100644
--- 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 413686a..a204510 100644
--- a/templates/head-inc.html.tpl
+++ b/templates/head-inc.html.tpl
@@ -1,4 +1,17 @@
 
 
 
+
 
+
+
+
+
+
+
+
+
diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl
index 53d8efd..2291480 100644
--- a/templates/nav.html.tpl
+++ b/templates/nav.html.tpl
@@ -4,8 +4,6 @@
 	
 	

 	
-	
categories

-	
 	
 	
 	
    • 
@@ -13,11 +11,8 @@
 	
 	
    
 	
-	
    pages
    
-	
-	
-	
-	
    • 
-	
+	
  • aggregate
    • 
+	
  • links
    • 	
+	
  • about
    • 
 
 	
diff --git a/templates/page.html.tpl b/templates/page.html.tpl
index 346fdef..159c659 100644
--- a/templates/page.html.tpl
+++ b/templates/page.html.tpl
@@ -12,8 +12,6 @@
     
 
    
 	
-	
    
-
 	
 	
 
    
-- 
2.34.1