brought in more-link changes from the quilime branch

diff --git a/content/blog/2010-07-29_biennial_perf b/content/blog/2010-07-29_biennial_perf
index 11350adf2e2226e81f79b0e7e287728af5df317f..b10e4f9e3361ddf7d159ffc2bef1e889db57afe1 100644 (file)
--- a/content/blog/2010-07-29_biennial_perf
+++ b/content/blog/2010-07-29_biennial_perf
@@ -3,9 +3,11 @@ tags = perf install projection vis aud
 notes = this might need to be split up into a few posts
 --
 
-# video
+[video1]
 
-[video]
+[video2]
+
+two audiovisual performances, done July 29 2010 during the [Biennial of the Americas](http://biennialoftheamericas.org), Denver, Colorado.
 
 <!--more-->
 

diff --git a/lib/data.php b/lib/data.php
index 9bee7eaebffe9ec0d5e941d65fe0c3c07b8d5add..3e0613efacf3ad8472e2f5357cdbc2bdddcfaf78 100644 (file)
--- a/lib/data.php
+++ b/lib/data.php
@@ -10,7 +10,7 @@ function get_entries( $path = "", $args = array())
        $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);
@@ -96,6 +96,7 @@ function parse_entry($fileInfo, $page = 0)
 {
        $config = "";
        $content = "";
+    $content_short = "";
        $passed_config = false;
        $file_contents = file($fileInfo->getRealPath(), FILE_USE_INCLUDE_PATH);
        foreach ( $file_contents as $line ) {
@@ -107,6 +108,12 @@ function parse_entry($fileInfo, $page = 0)
                        $config .= $line;
                        continue;
                }
+               if (trim($line) == MORE_DELIM) {
+          $passed_more = true;
+        }
+        if (!$passed_more) {
+          $content_short .= $line;
+        }
                $content .= $line;
        }
 
@@ -116,6 +123,8 @@ function parse_entry($fileInfo, $page = 0)
        $file['timestamp'] = $file['config']['date'] ? date('U', strtotime( $file['config']['date'])) : $fileInfo->getCTime();
        $file['tags'] = $file['config']['tags'] ? explode(" ", $file['config']['tags']) : null;
        $file['content'] = Markdown($content);
+    if ($passed_more)
+      $file['content_short'] = Markdown($content_short);
        $cat = clean_slashes(str_replace(LOCAL_ROOT . CONTENT_DIR, "", $fileInfo->getPath()));
        $file['cat'] = $page ? null : array('name' => substr($cat,1), 'url' => $cat.'/' );
        $file['path'] = $fileInfo->getRealPath();

diff --git a/lib/init.php b/lib/init.php
index a46bb52cb4de5ae6cb50822648219b787349a673..3fea4beeb6a79bd9c2e5d60eb359e32bcabe38f4 100644 (file)
--- a/lib/init.php
+++ b/lib/init.php
@@ -11,7 +11,8 @@
        define ('CONTENT_DIR', 'content');
        define ('TEMPLATE_DIR', 'templates');
        define ('PAGE_DIR', 'pages');   
-       define ('CONFIG_DELIMITER', '--');      
+       define ('CONFIG_DELIMITER', '--'); 
+    define ('MORE_DELIM', '<!--more-->');
        define ('TITLE_DELIMITER', ': ');
        define ('CONFIG_FILE', 'config');       
        

diff --git a/lib/template.php b/lib/template.php
index c470488eb9e758331df48b12d3f5e5f4ddeec867..fea9eed792b8d02eba210a0b522ffbb431610532 100644 (file)
--- a/lib/template.php
+++ b/lib/template.php
@@ -49,7 +49,7 @@ class Template
        
        public function page_title($delim)
        {
-               return isset($this->_tpl_vars['page_title']) ? $delim . $this->_tpl_vars['page_title'] : "";
+               return $this->_tpl_vars['page_title'] ? $delim . $this->_tpl_vars['page_title'] : "";
        }
 }
 

diff --git a/public/index.php b/public/index.php
index fbb2931c88e26da17245ea0716697b9e72f52644..76e89fbbd6d8bea38e32c08428f0a19e98415d05 100644 (file)
--- a/public/index.php
+++ b/public/index.php
@@ -1,5 +1,7 @@
 <?php
 
+
+
     require_once '../lib/init.php';
 
     $url = get_url();

diff --git a/templates/default.html.tpl b/templates/default.html.tpl
index a50c35ba7c90e4cdc6c62288676949a55fc5f659..c548db7c718d58275293185bda2a8db3bb17b9c7 100644 (file)
--- a/templates/default.html.tpl
+++ b/templates/default.html.tpl
@@ -3,7 +3,7 @@
     
     <? $this->include_template('head-inc.html.tpl') ?>
     
-    <title><?=SITE_TITLE?>: <?=$page_title?></title>
+    <title><?=SITE_TITLE?><?=$this->page_title(TITLE_DELIMITER);?></title>
     
 </head>
 <body>
@@ -13,7 +13,11 @@
 <div id="content">
 
        <? foreach($data as $entry): ?>
-       <? $this->include_template('entry.html.tpl', array('data' => $entry)); ?>
+       <?  
+    if ($entry['content_short']) 
+    $entry['content'] = $entry['content_short'] . '<br /><a class="more" href="'.$entry['url'].'">more &rarr;</a><br /><br />';
+    $this->include_template('entry.html.tpl', array('data' => $entry)); 
+    ?>
        <? endforeach; ?>       
        
 </div>

diff --git a/templates/default.txt.tpl b/templates/default.txt.tpl
index bfef63c15af8f89bba69d184f73d37b21c2afe5f..eac9fb233a36720a1a9e144ddd933f5c2018f950 100644 (file)
--- a/templates/default.txt.tpl
+++ b/templates/default.txt.tpl
@@ -1,4 +1,4 @@
-title : <?=SITE_TITLE?><?=$this->title()."\n"; ?>
+title : <?=SITE_TITLE?>, <?=$page_title . "\n"; ?>
 author : gabriel dunne
 email : gdunne at quilime dot com
 copyright : 1997 - <?=date('Y');?>