some updates

diff --git a/css/style.css b/css/style.css
index 5cde8853efa8a2991571d74f0c936242ec376c15..e6bdc0b5fbd9049b226b0e99c29644bd165e398d 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -251,7 +251,7 @@ table, td, tr {
   display:inherit;
 }
 .entries.projects.featured li {
-  height:200px;
+  
 }
 
 .entries.log li {

diff --git a/lib/config.ini b/lib/config.ini
index d3d2a7d03c972cdb8221c796bc5c2a663e855166..005e1bf327deb5b11a4821cc73685eef34f86b08 100644 (file)
--- a/lib/config.ini
+++ b/lib/config.ini
@@ -1,5 +1,5 @@
 ; settings
-site_title  = GABRIEL L. DUNNE
+site_title  = GABRIEL DUNNE
 clean_urls  = 1
 limit       = 1000
 ; http://php.net/manual/en/function.date.php

diff --git a/lib/data.php b/lib/data.php
index 892e78ea2f03ea890a46fdd1bb68e436b13097bf..61ac270fc44fa2e8ed1634018b25cf002d2de577 100644 (file)
--- a/lib/data.php
+++ b/lib/data.php
@@ -170,6 +170,14 @@ function get_dirs( $path = "", $args = array())
             if (!CLEAN_URLS)
                $d['url'] = WEB_ROOT . '?p=' . clean_slashes($d['url'], true);
             $d['name'] = str_replace($path, "",  $info->getRealPath());
+            
+
+            //echo $info->pathName;
+            //if (file_exists($info->getPathName() . DIRECTORY_SEPARATOR . CONFIG_FILE)) {
+                //$e = get_entry(new SplFileInfo($info->getPathName() . DIRECTORY_SEPARATOR . CONFIG_FILE) ); //parse_entry($info->pathName() . "/_config", 1);
+                //print_r($e);
+            //}
+
             $d['title'] =  ltrim($d['name'],"/");
                        $dirs[] = (object) $d;
                }

diff --git a/pages/.log b/pages/.log
deleted file mode 100644 (file)
index ee06ce5..0000000
--- a/pages/.log
+++ /dev/null
@@ -1,2 +0,0 @@
-title = process
---

diff --git a/pages/about b/pages/about
index 165e9940606c148b1da1ded5dc92133411be078e..0bfda0df96543d8fdf7651c3552e0c45504f2a15 100755 (executable)
--- a/pages/about
+++ b/pages/about
@@ -4,34 +4,29 @@ template = page
 <img src="http://media.quilime.com/files/img/IMG_1881.jpg" />\r
 </div>\r
 \r
-Gabriel Labov Dunne  \r
-Artist, Designer  \r
+\r
+studio  \r
 1242 Market St, FL 2  \r
 San Francisco, CA 94102  \r
-[email](mailto:studio@gabrieldunne.com)  \r
-[blog](http://quilime.com)\r
-<br />\r
-<br />\r
-\r
-###### edu\r
-2003 B.A. Design | Media Arts, UCLA    \r
-2001 Pont Aven School of Art, France  \r
-1999 College of Marin, Architecture\r
-<br />\r
-<br />\r
 \r
-\r
-###### exhibition\r
-2013 [Stars](/stars) SomArts 'NightLight', San Francisco CA  \r
-2013 [FaceReplace](/facereplace) @ ArtHackDay "Lethal Software, San Francisco CA  \r
-2012 [Audio ShaderToy](/audioshadertoy) @ Creators Project SF, collab w/ Ryan Alexander, Reza Ali, San Francisco, CA   \r
-2012 [NAAG](/naag). Delhi, India  \r
-2010 [Monad](/monad), Prototype, GAFFTA, San Francisco CA   \r
-2010 [Stars](/stars), GAFFTA, San Francisco, CA    \r
-2010 [Seaquence](/seaquence), GAFFTA, San Francisco CA   \r
-2008 [Cabspotting](/cabspotting), Stamen Design, Design and the Elastic Mind, NYC MoMA  Permanent Collection. New York, NY     \r
-2006 [Celestial Mechanics](/celestialmechanics), Interferenze: Naturalis Electronica, Valle Caudina, Italy       \r
-2006 [Celestial Mechanics](/celestialmechanics), Festival Sonar, Barcelona, Spain   \r
+[email](mailto:studio@gabrieldunne.com)  \r
+[blog](http://quilime.com)  \r
+<br />\r
+\r
+\r
+###### exhibition / performance / projects\r
+2013 Stars SomArts NightLight, San Francisco CA  \r
+2013 FaceReplace, ArtHackDay, San Francisco CA  \r
+2012 Audio ShaderToy, Creators Project, San Francisco, CA   \r
+2012 NAAG. Delhi, India  \r
+2011 ICOSI, Milieux Sonores: Sound and Imaginary Space, GAFFTA, San Francisco, CA    \r
+2010 ICOSI, Biennial of the Americas. Denver, CO\r
+2010 Monad, Prototype, Gray Area, San Francisco CA   \r
+2010 Stars, Gray Area, San Francisco, CA    \r
+2010 Seaquence, Gray Area, San Francisco CA   \r
+2008 Cabspotting, Stamen Design, Design and the Elastic Mind, NYC MoMA  Permanent Collection. New York, NY     \r
+2006 Celestial Mechanics, Interferenze: Naturalis Electronica, Valle Caudina, Italy       \r
+2006 Celestial Mechanics, Festival Sonar, Barcelona, Spain   \r
 2005 :Output Festival, Amsterdam, Netherlands  \r
 2005 CiberArt: International Festival of New Technologies, Bilbao, Spain  \r
 2003 Sur(Face), UCLA, Los Angeles, CA  \r
@@ -45,17 +40,6 @@ San Francisco, CA 94102
 <br />\r
 \r
 \r
-\r
-###### performance\r
-2012 UP Festival, San Francisco, CA   \r
-2012 CCRMA Modulations, San Francisco, CA     \r
-2011 Sepalcure, Shigeto, Simple & Santa, GAFFTA, San Francisco, CA    \r
-2010 "ICOSI", Milieux Sonores: Sound and Imaginary Space, GAFFTA, San Francisco, CA    \r
-2010 "ICOSI", Biennial of the Americas. Denver, CO\r
-<br />\r
-<br />\r
-\r
-\r
 ###### talks / teaching\r
 2012 Film/Code/Remix, BAVC, San Francisco  \r
 2012 Processing, ACCU, Symantic, Palo Alto     \r
@@ -83,8 +67,25 @@ San Francisco, CA 94102
 <br />\r
 <br />\r
 \r
+###### professional\r
+Obscura Digital  \r
+Bay Area Video Coalition  \r
+Tessellated Group  \r
+Gray Area Foundation for the Arts  \r
+Stamen Design  \r
+Google  \r
+Motion Theory  \r
+<br />\r
+\r
+\r
+###### edu\r
+2003 B.A. Design | Media Arts, UCLA     \r
+2001 Pont Aven School of Art  \r
+1999 College of Marin  \r
+<br />\r
+\r
 \r
-###### media / festivals\r
+###### media\r
 SIGGRAPH\r
 Creators Project  \r
 Discover Magazine  \r
@@ -102,6 +103,12 @@ HDRI Magazine
 \r
 \r
 <!--\r
+###### performance\r
+2012 UP Festival, San Francisco, CA   \r
+2012 CCRMA Modulations, San Francisco, CA     \r
+2011 Sepalcure, Shigeto, Simple & Santa, GAFFTA, San Francisco, CA    \r
+<br />\r
+<br />\r
 \r
 \r
 ###### professional\r

diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl
index b3253b5faab880f72032cd690f667c8f9238602c..096a668bf5dac10d9f90097ebba7c7e2cd4faf07 100644 (file)
--- a/templates/nav.html.tpl
+++ b/templates/nav.html.tpl
@@ -2,12 +2,6 @@
     <ul class="nav">
 
     <li class="home"><a href="<?=WEB_ROOT?>"><?=SITE_TITLE?></a></li>        
-    
-
-    
-  
-    
-
     <? if (!isset($entry->is_single)) {
         $en = get_pages('', $args = array(
         'recursive' => false, 
@@ -18,15 +12,21 @@
     <? foreach($dirs as $e) : ?>
     <li><a href="<?=$e->url?>"><?=$e->title?></a></li>
     <? endforeach; ?>          
-    <? foreach($en as $e) : /*print_r($e);*/ ?>
-    
-        
+    <? foreach($en as $e) : /*print_r($e);*/ ?>        
     <li>
         <a <?=$request['basename'] == $e->title ? 'class="selected"' : ''?> href="<?=$e->url?>"><?=$e->title?></a><? if ($e->title == 'tag' && isset($tag)): ?>&nbsp;&nbsp;<span class="tag"><?=$tag;?></span><? endif; ?>
-
     </li>
     <? endforeach; ?>
     <? } ?>
+
+    <? if (isset($entry->is_single) && $entry->is_single): ?> 
+    <li>
+        <a href="<?=dirname($entry->cat->url)?>/">
+            <?=ltrim(dirname($entry->cat->url), '/');?>
+        </a>
+    </li>
+    <? endif; ?>
+
     <!-- 
     <li>
         <? $this->include_template('pagination.html.tpl') ?>