updates

diff --git a/content/content_folders_go_here b/content/content_folders_go_here
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/content/projects/example/config b/content/projects/example/config
deleted file mode 100644 (file)
index 038edfd..0000000
--- a/content/projects/example/config
+++ /dev/null
@@ -1,2 +0,0 @@
-title = Example
-date = october 12 2009

diff --git a/content/projects/example/content.html b/content/projects/example/content.html
deleted file mode 100644 (file)
index 4a89148..0000000
--- a/content/projects/example/content.html
+++ /dev/null
@@ -1 +0,0 @@
-This is an example project
\ No newline at end of file

diff --git a/css/style.css b/css/style.css
index c0bc11717452ab9232e33beabdbc4030d4db8e57..e77adc127e42637409343a44cbf34bf9c26b0d4f 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -1,28 +1,29 @@
 
 body { margin:10px 100px 50px 40px; }
-html, body, table { font-family: helvetica; font-size:12px; line-height:1.5em; color:#222; }
+html, body, table { font-family: helvetica; font-size:11px; line-height:1.5em; color:#222; }
 
 /*selection*/
 ::-moz-selection {background: #08f !important; color:#fff;} 
 ::selection {background: #08f !important; color:#fff;} 
 
 /*links*/
-a { color:#07e; border:0; }
+a { color:#07e; border:0; text-decoration:none;  }
 a img { border:0; }
-a.mute { color:#555; text-decoration:none; }
+a.mute { color:#555; }
 a:hover, a.mute:hover { color:#fa4; background:#ffa;  text-decoration:none;  }
 .caption a { color:#888;}
 .caption a:hover { color:#905;}
 
 /*headings*/
 h1, h2, h3, h4, h5, h6 { color:#444; font-size:1em; }
+h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { background:#ffe; }
 h1 { margin:0 0 3em 0; }
 h2 { margin:4em 0 0.5em 0; }
 h3 { font-size:1em; margin:0; }
 
 /*code*/
-pre, .code { font-family: Monaco, monospace; font-size:11px; line-height:1.4em; background:#ddd; color:#50d; padding:1em 2em; }
-span.code { padding:0.1em 0.5em; }
+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;}
@@ -34,15 +35,15 @@ li { margin-bottom:1px; padding: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; }
-table h2, table h3 { border-bottom:1px dotted #888; margin-bottom:1em;}
+table h2, table h3 { margin-bottom:2em;}
 table .video li, table .image li { margin-bottom:2em; }
-table .reader li, table .bookmarks li { margin-bottom:1em; padding-bottom:1em;  border-bottom:1px dotted #888; }
+table .reader li, table .bookmarks li { margin-bottom:1em; padding-bottom:1em;  border-bottom:1px dotted #ddd; }
 .reader_links li, .bookmark_links li { padding-top:.75em; margin-bottom:.75em; }
 .bookmark_links li a { display:block; }
 .bookmark_links li span { font-style: italic; color:#444; }
 .image li a { background:none;}
 
-.c_pop { position:absolute; background:#fff; display:none; border:5px outset #ad4; padding:1em 2em; left:260px; z-index:5; } 
+.c_pop { position:absolute; background:#fff; display:none; border:5px outset #000; padding:1em 2em; left:260px; z-index:5; } 
 
 .func { font-weight:bold; color:#444; }
 
@@ -51,9 +52,7 @@ table .reader li, table .bookmarks li { margin-bottom:1em; padding-bottom:1em;
 #content { margin-left:120px; min-width:500px; }
     #content p {  }
     ul.inline_content { }
-    ul.inline_content li { margin:0 0 50px 0; padding-bottom:50px; border-bottom:1px dotted #888; }    
-    ul.inline_content li div.content li { padding:0; border:0; margin:0; }
-    ul.inline_content .date { color:#999; font-size:10px;}
+    ul.inline_content li { margin:0 0 50px 0; padding-bottom:75px;  }    
     ul.thumbnails    { }
     ul.thumbnails li { display:inline-block; margin: 0px 60px 60px 0px; }
     ul.thumbnails .thumbnail { width:160px; height:120px; text-align:center; background:#888; }
@@ -65,13 +64,17 @@ table .reader li, table .bookmarks li { margin-bottom:1em; padding-bottom:1em;
     }     
     ul.thumbnails a { text-decoration:none;  }   
     ul.thumbnails .title {  }
+    
+    .date {  font-weight:bold; }    
 
     .text { font-family:serif; font-size:15px; line-height:2.2em;  margin-top:80px;}
     .indent { text-indent:3em; }
     
-.nav { position:absolute; top:1em; left:1em; line-height:1.1em;}
+.nav { position:fixed; top:1em; left:1em; line-height:1.1em;}
 .nav ul { margin-left:1em; }
+.nav li a { background:#ffe; font-weight:bold; }
 .nav h3 { margin-bottom:0.4em; }
+
     
 .caption { font-style:italic; margin-top:5px; color:#444; }
 .more, .home { text-decoration:none; color:#999; }

diff --git a/index.php b/index.php
index 7d405864a644e5a46f6342eca62ff9f26c0cc217..98a47d77e090ae8a9a9820e705ca7087543c3c1b 100644 (file)
--- a/index.php
+++ b/index.php
@@ -5,7 +5,12 @@
     $url_string = get_url_string();
     
     if (is_string($url_string)) {
-        if (is_file ( TEMPLATE_DIR . basename($url_string) . '.html' )) {
+       
+       if ( basename($url_string) == "aggregate") {
+               header ("Location: http://quilime.com/aggregate/index.php");
+               exit;
+       }
+        else if (is_file ( TEMPLATE_DIR . basename($url_string) . '.html' )) {
             include ( TEMPLATE_DIR . basename($url_string) . '.html' );
             exit;
         }

diff --git a/lib/config b/lib/config
index 01cbcf461ad6bdb97dc27c56838325a0b81a4ccd..ae634984119a56f562789983a7aa0a02610564ab 100644 (file)
--- a/lib/config
+++ b/lib/config
@@ -1,4 +1,4 @@
 LOCAL_ROOT      = /home/quilime/quilime.com/
-CONTENT_DIR     = content/
+CONTENT_DIR     = c/
 TEMPLATE_DIR    = templates/
 SITE_TITLE      = quilime

diff --git a/lib/scripts/2009-12-13 b/lib/scripts/2009-12-13
deleted file mode 100644 (file)
index 7081025..0000000
--- a/lib/scripts/2009-12-13
+++ /dev/null
@@ -1,12 +0,0 @@
-title = seanome
-date = 2009-12-13
-
---
-
-<img src="http://farm3.static.flickr.com/2506/4164276287_36e24ac064.jpg" /><br/>
-<img src="http://farm3.static.flickr.com/2675/4164277007_9d8dd43def.jpg">
-
-<p>
-<a href='http://www.flickr.com/photos/quilime/sets/72157622950657676/">"Seaquence" via flickr</a>
-</p>
-

diff --git a/templates/about.html b/templates/about.html
index 5e852cf5d353e6a2f2b970b1e8553a364b27b9f0..81ba936b556d1ff9fd55a7fbde8579b824a720bc 100644 (file)
--- a/templates/about.html
+++ b/templates/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>
 
@@ -14,11 +14,11 @@
 
     <div id="content">
 
-       <h1>about</h1>
-        
-        <p>
-            built with <a href="http://git.quilime.com/?p=plog.git;a=summary">project log</a> by quilime
-       </p>
+       &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>
+       
 
     </div>
     

diff --git a/templates/agg.html b/templates/agg.html
index b02d1a4e453f58ddd00c2eb6e2e94970a1731b8d..25eec85d482da54a3bbb59fbaf20dc515a5065a6 100644 (file)
--- a/templates/agg.html
+++ b/templates/agg.html
@@ -17,10 +17,8 @@
 
     <div id="content">
 
-       <h1>aggregate</h1>
-       
        <p>
-        visual content and links
+        saved images, links for reference, inspiration
     </p>
     
     <table border="0" id="agg"><tr>

diff --git a/templates/code.html b/templates/code.html
index a2b495a0c6d0fbf8edf5edbf9e13cfe2d269f0d9..9a16cbbe7e3252d22b91614bcc56304685768f9b 100644 (file)
--- a/templates/code.html
+++ b/templates/code.html
@@ -85,11 +85,12 @@
                 foreach($items_list as $items): ?>
                        <tr>
                     <td style="text-align:right; padding-right:1em;">
-                        <small class="medium"><?php echo $items['medium']; ?></small>
+                        <strong class="medium"><?php echo $items['medium']; ?></strong>
                     </td>
                     <td>
+                        <strong>
                                    <a onmouseout="$('.c_pop').hide();" onmouseover="$('.c_pop').hide(); $('#c_<?php echo $c; ?>').show();" href="<?php echo $items['href']?>"><?php echo $items['title']; ?></a>
-                        
+                        </strong>
                         <div id="c_<?php echo $c; ?>" class="c_pop">
                         <?php 
                             $base_dir = $items['base_dir'];

diff --git a/templates/contact.html b/templates/contact.html
deleted file mode 100644 (file)
index c6ba9fe..0000000
--- a/templates/contact.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<html>
-
-<head>
-
-    <?php include_template('header-src.html'); ?>
-        
-    <title><?php echo SITE_TITLE ?> :contact</title>
-    
-</head>
-
-<body>
-    
-    <?php include_template('nav.html'); ?>
-
-    <div id="content">
-
-       <h1>contact</h1>
-        
-        email: <a href="mailto:gdunne@quilime.com">gdunne@quilime.com</a>
-        
-    </div>
-    
-</body>
-
-</html>
\ No newline at end of file

diff --git a/templates/img.html b/templates/img.html
index c068eb5e8a19b2ff65fd35a75a841d83b0b7f2f2..b467cfa1ad2ef3e8546e4eee488c937d03cdf284 100644 (file)
--- a/templates/img.html
+++ b/templates/img.html
@@ -14,7 +14,7 @@ $img = get_rss_feed('http://api.flickr.com/services/feeds/photos_public.gne?id=2
     
     <style>
     
-        ul.image li { float:left; width:240px; height:240px; text-align:center; margin:0 50px 50px 0;}    
+        ul.image li { float:left; width:240px; height:240px; text-align:center; margin:0 20px 20px 0;}    
         
     </style>
     
@@ -25,8 +25,6 @@ $img = get_rss_feed('http://api.flickr.com/services/feeds/photos_public.gne?id=2
     <?php include_template('nav.html'); ?>
 
     <div id="content">
-
-       <h1>img</h1>
     
         <ul class="image">
         <?php foreach($img->channel->item as $item) : ?>
@@ -42,7 +40,7 @@ $img = get_rss_feed('http://api.flickr.com/services/feeds/photos_public.gne?id=2
         
         <div style="clear:both;"></div>
         
-        <a href="http://www.flickr.com/photos/quilime/" title="via flickr" >via flickr &rarr;</a>            
+        <a class="more" href="http://www.flickr.com/photos/quilime/" title="via flickr" >more &rarr;</a>            
  
     </div>
     

diff --git a/templates/links.html b/templates/links.html
index 63235adaa1b2db253bec72ddf4957fe38bf40158..d1a8d1c89f19843d040c3f112b69dfc7f10156fd 100644 (file)
--- a/templates/links.html
+++ b/templates/links.html
@@ -14,8 +14,6 @@
 
     <div id="content">
 
-       <h1>links</h1>
-    
         <?php
         
             function linklist($links)
@@ -28,8 +26,8 @@
         
             $people = array(
 //                    array('http://aaronkoblin.com', 'aaron koblin'),
-                    array('http://universaloscillation.com', 'aaron meyers'),
-//                    array('http://ripevessel.com', 'adam roth'),
+//                    array('http://universaloscillation.com', 'aaron meyers'),
+                    array('http://ripevessel.com', 'adam roth'),
 //                    array('http://reas.com/', 'casey reas'),
 //                    array('http://cenizal.com', 'cj cenizal'),
                     array('http://www.oddsympathy.com/', 'daniel massey'),
@@ -47,22 +45,21 @@
                     array('http://onecm.com', 'ryan alexander'),
                     array('http://pohflepp.com', 'sascha pohflepp'),
                     array('http://ssherriff.com', 'stephanie sherriff'),
-//                    array('http://www.thegreeneyl.com/', 'the green eyl'),
+                    array('http://www.thegreeneyl.com/', 'the green eyl'),
                     array('http://tom-carden.co.uk', 'tom carden')
                     );
         ?>
     
     
-        <h2>me</h2>
+
         <ul>
-            <li><a href="http://gabrieldunne.com">gabrieldunne.com</a></li>
             <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>people</h2>
+        <h2>links</h2>
         <ul>
             <?php linklist($people); ?>
         </ul>

diff --git a/templates/log.html b/templates/log.html
index c9e3492afd0091f83d6420acfc84e37b7450a91f..6a61f25a43390dc1d22b9e0c1e09078066ee223c 100644 (file)
--- a/templates/log.html
+++ b/templates/log.html
@@ -36,7 +36,7 @@
 
         <?php if ($single) : ?>
 
-               <h1><a href="/log/">log</a> / <?php echo $log['title']; ?> <small class="date"><?php echo date("M d Y", $log['timestamp']); ?></small></h1>    
+               <h1><a href="/log/">log</a> / <span class="date"><?php echo date("m/d/Y", $log['timestamp']); ?></span> <?php echo $log['title']; ?></h1>    
             
             <div class="content">
             <?php echo $log['inline_content']; ?>
@@ -58,10 +58,12 @@
                 ?>
                 <tr>
                 <td style="text-align:right; padding-right:1em;">
-                <small class="medium"><?php echo date("M d Y", $log['timestamp']); ?></small>
+                <span class="date"><?php echo date("m/d/Y", $log['timestamp']); ?></span>
                 </td>
                 <td>
+                    <strong>
                                    <a onmouseout="$('.c_pop').hide();" onmouseover="$('.c_pop').hide(); $('#c_<?php echo $c; ?>').show();" href="<?php echo $log['href']?>"><?php echo $log['title']; ?></a>
+                               </strong>
                     <div id="c_<?php echo $c; ?>" class="c_pop">
                     <?php 
                         $base_dir = $log['base_dir'];
@@ -74,9 +76,9 @@
             </table> 
             
             <br/>
-            <p class="func">
-                <a href="/log/">view inline</a>
-            </p>            
+            
+                <a class="func" href="/log/">view inline</a>
+          
             
 
 
@@ -87,23 +89,18 @@
             <?php foreach($log_list as $log): ?>
                    <li>
                        <h3>
+                           <span class="date"><?php echo date("m/d/Y", $log['timestamp']); ?></span>     
                            <a title="<?php echo get_relative_time($log['timestamp']); ?>" href="<?php echo $log['href'];?>">
-                               <?php echo $log['title']; ?></a>  <span class="date"><?php echo date("M d Y", $log['timestamp']); ?></span>     
-                       </h3>
-                       
-                                       
-                       
-                    <br/>
-                    
+                               <?php echo $log['title']; ?></a>  
+                       </h3>                    
                     <?php echo $log['inline_content']; ?>
                 </li>
             <? endforeach; ?>
             </ul>
             
             <br/>            
-            <p class="func">
-                <a class="func" href="/log/?list=1">archive</a>
-            </p>
+            <a class="func" href="/log/?list=1">vew archive</a>
+           
             
         <?php endif; ?>
                 

diff --git a/templates/nav.html b/templates/nav.html
index b578819bdda4f2dea281c23759d4b50204adfb6e..5416a8d29fedba737acb48329661097eb9d5f371 100644 (file)
--- a/templates/nav.html
+++ b/templates/nav.html
@@ -5,11 +5,7 @@
     <h3>
         <strong><a href="/"><? echo SITE_TITLE; ?></a></strong>
     </h3>
-    
-    <li>
-    (process<br/>and<br/>projects)
-    </li>
-    
+
     
     <br/>
 
@@ -22,7 +18,7 @@
     
     <li><a href="/agg/">aggregate</a></li>
     <li><a href="/links/">links</a></li>
-    <li><a href="/contact/">contact</a></li>    
+    <li><a href="/about/">about</a></li>    
     
     <br/>
     

diff --git a/templates/projects.html b/templates/projects.html
index a70ed43a5fb8eaf57192c51143dd6fe598698b48..6e80fd0d2aaba3b0de4489e7b7f5169155fced34 100644 (file)
--- a/templates/projects.html
+++ b/templates/projects.html
@@ -41,14 +41,8 @@
         <?php elseif ($list): ?>
 
         <?php else: ?>
-        
-             <h1>projects</h1>
-             
-             <p>slightly borked. bbl.</p>
-             
              <p>
-                 in the meantime, go here:<br/>
-                 <a href="http://gabrieldunne.com/projects/">gabrieldunne.com/projects/</a><br/>
+                 <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>