From: Gabriel Dunne <gdunne@quilime.com>
Date: Sat, 8 Sep 2012 21:08:00 +0000 (-0700)
Subject: Added get_entires_and_dirs() to data.php
X-Git-Url: https://git.quilime.com/?a=commitdiff_plain;h=01560c074e4a3b6f5f2dc4317bba055ab00c7abd;p=plog.git

Added get_entires_and_dirs() to data.php
---

diff --git a/data/content/data.json b/data/content/data.json
index b754b88..7183737 100644
--- a/data/content/data.json
+++ b/data/content/data.json
@@ -1 +1 @@
-{"entries":[{"config":{"template":"page","date":null},"title":"about","filename":"about","path":"\/Users\/gdunne\/_code\/plog\/content\/about","fileInfo":{},"timestamp":1347137429,"tags":null,"content":"<p>Lives and works in San Francisco Bay Area.<\/p>\n\n<p>Born in San Francisco.<\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/about\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":false,"url":"\/"},"media":"media\/\/about\/","thumb":"media\/\/about\/thumb.png","url":"\/about","edit_url":"\/edit\/\/about"},{"config":{"title":"links","template":"page","date":null},"title":"links","filename":"links","path":"\/Users\/gdunne\/_code\/plog\/content\/links","fileInfo":{},"timestamp":1347137078,"tags":null,"content":"<ul>\n<li><a href=\"http:\/\/quilime.com\">quilime.com<\/a> process blog  <\/li>\n<li><a href=\"http:\/\/ssherriff.com\">ssherriff.com<\/a> stephanie sherriff<\/li>\n<li><a href=\"http:\/\/onecm.com\">onecm.com<\/a> ryan alexander<\/li>\n<li><a href=\"http:\/\/ripevessel.com\">ripevessel.com<\/a> adam roth<\/li>\n<li><a href=\"http:\/\/jtnimoy.net\">jtnimoy.net<\/a> joshua nimoy<\/li>\n<li><a href=\"http:\/\/oddsympathy.com\">oddsympathy.com<\/a> daniel massey<\/li>\n<li><a href=\"http:\/\/carbonworkshop.com\">carbonworkshop.com<\/a> gustavo huber &amp; shelly brown<\/li>\n<li><a href=\"http:\/\/keithpasko.com\">keithpasko.com<\/a> keith pasko<\/li>\n<li><a href=\"http:\/\/dabkitsch.com\/jml\/\">dabkitsch.com\/jml\/<\/a> jeff lubow<\/li>\n<li><a href=\"http:\/\/ghost-hack.com\">ghost-hack.com<\/a> michael chang<\/li>\n<li><a href=\"http:\/\/flight404.com\">flight404.com<\/a> robert hodgin<\/li>\n<li><a href=\"http:\/\/pohflepp.com\">pohflepp.com<\/a> sascha pohflep<\/li>\n<li><a href=\"http:\/\/mylinhtrieu.com\">mylinhtrieu.com<\/a> mylinh ttieu nguyen<\/li>\n<li><a href=\"http:\/\/fredericeyl.de\">fredericeyl.de<\/a> fr\u00c3\u00a9d\u00c3\u00a9ric eyl <\/li>\n<li><a href=\"http:\/\/thegreeneyl.com\">thegreeneyl.com<\/a> the green eyl <\/li>\n<li><a href=\"http:\/\/universaloscillation.com\">universaloscillation.com<\/a> aaron meyers<\/li>\n<li><a href=\"http:\/\/aaronkoblin.com\">aaronkoblin.com<\/a> aaron koblin<\/li>\n<li><a href=\"http:\/\/tom-carden.co.uk\">tom-carden.co.uk<\/a> tom carden<\/li>\n<li><a href=\"http:\/\/mike.teczno.com\">mike.teczno.co<\/a> michal migurski<\/li>\n<li><a href=\"http:\/\/davidrager.org\">davidrager.org<\/a> david rager<\/li>\n<li><a href=\"http:\/\/digitanalog.net\">digitanalog.net<\/a> marc nimoy <\/li>\n<li><a href=\"http:\/\/makaga.com\">makaga.com<\/a> matthew gale <\/li>\n<li><a href=\"http:\/\/rea.com\/\">reas.com<\/a> casey reas  <\/li>\n<li><a href=\"http:\/\/n-e-r-v-o-u-s.com\/\">n-e-r-v-o-u-s.com<\/a> nervous system <\/li>\n<li><a href=\"http:\/\/gaffta.org\">gaffta.org<\/a> gray area foundation for the arts (GAFFTA)<\/li>\n<li><a href=\"http:\/\/bavc.org\">bavc.org<\/a> bay area video coalition (BAVC)<\/li>\n<\/ul>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/links\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":false,"url":"\/"},"media":"media\/\/links\/","thumb":"media\/\/links\/thumb.png","url":"\/links","edit_url":"\/edit\/\/links"},{"config":{"title":"tag","template":"page","date":null},"title":"tag","filename":"tags","path":"\/Users\/gdunne\/_code\/plog\/content\/tags","fileInfo":{},"timestamp":1347137035,"tags":null,"content":"<p><? if (isset($tag)): ?><\/p>\n\n<p><? $entries = get_entries('\/', $args = array('tag' => $tag)); ?>\n<? foreach($entries as $entry): ?>\n<?\nif (isset($entry->content_short))\n$entry->content = $entry->content_short .\n'<br \/><a class=\"more\" href=\"' . $entry->url . '\">more &rarr;<\/a><br \/><br \/>';\n?><\/p>\n\n<div class=\"entry\">\n<? $this->include_template('entry.html.tpl', array('entry' => $entry)); ?>\n<\/div>\n\n<p><? endforeach; ?><\/p>\n\n<p><? else: ?><\/p>\n\n<ul class=\"tags\">\n<? $tags = get_tags('\/'); ksort($tags); ?>\n<? foreach($tags as $tag => $count) : ?>\n<li><a href=\"\/tag\/<?=$tag?>\"><?=$tag?><\/a> &times; <?=$count?><\/li>\n<? endforeach; ?>\n<\/ul>\n\n<p><? endif; ?><\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/tags\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":false,"url":"\/"},"media":"media\/\/tags\/","thumb":"media\/\/tags\/thumb.png","url":"\/tags","edit_url":"\/edit\/\/tags"},{"config":{"title":"c\/v","template":"page","date":null},"title":"c\/v","filename":"cv","path":"\/Users\/gdunne\/_code\/plog\/content\/cv","fileInfo":{},"timestamp":1347137007,"tags":null,"content":"<p><strong>edu<\/strong><br \/>\n2003 B.A. Design | Media Arts, UCLA<br \/>\n2001 Pont Aven School of Art, France<br \/>\n1999 College of Marin, Architecture\n<br \/>\n<br \/><\/p>\n\n<p><strong>select exhibition + performance<\/strong><br \/>\n2012 CCRMA Show. Live Visuals.<br \/>\n2012 Creators Project SF, San Francisco. \"Audio Shader Toy\", Installation (collab).<br \/>\n2012 India Art Fair, Delhi, India. Collaboration with Vishal K Dar.\n2011 Sepalcure, Shigeto, Simple &amp; Santa, GAFFTA, San Francisco. Live visuals. <a href=\"http:\/\/www.gaffta.org\/2011\/03\/01\/sepalcure-shigeto-simple-santa\/\">&rarr;<\/a><br \/>\n2010 Milieux Sonores: Sound and Imaginary Space, GAFFTA, San Francisco. Live A\/V performance.<br \/>\n2010 Biennial of the Americas, Denver.  Live A\/V performance.<br \/>\n2010 Prototype, GAFFTA, San Francisco. Installation.<br \/>\n2010 Powers of Ten, GAFFTA. Installation.<br \/>\n2008 Design and the Elastic Mind, MoMA NYC Permanent Collection. Collab w\/Stamen Design.<br \/>\n2006 Interferenze: Naturalis Electronica, Valle Caudina, Italy.<br \/>\n2006 Japan Media Arts Festival, Tokyo, Japan<br \/>\n2006 Festival Sonar, Barcelona, Spain<br \/>\n2006 SIGGRAPH, Boston<br \/>\n2005 New Wight Gallery MFA Show, UCLA, Los Angeles, CA (collab.)<br \/>\n2005 SIGGRAPH, Los Angeles<br \/>\n2005 :Output International Design Competition, Amsterdam, Netherlands<br \/>\n2005 CiberArt: International Festival of New Technologies, Bilbao, Spain<br \/>\n2004 Traffic, New Wight Gallery, UCLA, Los Angeles, CA. Collab w\/Scott Hessels.<br \/>\n2003 Sur(Face), Design Media Arts EDA, Los Angeles, CA<br \/>\n2003 Eyberrations Digital Film Festival, Irvine, CA<br \/>\n2002 Melbourne International Film Festival\", Melbourne, Australia<br \/>\n2002 Experimental Works On Paper, Paris, France<br \/>\n2002 Experimental Works On Paper, Rennes, France<br \/>\n2002 Jaquez Gallery Collection, Pont Aven, France. Permanent Collection.\n<br \/>\n<br \/><\/p>\n\n<p><strong>residencies \/ collaborations<\/strong><br \/>\n2011&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Studio Collaboration w\/ Studio Vishal K. Dar<br \/>\n2009&mdash;2010 Residency, Gray Area Foundation for the Arts\n<br \/>\n<br \/><\/p>\n\n<p><strong>public collections<\/strong><br \/>\nNew York Museum of Modern Art, NY<br \/>\nJaquez Gallery Collection, Pont Aven, France\n<br \/>\n<br \/><\/p>\n\n<p><strong>talks<\/strong><br \/>\n2010 \"Prototype\" Resident Artist Symposium, Gray Area, San Francisco<br \/>\n2004 Text + Architecture &amp; Writing in Architecture, SCIARC, Los Angeles<br \/>\n2003 narr@tive: Digital Storytelling, Hammer Museum, Los Angeles\n<br \/>\n<br \/><\/p>\n\n<p><strong>teaching\/advisory<\/strong><br \/>\n2012 Film\/Code Remix (Youth Program, BAVC, San Francisco), co-teach with Jonathan McIntosh.  1 yr.<br \/>\n2011 Creative Code (Youth Program, BAVC, San Francisco), 1 yr.<br \/>\n2011 Processing 101 Workshop(Certificate Program, Gray Area, San Francisco), 2 wk<br \/>\n2010 Open Source (Youth Program, BAVC, San Francisco), 1 yr.<br \/>\n2010 Creative Coding: An Introduction to Processing  (Gray Area, San Francisco), 2 wk<br \/>\n2009 Creative Coding (Gray Area, San Francisco), 2 wek<br \/>\n2009 Introduction to Processing (Gray Area, San Francisco), weekend<br \/>\n2007 Processing (Makers Faire, San Mateo), 2 hr<br \/>\n2005 Programming and Design (UCLA student workshops, Los Angeles), 1 semester<br \/>\n2004 Maya Workshop Series (UCLA, Los Angeles), 1 semester<br \/>\n2003 Typography Workshop Series (UCLA, Los Angeles), 1 day<br \/>\n2003 Adobe Software Workshops, Photoshop\/Illustrator\/After Effects (UCLA, Los Angeles), Lead Instructor, 1 day each<br \/>\n2002 Macromedia Design Student Workshops (UCLA, Los Angeles), 1 day\n<br \/>\n<br \/><\/p>\n\n<p><strong>websites<\/strong><br \/>\n2011 Duran Duran \"All You Need Is Now\" http:\/\/now.gaffta.org<br \/>\n2010 Seaquence http:\/\/seaquence.org<br \/>\n2007 Motion Theory [link]\n<br \/>\n<br \/><\/p>\n\n<p><strong>commercials<\/strong><br \/>\nBudwieser \"Superbowl\", Motion Theory<br \/>\nBudwieser \"The Game\", Motion Theory<br \/>\nNike \"One\", Motion Theory\n<br \/>\n<br \/><\/p>\n\n<p><strong>shorts<\/strong><br \/>\nRestFest 2003 Opener, Motion Theory<br \/>\nThe Mirror\n<br \/>\n<br \/><\/p>\n\n<p><strong>music videos<\/strong><br \/>\nBeck \"Girl\", Motion Theory<br \/>\nPapa Roach \"Getting Away With Murder\", Motion Theory\n<br \/>\n<br \/><\/p>\n\n<p><strong>print \/ tv \/ radio<\/strong><br \/>\nArt College Radio, San Francisco<br \/>\nMIT Aerospace Annual<br \/>\nA'minima #17<br \/>\nFOCUS Italia, May Issue<br \/>\nDiscover Magazine<br \/>\nWired<br \/>\nAdult Swim, Cartoon Network<br \/>\nContemporary Art of Science and Technology<br \/>\nAD: Architectural Digest<br \/>\nHDRI\n<br \/>\n<br \/><\/p>\n\n<p><strong>awards<\/strong><br \/>\nCreative Review Best in Show 2005, Beck \"Girl\"<br \/>\nType Directors Award, Nike \"Golf\"<br \/>\nAIGA, Hewlett Packard \"It Consolidates\"<br \/>\nAICP, Hewlett Packard \"Hands\"<br \/>\nScreen Network Australia Best in Show<br \/>\nShorttakes Film Festival, Best Visual Effects\n<br \/>\n<br \/><\/p>\n\n<p><strong>academic honors<\/strong><br \/>\n2002, 2003 UCLA Deans List<br \/>\n2001 UCLA Merit Scholarship\n<br \/>\n<br \/><\/p>\n\n<p><strong>credentials<\/strong><br \/>\nAdobe A.C.E. Certified in Photoshop, Illustrator\n<br \/>\n<br \/><\/p>\n\n<p><strong>professional activity<\/strong><br \/>\n2012&mdash;cur&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Obscura Digital, Consultant<br \/>\n2010&mdash;cur&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Bay Area Video Coalition, Youth Instructor<br \/>\n2005&mdash;cur&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Tessellated Group, Designer<br \/>\n1999&mdash;cur&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Studio Gabriel Dunne, Owner<br \/>\n2009&mdash;2010 Gray Area Foundation for the Arts, Studio Director\/Resident Artist<br \/>\n2007&mdash;2008 Stamen Design, Data Visualization Software Developer<br \/>\n2007&mdash;2008 Google, Inc, Data Visualization Software Developer<br \/>\n2004&mdash;2006 Motion Theory: Animator, Designer, Software, \n<br \/>\n<br \/><\/p>\n\n<p><strong>commercial &amp; non\/profit clients<\/strong><br \/>\nOgilvy &amp; Mather<br \/>\nGoodby, Silverstein &amp; Partners<br \/>\nMekanism<br \/>\nHewlett Packard<br \/>\nNike<br \/>\nBudweiser<br \/>\nCadillac<br \/>\nOgilvy &amp; Mather<br \/>\nThe Soup<br \/>\nTessellated Group<br \/>\nGoogle<br \/>\nYouTube<br \/>\nGray Area Foundation for the Arts<br \/>\nBay Area Video Coalition<br \/>\nDuran Duran\n<br \/>\n<br \/><\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/cv\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":false,"url":"\/"},"media":"media\/\/cv\/","thumb":"media\/\/cv\/thumb.png","url":"\/cv","edit_url":"\/edit\/\/cv"},{"config":{"template":"page","date":null},"title":"contact","filename":"contact","path":"\/Users\/gdunne\/_code\/plog\/content\/contact","fileInfo":{},"timestamp":1347136860,"tags":null,"content":"<p>Gabriel Dunne<br \/>\n1242 Market St\nFloor 2<br \/>\nSan Francisco, CA USA 94102  <\/p>\n\n<p>studio at gabrieldunne dot com   <\/p>\n\n<p>&#43; 1 415 493 8496  <\/p>\n\n<p><br \/><\/p>\n\n<p><form><\/p>\n\n<p>\n<lable>name<\/label><br \/>\n<input type=\"text\" name=\"name\">\n<\/p>\n\n<p>\n<lable>email<\/label><br \/>\n<input type=\"text\" name=\"email\">\n<\/p>\n\n<p><p>\n<lable>message<\/label><br \/>\n<textarea style=\"width:250px;height:100px;\"><\/textarea><\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/contact\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":false,"url":"\/"},"media":"media\/\/contact\/","thumb":"media\/\/contact\/thumb.png","url":"\/contact","edit_url":"\/edit\/\/contact"},{"config":{"template":"test","date":null},"title":"test","filename":"test","path":"\/Users\/gdunne\/_code\/plog\/content\/test","fileInfo":{},"timestamp":1347069441,"tags":null,"content":"<p>Plog Unit Tests.<\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/test\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":false,"url":"\/"},"media":"media\/\/test\/","thumb":"media\/\/test\/thumb.png","url":"\/test","edit_url":"\/edit\/\/test"}]}
\ No newline at end of file
+{"entries":[{"config":{"template":"page","date":null},"title":"about","filename":"about","path":"\/Users\/gdunne\/_code\/plog\/content\/about","fileInfo":{},"timestamp":1347137429,"tags":null,"content":"<p>Lives and works in San Francisco Bay Area.<\/p>\n\n<p>Born in San Francisco.<\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/about\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":false,"url":"\/"},"media":"media\/\/about\/","thumb":"media\/\/about\/thumb.png","url":"\/about","edit_url":"\/edit\/\/about"},{"config":{"title":"c\/v","template":"page","date":null},"title":"c\/v","filename":"cv","path":"\/Users\/gdunne\/_code\/plog\/content\/cv","fileInfo":{},"timestamp":1347137007,"tags":null,"content":"<p><strong>edu<\/strong><br \/>\n2003 B.A. Design | Media Arts, UCLA<br \/>\n2001 Pont Aven School of Art, France<br \/>\n1999 College of Marin, Architecture\n<br \/>\n<br \/><\/p>\n\n<p><strong>select exhibition + performance<\/strong><br \/>\n2012 CCRMA Show. Live Visuals.<br \/>\n2012 Creators Project SF, San Francisco. \"Audio Shader Toy\", Installation (collab).<br \/>\n2012 India Art Fair, Delhi, India. Collaboration with Vishal K Dar.\n2011 Sepalcure, Shigeto, Simple &amp; Santa, GAFFTA, San Francisco. Live visuals. <a href=\"http:\/\/www.gaffta.org\/2011\/03\/01\/sepalcure-shigeto-simple-santa\/\">&rarr;<\/a><br \/>\n2010 Milieux Sonores: Sound and Imaginary Space, GAFFTA, San Francisco. Live A\/V performance.<br \/>\n2010 Biennial of the Americas, Denver.  Live A\/V performance.<br \/>\n2010 Prototype, GAFFTA, San Francisco. Installation.<br \/>\n2010 Powers of Ten, GAFFTA. Installation.<br \/>\n2008 Design and the Elastic Mind, MoMA NYC Permanent Collection. Collab w\/Stamen Design.<br \/>\n2006 Interferenze: Naturalis Electronica, Valle Caudina, Italy.<br \/>\n2006 Japan Media Arts Festival, Tokyo, Japan<br \/>\n2006 Festival Sonar, Barcelona, Spain<br \/>\n2006 SIGGRAPH, Boston<br \/>\n2005 New Wight Gallery MFA Show, UCLA, Los Angeles, CA (collab.)<br \/>\n2005 SIGGRAPH, Los Angeles<br \/>\n2005 :Output International Design Competition, Amsterdam, Netherlands<br \/>\n2005 CiberArt: International Festival of New Technologies, Bilbao, Spain<br \/>\n2004 Traffic, New Wight Gallery, UCLA, Los Angeles, CA. Collab w\/Scott Hessels.<br \/>\n2003 Sur(Face), Design Media Arts EDA, Los Angeles, CA<br \/>\n2003 Eyberrations Digital Film Festival, Irvine, CA<br \/>\n2002 Melbourne International Film Festival\", Melbourne, Australia<br \/>\n2002 Experimental Works On Paper, Paris, France<br \/>\n2002 Experimental Works On Paper, Rennes, France<br \/>\n2002 Jaquez Gallery Collection, Pont Aven, France. Permanent Collection.\n<br \/>\n<br \/><\/p>\n\n<p><strong>residencies \/ collaborations<\/strong><br \/>\n2011&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Studio Collaboration w\/ Studio Vishal K. Dar<br \/>\n2009&mdash;2010 Residency, Gray Area Foundation for the Arts\n<br \/>\n<br \/><\/p>\n\n<p><strong>public collections<\/strong><br \/>\nNew York Museum of Modern Art, NY<br \/>\nJaquez Gallery Collection, Pont Aven, France\n<br \/>\n<br \/><\/p>\n\n<p><strong>talks<\/strong><br \/>\n2010 \"Prototype\" Resident Artist Symposium, Gray Area, San Francisco<br \/>\n2004 Text + Architecture &amp; Writing in Architecture, SCIARC, Los Angeles<br \/>\n2003 narr@tive: Digital Storytelling, Hammer Museum, Los Angeles\n<br \/>\n<br \/><\/p>\n\n<p><strong>teaching\/advisory<\/strong><br \/>\n2012 Film\/Code Remix (Youth Program, BAVC, San Francisco), co-teach with Jonathan McIntosh.  1 yr.<br \/>\n2011 Creative Code (Youth Program, BAVC, San Francisco), 1 yr.<br \/>\n2011 Processing 101 Workshop(Certificate Program, Gray Area, San Francisco), 2 wk<br \/>\n2010 Open Source (Youth Program, BAVC, San Francisco), 1 yr.<br \/>\n2010 Creative Coding: An Introduction to Processing  (Gray Area, San Francisco), 2 wk<br \/>\n2009 Creative Coding (Gray Area, San Francisco), 2 wek<br \/>\n2009 Introduction to Processing (Gray Area, San Francisco), weekend<br \/>\n2007 Processing (Makers Faire, San Mateo), 2 hr<br \/>\n2005 Programming and Design (UCLA student workshops, Los Angeles), 1 semester<br \/>\n2004 Maya Workshop Series (UCLA, Los Angeles), 1 semester<br \/>\n2003 Typography Workshop Series (UCLA, Los Angeles), 1 day<br \/>\n2003 Adobe Software Workshops, Photoshop\/Illustrator\/After Effects (UCLA, Los Angeles), Lead Instructor, 1 day each<br \/>\n2002 Macromedia Design Student Workshops (UCLA, Los Angeles), 1 day\n<br \/>\n<br \/><\/p>\n\n<p><strong>websites<\/strong><br \/>\n2011 Duran Duran \"All You Need Is Now\" http:\/\/now.gaffta.org<br \/>\n2010 Seaquence http:\/\/seaquence.org<br \/>\n2007 Motion Theory [link]\n<br \/>\n<br \/><\/p>\n\n<p><strong>commercials<\/strong><br \/>\nBudwieser \"Superbowl\", Motion Theory<br \/>\nBudwieser \"The Game\", Motion Theory<br \/>\nNike \"One\", Motion Theory\n<br \/>\n<br \/><\/p>\n\n<p><strong>shorts<\/strong><br \/>\nRestFest 2003 Opener, Motion Theory<br \/>\nThe Mirror\n<br \/>\n<br \/><\/p>\n\n<p><strong>music videos<\/strong><br \/>\nBeck \"Girl\", Motion Theory<br \/>\nPapa Roach \"Getting Away With Murder\", Motion Theory\n<br \/>\n<br \/><\/p>\n\n<p><strong>print \/ tv \/ radio<\/strong><br \/>\nArt College Radio, San Francisco<br \/>\nMIT Aerospace Annual<br \/>\nA'minima #17<br \/>\nFOCUS Italia, May Issue<br \/>\nDiscover Magazine<br \/>\nWired<br \/>\nAdult Swim, Cartoon Network<br \/>\nContemporary Art of Science and Technology<br \/>\nAD: Architectural Digest<br \/>\nHDRI\n<br \/>\n<br \/><\/p>\n\n<p><strong>awards<\/strong><br \/>\nCreative Review Best in Show 2005, Beck \"Girl\"<br \/>\nType Directors Award, Nike \"Golf\"<br \/>\nAIGA, Hewlett Packard \"It Consolidates\"<br \/>\nAICP, Hewlett Packard \"Hands\"<br \/>\nScreen Network Australia Best in Show<br \/>\nShorttakes Film Festival, Best Visual Effects\n<br \/>\n<br \/><\/p>\n\n<p><strong>academic honors<\/strong><br \/>\n2002, 2003 UCLA Deans List<br \/>\n2001 UCLA Merit Scholarship\n<br \/>\n<br \/><\/p>\n\n<p><strong>credentials<\/strong><br \/>\nAdobe A.C.E. Certified in Photoshop, Illustrator\n<br \/>\n<br \/><\/p>\n\n<p><strong>professional activity<\/strong><br \/>\n2012&mdash;cur&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Obscura Digital, Consultant<br \/>\n2010&mdash;cur&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Bay Area Video Coalition, Youth Instructor<br \/>\n2005&mdash;cur&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Tessellated Group, Designer<br \/>\n1999&mdash;cur&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Studio Gabriel Dunne, Owner<br \/>\n2009&mdash;2010 Gray Area Foundation for the Arts, Studio Director\/Resident Artist<br \/>\n2007&mdash;2008 Stamen Design, Data Visualization Software Developer<br \/>\n2007&mdash;2008 Google, Inc, Data Visualization Software Developer<br \/>\n2004&mdash;2006 Motion Theory: Animator, Designer, Software, \n<br \/>\n<br \/><\/p>\n\n<p><strong>commercial &amp; non\/profit clients<\/strong><br \/>\nOgilvy &amp; Mather<br \/>\nGoodby, Silverstein &amp; Partners<br \/>\nMekanism<br \/>\nHewlett Packard<br \/>\nNike<br \/>\nBudweiser<br \/>\nCadillac<br \/>\nOgilvy &amp; Mather<br \/>\nThe Soup<br \/>\nTessellated Group<br \/>\nGoogle<br \/>\nYouTube<br \/>\nGray Area Foundation for the Arts<br \/>\nBay Area Video Coalition<br \/>\nDuran Duran\n<br \/>\n<br \/><\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/cv\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":false,"url":"\/"},"media":"media\/\/cv\/","thumb":"media\/\/cv\/thumb.png","url":"\/cv","edit_url":"\/edit\/\/cv"},{"config":{"template":"page","date":null},"title":"contact","filename":"contact","path":"\/Users\/gdunne\/_code\/plog\/content\/contact","fileInfo":{},"timestamp":1347136860,"tags":null,"content":"<p>Gabriel Dunne<br \/>\n1242 Market St\nFloor 2<br \/>\nSan Francisco, CA USA 94102  <\/p>\n\n<p>studio at gabrieldunne dot com   <\/p>\n\n<p>&#43; 1 415 493 8496  <\/p>\n\n<p><br \/><\/p>\n\n<p><form><\/p>\n\n<p>\n<lable>name<\/label><br \/>\n<input type=\"text\" name=\"name\">\n<\/p>\n\n<p>\n<lable>email<\/label><br \/>\n<input type=\"text\" name=\"email\">\n<\/p>\n\n<p><p>\n<lable>message<\/label><br \/>\n<textarea style=\"width:250px;height:100px;\"><\/textarea><\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/contact\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":false,"url":"\/"},"media":"media\/\/contact\/","thumb":"media\/\/contact\/thumb.png","url":"\/contact","edit_url":"\/edit\/\/contact"},{"config":{"title":"links","template":"page","date":null},"title":"links","filename":"links","path":"\/Users\/gdunne\/_code\/plog\/content\/links","fileInfo":{},"timestamp":1347137078,"tags":null,"content":"<ul>\n<li><a href=\"http:\/\/quilime.com\">quilime.com<\/a> process blog  <\/li>\n<li><a href=\"http:\/\/ssherriff.com\">ssherriff.com<\/a> stephanie sherriff<\/li>\n<li><a href=\"http:\/\/onecm.com\">onecm.com<\/a> ryan alexander<\/li>\n<li><a href=\"http:\/\/ripevessel.com\">ripevessel.com<\/a> adam roth<\/li>\n<li><a href=\"http:\/\/jtnimoy.net\">jtnimoy.net<\/a> joshua nimoy<\/li>\n<li><a href=\"http:\/\/oddsympathy.com\">oddsympathy.com<\/a> daniel massey<\/li>\n<li><a href=\"http:\/\/carbonworkshop.com\">carbonworkshop.com<\/a> gustavo huber &amp; shelly brown<\/li>\n<li><a href=\"http:\/\/keithpasko.com\">keithpasko.com<\/a> keith pasko<\/li>\n<li><a href=\"http:\/\/dabkitsch.com\/jml\/\">dabkitsch.com\/jml\/<\/a> jeff lubow<\/li>\n<li><a href=\"http:\/\/ghost-hack.com\">ghost-hack.com<\/a> michael chang<\/li>\n<li><a href=\"http:\/\/flight404.com\">flight404.com<\/a> robert hodgin<\/li>\n<li><a href=\"http:\/\/pohflepp.com\">pohflepp.com<\/a> sascha pohflep<\/li>\n<li><a href=\"http:\/\/mylinhtrieu.com\">mylinhtrieu.com<\/a> mylinh ttieu nguyen<\/li>\n<li><a href=\"http:\/\/fredericeyl.de\">fredericeyl.de<\/a> fr\u00c3\u00a9d\u00c3\u00a9ric eyl <\/li>\n<li><a href=\"http:\/\/thegreeneyl.com\">thegreeneyl.com<\/a> the green eyl <\/li>\n<li><a href=\"http:\/\/universaloscillation.com\">universaloscillation.com<\/a> aaron meyers<\/li>\n<li><a href=\"http:\/\/aaronkoblin.com\">aaronkoblin.com<\/a> aaron koblin<\/li>\n<li><a href=\"http:\/\/tom-carden.co.uk\">tom-carden.co.uk<\/a> tom carden<\/li>\n<li><a href=\"http:\/\/mike.teczno.com\">mike.teczno.co<\/a> michal migurski<\/li>\n<li><a href=\"http:\/\/davidrager.org\">davidrager.org<\/a> david rager<\/li>\n<li><a href=\"http:\/\/digitanalog.net\">digitanalog.net<\/a> marc nimoy <\/li>\n<li><a href=\"http:\/\/makaga.com\">makaga.com<\/a> matthew gale <\/li>\n<li><a href=\"http:\/\/rea.com\/\">reas.com<\/a> casey reas  <\/li>\n<li><a href=\"http:\/\/n-e-r-v-o-u-s.com\/\">n-e-r-v-o-u-s.com<\/a> nervous system <\/li>\n<li><a href=\"http:\/\/gaffta.org\">gaffta.org<\/a> gray area foundation for the arts (GAFFTA)<\/li>\n<li><a href=\"http:\/\/bavc.org\">bavc.org<\/a> bay area video coalition (BAVC)<\/li>\n<\/ul>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/links\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":false,"url":"\/"},"media":"media\/\/links\/","thumb":"media\/\/links\/thumb.png","url":"\/links","edit_url":"\/edit\/\/links"},{"config":{"title":"tag","template":"page","date":null},"title":"tag","filename":"tags","path":"\/Users\/gdunne\/_code\/plog\/content\/tags","fileInfo":{},"timestamp":1347137035,"tags":null,"content":"<p><? if (isset($tag)): ?><\/p>\n\n<p><? $entries = get_entries('\/', $args = array('tag' => $tag)); ?>\n<? foreach($entries as $entry): ?>\n<?\nif (isset($entry->content_short))\n$entry->content = $entry->content_short .\n'<br \/><a class=\"more\" href=\"' . $entry->url . '\">more &rarr;<\/a><br \/><br \/>';\n?><\/p>\n\n<div class=\"entry\">\n<? $this->include_template('entry.html.tpl', array('entry' => $entry)); ?>\n<\/div>\n\n<p><? endforeach; ?><\/p>\n\n<p><? else: ?><\/p>\n\n<ul class=\"tags\">\n<? $tags = get_tags('\/'); ksort($tags); ?>\n<? foreach($tags as $tag => $count) : ?>\n<li><a href=\"\/tag\/<?=$tag?>\"><?=$tag?><\/a> &times; <?=$count?><\/li>\n<? endforeach; ?>\n<\/ul>\n\n<p><? endif; ?><\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/tags\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":false,"url":"\/"},"media":"media\/\/tags\/","thumb":"media\/\/tags\/thumb.png","url":"\/tags","edit_url":"\/edit\/\/tags"},{"config":{"template":"test","date":null},"title":"test","filename":"test","path":"\/Users\/gdunne\/_code\/plog\/content\/test","fileInfo":{},"timestamp":1347069441,"tags":null,"content":"<p>Plog Unit Tests.<\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/test\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":false,"url":"\/"},"media":"media\/\/test\/","thumb":"media\/\/test\/thumb.png","url":"\/test","edit_url":"\/edit\/\/test"}]}
\ No newline at end of file
diff --git a/lib/data.php b/lib/data.php
index aa53b3a..b2eb09f 100644
--- a/lib/data.php
+++ b/lib/data.php
@@ -57,13 +57,28 @@ function get_entries( $path = "", $args = array() )
 
         switch ($order_by)
         {
-            default :
+            case 'alpha' :
+
+                foreach ($entries as $key => $row)
+                    $alpha[$key] = $row->title;
+
+                if (isset($alpha))
+                    array_multisort($alpha, $order, $entries);
+
+                break;
+
+
+            case 'date' :
+            default : 
+
                 foreach ($entries as $key => $row)
                     $time[$key] = $row->timestamp;
+
                 if (isset($time))
                     array_multisort($time, $order, $entries);
         }
 
+
         if ($create_datafile) {
             if (!is_dir($data_path)) {
                 if (!mkdir($data_path, 0777, true)) {
@@ -84,6 +99,42 @@ function get_entries( $path = "", $args = array() )
 }
 
 
+function get_entries_and_dirs( $path = "", $args = array() )
+{
+    $recursive = isset($args['recursive']) ? $args['recursive'] : 1;
+    $order_by = empty($args['order_by']) ? null : $args['order_by'];
+    $order = empty($args['order']) ? SORT_DESC : $args['order'];
+
+    $entries = get_entries($path, $args);
+    $dirs = get_dirs($path, $args);
+
+    $res = array_merge($entries, $dirs);
+
+    switch ($order_by)
+    {
+        case 'alpha' :
+
+            foreach ($res as $key => $row)
+                $alpha[$key] = $row->title;
+
+            if (isset($alpha))
+                array_multisort($alpha, $order, $res);
+
+            break;
+
+
+        case 'date' :
+        default : 
+
+            foreach ($res as $key => $row)
+                $time[$key] = $row->timestamp;
+
+            if (isset($time))
+                array_multisort($time, $order, $res);
+    }    
+
+    return $res;
+}
 
 
 
@@ -132,6 +183,8 @@ function get_dirs( $path = "", $args = array())
 }
 
 
+
+
 /**
  * get all pages
  */
diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl
index 27a45b5..593dbed 100644
--- a/templates/nav.html.tpl
+++ b/templates/nav.html.tpl
@@ -4,28 +4,13 @@
 
     <li class="spacer">&nbsp;</li>    
 
-    <? $e = get_entries('', $args = array('recursive' => false) ); ?>
-    <? foreach($e as $dir) : 
-    // echo '<pre>';
-    // print_r($e);
-    ?>
-    <li><a href="<?=$dir->url?>"><?=$dir->title?></a></li>
-    <? endforeach; ?>    
-
-
-
-
-    <? $dirs = get_dirs('', $args = array('recursive' => false) ); ?>
-    <? foreach($dirs as $dir) : ?>
-    <li><a href="<?=$dir->url?>"><?=$dir->name?></a></li>
-    <? endforeach; ?>
-
-    <li class="spacer">&nbsp;</li>
-
-    <? $pages = get_pages('', $args = array('recursive' => false) ); ?>
-    <? foreach($pages as $page) : ?>
-    <? if (isset($page->config->hidden) && $page->config->hidden) continue; ?>
-    <li><a href="<?=$page->url?>"><?=$page->title?></a></li>
+    <? $en = get_entries_and_dirs('', $args = array(
+        'recursive' => false, 
+        'order_by' => 'alpha',
+        'order' => SORT_ASC
+        ) ); ?>
+    <? foreach($en as $e) : ?>
+    <li><a href="<?=$e->url?>"><?=$e->title?></a></li>
     <? endforeach; ?>
 
 </ul>