]> git.quilime.com - plog_bk.git/commitdiff
quilime update
authorGabriel Dunne <gdunne@quilime.com>
Sat, 29 May 2010 03:29:42 +0000 (20:29 -0700)
committerGabriel Dunne <gdunne@quilime.com>
Sat, 29 May 2010 03:29:42 +0000 (20:29 -0700)
13 files changed:
css/style.css
js/prettify/prettify.css
lib/config
templates/about.html
templates/agg.html
templates/code.html
templates/header-src.html
templates/img.html
templates/index.html
templates/links.html
templates/log.html
templates/nav.html
templates/projects.html

index 7240b20087b977e00b6a2a0faca821d1a4f05e88..677585e7ba0625a366b24043d8d183e0338a5655 100644 (file)
@@ -1,41 +1,37 @@
+body { margin:80px 100px 50px 40px; }
+html, body, table { font-family: times, helvetica, sans; font-size:15px; line-height:1.3em; color:#999; }
 
-body { margin:10px 100px 50px 40px; }
-html, body, table { font-family: helvetica; font-size:11px; line-height:1.5em; color:#222; }
+.nav { position:absolute; z-index:1; top:20px; left:20px;  }
+.nav ul { margin-left:1em; }
+.nav h1 { margin-bottom:50px;}
+
+#head { position:absolute; top: 20px; left: 160px;}
 
 /*selection*/
 ::-moz-selection {background: #08f !important; color:#fff;} 
 ::selection {background: #08f !important; color:#fff;} 
 
 /*links*/
-a { color:#60d; border:0; text-decoration:none;  }
+a { color:#555; border:0; padding:0.2em 0.1em 0.1em 0em; font-weight:bold; text-decoration:none; }
 a img { border:0; }
-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;}
+a.mute { }
+a:hover, a.mute:hover { color:#d15; border-bottom:2px solid #d15;  text-decoration:none;  }
 
 /*headings*/
-h1, h2, h3, h4, h5, h6 { color:#444; font-size:1em; }
-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; }
-*/
+h1, h2, h3, h4, h5, h6 {  font-size:1.3em; }
+h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { text-decoration:none; }
+h1 { margin:0 0 3em 0; font-size:2em;}
+h2 { margin:4em 0 0.5em 0;  }
+h3 { margin:0 0 0 0; }
 
 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;}
 
 p { max-width:720px; }
 
-ul { margin:0; padding:0; list-style-type:none; }
-li { margin-bottom:1px; padding:1px; }
+ul, li { margin:0; padding:0; list-style-type:none; }
 table { margin:0; padding:0; border:0;  }
-table .column { padding-right:100px; min-width:120px; max-width:275px; }
+table .column { padding-right:100px; min-width:120px; max-width:400px; }
 table .column h2 a { text-decoration:none; }
 table h2, table h3 { margin-bottom:2em;}
 table .video li, table .image li { margin-bottom:2em; }
@@ -45,17 +41,19 @@ table .reader li, table .bookmarks li { margin-bottom:1em; padding-bottom:1em;
 .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 #000; padding:1em 2em; left:260px; z-index:5; } 
+.c_pop { position:absolute; background:#fff; display:none; border:5px outset #000; padding:1em 2em; z-index:5; } 
 
 .func { font-weight:bold; color:#444; }
 
 #home_arrow { position: absolute; top:11px; left:23px; margin-left:250px; text-decoration:none; }
 
-#content { margin-left:120px; min-width:500px; }
+#content { margin-left:120px; min-width:500px; position:absolute; top:20px; padding-bottom:200px; z-index:10;}
     #content p {  }
-    ul.inline_content { }
-    ul.inline_content li { margin:0 0 50px 0; padding-bottom:75px; }
-    ul.inline_content ol li { margin:0; padding:0; }
+    ul.inline_content {}
+    ul.inline_content li .content { } 
+    ul.inline_content li { margin:0 0 150px 0; }
+    ul.inline_content li h3 { border-bottom:2px solid #ddd; }
+    ul.inline_content ol li { margin:0; padding:0; border:0;}
     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; }
@@ -69,17 +67,15 @@ table .reader li, table .bookmarks li { margin-bottom:1em; padding-bottom:1em;
     ul.thumbnails .title {  }
     
     .date { color:#ccc;}    
-.func { font-weight:normal; color:#990; }
+       .func { margin-bottom:2em; }
+       .func a { background:#daa;  padding:0.2em 1em 0.02em 1em; font-size:9px; text-transform:uppercase;}
 
     .text { font-family:serif; font-size:15px; line-height:2.2em;  margin-top:80px;}
     .indent { text-indent:3em; }
     
 
 
-.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; }
@@ -88,3 +84,4 @@ table .reader li, table .bookmarks li { margin-bottom:1em; padding-bottom:1em;
 #footer {  margin-top:120px; }    
 #footer .copy a { text-decoration:none; }
 
+
index bb02856851837a8d88ce5efa6f307eb07c471dae..87ec1aff7873095fd64f4f326528464c4c2fe40b 100755 (executable)
@@ -1,7 +1,7 @@
 /* Pretty printing styles. Used with prettify.js. */
 
 .str { color: #f26; } 
-.kwd { color: #000; font-weight:bold;  } 
+.kwd { color: #444; font-weight:bold;  } 
 .com { color: #888; font-style:italic; }
 .typ { color: #606; }
 .lit { color: #066; }
 .atn { color: #606; }
 .atv { color: #080; }
 .dec { color: #606; }
-pre.prettyprint, code.prettyprint { font-family:monospace; font-size:12px; padding:2px 20px; background:#f0f0f0; }
+pre.prettyprint, code.prettyprint { font-family:monaco, "Lucida Console", monospace; font-size:11px; line-height:1.6em; padding:0.3em 0.5em; background:#e9e9e9;
+-moz-border-radius: 4px;
+-webkit-border-radius: 4px;
+}
 pre.prettyprint { padding:20px; }
 
 @media print {
index ae634984119a56f562789983a7aa0a02610564ab..01cbcf461ad6bdb97dc27c56838325a0b81a4ccd 100644 (file)
@@ -1,4 +1,4 @@
 LOCAL_ROOT      = /home/quilime/quilime.com/
-CONTENT_DIR     = c/
+CONTENT_DIR     = content/
 TEMPLATE_DIR    = templates/
 SITE_TITLE      = quilime
index 1ab3a63a1b9c727559cdabd48178eac8fd74842f..e58377b49a50322cf8e8220ac92128bc859dc542 100644 (file)
@@ -2,29 +2,37 @@
 
 <head>
 
-    <?php include_template('header-src.html'); ?>
+    <?php include_template( 'header-src.html' ); ?>
         
     <title><?php echo SITE_TITLE ?> - about</title>
     
+<? $page = "about"; ?>
+
 </head>
 
 <body>
     
-    <?php include_template('nav.html'); ?>
+    <?php include('nav.html'); ?>
 
     <div id="content">
        
-       <h1>about</h1>
-        
         <p>
-            <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>
-        
-
-       &copy; 1997&mdash;<?= date('Y'); ?>
+               
+                       quilime is a continually growing codification of exploration, resource, and creativity.
+                       <br/>
+                       <br/>
+                       author: gabriel dunne (<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>, <a href="http://gabrieldunne.com">www</a>)
+                                       <br/>   
+                       elsewhere:
+       <a href="http://flickr.com/photos/quilime/">flickr</a>, 
+       <a href="http://delicious.com/quilime/">delicious</a>,
+       <a href="http://vimeo.com/quilime/">vimeo</a>,  
+       <a href="http://github.com/quilime/">github</a>
+               </p>
        <br/>
 
+
+
        
 
     </div>
index 50a95805eb6f7e8184ce0cf9b0c2c87def151ebd..a00a0c2bf81e62c152183a475e9a01adbe4fbd65 100644 (file)
@@ -1,3 +1,7 @@
+<?
+       $page = "aggregate";
+?>
+
 <html>
 
 <head>
 
 <body>
     
-    <?php include_template('nav.html'); ?>
+    <?php include('nav.html'); ?>
     
     <div id="content">
-       
-       <h1>aggregate</h1>
     
     <table border="0" id="agg"><tr>
 
         <td valign="top" class="column">
         <?php $agg = get_rss_feed('http://media.quilime.com/aggregate/index.php?return=rss'); ?>
-        <h3><a class="mute" href="http://quilime.com/aggregate/">image aggregate</a></h3>
+        <h3><a class="mute" href="http://media.quilime.com/aggregate/">image aggregate</a></h3>
         <ul class="image">
 
         <?php 
-        $count = 8;
+        $count = 10;
         foreach($agg->channel->item as $item) :  
         if ($count-- == 0) break;
         ?>    
         <? endforeach; ?>  
         </ul>
         <p>
-            <a class="more" href="http://quilime.com/aggregate" title="via quilime.com/aggregate">more &rarr;</a>            
+            <a class="more" href="http://media.quilime.com/aggregate" title="via quilime.com/aggregate">more &rarr;</a>            
         </p>
 
         </td>
 
 
-<?php /*        
+<?php /*    
         <td valign="top" class="column">
         <?php $tube = get_rss_feed('http://gdata.youtube.com/feeds/base/users/kabr/favorites?alt=rss&v=2&orderby=published&client=ytapi-youtube-profile'); ?>
         <h2><a href="http://www.youtube.com/profile?user=kabr&view=favorites">video </a></h2>
index 36509a1abecad234bbbdd129094eec09a535d505..63aa8965befa5fe6a53316fb03301460e13b3aa6 100644 (file)
@@ -13,6 +13,8 @@
     }
 
        $inline = isset($_GET['inline']) ? true : false;
+       
+       $page = "code";
 
 
 ?>
 <body>
     
     <?php 
-        include_template('nav.html');         
+        include('nav.html');         
     ?>
 
+
+
     <div id="content">
+       
 
         <?php if ($single) : ?>
 
-                   <h1><a href="/code/">code</a> / <?php echo $items['title']; ?>   <small class="medium">[<?php echo $items['medium']; ?>]</small></h1>
-
             <div class="content">
                 <?php 
                     $base_dir = $items['base_dir'];
                     include_once($items['content']); 
                 ?>
             </div>
-                   
        
         <?php elseif ($inline): ?>
        
-                       <h1>code</h1>
+<div class="func"><a href="/code/">list</a></div>              
        
             <ul class="inline_content">
             <?php foreach($items_list as $items): ?>
                    <li>
                        <h3>
                            <a href="<?php echo $items['href']?>"><?php echo $items['title']; ?></a>
-                    <small class="medium">[<?php echo $items['medium']; ?>]</small>
                     </h3>
                     <div class="content">
                     <?php 
                     </div>
                 </li>
             <?  endforeach; ?>
-            </ul>        
-            
-            <a class="func" href="/code/">archive</a>            
+            </ul>       
+
+                       <br/>
 
         <?php else: ?>
+       
+       <div class="func"><a href="/code/?inline=1">inline</a></div>    
 
-                       <h1>code</h1>
-           
             <table class="archive" cellspacing="0" cellpadding="0">
 
                 <tr>
                 <? $c++;  endforeach; ?>
             </table>          
             
-            <br/>
-            <p>
-            <a class="func" href="/code/?inline=1">view inline</a>            
-            </p>
-
         <?php endif; ?>
         
     </div>
index 3d232c2ad22fae2a1c1dcb6a0002a971f51c439f..8be2bce100b72b9a217128248259463a3eb9e9b1 100644 (file)
@@ -8,11 +8,17 @@
 <!-- code prettifyier -->
 <link href="<?= get_base_dir(); ?>/js/prettify/prettify.css" type="text/css" rel="stylesheet" />
 <script type="text/javascript" src="<?= get_base_dir(); ?>/js/prettify/prettify.js"></script>
-
+<meta name="google-site-verification" content="1OBSuW_Qc3OFWC8whRGv2DJxQUUZkjcaY_cdd6PpdR8" />
 
 
 <script>
+
  $(document).ready(function() {
      prettyPrint();
  });
+
+ $(document).mousemove(function(e){
+    $('.c_pop').css({'left':(e.pageX-170)+"px", 'top':e.pageY+"px"});
+ }); 
+
 </script>
\ No newline at end of file
index 976baac5ac929f9cc25f8f514baf970ed9ba12dd..d0d637bf04bd66321578031dc9f6bb1fe5611ada 100644 (file)
@@ -2,6 +2,8 @@
 
 $img = get_rss_feed('http://api.flickr.com/services/feeds/photos_public.gne?id=28394478@N00&lang=en-us&format=rss_200'); 
 
+$page = "image";
+
 ?>
 
 <html>
@@ -22,11 +24,10 @@ $img = get_rss_feed('http://api.flickr.com/services/feeds/photos_public.gne?id=2
 
 <body>
     
-    <?php include_template('nav.html'); ?>
+    <?php include('nav.html'); ?>
 
     <div id="content">
        
-       <h1>img</h1>
     
         <ul class="image">
         <?php foreach($img->channel->item as $item) : ?>
index ed7efaa1c75f5daba70c0be592f5404ea1ce9e0f..100c4a0a7dd83e4bf99e43c5a64c752ecd845bec 100644 (file)
@@ -13,7 +13,7 @@
     <? include_template('nav.html'); ?>
     
 <div id="content">
-       projects, experiments, code, reference, inspiration, aggregate
+       <--- navigation
 </div>
     
 </body>
index 9f8df51ed5fa8fa1331bbf5f42adee674e13c39b..50f7b45052de21052305f7b97b6901d55960a74a 100644 (file)
@@ -1,3 +1,7 @@
+<?
+       $page = 'links';
+?>
+
 <html>
 
 <head>
 
 <body>
 
-    <?php include_template('nav.html'); ?>
+    <?php include('nav.html'); ?>
 
     <div id="content">
        
-       <h1>links</h1>
+
 
         <?php
 
             <?php
             }
 
-            $people = array(
-
-                    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://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://ripevessel.com', 'adam roth'),
-                    array('http://davidrager.org', 'david rager'),
-                    array('http://digitanalog.net', 'marc nimoy'),
-                    array('http://makaga.com', 'matthew gale'),
-                    array('http://fredericeyl.de', 'frédéric eyl'),
-                    array('http://thegreeneyl.com/', 'the green eyl'),
-                                       array('http://local.wasp.uwa.edu.au/~pbourke/', ''),
+            $people = array
+            (
+                    array('ssherriff.com', 'stephanie sherriff'),
+                    array('dabkitsch.com/jml/', 'jeff lubow'),
+                    array('onecm.com', 'ryan alexander'),
+                    array('oddsympathy.com', 'daniel massey'),
+                    array('jtnimoy.net', 'joshua nimoy'),
+                    array('keithpasko.com', 'keith pasko'),
+                    array('pohflepp.com', 'sascha pohflepp'),
+                    array('mylinhtrieu.com', 'mylinh trieu'),
+                    array('universaloscillation.com', 'aaron meyers'),
+                    array('tom-carden.co.uk', 'tom carden'),
+                    array('mike.teczno.com', 'michal migurski'),
+                    array('ripevessel.com', 'adam roth'),
+                    array('davidrager.org', 'david rager'),
+                    array('digitanalog.net', 'marc nimoy'),
+                    array('makaga.com', 'matthew gale'),
+                    array('fredericeyl.de', 'frédéric eyl'),
+                    array('thegreeneyl.com', 'the green eyl'),
+                                       array('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>
+            <?php linklist($people); ?>
         </ul>
 
 
-        <h2>links</h2>
-        <ul>
-            <?php linklist($people); ?>
-        </ul>
 
     </div>
 
index 650e6fbbf335de79cc1171561844009573454184..749647c1ed654f3ab55aedb9cfe959d63aef2236 100644 (file)
@@ -1,4 +1,4 @@
-<?php
+t<?php
 
     $single = false;
     
@@ -13,6 +13,8 @@
     }
     
     $list = isset($_GET['list']) ? $_GET['list'] : false;
+
+       $page = "/log";
     
 ?>
 <html>
 
 <body>
     
-    <?php include_template('nav.html'); ?>
+    <?php include('nav.html'); ?>
 
 
 
     <div id="content">
-       
-               
 
         <?php if ($single) : ?>
 
-               <h1><a href="/log/">log</a> / <?php echo $log['title']; ?> <span class="date"><?php echo date("m/d/Y", $log['timestamp']); ?></span> </h1>    
-            
+               <h1>
+                   <a title="<?php echo get_relative_time($log['timestamp']); ?>" href="<?php echo $log['href'];?>">
+                       <?php echo $log['title']; ?>
+                               </a><small>[<?=get_relative_time($log['timestamp']);?>]</small>
+               </h1>
+       
+                       
+       
             <div class="content">
             <?php echo $log['inline_content']; ?>
             </div>
                                 
         <?php elseif ($list): ?>
-
-                       <h1>log</h1>
         
            <table class="archive" cellspacing="0" cellpadding="0">
                 <tr>
@@ -90,8 +94,6 @@
             
         <?php else: ?>
        
-       <h1>log</h1>
-            
             <ul class="inline_content log">
             <?php foreach($log_list as $log): ?>
                    <li>
                                
                            <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>                    
                     <?php echo $log['inline_content']; ?>
                 </li>
             </ul>
             
             <br/>            
-            <a class="func" href="/log/?list=1">vew archive</a>
+            <a class="func" href="/log/?list=1">view archive</a>
            
             
         <?php endif; ?>
index cdfb290232fc33fe4a0045b099d6819327e17b41..411f6414ce9dd3621eda2646ecb80c10eba636e3 100644 (file)
@@ -1,18 +1,9 @@
 <ul class="nav">          
-    
-    <strong><a class="mute" href="/"><?= SITE_TITLE ?></a></strong><br/>
-
-    <br/>
-    <br/>    
-
+       <li><a href="/">home</a><br/><br/></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>
+    <li><a href="/projects/">projects</a></li>
+    <li><a href="/code/">code</a></li>
     <li><a href="/links/">links</a></li>
+    <li><a href="/agg/">aggregate</a></li>
     <li><a href="/about/">about</a></li>    
-    
-    <br/>
-    
-    
 </ul>  
index 6e80fd0d2aaba3b0de4489e7b7f5169155fced34..4386816f3a4668bd164ca811059400359ad517a3 100644 (file)
@@ -12,6 +12,9 @@
         $single = true;
     }
 
+$parent_page = "/projects";
+$page = '<a href="/projects">projects</a>';
+
 ?>
 <html>
 
 
 <body>
     
-    <?php include_template('nav.html'); ?>
+    <?php include('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><?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>
+                 <a href="http://portfolio.quilime.com/recent.html">2004 - 2006</a><br/>
+                 <a href="http://portfolio.quilime.com/archive/">1999 - 2004</a>
              </p>
-             
-             <!--
-            <ul class="thumbnails">
+
+<!--
+            <ul>
             <?php foreach($projects_list as $project): ?>
                    <li>
                        <a href="<?php echo $project['href']?>">
@@ -63,8 +69,7 @@
                 </li>
             <? endforeach; ?>
             </ul>
-            -->     
-            
+    -->                     
         <?php endif; ?>
         
     </div>