]> git.quilime.com - plog.git/commitdiff
updated next/prev
authorGabriel Dunne <gdunne@quilime.com>
Mon, 20 Feb 2012 05:11:44 +0000 (21:11 -0800)
committerGabriel Dunne <gdunne@quilime.com>
Mon, 20 Feb 2012 05:11:44 +0000 (21:11 -0800)
33 files changed:
TODO
content/code/archlinux_install
content/code/bash_profile_linux
content/config
content/projects/.obsession [moved from content/projects/obsession with 91% similarity]
content/projects/aero
content/projects/boat
content/projects/bodyneg
content/projects/cabspotting
content/projects/dots
content/projects/icarus
content/projects/jellyfish
content/projects/light
content/projects/mask
content/projects/prism
content/projects/rattle
content/projects/rattles
content/projects/sempernull
content/projects/swimtank
content/projects/synony
css/style.css
index.php
lib/data.php
lib/init.php
lib/model.php
templates/default.html.tpl
templates/entry.html.tpl
templates/index.html.tpl
templates/nav.html.tpl
templates/nextprev.html.tpl
templates/page.html.tpl
templates/single.html.tpl
templates/test.html.tpl

diff --git a/TODO b/TODO
index 706a6cf5d50fc74c3de76055ab71b0faeba95b28..d3550fe6ae3ff0ad0b90e1f78c7d3d476841cd0c 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,9 +1,14 @@
 TODO
 
 - pagination (View)
-- prev/next (View)
-- static cache generation (wget? curl?) 
+
+- canvas icons for list/thumb/tile views (js)
+
+- static cache generation (wget? curl?)
+
 - update content.sh to give back help if used incorrectly
 
-nice things
-- highlight categories from index
\ No newline at end of file
+
+
+done
+- prev/next (View)
index 8c8cc9af169a4caaf7dd8f496e3f1a52573f1d7b..c34cb624e4e18c7954d4b52cd03f598536dd086d 100644 (file)
@@ -3,7 +3,6 @@ date = 2012-01-02
 tags = arch linux windows installation tutorial
 --
 
-
 Documentation of the process of installing [archlinux](http://www.archlinux.org/) and Windows 7 in a dual-boot configuration. 
 
 ## System Specs
index 6f6550cf4e7329ad45231edec954cb85fe258210..7146b562286a38af41fe3cd9d4a588f954c37303 100644 (file)
@@ -7,4 +7,4 @@ export CLICOLOR=1
 export LSCOLORS=gxFxCxDxBxgggdabagacad
 
 export EDITOR='emacs'
-</pre>
\ No newline at end of file
+</pre>
index 759fb8f79639db46b2b7b273c6e5bdb58e9a1185..94c78eabf63b98818719c7d01354c69457539788 100644 (file)
@@ -1,2 +1,3 @@
+title = quilime
 template = index
-title = delhi 2011
\ No newline at end of file
+
similarity index 91%
rename from content/projects/obsession
rename to content/projects/.obsession
index f28f27c534b420612f1aeb171de36ff4c283ae9b..07c127dd6c15e35800b31710c4696f74b0f1a1af 100644 (file)
@@ -1,5 +1,5 @@
 title = obsession
-date = 203
+date = 2003-07-04
 thumb = http://portfolio.quilime.com/2008/obsession/thumb.png
 --
 <img src="obsession/detail.jpg">
index 3c36527f75a2aa245c022b0aa754a0f1c3924097..cb62137f379478e359838e3bb830c5a03b6a24af 100644 (file)
@@ -1,5 +1,5 @@
 title = aero
-date = 2007
+date = 2007-04-01
 thumb = http://portfolio.quilime.com/2008/aero/thumb.png
 --
 <img src="http://portfolio.quilime.com/2008/aero//aero.jpg" />
index e8147d1cf272f2750d02dc12b968973f80df3fe6..a691a09fa155ae1e4c353da34d823ba9a193cd7f 100644 (file)
@@ -1,19 +1,19 @@
 title = boat
-date = 2007
+date = 2007-01-01
 --
 
 
 <object classid="clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b" id="qt_object" width="535" height="374" codebase="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0">
 <param name="type" value="video/quicktime">
 <param name="name" value="qt_object">
-<param name="nocache" value="true">
-<param name="autoplay" value="true">
-<param name="kioskmode" value="true">
+<param name="nocache" value="false">
+<param name="autoplay" value="false">
+<param name="kioskmode" value="false">
 <param name="controller" value="true">
 <param name="loop" value="true">
 <param name="bgcolor" value="#000000">
 <param name="src" value="http://portfolio.quilime.com/2008/boat/boat.mov">
-<param name="pluginspage" value="http://www.apple.com/quicktime/download/indext.html">         
-<embed name = "qt_object" width="535" height="374" controller="true" loop="true" autoplay="true" src="http://portfolio.quilime.com/2008/boat/boat.mov" kioskmode="true" nocache="true" type="video/quicktime" bgcolor="#000000" border="0" pluginspage="http://www.apple.com/quicktime/download/indext.html" enablejavascript="true">
+<param name="pluginspage" value="http://www.apple.com/quicktime/download/indext.html">
+<embed name = "qt_object" width="535" height="374" controller="true" loop="true" autoplay="false" src="http://portfolio.quilime.com/2008/boat/boat.mov" kioskmode="false" nocache="false" type="video/quicktime" bgcolor="#000000" border="0" pluginspage="http://www.apple.com/quicktime/download/indext.html" enablejavascript="true">
 </embed>
 </object>
index da8727f64f97cd7fdbbebe753d8e64b027094390..d931214d500c0be84e9dcb891885191464be1f0e 100644 (file)
@@ -1,5 +1,5 @@
 title = bodyneg
-date = 2008
+date = 2004-06-05
 thumb = http://portfolio.quilime.com/2008/bodyneg/thumb.png
 --
 
index 6e333d9ab976396d3f5464dccbec76279e03b5f7..5d05632d69d31036c9e9da962f47d1aa2c2cf7dc 100644 (file)
@@ -1,20 +1,20 @@
 title = Cabspotting
-date = 2006
+date = 2006-05-01
 thumb = http://portfolio.quilime.com/2008/cabspotting/thumb.png
 --
 
 <object classid="clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b" id="qt_object" width="800" height="516" codebase="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0">
 <param name="type" value="video/quicktime">
 <param name="name" value="qt_object">
-<param name="nocache" value="true">
-<param name="autoplay" value="true">
-<param name="kioskmode" value="true">
+<param name="nocache" value="false">
+<param name="autoplay" value="false">
+<param name="kioskmode" value="false">
 <param name="controller" value="true">
 <param name="loop" value="true">
 <param name="bgcolor" value="#000000">
 <param name="src" value="http://portfolio.quilime.com/2008/cabspotting/cabspotting_web.mov">
-<param name="pluginspage" value="http://www.apple.com/quicktime/download/indext.html">         
-<embed name = "qt_object" width="800" height="516" controller="true" loop="true" autoplay="true" src="http://portfolio.quilime.com/2008/cabspotting/cabspotting_web.mov" kioskmode="true" nocache="true" type="video/quicktime" bgcolor="#000000" border="0" pluginspage="http://www.apple.com/quicktime/download/indext.html" enablejavascript="true">
+<param name="pluginspage" value="http://www.apple.com/quicktime/download/indext.html">
+<embed name = "qt_object" width="800" height="516" controller="true" loop="true" autoplay="false" src="http://portfolio.quilime.com/2008/cabspotting/cabspotting_web.mov" kioskmode="false" nocache="false" type="video/quicktime" bgcolor="#000000" border="0" pluginspage="http://www.apple.com/quicktime/download/indext.html" enablejavascript="true">
 </embed>
 </object>
 
index 57ebc559714fcd9708b337760b0b3ecc61080a91..272892eba432847f7c9621b6546badd066981014 100644 (file)
@@ -1,5 +1,5 @@
 title = dots
-date = 2007
+date = 2007-05-02
 --
 
 <img style="width:100%;" src="http://portfolio.quilime.com/new/content/01_Dots/images/out.0033.png">
index 384fc8b9ffd76565cef2357c0e4e3c045901bc3a..67ca1bfe50609db9c5fbb6de83fd623419ec7e31 100644 (file)
@@ -1,5 +1,5 @@
 title = icarus
-date = 2007
+date = 1999-08-05
 thumb = http://portfolio.quilime.com/2008/icarus/thumb.png
 --
 <img src="http://portfolio.quilime.com/2008/icarus/icarus.jpg" />
index 3298cacb6490241fefe4e2d8df901ac4887c6add..5188b5bdcc87870f634ed5f6ca6a2fb11c28b8c0 100644 (file)
@@ -1,5 +1,5 @@
 title = Jellyfish
-date = 2008
+date = 2008-05-01
 --
 
 <img style="width:100%;" src="http://portfolio.quilime.com/new/content/02_Jellyfish/images/jellies.0237.png">
index f2aa8bdf0215c44f62dd5ab53a90b6c900740444..37918bb5bb4e363f4a4787b726849dfc0e9a2381 100644 (file)
@@ -1,10 +1,12 @@
 title = spacelamp
-date = 2007
+date = 2007-03-10
 thumb = http://portfolio.quilime.com/2008/spacelamp/thumb.png
 --
 
 <img src="http://portfolio.quilime.com/new/content/07_Light/images/light2.jpg">
 
+<!--more-->
+
 <img src="http://portfolio.quilime.com/new/content/07_Light/images/noton.jpg">
 
 found plexi (street find by ss). Added lights, hung with wire. The beginnings of exploring interactive sculpture.
index 69acae83d0916e8548c9d7c5d6e990bdc7130ded..d72fb4061dfde5cd98c529f6d5211d4725960bab 100644 (file)
@@ -1,5 +1,5 @@
 title = mask
-date = 2007
+date = 2007-07-02
 thumb = http://portfolio.quilime.com/2008/mask/thumb.png
 --
 
index e66e0adf89efebbf41eae5e9dcab9f94a3ddf0b9..ea834a35c32a4afd6f645e048ce3bd5b7e431c33 100644 (file)
@@ -1,5 +1,5 @@
 title = prism
-date = 2007
+date = 2007-08-23
 thumb = http://portfolio.quilime.com/2008/prism/thumb.png
 --
 
index 0422b6d5375309d66a4804d09bafca06f205583f..d87020c225d2ffd022c51108822a56f1f9da99d9 100644 (file)
@@ -1,21 +1,19 @@
 title = rattle
-date = 2008
+date = 2008-05-02
 --
 
-
-
 <object classid="clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b" id="qt_object" width="640" height="496" codebase="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0">
 <param name="type" value="video/quicktime">
 <param name="name" value="qt_object">
 <param name="nocache" value="true">
-<param name="autoplay" value="true">
+<param name="autoplay" value="false">
 <param name="kioskmode" value="true">
 <param name="controller" value="true">
-<param name="loop" value="true">
+<param name="loop" value="false">
 <param name="bgcolor" value="#000000">
 <param name="src" value="http://portfolio.quilime.com/2008/rattle/rattle.mov">
-<param name="pluginspage" value="http://www.apple.com/quicktime/download/indext.html">         
-<embed name = "qt_object" width="640" height="496" controller="true" loop="true" autoplay="true" src="http://portfolio.quilime.com/2008/rattle/rattle.mov" kioskmode="true" nocache="true" type="video/quicktime" bgcolor="#000000" border="0" pluginspage="http://www.apple.com/quicktime/download/indext.html" enablejavascript="true">
+<param name="pluginspage" value="http://www.apple.com/quicktime/download/indext.html">
+<embed name = "qt_object" width="640" height="496" controller="true" loop="false" autoplay="false" src="http://portfolio.quilime.com/2008/rattle/rattle.mov" kioskmode="true" nocache="true" type="video/quicktime" bgcolor="#000000" border="0" pluginspage="http://www.apple.com/quicktime/download/indext.html" enablejavascript="true">
 </embed>
 </object>
 
index 01ea7262d02daed8198e16709787235817e13d24..bc9b1aa25380297a51562144c8c0f10c330c5823 100644 (file)
@@ -1,5 +1,5 @@
 title = Rattles
-date = 2006
+date = 2006-05-02
 thumb = http://portfolio.quilime.com/2008/rattle/thumb.png
 --
 
@@ -8,7 +8,7 @@ Rattles and shakers can be embedded into one another, allowing for more sensitiv
 
 <img style="width:100%;" src="http://portfolio.quilime.com/new/content/03_Rattles/images/rattleFlowers.0077.png">
 
-
+<!--more-->
 
 
 
index ceadcd18e59187e51e20d06a3d359ee8b4152ed7..62f7b6c89f0e55545a399466b666849f2046e96b 100644 (file)
@@ -1,9 +1,18 @@
 title = sempernull
-date = 2007
+date = 2007-08-12
 thumb = http://portfolio.quilime.com/2008/sempernull/thumb.png
 tag = video installation
 --
 
+<img style="width:100%;" src="http://portfolio.quilime.com/new/content/04_Stars/images/god.0498.png">
+
+
+An exploration of infinite/finite space. The user transitions between macro and micro environments of mathematically infinite scale, limited only by computer processing power. As the viewer moves through multiple spaces, their scope and perspective widends and transcends while space becoms infinitely big and infinitely small simultaneously.
+
+*non-interactive software*
+
+
+<!--more-->
 
 <object classid="clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b" id="qt_object" width="640" height="496" codebase="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0">
 <param name="type" value="video/quicktime">
@@ -26,11 +35,7 @@ sempernull
 </p>
 
 
-An exploration of infinite/finite space. The user transitions between macro and micro environments of mathematically infinite scale, limited only by computer processing power. As the viewer moves through multiple spaces, their scope and perspective widends and transcends while space becoms infinitely big and infinitely small simultaneously.
-
-*non-interactive software*
 
-<!--more-->
 
 <img style="width:100%;" src="http://portfolio.quilime.com/new/content/04_Stars/images/astars.10535.png">
 
index b84c324f1e78e45ba9b3223e230f98df85382366..89cac7eab25724235fa9a1544b093bea9c7d6618 100644 (file)
@@ -1,5 +1,5 @@
 title = Swimtank
-date = 2007
+date = 2007-05-01
 --
 
 <img style="width:100%;" src="http://portfolio.quilime.com/new/content/05_Swim_Tank/images/fish_close.0261.png">
index 2ac02b962d5f8b73fdb52f7e8210e41f3f195996..f55a9fca820fadef15a4cc149b6e269cf8f88da4 100644 (file)
@@ -1,8 +1,12 @@
 title = synonymovement
-date = 2007
+date = 2007-04-10
 thumb = http://portfolio.quilime.com/2008/synonymovement/thumb.png
 --
 
+synonymovement  
+*non-interactive software*
+
+<!--more-->
 
 <object classid="clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b" id="qt_object" width="640" height="496" codebase="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0">
 <param name="type" value="video/quicktime">
index 09d2c90921c6e59794913f98794c88aef07f4e80..0a0c811aa3210aa6971077777cf714f309ab492c 100644 (file)
@@ -1,31 +1,31 @@
 body, table {
-    font-size: 12px;
+    font-size:14px;
     font-family: arial, monaco, monospace;
     line-height:1.6em;
 }
 
-body { 
+body {
     background:rgb(25, 25, 25);
     padding:0;
     margin:0;
     color: #ddd;
 }
 
-a { 
+a {
   outline:none;
     color:rgb(42, 128, 235);
     text-decoration:none;
 }
-a img { 
-    border:0; 
+a img {
+    border:0;
 }
 a.visited {
 }
-a.mute { 
+a.mute {
     font-weight:normal;
     color:rgb(129, 144, 144);
 }
-a:hover, a.mute:hover { 
+a:hover, a.mute:hover {
     color:f0a;;
 }
 
@@ -33,48 +33,35 @@ h1 {
     padding-top:0;
     margin-top:0;
     margin-bottom:30px;
-
-}
-h1 a {
-  background:#121212;
-display:block;
-  margin-left:-1.5em;
-    padding-left:1.5em;
 }
-h1 a:hover {
-    color:#ddd;
-background:#333;
-}
-h1, h2, h3, h4, h5, h6 { 
+h1, h2, h3, h4, h5, h6 {
     font-weight:normal;
     color:#666;
-    font-size:12px;
+    font-size:14px;
 }
 h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
     display:block;
     text-decoration:none;
-    color:#fff;
+    color:#666;
 }
-h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover { 
-background:#161616;
+h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover {
+  color:#fff;
 }
-h1 a:hover {
 
-}
 
-ul, li { 
-    margin:0; padding:0; list-style-type:none; 
+ul, li {
+    margin:0; padding:0; list-style-type:none;
 }
-ol { 
+ol {
     margin:0;
 }
-ol li { 
-    list-style-type:decimal; 
+ol li {
+    list-style-type:decimal;
 }
-blockquote { 
+blockquote {
     font-family:serif;
     font-style:italic;
-    font-size:1.45em;  
+    font-size:1.45em;
     line-height:1.3em;
     margin:0;
     padding:0;
@@ -150,23 +137,22 @@ background:rgba(25,25,25,0.3);
 .entry h2 {
     margin-top:40px;
 }
-.entry .metadata { 
-    
+.entry .metadata {
     margin-bottom:30px;
-    color:#444;
+    color:#333;
 }
 .entry .metadata a {
-    color:#444;
+    color:#555;
 }
 .entry .metadata a:hover {
     color:#999;
 }
-.entry .metadata .tags li { 
-    display:inline-block; 
-    margin-right:0.3em; 
+.entry .metadata .tags li {
+    display:inline-block;
+    margin-right:0.3em;
 }
 .entry p {
-     max-width:720px;   
+     max-width:720px;
 }
 
 
@@ -186,7 +172,7 @@ background:rgba(25,25,25,0.3);
   height:100px;
   border:1px dotted #000;
   overflow:hidden;
-  
+
 }
 
 
index b16eaa32a9e03ce31c3710784d201b02f34611ff..a41ee497595cdf644083736c5bf4164cbd84fb74 100644 (file)
--- a/index.php
+++ b/index.php
@@ -7,7 +7,6 @@ require 'lib/init.php';
 
 
 $request = get_request();
-
 $v = new View  ($request);
 $m = new Model ($request);
 
@@ -30,15 +29,7 @@ else if ($m->is_multiple())
 
 
 
-header("Content-Type: {$m->response_mime_type}; charset=UTF-8"); 
+header("Content-Type: {$m->response_mime_type}; charset=UTF-8");
 $v->render( $m->template );
 
-
-
-
-
-
-
-
-
 exit;
index 5cf44bbf7e145a367f57fb9ac36c1469e82f8800..3d4a35fe249a94512d17bba576fc82cc35bb3cd2 100644 (file)
@@ -30,11 +30,11 @@ function get_entries( $path = "", $args = array())
 
                // $finfo = finfo_open(FILEINFO_MIME_TYPE);
                // $ftype = finfo_file($finfo, join(array($info->getPath(), $info->getFilename()), DIRECTORY_SEPARATOR));
-               // finfo_close($finfo);         
+               // finfo_close($finfo);
 
-               if ( 
-//                     $ftype == 'text/plain' && 
-                       !$info->isDir() && 
+               if (
+//                     $ftype == 'text/plain' &&
+                       !$info->isDir() &&
                        !in_array( $info->getFilename(), $_FILE_IGNORES )) {
                        $entries[] = parse_entry( $info );
                }
@@ -50,14 +50,6 @@ function get_entries( $path = "", $args = array())
                                array_multisort( $time, $order, $entries );
        }
 
-
-       // assign next/prev for each entry
-       $num_entries = count($entries);
-       for ($i = $num_entries-1; $i>=0; $i--) {
-               $entries[$i]['prev_entry'] = isset($entries[$i+1]) ? $entries[$i+1] : null;
-               $entries[$i]['next_entry'] = isset($entries[$i-1]) ? $entries[$i-1] : null;
-       }
-
        return $entries;
 }
 
@@ -152,7 +144,7 @@ function parse_entry($fileInfo, $page = false)
        $f['timestamp'] = $f['config']['date'] ? date('U', strtotime( $f['config']['date'])) : $fileInfo->getCTime();
        $f['tags'] = isset($f['config']['tags']) ? explode(" ", $f['config']['tags']) : null;
        $f['content'] = Markdown($content);
-    
+
     if ($passed_more)
       $f['content_short'] = Markdown($content_short);
 
@@ -172,7 +164,7 @@ function parse_entry($fileInfo, $page = false)
 }
 
 
-function get_entry ( $relative_path ) 
+function get_entry ( $relative_path )
 {
        return parse_entry(new SplFileInfo(join(array(LOCAL_ROOT, CONTENT_DIR, $relative_path), DIRECTORY_SEPARATOR)));
 }
index c0d38495ca2087acfef3a1632554db6caea04680..e77e3a28b482a58fd17942120ee0940fcf4a3ae2 100644 (file)
@@ -1,34 +1,4 @@
 <?php
-/*
-<<<<<<< HEAD
-    putenv("TZ=America/Los_Angeles");
-
-       ini_set('include_path', ini_get('include_path') . PATH_SEPARATOR . dirname(realpath(__FILE__)));
-
-       define ('SITE_TITLE', 'quilime');
-       define ('LOCAL_ROOT', '/home/quilime/quilime.com/');
-       define ('WEB_ROOT', 'http://quilime.com/');
-
-       define ('CONTENT_DIR', 'content');
-       define ('TEMPLATE_DIR', 'templates');
-       define ('PAGE_DIR', 'pages');
-       define ('CONFIG_DELIMITER', '--');
-    define ('MORE_DELIM', '<!--more-->');
-       define ('TITLE_DELIMITER', ': ');
-       define ('CONFIG_FILE', 'config');
-
-    require_once 'data.php';
-    require_once 'output.php';
-    require_once 'markdown.php';
-    require_once 'template.php';
-
-
-       //error_reporting(E_ALL);
-       //ini_set("display_errors", 1);
-
-?>
-=======
-*/
 /**
  *             SETUP
  *
index e148db21e50f6cf4e3095e9df2a422c676b8addb..3cd2c00388b5c70d16899a9736bbc77c3d7fe6ae 100644 (file)
@@ -1,11 +1,11 @@
 <?php
 
 class Model
-{      
+{
 
        var $content_request = null;
        var $page_request = null;
-       
+
        var $response_format = 'html';
        var $response_mime_type = 'text/html';
        var $page_title = null;
@@ -25,6 +25,7 @@ class Model
 
        function parse_request( $request )
        {
+
                $this->content_request = join(array($this->request['dirname'], $this->request['filename']), DIRECTORY_SEPARATOR );
                $this->page_request    = $this->request['filename'];
 
@@ -39,7 +40,7 @@ class Model
                    }
                $this->entries = get_entries( $this->content_request );
                $this->page_title = preg_replace('{^/|/$}', '', $this->request['path']);
-               } 
+               }
 
 
                # if single entry (file in CONTENT dir)
@@ -47,25 +48,27 @@ class Model
                {
                        $this->entry = get_entry( $this->content_request );
 
-                       // heavy handed prev/next
-                       $entries = get_entries();
+                       // prev/next
+                       $entries = get_entries($request['dirname']);
+
                        for($i = count($entries)-1; $i>=0; $i--) {
                                if ($this->entry['url'] == $entries[$i]['url']) {
-                                       $this->entry['prev_entry'] = $entries[$i]['prev_entry'];
-                                       $this->entry['next_entry'] = $entries[$i]['next_entry'];
+                                       $this->entry['prev_entry'] = isset($entries[$i-1]) ? $entries[$i-1] : null;
+                                       $this->entry['next_entry'] = isset($entries[$i+1]) ? $entries[$i+1] : null;
                                        break;
                                }
                        }
 
+                       $this->entry['is_single'] = true;
                        $this->template = 'single.' . $this->response_format . '.tpl';
                }
 
 
                # if page (file in PAGES dir)
                else if ($this->is_page()) {
-               $this->page = get_page( $this->page_request );                  
-               $this->template = isset($this->page['config']['template']) ? 
-                                                       $this->page['config']['template'] . '.' . $this->response_format . '.tpl' : 
+               $this->page = get_page( $this->page_request );
+               $this->template = isset($this->page['config']['template']) ?
+                                                       $this->page['config']['template'] . '.' . $this->response_format . '.tpl' :
                                                        'page.' . $this->response_format . '.tpl';
                }
 
@@ -93,5 +96,5 @@ class Model
        function is_page()
        {
                return is_file(join(array( LOCAL_ROOT, PAGE_DIR, $this->page_request ), DIRECTORY_SEPARATOR )) ? 1 : 0;
-       }                       
+       }
 }
index b68684f35592c6b2d8366f3a1e65a17bf75a62e5..236b76af673afa99ff71ef22060a52902ef54fa1 100644 (file)
@@ -1,31 +1,38 @@
 <html>
 <head>
-    
+
     <? $this->include_template('head-inc.html.tpl') ?>
-    
+
     <title><?=SITE_TITLE?><?=$this->page_title(TITLE_DELIMITER);?></title>
-    
+
 </head>
 <body>
-    
-    
+
+
 <div id="content">
 
     <div class="entries">
+    <?
+        // TODO: PAGINATION!!
+    ?>
        <? foreach($entries as $entry): ?>
-       <?  
-        if (isset($entry['content_short'])) 
+       <?
+        if (isset($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('entry' => $entry)); 
+        $this->include_template('entry.html.tpl', array('entry' => $entry));
+    ?>
+       <? endforeach;
+
+        unset($entry);
+
     ?>
-       <? endforeach; ?>       
     </div>
-       
+
 </div>
 
-       <? $this->include_template('footer.html.tpl') ?>
     <? $this->include_template('nav.html.tpl') ?>
+       <? $this->include_template('footer.html.tpl') ?>
 
 </body>
 </html>
index e26f83d3288272f212169d0c76e6f16e3ae7054a..e5bb41573cbeca71a654b067c91647ee23c24687 100644 (file)
@@ -1,15 +1,16 @@
 <div class="entry">
 
        <h1>
-               <a title="posted on <?=$entry['date']?>" href="/<?=$entry['url']?>"><?=$entry['title']?></a>
+       <a title="posted on <?=$entry['date']?>" href="/<?=$entry['url']?>"><?=$entry['title']?></a>
        </h1>
 
-       <div class="content">   
+       <div class="content">
                <?=$entry['content']?>
        </div>
 
        <div class="metadata">
-               <a title="posted on <?=$entry['date']?>" href="<?=$entry['url']?>">#</a>
-       </div>  
+               <a title="permalink" href="/<?=$entry['url']?>">#</a><br />
+               <!-- <abbr title="<?=get_relative_time($entry['timestamp']);?>"><?=date("F d, Y", $entry['timestamp'])?></abbr>  -->
+       </div>
 
 </div>
index 14a72f6a6c1294110f35e2c4d8e3bf654681760d..1b7b7be923d3a61288da3ce879513c876840c2d7 100644 (file)
     
 <div id="content">
 
-
-
-
-
        <table cellspacing="0" cellpadding="0">
 
-
        <tr>
 
        <td  style="padding-right:100px;"  valign="top">
        </tr>
        </table>        
 
-
-
-
-
-
 <!--           &bull; <a href="http://content.stamen.com/som_transbay_tower">Bay Area Transit</a> - data visualization<br />           
                &bull; <a href="http://portfolio.quilime.com/content/daschtein/index.html">Dachstein</a> - installation<br />
                &bull; <a href="http://portfolio.quilime.com/content/cm/index.html">Celestial Mechanics</a> - dome-based animation<br />
index 226ec1b40fe8fc30f19bd0381c15d5688b282dd4..a1df5ede5578fc5e34451b736ad0060fd4733ff0 100644 (file)
@@ -9,7 +9,7 @@
        <? $dirs = get_dirs("", array('recursive' => 0)); ?>
        <? foreach($dirs as $dir) : ?>
        <li><a href="<?=$dir['url']?>"><?=$dir['name']?></a></li>
-       <? endforeach; ?> 
+       <? endforeach; ?>
 
        <br />
 
 
 </ul>
 ======= -->
-<ul id="nav">    
+<ul id="nav">
 
     <li><a href="/">home</a></li>
-       <li><a href="/about/">about</a></li>
+    <!-- <li><a href="/contents">contents</a></li> -->
+       <li><a href="/about">about</a></li>
 
        <br />
        <br />
@@ -51,7 +52,7 @@
        <? $dirs = get_dirs("", array('recursive' => 0)); ?>
        <? foreach($dirs as $dir) : ?>
        <li><a href="/<?=$dir['url']?>"><?=$dir['name']?></a></li>
-       <? endforeach; ?>  
+       <? endforeach; ?>
 
        <br />
        <br />
@@ -59,7 +60,7 @@
        static
        <li><a href="/photo">photo</a></li>
        <li><a href="/agg">aggregate</a></li>
-       <li><a href="/links">links</a></li>     
+       <li><a href="/links">links</a></li>
 
        <br />
        <br />
@@ -68,5 +69,6 @@
                <? $this->include_template('nextprev.html.tpl'); ?>
        </li>
 
+
 </ul>
 
index 55041d6179d5f09f0e6d73041da642f5721560ec..432c04a2daae92ade0583188115c8137fb6246ef 100644 (file)
@@ -1,24 +1,39 @@
+
 <span style="font-size=15px;">
-<? if (isset($entry['cat'])) : ?>
+<?
+
+       // surely this is in the template somewhere??
+       $cur_request = get_request();
+       if (isset($entries)) {
+               $entry = null;
+       }
+?>
+
+<? if (isset($cur_request['dirname']) && $cur_request['dirname'] != '/' ) : ?>
 <span style="font-family:arial">
-<a href="/<?=$entry['cat']['url'];?>">&uarr;</a>
+<a href="/<?=$cur_request['dirname']?>">&uarr;</a>
 </span>
-
 <br /><br />
 <? endif; ?>
 
+<? if(isset($entry['is_single'])) : ?>
 <span style="font-family:arial">
-<? if (isset($entry['prev_entry'])) : ?> 
-       <a href="/<?=$entry['prev_entry']['url']?>">&larr;</a>
-       <script>var PREV_ENTRY = '<?=$entry['prev_entry']['url']?>'</script>
-       <br /><br />
-<? endif; ?>
 
+       <? if (isset($entry['next_entry'])) : ?>
+               <a href="/<?=$entry['next_entry']['url']?>">&rarr;</a>
+               <script>var NEXT_ENTRY = '<?=$entry['next_entry']['url']?>'</script>
+       <? endif; ?>
 
+       <br /><br />
+
+       <? if (isset($entry['prev_entry'])) : ?>
+               <a href="/<?=$entry['prev_entry']['url']?>">&larr;</a>
+               <script>var PREV_ENTRY = '<?=$entry['prev_entry']['url']?>'</script>
+       <? endif; ?>
 
-<? if (isset($entry['next_entry'])) : ?> 
-       <a href="/<?=$entry['next_entry']['url']?>">&rarr;</a>
-       <script>var NEXT_ENTRY = '<?=$entry['next_entry']['url']?>'</script>
 <? endif; ?>
+
 </span>
-</span>
+
+
+
index d26a1786f531afaf28bde4cfbbaf90b62510ada3..8d6d1ab8c3359b194e5a5107c894f4935f5667fb 100644 (file)
     
 <div id="content">
 
-<!-- <<<<<<< HEAD
-       <div class="page">
-       <?=$data['content'];?>
-       </div>
-======= -->
        <?=$page['content'];?>
-<!-- >>>>>>> 2ae0cd949c331f83dcb05116cffdca21b2ecb871 -->
        
 </div>
 
index e9b5f8a29fac10a0c18e7aeda3814855f92cac96..d35a00b4b5184dc0917c031ad329a43b2f540c4e 100644 (file)
@@ -1,45 +1,46 @@
 <html>
 <head>
-    
+
     <? $this->include_template('head-inc.html.tpl') ?>
-    
+
     <title><?=$entry['title'];?></title>
-    
+
 </head>
 <body>
-    
+
        <div id="content" class="single">
-               <? 
+               <?
                if (isset($entry['config']['template'])) {
-                       $this->include_template($entry['config']['template'] . '.' . $this->response_format . '.tpl'); 
+                       $this->include_template($entry['config']['template'] . '.' . $this->response_format . '.tpl');
                }
-               else { ?>
-                       
-<div class="entry">
+               else {
+               ?>
+
+       <div class="entry">
 
-       <h1>
-               <a title="posted on <?=$entry['date']?>" href="/<?=$entry['url']?>"><?=$entry['title']?></a>
-       </h1>
+       <h1><?=$entry['title']?></h1>
 
-       <div class="content">   
+       <div class="content">
                <?=$entry['content']?>
        </div>
 
        <div class="metadata">
-               <a title="posted on <?=$entry['date']?>" href="<?=$entry['url']?>">#</a>
-               <span title="<?=get_relative_time($entry['timestamp']);?>"><?=date("F d, Y", $entry['timestamp'])?></span> 
-               in <a href="/<?=$entry['cat']['url'];?>"><?=$entry['cat']['name'];?></a><? if ($entry['tags']) echo ' as ' . implode(', ', $entry['tags']); ?>
-       </div>  
 
-</div>
-                       
+               <a href="/<?=$entry['url']?>">#</a>
 
-                       <?}
+               <br />
+
+               created: <span title="<?=get_relative_time($entry['timestamp']);?>"><?=date("F d, Y", $entry['timestamp'])?></span> in
+               <a href="/<?=$entry['cat']['url'];?>">/<?=$entry['cat']['url'];?></a><? if ($entry['tags']) echo '<br/>tags: ' . implode(', ', $entry['tags']); ?>
+       </div>
+
+       </div>
+
+       <? } ?>
 
-               ?>
        </div>
 
-       <? $this->include_template('nav.html.tpl') ?>   
+       <? $this->include_template('nav.html.tpl') ?>
        <? $this->include_template('footer.html.tpl') ?>
 
 </body>
index d71de860d79d74f2e1dfd3acf13817f17940241a..c358a92eb5a63f5eb6aaf21d474404f9da164a1d 100644 (file)
     
 <div id="content">
 
-       this is the TEST TEST TEST template
+       <h1>tests</h1>
+
+       <?php
+
+       
+
+       ?>
        
 </div>