From bbaca28dbe98d58c9252855c0015130a001ec891 Mon Sep 17 00:00:00 2001
From: Gabriel Dunne <gdunne@quilime.com>
Date: Sun, 1 Aug 2010 14:44:26 -0700
Subject: [PATCH] new content, data

---
 content/code/maya_render_bat                  |  9 +++--
 .../code/{bash => scripts}/date_for_filename  |  0
 content/code/{bash => scripts}/imageslice     | 28 +++++--------
 content/config                                |  0
 content/log/2010-01-13_relative_time          |  6 +--
 content/log/2010-07-29_icosi                  |  6 +++
 lib/data.php                                  | 11 +++++-
 pages/links                                   | 36 ++++++++---------
 pages/projects                                | 39 +++++++++++++++++++
 public/css/style.css                          |  3 +-
 public/index.php                              |  2 +
 public/js/prettify/prettify copy.css          | 27 -------------
 templates/default.html.tpl                    |  6 ++-
 templates/index.html.tpl                      | 11 +++++-
 14 files changed, 108 insertions(+), 76 deletions(-)
 rename content/code/{bash => scripts}/date_for_filename (100%)
 rename content/code/{bash => scripts}/imageslice (56%)
 create mode 100644 content/config
 create mode 100644 content/log/2010-07-29_icosi
 create mode 100644 pages/projects
 delete mode 100644 public/js/prettify/prettify copy.css

diff --git a/content/code/maya_render_bat b/content/code/maya_render_bat
index 8068b31..8d9af38 100644
--- a/content/code/maya_render_bat
+++ b/content/code/maya_render_bat
@@ -1,24 +1,25 @@
 title = Maya render bat batch file
 tags = maya render bat
 date = 2010-07-07
+hidden = true
 --
- 
 *.bat file structure
+
 <pre class="prettyprint">
 REM // .bat comment syntax
 C:\Progra~1\Autodesk\Maya2010\bin\render -s 1 -e 30 -im output_image myscene.ma
 C:\Progra~1\Autodesk\Maya2010\bin\render -s 1 -e 30 -im output_image2 anotherscene.ma
 </pre>
 
-Maya directory must be the 8.3 character DOS version. To execute the file, save as a *.bat and double click it in Explorer.
+The path to render.exe must be the 8.3 character DOS version.  
+To execute the file, save as a *.bat and double click it in Explorer.
 
+<!--more-->
 
 <pre class="prettyprint">
 // Render Flags
-
 usage: Render &lt;options&gt; &lt;filename&gt;
 where &lt;filename&gt; is a Maya ASCII or a Maya Binary file.
-
  
 
 startFrame            -s   &lt;float&gt;     starting frame for an animation sequence
diff --git a/content/code/bash/date_for_filename b/content/code/scripts/date_for_filename
similarity index 100%
rename from content/code/bash/date_for_filename
rename to content/code/scripts/date_for_filename
diff --git a/content/code/bash/imageslice b/content/code/scripts/imageslice
similarity index 56%
rename from content/code/bash/imageslice
rename to content/code/scripts/imageslice
index 2b2906a..ccf4286 100644
--- a/content/code/bash/imageslice
+++ b/content/code/scripts/imageslice
@@ -4,14 +4,10 @@ tags = bash script slice image imagemagick
 lang = bash
 --
 
-<p>
-    Shell script that slices a single image into any number of vertical and horizontal sections.
-</p>
+Shell script that slices a single image into any number of vertical and horizontal sections.
 
-<pre class="prettyprint lang-bash">#!/bin/bash
-#copyright: 2009
-#author: gabriel dunne
-#url: quilime.com
+<pre class="prettyprint">#!/bin/bash
+#@author  gabriel dunne &lt;quilime.com&gt;
 
 IMAGE=$1
 IMAGE_W=$2
@@ -43,15 +39,11 @@ else
 fi
 </pre>
 
-<h2>To Use</h2>
-<p>
-    <ol>
-        <li>navigate to slice.sh in your terminal and do 
-            <br />
-            <pre class="prettyprint lang-bash">$  chmod 775 slice.sh
+##To Use
+navigate to slice.sh in your terminal and do 
+<pre class="prettyprint">$  chmod 775 slice.sh
 $  ./slice.sh Sunset.jpg 800 600 16 16</pre>
-        </li>
-        <li>replace <strong>Sunset.jpg</strong> with your image name.</li>
-        <li>vars: <strong>Image Height, Image Width, Vertical Divisions, Horizontal Divisions</strong></li>        
-    </ol>
-</p>
\ No newline at end of file
+replace **Sunset.jpg** with your image name.  
+params: **Image Height, Image Width, Vertical Divisions, Horizontal Divisions**  
+
+  <br />
\ No newline at end of file
diff --git a/content/config b/content/config
new file mode 100644
index 0000000..e69de29
diff --git a/content/log/2010-01-13_relative_time b/content/log/2010-01-13_relative_time
index 05fb805..2944838 100644
--- a/content/log/2010-01-13_relative_time
+++ b/content/log/2010-01-13_relative_time
@@ -1,7 +1,5 @@
 title = relative_time
 date = 2010-01-13
-tags = time, inspiration
+tags = time inspiration jpg
 --
-<img src="http://media.quilime.com/aggregate/agg/relativity_visualized__relative_time.jpg"/>
-
-
+!["relative time"](http://media.quilime.com/aggregate/agg/relativity_visualized__relative_time.jpg)
\ No newline at end of file
diff --git a/content/log/2010-07-29_icosi b/content/log/2010-07-29_icosi
new file mode 100644
index 0000000..817c579
--- /dev/null
+++ b/content/log/2010-07-29_icosi
@@ -0,0 +1,6 @@
+tags = icosi installation performance projection
+title = icosi
+date = 2010-07-29
+--
+[![icosi](http://farm5.static.flickr.com/4083/4847387648_908df243cc.jpg)](http://www.flickr.com/photos/quilime/sets/72157624499344281/with/4847387648/)
+
diff --git a/lib/data.php b/lib/data.php
index 9bee7ea..3e0613e 100644
--- 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/pages/links b/pages/links
index 4984cb2..6eb4d8d 100644
--- a/pages/links
+++ b/pages/links
@@ -3,21 +3,21 @@ type = page
 markdown = true
 --
 ## friends and inspiration
-+ [stephanie sherriff](http://ssherriff.com) &rarr;
-+ [ryan alexander](http://onecm.com) &rarr;
-+ [daniel massey](http://oddsympathy.com) &rarr;
-+ [joshua nimoy](http://jtnimoy.net) &rarr;
-+ [keith pasko](http://keithpasko.com) &rarr;
-+ [jeff lubow](http://dabkitsch.com/jml/) &rarr;
-+ [carbon workshop (gustavo huber & shelly brown)](http://carbonworkshop.com) &rarr;
-+ [sascha pohflepp](http://pohflepp.com) &rarr;
-+ [mylinh trieu](http://mylinhtrieu.com) &rarr;
-+ [aaron meyers](http://universaloscillation.com) &rarr;
-+ [tom carden](http://tom-carden.co.uk) &rarr;
-+ [michal migurski](http://mike.teczno.com) &rarr;
-+ [adam roth](http://ripevessel.com) &rarr;
-+ [david rager](http://davidrager.org) &rarr;
-+ [marc nimoy](http://digitanalog.net) &rarr;
-+ [matthew gale](http://makaga.com) &rarr;
-+ [frédéric eyl](http://fredericeyl.de) &rarr;
-+ [the green eyl](http://thegreeneyl.com) &rarr;
\ No newline at end of file
++ stephanie sherriff [ssherriff.com](http://ssherriff.com)
++ ryan alexander [onecm.com](http://onecm.com)
++ daniel massey [oddsympathy.com](http://oddsympathy.com)
++ joshua nimoy [jtnimoy.net](http://jtnimoy.net)
++ keith pasko [keithpasko.com](http://keithpasko.com)
++ jeff lubow [dabkitsch.com/jml/](http://dabkitsch.com/jml/)
++ carbon workshop [carbonworkshop.com](http://carbonworkshop.com)
++ sascha pohflep [pohflepp.com](http://pohflepp.com)
++ mylinh trieu [mylinhtrieu.com](http://mylinhtrieu.com)
++ aaron meyers [universaloscillation.com](http://universaloscillation.com)
++ tom carden [tom-carden.co.uk](http://tom-carden.co.uk)
++ michal migurski [mike.teczno.co](http://mike.teczno.com)
++ adam roth [ripevessel.com](http://ripevessel.com)
++ david rager [davidrager.org](http://davidrager.org)
++ marc nimoy [digitanalog.net](http://digitanalog.net)
++ matthew gale [makaga.com](http://makaga.com)
++ frédéric eyl [fredericeyl.de](http://fredericeyl.de)
++ the green eyl [thegreeneyl.com](http://thegreeneyl.com)
\ No newline at end of file
diff --git a/pages/projects b/pages/projects
new file mode 100644
index 0000000..ebf525d
--- /dev/null
+++ b/pages/projects
@@ -0,0 +1,39 @@
+title = projects
+--
+
+### past portfolio(s)
+[works 4](http://portfolio.quilime.com/2008/)  
+[works 3](http://portfolio.quilime.com/new/port.php)  
+[works 2](http://portfolio.quilime.com/recent.html)  
+[works 1](http://quilime.com/main.php)  
+ 
+<br />
+ 
+### selected projects
+[Tessellated Group](http://portfolio.quilime.com/2008/?p=tessellated)  
+[Rattles](http://portfolio.quilime.com/2008/?p=rattle)  
+[Sempernull](http://portfolio.quilime.com/2008/?p=sempernull)  
+[Synonymovement](http://portfolio.quilime.com/2008/?p=synonymovement)  
+[Mask](http://portfolio.quilime.com/2008/?p=mask)  
+[Prism](http://portfolio.quilime.com/2008/?p=prism)  
+[Cabspotting w/Stame](http://portfolio.quilime.com/2008/?p=cabspotting)  
+[Bay Area Transit w/Stamen](http://content.stamen.com/som_transbay_tower)  
+[Spacelamp](http://portfolio.quilime.com/2008/?p=spacelamp)  
+[Boat](http://portfolio.quilime.com/2008/?p=boat)  
+[Dots](http://portfolio.quilime.com/new/port.php?p=01_Dots)  
+[Jelly](http://portfolio.quilime.com/new/port.php?p=02_Jellyfish)  
+[Swim Tank](http://portfolio.quilime.com/new/port.php?p=05_Swim_Tank)  
+[Web](http://portfolio.quilime.com/new/port.php?p=06_Web)   
+[Sempernull (prog)](http://portfolio.quilime.com/new/port.php?p=04_Stars)  
+[Rattles (prog)](http://portfolio.quilime.com/new/port.php?p=03_Rattles)  
+[Dachstein](http://portfolio.quilime.com/content/daschtein/index.html)  
+[Celestial Mechanics](http://portfolio.quilime.com/content/cm/index.html)  
+[Valentine](http://portfolio.quilime.com/content/valentine/index.html)  
+[Weekly France](http://quilime.com/content/fr_weekly)  
+[Posters](http://quilime.com/content/fr_posters)  
+[Egg](http://portfolio.quilime.com/2008/?p=egg)  
+[Obsession](http://portfolio.quilime.com/2008/?p=obsession)  
+[Body Negative](http://portfolio.quilime.com/2008/?p=bodyneg)  
+[Nos Reves](http://portfolio.quilime.com/content/nosreves/index.html)  
+[Icarus and Daedalus](http://portfolio.quilime.com/2008/?p=icarus)  
+[AeroBlob](http://portfolio.quilime.com/2008/?p=aero)  
\ No newline at end of file
diff --git a/public/css/style.css b/public/css/style.css
index 746fa2f..194312d 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -17,6 +17,7 @@ h2 { margin:0 0 0.5em 0; }
 h3 { margin:0 0 0 0; }
 
 ul, li { margin:0; padding:0; list-style-type:none; }
+ol { margin:0;}
 ol li { list-style-type:decimal; }
 
 blockquote { font-family:times; background:#000; color:#aaa;
@@ -28,7 +29,7 @@ p { max-width:720px; }
 
 
 .nav { position:absolute; z-index:1; top:20px; left:30px;  }
-.nav a { }
+.nav a { text-decoration:none; font-weight:bold;}
 .nav ul { margin-left:1em; }
 .nav h1 {  }
     
diff --git a/public/index.php b/public/index.php
index fbb2931..76e89fb 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,5 +1,7 @@
 <?php
 
+
+
     require_once '../lib/init.php';
 
     $url = get_url();
diff --git a/public/js/prettify/prettify copy.css b/public/js/prettify/prettify copy.css
deleted file mode 100644
index 351152b..0000000
--- a/public/js/prettify/prettify copy.css	
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Pretty printing styles. Used with prettify.js. */
-
-.str { color: #080; }
-.kwd { color: #008; }
-.com { color: #800; }
-.typ { color: #606; }
-.lit { color: #066; }
-.pun { color: #660; }
-.pln { color: #000; }
-.tag { color: #008; }
-.atn { color: #606; }
-.atv { color: #080; }
-.dec { color: #606; }
-pre.prettyprint { padding: 2px; border: 1px solid #888; }
-
-@media print {
-  .str { color: #060; }
-  .kwd { color: #006; font-weight: bold; }
-  .com { color: #600; font-style: italic; }
-  .typ { color: #404; font-weight: bold; }
-  .lit { color: #044; }
-  .pun { color: #440; }
-  .pln { color: #000; }
-  .tag { color: #006; font-weight: bold; }
-  .atn { color: #404; }
-  .atv { color: #060; }
-}
diff --git a/templates/default.html.tpl b/templates/default.html.tpl
index 7972f03..c548db7 100644
--- a/templates/default.html.tpl
+++ b/templates/default.html.tpl
@@ -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/index.html.tpl b/templates/index.html.tpl
index 964b92d..7d62334 100644
--- a/templates/index.html.tpl
+++ b/templates/index.html.tpl
@@ -4,7 +4,9 @@
     <? $this->include_template('head-inc.html.tpl') ?>
     
     <title><?=SITE_TITLE?></title>
-    
+
+    <meta http-equiv="refresh" content="0;url=/log/">
+
 </head>
 <body>
     
@@ -12,7 +14,12 @@
     
 <div id="content">
 
-	this is the index template
+<br />
+<br />
+<br />
+<br />
+<br />
+&larr; navigation
 	
 </div>
 
-- 
2.34.1