From 50fc27a53951696905923f8ed201f2da6e628e3f Mon Sep 17 00:00:00 2001
From: Gabriel Dunne <quilime@monkey.dreamhost.com>
Date: Sun, 24 Jan 2010 02:29:55 -0800
Subject: [PATCH] cleaning

---
 css/style.css   |  6 +----
 lib/config      |  9 ++++---
 t/about.html    | 32 +++++++++++++++++++----
 t/agg.html      |  2 ++
 t/index.html    | 22 +++++++++-------
 t/links.html    | 11 +-------
 t/nav.html      |  9 ++++---
 t/projects.html | 67 ++++++++++++++++++++++++-------------------------
 8 files changed, 87 insertions(+), 71 deletions(-)

diff --git a/css/style.css b/css/style.css
index 2e11517..5cd2c79 100644
--- a/css/style.css
+++ b/css/style.css
@@ -21,10 +21,6 @@ h1 { margin:0 0 3em 0; }
 h2 { margin:4em 0 0.5em 0; }
 h3 { font-size:1em; margin:0; margin-bottom:0.5em; }
 
-/*code
-pre, .code { font-family: Monaco, monospace; font-size:11px; line-height:1.4em; background:#212121; color:#0f4; padding:1em 2em; }
-span.code { padding:0.5em 1em; }
-*/
 
 blockquote { font-family:times; background:#000; color:#aaa;
 margin:0; font-size:15px; line-height:1.4em; padding:2em 4em; font-style:italic; line-height:1.45em; max-width:600px;}
@@ -32,7 +28,7 @@ margin:0; font-size:15px; line-height:1.4em; padding:2em 4em; font-style:italic;
 p { max-width:720px; }
 
 ul { margin:0; padding:0; list-style-type:none; }
-li { margin-bottom:1px; padding:1px; }
+li { margin-bottom:1px; }
 table { margin:0; padding:0; border:0;  }
 table .column { padding-right:100px; min-width:120px; max-width:275px; }
 table .column h2 a { text-decoration:none; }
diff --git a/lib/config b/lib/config
index ae63498..d1f8cde 100644
--- a/lib/config
+++ b/lib/config
@@ -1,4 +1,5 @@
-LOCAL_ROOT      = /home/quilime/quilime.com/
-CONTENT_DIR     = c/
-TEMPLATE_DIR    = templates/
-SITE_TITLE      = quilime
+LOCAL_ROOT = /home/quilime/gabrieldunne.com/
+CONTENT_DIR = c/
+TEMPLATE_DIR = t/
+SITE_TITLE = gabriel dunne
+DELIM = /
diff --git a/t/about.html b/t/about.html
index 81ba936..0ae4bbb 100644
--- a/t/about.html
+++ b/t/about.html
@@ -4,7 +4,7 @@
 
     <?php include_template('header-src.html'); ?>
         
-    <title><?php echo SITE_TITLE ?> - about</title>
+    <title><?php echo SITE_TITLE ?>:about</title>
     
 </head>
 
@@ -13,11 +13,33 @@
     <?php include_template('nav.html'); ?>
 
     <div id="content">
+        
+        <h1>about</h1>
 
-    	&copy; 1997&mdash;<?= date('Y'); ?> <a href="http://gabrieldunne.com">gabriel dunne</a>. All rights reserved.
-    <br/> 
-<br/>    	
-    	email: <a href="&#x6d;&#x61;&#x69;&#108;&#x74;&#111;&#x3a;&#x67;&#x64;&#x75;&#x6e;&#110;&#x65;&#x40;&#x71;&#117;&#105;&#x6c;&#x69;&#x6d;&#101;&#x2e;&#x63;&#111;&#x6d;">&#x67;&#x64;&#x75;&#x6e;&#110;&#x65;&#x40;&#x71;&#117;&#105;&#x6c;&#x69;&#x6d;&#101;&#x2e;&#x63;&#111;&#x6d;</a>
+        <p>
+            This website is a collection of experiments, code, images, sounds, reference, and aggregate.        
+        </p>
+        
+        <p>
+            <a href="<?=$base_dir?>/cv/">c/v</a>
+        </p>
+        
+        <h2>contact</h2>
+        email <a href="&#x6d;&#x61;&#x69;&#108;&#x74;&#111;&#x3a;&#x67;&#x64;&#x75;&#x6e;&#110;&#x65;&#x40;&#x71;&#117;&#105;&#x6c;&#x69;&#x6d;&#101;&#x2e;&#x63;&#111;&#x6d;">&#x67;&#x64;&#x75;&#x6e;&#110;&#x65;&#x40;&#x71;&#117;&#105;&#x6c;&#x69;&#x6d;&#101;&#x2e;&#x63;&#111;&#x6d;</a>        
+        <br/>
+        phone +1 415 493 8496
+        
+        <br/>
+        <br/>        
+        <br/>          
+
+    	&copy; 1997&mdash;<?= date('Y'); ?>
+    	
+        <p>
+            This website source is based on a custom CMS written in PHP, the code of which is available <a href="http://git.quilime.com/?p=plog.git;a=summary">here</a>.
+        </p>
+  	
+    	
     	
 
     </div>
diff --git a/t/agg.html b/t/agg.html
index 2dea6e8..a2f0d3d 100644
--- a/t/agg.html
+++ b/t/agg.html
@@ -15,6 +15,8 @@
     <?php include_template('nav.html'); ?>
     
     <div id="content">
+        
+        <h1>aggregate</h1>
     
     <table border="0" id="agg"><tr>
 
diff --git a/t/index.html b/t/index.html
index eea502f..400a5f7 100644
--- a/t/index.html
+++ b/t/index.html
@@ -1,20 +1,24 @@
 <html>
 
 <head>
-    
+
     <?php include_template('header-src.html'); ?>
-    
+
     <title><?php echo SITE_TITLE; ?></title>
-    
+
 </head>
 
 <body>
-    
+
     <? include_template('nav.html'); ?>
-    
-<div id="content">
-    projects, process log, experiments, code, reference, inspiration, aggregate
-</div>
-    
+
+    <div id="content">
+        <img src="http://farm3.static.flickr.com/2532/3928515140_e2ed67b1c7.jpg" />
+        
+        <p>
+        projects, process log, experiments, code, reference, inspiration, aggregate    
+        </p>
+    </div>
+
 </body>
 </html>
diff --git a/t/links.html b/t/links.html
index 94bfa6c..8db231a 100644
--- a/t/links.html
+++ b/t/links.html
@@ -56,17 +56,8 @@
                     array('http://gaffta.org/', 'gaffta')
                     );
         ?>
-    
-    
-
-        <ul>
-            <li><a href="http://delicious.com/quilime/">delicious</a></li>
-            <li><a href="http://flickr.com/photos/quilime/">flickr</a></li>
-            <li><a href="http://vimeo.com/quilime/">vimeo</a></li>
-        </ul>
         
-    
-        <h2>links</h2>
+        <h1>links</h1>
         <ul>
             <?php linklist($people); ?>
         </ul>
diff --git a/t/nav.html b/t/nav.html
index 8c91bdb..6ca2d67 100644
--- a/t/nav.html
+++ b/t/nav.html
@@ -3,15 +3,16 @@
     <h3>
         <strong><a class="mute" href="/"><?= SITE_TITLE ?></a></strong>
     </h3>
-    by gabriel dunne
+    <p>
+    projects, process
+    </p>
 
     <br/>
     <br/>    
 
-    <li><a href="/log/">log</a></li>
+    <li><a href="/log/">log</a></li>    
     <li><a href="/projects/">projects</a></li>
-    <li><a href="/code/">code</a></li>
-    <li><a href="/img/">img</a></li>    
+    <li><a href="/img/">img</a></li>
 
     <br/>
     
diff --git a/t/projects.html b/t/projects.html
index 6e80fd0..88ccc04 100644
--- a/t/projects.html
+++ b/t/projects.html
@@ -2,7 +2,7 @@
 
     $projects = array();
     $single = false;
-    
+
     if (is_dir(CONTENT_DIR . $url_string) && !is_file(CONTENT_DIR . $url_string . '/config') ) {
         list($projects_list, $total) = get_content(basename($url_string));
     }
@@ -18,57 +18,56 @@
 <head>
 
     <?php include_template('header-src.html'); ?>
-    
-    <title><?php echo SITE_TITLE; ?> - projects<?php if (sizeof($projects) > 0 ) : ?>: <?echo strtolower($project['title']); ?> [<?php echo $project['medium']; ?>]<?php endif; ?></title>
-    
+
+    <title><?php echo SITE_TITLE; ?>:projects<?php if ($single)  : ?><?=DELIM?><? echo $project['title']; ?> <?php endif; ?></title>
+
 </head>
 
 <body>
-    
+
     <?php include_template('nav.html'); ?>
 
     <div id="content">
-        
-        
+
         <?php if ($single) : ?>
 
-           <h1><a href="<?php echo get_base_dir(); ?>/projects">projects</a> / <?php echo $project['title']; ?></h1>    
+           <h1><a href="<?php echo get_base_dir(); ?>/projects">projects/</a> <?php echo $project['title']; ?></h1>
             <?php
                 $base_dir = $project['base_dir'];
                 include_once($project['content']);
             ?>
-                    
+
         <?php elseif ($list): ?>
 
         <?php else: ?>
-             <p>
-                 <a href="http://gabrieldunne.com/projects/">current</a><br/>
-                 <a href="http://portfolio.quilime.com/2008/">2008</a><br/>
-                 <a href="http://portfolio.quilime.com/new/port.php">2007</a><br/>            
-                 <a href="http://portfolio.quilime.com/recent.html">2004 - 2006</a>
-             </p>
-             
-             <!--
-            <ul class="thumbnails">
-            <?php foreach($projects_list as $project): ?>
-        	    <li>
-        	        <a href="<?php echo $project['href']?>">
-        	            <div class="thumbnail" title="<? echo $project['title'] ?>">
-        	                <?php if(isset($project['thumb'])) :?>
-        	                <img src="<?php echo $project['thumb']; ?>" />
-        	                <?php endif; ?>
-        	                </div>
-        	            <div class="title"><? echo $project['title']; ?></div>
-        	        </a>
-                </li>
-            <? endforeach; ?>
+
+            <h1>projects</h1>
+
+            <ul>
+                <?php foreach($projects_list as $project): ?>
+                    <li>
+                        <a href="<?php echo $project['href']?>"><? echo $project['title']; ?></a>
+                    </li>
+                <? endforeach; ?>
             </ul>
-            -->     
-            
+
+            <br/><br/><br/>
+
+            <h1>archive</h1>
+            <ul>
+
+                <li><a href="http://portfolio.quilime.com/2008/">2008</a></li>
+                <li><a href="http://portfolio.quilime.com/new/port.php">2007</a></li>
+                <li><a href="http://portfolio.quilime.com/recent.html">2004 - 2006</a></li>
+                <li><a href="http://portfolio.quilime.com/archive/">1999 - 2004</a></li>
+            </ul>
+
+            <br/><br/>
+
         <?php endif; ?>
-        
+
     </div>
-    
+
 </body>
 
 </html>
\ No newline at end of file
-- 
2.34.1