style, etc

diff --git a/css/style.css b/css/style.css
index ec06463e788baa7475cf216f0adbf0fcc1f78a92..2e115172356f5cbdbc877767e2045d660fca8250 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -19,7 +19,7 @@ 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; }
+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; }

diff --git a/index.php b/index.php
index cd3e07da8eafd174ccabc8e0a3cb813eba0282bc..9a64b05bac19db5a0340bf1618e931337fd15cef 100644 (file)
--- a/index.php
+++ b/index.php
@@ -24,7 +24,6 @@
         }
     }
     
-    header ( "Location: /img/" );
     include ( TEMPLATE_DIR . 'index.html' );
                                                                                                                  
 ?>

diff --git a/js/prettify/prettify.css b/js/prettify/prettify.css
index 7ab26c616a5dbc3fa809e4c81a51dd30c64f5073..f150b38c75b02700787b4c91fc3681288ec087cc 100755 (executable)
--- a/js/prettify/prettify.css
+++ b/js/prettify/prettify.css
@@ -1,7 +1,7 @@
 /* Pretty printing styles. Used with prettify.js. */
 
-.str { color: #f28; }
-.kwd { color: #008; }
+.str { color: #f26; } 
+.kwd { color: #000; font-weight:bold;  } 
 .com { color: #888; font-style:italic; }
 .typ { color: #606; }
 .lit { color: #066; }
@@ -11,7 +11,7 @@
 .atn { color: #606; }
 .atv { color: #080; }
 .dec { color: #606; }
-pre.prettyprint, code.prettyprint { font-family:monaco, monospace; padding:2px 20px; background:#eee; }
+pre.prettyprint, code.prettyprint { font-family:monospace; font-size:11px; padding:2px 20px; background:#f0f0f0; }
 pre.prettyprint { padding:20px; }
 
 @media print {

diff --git a/lib/output.php b/lib/output.php
index 2d82d831714404c9c23ddedcf1b0a8573fec3077..14a8673a4b05cdb16235d00081167743e143529d 100644 (file)
--- a/lib/output.php
+++ b/lib/output.php
@@ -93,6 +93,7 @@
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         $feed = curl_exec($ch);
         curl_close($ch);
+        
         $xml = new SimpleXMLElement($feed);
         return $xml;        
     }

diff --git a/templates/agg.html b/templates/agg.html
index bf7106074c0a5519fe0b05f6e432f1eda3be848d..2dea6e887fa48ce7c9fb17f985d5a0498d5016b9 100644 (file)
--- a/templates/agg.html
+++ b/templates/agg.html
@@ -77,15 +77,32 @@
 
 
         <td valign="top" class="column">
-        <?php  $feed = get_rss_feed('http://feeds.delicious.com/v2/rss/quilime?count=20'); ?>
-        <h3><a class="mute" href="http://delicious.com/quilime/">bookmarks </a></h3>
+        <?php
+        
+               $url = 'https://api.del.icio.us/v1/posts/recent?count=20';
+               $ch = curl_init();
+               curl_setopt($ch, CURLOPT_URL, $url);
+               curl_setopt($ch, CURLOPT_POST, 1);
+               curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+               curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 30);
+               curl_setopt($ch, CURLOPT_TIMEOUT, 5);
+               curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
+               curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+               // add delicious.com username and password below
+               curl_setopt($ch, CURLOPT_USERPWD, 'quilime:redsink67');
+               $data = curl_exec($ch);
+               curl_close($ch);     
+               $del = new SimpleXMLElement($data);   
+        
+        ?>
+        <h3><a class="mute" href="http://delicious.com/quilime/">bookmarks</a></h3>
         <ul class="bookmarks">
-        <?php foreach($feed->channel->item as $item) : ?>
+        <?php foreach($del->post as $d) : ?>
         <li>
-            <a href="<?=$item->link?>"><?=$item->title?></a>
+            <a href="<?=$d['href']?>"><?=$d['description'];?></a>
             <br/>
 
-            <span class="desc"><?=$item->description;?></span>
+            <span class="desc"><?=$d['extended'];?></span>
         </li>
         <? endforeach; ?>       
         </ul>

diff --git a/templates/index.html b/templates/index.html
index 827ed4c29ac29c5770013231b023357100dcdcbc..eea502f9ca9006edfad2202c069ed15f9c24139c 100644 (file)
--- a/templates/index.html
+++ b/templates/index.html
@@ -12,5 +12,9 @@
     
     <? include_template('nav.html'); ?>
     
+<div id="content">
+    projects, process log, experiments, code, reference, inspiration, aggregate
+</div>
+    
 </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/templates/links.html b/templates/links.html
index d1a8d1c89f19843d040c3f112b69dfc7f10156fd..94bfa6c2654d028098d77c9b9a5840a9ec9d4c54 100644 (file)
--- a/templates/links.html
+++ b/templates/links.html
@@ -25,28 +25,35 @@
             }
         
             $people = array(
-//                    array('http://aaronkoblin.com', 'aaron koblin'),
-//                    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://onecm.com', 'ryan alexander'),                    
+                    array('http://ssherriff.com', 'stephanie sherriff'),                                        
                     array('http://www.oddsympathy.com/', 'daniel massey'),
-                    array('http://davidrager.org', 'david rager'),
+                    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://dabkitsch.com/jml', 'jeff lubow'),
-                    array('http://jtnimoy.net', 'joshua nimoy'),
-                    array('http://keithpasko.com', 'keith pasko'),
+                    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://tom-carden.co.uk', 'tom carden'),
+                    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('http://davidmichaeldunne.com', 'michael dunne'),                    
-                    array('http://mike.teczno.com', 'michal migurski'),
-                    array('http://mylinhtrieu.com', 'mylinh trieu'),
-//                    array('http://renataraksha.com', 'renata raksha'),
-                    array('http://onecm.com', 'ryan alexander'),
-                    array('http://pohflepp.com', 'sascha pohflepp'),
-                    array('http://ssherriff.com', 'stephanie sherriff'),
+                    array('http://makaga.com', 'matthew gale'),
+                    
+                    array(' ', ' '),                    
+                                        
                     array('http://www.thegreeneyl.com/', 'the green eyl'),
-                    array('http://tom-carden.co.uk', 'tom carden')
+                    array('http://gaffta.org/', 'gaffta')
                     );
         ?>
     

diff --git a/templates/nav.html b/templates/nav.html
index c421c4da616fd5d1866ac23bc73180c44dc0f08f..8c91bdb0a20044e8e1f014c0fbf2bb37fd3bec95 100644 (file)
--- a/templates/nav.html
+++ b/templates/nav.html
@@ -1,10 +1,12 @@
 <ul class="nav">          
     
-    <h3 >
-        <strong><a class="mute" href="/"><? echo SITE_TITLE; ?></a></strong>
+    <h3>
+        <strong><a class="mute" href="/"><?= SITE_TITLE ?></a></strong>
     </h3>
+    by gabriel dunne
 
     <br/>
+    <br/>    
 
     <li><a href="/log/">log</a></li>
     <li><a href="/projects/">projects</a></li>