template edits

diff --git a/css/style.css b/css/style.css
index 770517030cc1dbd1cbbbcaaec2ab49057686ec2e..7240b20087b977e00b6a2a0faca821d1a4f05e88 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -7,7 +7,7 @@ html, body, table { font-family: helvetica; font-size:11px; line-height:1.5em; c
 ::selection {background: #08f !important; color:#fff;} 
 
 /*links*/
-a { color:#07e; border:0; text-decoration:none;  }
+a { color:#60d; border:0; text-decoration:none;  }
 a img { border:0; }
 a.mute { color:#555; }
 a:hover, a.mute:hover { color:#fa4; background:#ffa;  text-decoration:none;  }
@@ -16,11 +16,12 @@ a:hover, a.mute:hover { color:#fa4; background:#ffa;  text-decoration:none;  }
 
 /*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; 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; }
@@ -67,7 +68,8 @@ 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; }    
+    .date { color:#ccc;}    
+.func { font-weight:normal; color:#990; }
 
     .text { font-family:serif; font-size:15px; line-height:2.2em;  margin-top:80px;}
     .indent { text-indent:3em; }

diff --git a/index.php b/index.php
index c1385689456c0cc38840b852278f41f7998f05f4..7fee15314b0cbd8200799770a01d394cb2db8e90 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,11 +1,11 @@
 <?php
 
     require_once 'lib/init.php';
-    
+
     $url_string = get_url_string();
-    
+
     if (is_string($url_string)) {
-       
+
        if ( basename($url_string) == "aggregate") {
                header ("Location: http://quilime.com/aggregate/index.php");
                exit;
@@ -19,12 +19,11 @@
             exit;
         }
         else  {
-            include( TEMPLATE_DIR . '404.html' );            
+            include( TEMPLATE_DIR . '404.html' );
             exit;
         }
     }
-    
-    header("Location: /log/");
+
     include ( TEMPLATE_DIR . 'index.html' );
-                                                                                                                 
+
 ?>

diff --git a/js/prettify/prettify.css b/js/prettify/prettify.css
index f150b38c75b02700787b4c91fc3681288ec087cc..bb02856851837a8d88ce5efa6f307eb07c471dae 100755 (executable)
--- a/js/prettify/prettify.css
+++ b/js/prettify/prettify.css
@@ -11,7 +11,7 @@
 .atn { color: #606; }
 .atv { color: #080; }
 .dec { color: #606; }
-pre.prettyprint, code.prettyprint { font-family:monospace; font-size:11px; padding:2px 20px; background:#f0f0f0; }
+pre.prettyprint, code.prettyprint { font-family:monospace; font-size:12px; padding:2px 20px; background:#f0f0f0; }
 pre.prettyprint { padding:20px; }
 
 @media print {

diff --git a/js/prettify/prettify.css~ b/js/prettify/prettify.css~
deleted file mode 100755 (executable)
index 301ab24..0000000
--- a/js/prettify/prettify.css~
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Pretty printing styles. Used with prettify.js. */
-
-.str { color: #f28; }
-.kwd { color: #008; }
-.com { color: #888; font-style:italic; }
-.typ { color: #606; }
-.lit { color: #066; }
-.pun { color: #660; }
-.pln { color: #444; }
-.tag { color: #008; }
-.atn { color: #606; }
-.atv { color: #080; }
-.dec { color: #606; }
-pre.prettyprint, code.prettyprint { font-family:monaco, monospace; padding:2px 20px; background:#eee; }
-
-@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/about.html b/templates/about.html
index 4e5d96c49fb8d08f65b5674f1bf6850991326099..1ab3a63a1b9c727559cdabd48178eac8fd74842f 100644 (file)
--- a/templates/about.html
+++ b/templates/about.html
@@ -13,15 +13,17 @@
     <?php include_template('nav.html'); ?>
 
     <div id="content">
+       
+       <h1>about</h1>
         
         <p>
-            <strong>quilime</strong>is an ongoing collection of my process, notes, 
-            sights, sounds, thoughts, sketches, collections, and everything else that's worth documenting or sharing. 
-            I've used this URL since about 1999.
+            <strong>quilime</strong> is an ongoing collection of process, notes, observation, sketches, experiments by gabriel dunne. (<a href="http://gabrieldunne.com">www</a>, 
+<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;">email</a>)
         </p>
-       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/>           
-       &copy; 1997&mdash;<?= date('Y'); ?> <a href="http://gabrieldunne.com">gabriel dunne</a>
+        
+
+       &copy; 1997&mdash;<?= date('Y'); ?>
+       <br/>
 
        
 

diff --git a/templates/agg.html b/templates/agg.html
index 2dea6e887fa48ce7c9fb17f985d5a0498d5016b9..50a95805eb6f7e8184ce0cf9b0c2c87def151ebd 100644 (file)
--- a/templates/agg.html
+++ b/templates/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/templates/code.html b/templates/code.html
index b7b367a01e49f1d05e0c3cc22e81af0e06ef6bf1..36509a1abecad234bbbdd129094eec09a535d505 100644 (file)
--- a/templates/code.html
+++ b/templates/code.html
@@ -47,6 +47,9 @@
                    
        
         <?php elseif ($inline): ?>
+       
+                       <h1>code</h1>
+       
             <ul class="inline_content">
             <?php foreach($items_list as $items): ?>
                    <li>
@@ -68,12 +71,15 @@
 
         <?php else: ?>
 
+                       <h1>code</h1>
            
             <table class="archive" cellspacing="0" cellpadding="0">
+
                 <tr>
                     <td><a class="func" href="?order=lang">language</a></td>
                     <td><a class="func" href="?order=name">name</a></td>
                 </tr>
+
                 <?php
                 $c = 1; 
                 foreach($items_list as $items): ?>

diff --git a/templates/img.html b/templates/img.html
index b467cfa1ad2ef3e8546e4eee488c937d03cdf284..976baac5ac929f9cc25f8f514baf970ed9ba12dd 100644 (file)
--- a/templates/img.html
+++ b/templates/img.html
@@ -25,6 +25,8 @@ $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) : ?>

diff --git a/templates/index.html b/templates/index.html
index eea502f9ca9006edfad2202c069ed15f9c24139c..ed7efaa1c75f5daba70c0be592f5404ea1ce9e0f 100644 (file)
--- a/templates/index.html
+++ b/templates/index.html
@@ -13,7 +13,7 @@
     <? include_template('nav.html'); ?>
     
 <div id="content">
-    projects, process log, experiments, code, reference, inspiration, aggregate
+       projects, experiments, code, reference, inspiration, aggregate
 </div>
     
 </body>

diff --git a/templates/links.html b/templates/links.html
index 94bfa6c2654d028098d77c9b9a5840a9ec9d4c54..9f8df51ed5fa8fa1331bbf5f42adee674e13c39b 100644 (file)
--- a/templates/links.html
+++ b/templates/links.html
@@ -3,76 +3,68 @@
 <head>
 
     <?php include_template('header-src.html'); ?>
-    
+
     <title><?php echo SITE_TITLE ?> - links</title>
-    
+
 </head>
 
 <body>
-    
+
     <?php include_template('nav.html'); ?>
 
     <div id="content">
+       
+       <h1>links</h1>
 
         <?php
-        
+
             function linklist($links)
             { ?>
                 <?php foreach($links as $l) : ?>
-               <li><a href="<?php echo $l[0];?>"><?php echo $l[1];?></a></li>
-                <?php endforeach; ?>                
-            <?php 
+                <li><a href="<?php echo $l[0];?>"><?php echo $l[0];?></a></li>
+                <?php endforeach; ?>
+            <?php
             }
-        
+
             $people = array(
 
-                    array('http://onecm.com', 'ryan alexander'),                    
-                    array('http://ssherriff.com', 'stephanie sherriff'),                                        
-                    array('http://www.oddsympathy.com/', 'daniel massey'),
+                    array('http://ssherriff.com', 'stephanie sherriff'),
+                    array('http://dabkitsch.com/jml', 'jeff lubow'),
+                    array('http://onecm.com', 'ryan alexander'),
+                    array('http://oddsympathy.com/', 'daniel massey'),
+                    array('http://jtnimoy.net', 'joshua nimoy'),
+                    array('http://keithpasko.com', 'keith pasko'),
                     array('http://pohflepp.com', 'sascha pohflepp'),
-                    array('http://dabkitsch.com/jml', 'jeff lubow'),                    
-                    array('http://jtnimoy.net', 'joshua nimoy'),                                        
-                    array('http://keithpasko.com', 'keith pasko'),                                                            
-                    array('http://fredericeyl.de', 'frédéric eyl'),
-                    array('http://ghost-hack.com', 'michael chang'),                                        
-                    array('http://aaronkoblin.com', 'aaron koblin'),
-                    array('http://mylinhtrieu.com', 'mylinh trieu'),                    
-                    array('http://renataraksha.com', 'renata raksha'),                                        
-                    array('http://universaloscillation.com', 'aaron meyers'),                                                                                
-
+                    array('http://mylinhtrieu.com', 'mylinh trieu'),
+                    array('http://universaloscillation.com', 'aaron meyers'),
                     array('http://tom-carden.co.uk', 'tom carden'),
-                    array('http://mike.teczno.com', 'michal migurski'),                                        
-
-                
+                    array('http://mike.teczno.com', 'michal migurski'),
                     array('http://ripevessel.com', 'adam roth'),
-                    array('http://cenizal.com', 'cj cenizal'),
                     array('http://davidrager.org', 'david rager'),
                     array('http://digitanalog.net', 'marc nimoy'),
                     array('http://makaga.com', 'matthew gale'),
-                    
-                    array(' ', '&nbsp;'),                    
-                                        
-                    array('http://www.thegreeneyl.com/', 'the green eyl'),
-                    array('http://gaffta.org/', 'gaffta')
+                    array('http://fredericeyl.de', 'frédéric eyl'),
+                    array('http://thegreeneyl.com/', 'the green eyl'),
+                                       array('http://local.wasp.uwa.edu.au/~pbourke/', ''),
                     );
         ?>
-    
-    
 
+
+               <h2>quilime elsewhere</h2>
         <ul>
             <li><a href="http://delicious.com/quilime/">delicious</a></li>
+            <li><a href="http://vimeo.com/quilime/">vimeo</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>
         <ul>
             <?php linklist($people); ?>
         </ul>
 
     </div>
-    
+
 </body>
 
 </html>
\ No newline at end of file

diff --git a/templates/log.html b/templates/log.html
index 6a61f25a43390dc1d22b9e0c1e09078066ee223c..650e6fbbf335de79cc1171561844009573454184 100644 (file)
--- a/templates/log.html
+++ b/templates/log.html
@@ -32,11 +32,15 @@
     
     <?php include_template('nav.html'); ?>
 
+
+
     <div id="content">
+       
+               
 
         <?php if ($single) : ?>
 
-               <h1><a href="/log/">log</a> / <span class="date"><?php echo date("m/d/Y", $log['timestamp']); ?></span> <?php echo $log['title']; ?></h1>    
+               <h1><a href="/log/">log</a> / <?php echo $log['title']; ?> <span class="date"><?php echo date("m/d/Y", $log['timestamp']); ?></span> </h1>    
             
             <div class="content">
             <?php echo $log['inline_content']; ?>
@@ -44,6 +48,7 @@
                                 
         <?php elseif ($list): ?>
 
+                       <h1>log</h1>
         
            <table class="archive" cellspacing="0" cellpadding="0">
                 <tr>
@@ -84,14 +89,17 @@
 
             
         <?php else: ?>
+       
+       <h1>log</h1>
             
             <ul class="inline_content log">
             <?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>  
+                               <?php echo $log['title']; ?></a>   
+<span class="date"><?php echo date("m/d/Y", $log['timestamp']); ?></span>                              
                        </h3>                    
                     <?php echo $log['inline_content']; ?>
                 </li>

diff --git a/templates/nav.html b/templates/nav.html
index ea36937f0502f6d65d65fc5f1a70c4dd7904cf8e..cdfb290232fc33fe4a0045b099d6819327e17b41 100644 (file)
--- a/templates/nav.html
+++ b/templates/nav.html
@@ -1,15 +1,11 @@
 <ul class="nav">          
     
-    <h3>
-        <strong><a class="mute" href="/"><?= SITE_TITLE ?></a></strong>
-    </h3>
-    projects, process<br/>
-    by <a href="http://gabrieldunne.com">g.dunne</a>
+    <strong><a class="mute" href="/"><?= SITE_TITLE ?></a></strong><br/>
 
     <br/>
     <br/>    
 
-    <li><a href="/">home</a></li>
+    <li><a href="/log/">log</a></li>
     <li><a href="/code/?inline=1">code</a></li>
     <li><a href="/img/">img</a></li>    
     <li><a href="/agg/">aggregate</a></li>