Moving static pages to content dir.

diff --git a/content/about b/content/about
new file mode 100755 (executable)
index 0000000..cbb1535
--- /dev/null
+++ b/content/about
@@ -0,0 +1,8 @@
+template = page\r
+--\r
+\r
+Lives and works in San Francisco Bay Area.\r
+\r
+Born in San Francisco.\r
+\r
+\r

diff --git a/pages/contact b/content/contact
similarity index 89%
rename from pages/contact
rename to content/contact
index 8ce9bca85d2c0395af6dee0dc857bd13fd3f5aac..56d7e19d599b225e595b6bf60c6edea502787c40 100755 (executable)
--- a/pages/contact
+++ b/content/contact
@@ -1,3 +1,4 @@
+template = page\r
 --\r
 \r
 Gabriel Dunne  \r
@@ -26,5 +27,3 @@ studio at gabrieldunne dot com
 <p>\r
 <lable>message</label><br />\r
 <textarea style="width:250px;height:100px;"></textarea>\r
-\r
-\r

diff --git a/pages/cv b/content/cv
similarity index 96%
rename from pages/cv
rename to content/cv
index be097da40f71165fe960e787326e8a92a2f06379..516f56a9e68b9a17357208598b12b5dc895c1ec9 100755 (executable)
--- a/pages/cv
+++ b/content/cv
@@ -1,191 +1,192 @@
-title = cv
---
-
-**edu**    
-2003 B.A. Design | Media Arts, UCLA    
-2001 Pont Aven School of Art, France   
-1999 College of Marin, Architecture
-<br />
-<br />
-
-
-**select exhibition + performance**  
-2012 CCRMA Show. Live Visuals.   
-2012 Creators Project SF, San Francisco. "Audio Shader Toy", Installation (collab).  
-2012 India Art Fair, Delhi, India. Collaboration with Vishal K Dar.
-2011 Sepalcure, Shigeto, Simple & Santa, GAFFTA, San Francisco. Live visuals. <a href="http://www.gaffta.org/2011/03/01/sepalcure-shigeto-simple-santa/">&rarr;</a>    
-2010 Milieux Sonores: Sound and Imaginary Space, GAFFTA, San Francisco. Live A/V performance.  
-2010 Biennial of the Americas, Denver.  Live A/V performance.   
-2010 Prototype, GAFFTA, San Francisco. Installation.  
-2010 Powers of Ten, GAFFTA. Installation.    
-2008 Design and the Elastic Mind, MoMA NYC Permanent Collection. Collab w/Stamen Design.    
-2006 Interferenze: Naturalis Electronica, Valle Caudina, Italy.    
-2006 Japan Media Arts Festival, Tokyo, Japan  
-2006 Festival Sonar, Barcelona, Spain  
-2006 SIGGRAPH, Boston   
-2005 New Wight Gallery MFA Show, UCLA, Los Angeles, CA (collab.)   
-2005 SIGGRAPH, Los Angeles  
-2005 :Output International Design Competition, Amsterdam, Netherlands  
-2005 CiberArt: International Festival of New Technologies, Bilbao, Spain  
-2004 Traffic, New Wight Gallery, UCLA, Los Angeles, CA. Collab w/Scott Hessels.        
-2003 Sur(Face), Design Media Arts EDA, Los Angeles, CA  
-2003 Eyberrations Digital Film Festival, Irvine, CA  
-2002 Melbourne International Film Festival", Melbourne, Australia  
-2002 Experimental Works On Paper, Paris, France  
-2002 Experimental Works On Paper, Rennes, France  
-2002 Jaquez Gallery Collection, Pont Aven, France. Permanent Collection.
-<br />
-<br />
-
-
-
-**residencies / collaborations**    
-2011&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Studio Collaboration w/ Studio Vishal K. Dar    
-2009&mdash;2010 Residency, Gray Area Foundation for the Arts
-<br />
-<br />
-
-
-
-
-
-**public collections**  
-New York Museum of Modern Art, NY  
-Jaquez Gallery Collection, Pont Aven, France
-<br />
-<br />
-
-
-
-
-**talks**  
-2010 "Prototype" Resident Artist Symposium, Gray Area, San Francisco  
-2004 Text + Architecture & Writing in Architecture, SCIARC, Los Angeles  
-2003 narr@tive: Digital Storytelling, Hammer Museum, Los Angeles
-<br />
-<br />
-
-
-**teaching/advisory**  
-2012 Film/Code Remix (Youth Program, BAVC, San Francisco), co-teach with Jonathan McIntosh.  1 yr.  
-2011 Creative Code (Youth Program, BAVC, San Francisco), 1 yr.    
-2011 Processing 101 Workshop(Certificate Program, Gray Area, San Francisco), 2 wk  
-2010 Open Source (Youth Program, BAVC, San Francisco), 1 yr.    
-2010 Creative Coding: An Introduction to Processing  (Gray Area, San Francisco), 2 wk  
-2009 Creative Coding (Gray Area, San Francisco), 2 wek    
-2009 Introduction to Processing (Gray Area, San Francisco), weekend    
-2007 Processing (Makers Faire, San Mateo), 2 hr    
-2005 Programming and Design (UCLA student workshops, Los Angeles), 1 semester  
-2004 Maya Workshop Series (UCLA, Los Angeles), 1 semester  
-2003 Typography Workshop Series (UCLA, Los Angeles), 1 day    
-2003 Adobe Software Workshops, Photoshop/Illustrator/After Effects (UCLA, Los Angeles), Lead Instructor, 1 day each  
-2002 Macromedia Design Student Workshops (UCLA, Los Angeles), 1 day
-<br />
-<br />
-
-
-**websites**    
-2011 Duran Duran "All You Need Is Now" http://now.gaffta.org  
-2010 Seaquence http://seaquence.org  
-2007 Motion Theory [link]
-<br />
-<br />
-
-**commercials**    
-Budwieser "Superbowl", Motion Theory  
-Budwieser "The Game", Motion Theory  
-Nike "One", Motion Theory
-<br />
-<br />
-
-
-**shorts**    
-RestFest 2003 Opener, Motion Theory  
-The Mirror
-<br />
-<br />
-
-
-
-**music videos**    
-Beck "Girl", Motion Theory  
-Papa Roach "Getting Away With Murder", Motion Theory
-<br />
-<br />
-
-
-
-**print / tv / radio**  
-Art College Radio, San Francisco  
-MIT Aerospace Annual  
-A'minima #17  
-FOCUS Italia, May Issue  
-Discover Magazine  
-Wired  
-Adult Swim, Cartoon Network  
-Contemporary Art of Science and Technology  
-AD: Architectural Digest  
-HDRI
-<br />
-<br />
-
-
-**awards**  
-Creative Review Best in Show 2005, Beck "Girl"  
-Type Directors Award, Nike "Golf"  
-AIGA, Hewlett Packard "It Consolidates"  
-AICP, Hewlett Packard "Hands"  
-Screen Network Australia Best in Show  
-Shorttakes Film Festival, Best Visual Effects
-<br />
-<br />
-
-
-**academic honors**  
-2002, 2003 UCLA Deans List  
-2001 UCLA Merit Scholarship
-<br />
-<br />
-
-**credentials**  
-Adobe A.C.E. Certified in Photoshop, Illustrator
-<br />
-<br />
-
-
-
-
-
-
-
-
-**professional activity**    
-2012&mdash;cur&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Obscura Digital, Consultant      
-2010&mdash;cur&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Bay Area Video Coalition, Youth Instructor   
-2005&mdash;cur&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Tessellated Group, Designer  
-1999&mdash;cur&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Studio Gabriel Dunne, Owner    
-2009&mdash;2010 Gray Area Foundation for the Arts, Studio Director/Resident Artist     
-2007&mdash;2008 Stamen Design, Data Visualization Software Developer   
-2007&mdash;2008 Google, Inc, Data Visualization Software Developer   
-2004&mdash;2006 Motion Theory: Animator, Designer, Software, 
-<br />
-<br />
-
-**commercial & non/profit clients**  
-Ogilvy & Mather  
-Goodby, Silverstein & Partners  
-Mekanism  
-Hewlett Packard  
-Nike     
-Budweiser  
-Cadillac  
-Ogilvy & Mather  
-The Soup  
-Tessellated Group  
-Google  
-YouTube  
-Gray Area Foundation for the Arts  
-Bay Area Video Coalition  
-Duran Duran
-<br />
-<br />
+title =  c/v\r
+template = page\r
+--\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
+**select exhibition + performance**  \r
+2012 CCRMA Show. Live Visuals.   \r
+2012 Creators Project SF, San Francisco. "Audio Shader Toy", Installation (collab).  \r
+2012 India Art Fair, Delhi, India. Collaboration with Vishal K Dar.\r
+2011 Sepalcure, Shigeto, Simple & Santa, GAFFTA, San Francisco. Live visuals. <a href="http://www.gaffta.org/2011/03/01/sepalcure-shigeto-simple-santa/">&rarr;</a>    \r
+2010 Milieux Sonores: Sound and Imaginary Space, GAFFTA, San Francisco. Live A/V performance.  \r
+2010 Biennial of the Americas, Denver.  Live A/V performance.   \r
+2010 Prototype, GAFFTA, San Francisco. Installation.  \r
+2010 Powers of Ten, GAFFTA. Installation.    \r
+2008 Design and the Elastic Mind, MoMA NYC Permanent Collection. Collab w/Stamen Design.    \r
+2006 Interferenze: Naturalis Electronica, Valle Caudina, Italy.    \r
+2006 Japan Media Arts Festival, Tokyo, Japan  \r
+2006 Festival Sonar, Barcelona, Spain  \r
+2006 SIGGRAPH, Boston   \r
+2005 New Wight Gallery MFA Show, UCLA, Los Angeles, CA (collab.)   \r
+2005 SIGGRAPH, Los Angeles  \r
+2005 :Output International Design Competition, Amsterdam, Netherlands  \r
+2005 CiberArt: International Festival of New Technologies, Bilbao, Spain  \r
+2004 Traffic, New Wight Gallery, UCLA, Los Angeles, CA. Collab w/Scott Hessels.        \r
+2003 Sur(Face), Design Media Arts EDA, Los Angeles, CA  \r
+2003 Eyberrations Digital Film Festival, Irvine, CA  \r
+2002 Melbourne International Film Festival", Melbourne, Australia  \r
+2002 Experimental Works On Paper, Paris, France  \r
+2002 Experimental Works On Paper, Rennes, France  \r
+2002 Jaquez Gallery Collection, Pont Aven, France. Permanent Collection.\r
+<br />\r
+<br />\r
+\r
+\r
+\r
+**residencies / collaborations**    \r
+2011&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Studio Collaboration w/ Studio Vishal K. Dar    \r
+2009&mdash;2010 Residency, Gray Area Foundation for the Arts\r
+<br />\r
+<br />\r
+\r
+\r
+\r
+\r
+\r
+**public collections**  \r
+New York Museum of Modern Art, NY  \r
+Jaquez Gallery Collection, Pont Aven, France\r
+<br />\r
+<br />\r
+\r
+\r
+\r
+\r
+**talks**  \r
+2010 "Prototype" Resident Artist Symposium, Gray Area, San Francisco  \r
+2004 Text + Architecture & Writing in Architecture, SCIARC, Los Angeles  \r
+2003 narr@tive: Digital Storytelling, Hammer Museum, Los Angeles\r
+<br />\r
+<br />\r
+\r
+\r
+**teaching/advisory**  \r
+2012 Film/Code Remix (Youth Program, BAVC, San Francisco), co-teach with Jonathan McIntosh.  1 yr.  \r
+2011 Creative Code (Youth Program, BAVC, San Francisco), 1 yr.    \r
+2011 Processing 101 Workshop(Certificate Program, Gray Area, San Francisco), 2 wk  \r
+2010 Open Source (Youth Program, BAVC, San Francisco), 1 yr.    \r
+2010 Creative Coding: An Introduction to Processing  (Gray Area, San Francisco), 2 wk  \r
+2009 Creative Coding (Gray Area, San Francisco), 2 wek    \r
+2009 Introduction to Processing (Gray Area, San Francisco), weekend    \r
+2007 Processing (Makers Faire, San Mateo), 2 hr    \r
+2005 Programming and Design (UCLA student workshops, Los Angeles), 1 semester  \r
+2004 Maya Workshop Series (UCLA, Los Angeles), 1 semester  \r
+2003 Typography Workshop Series (UCLA, Los Angeles), 1 day    \r
+2003 Adobe Software Workshops, Photoshop/Illustrator/After Effects (UCLA, Los Angeles), Lead Instructor, 1 day each  \r
+2002 Macromedia Design Student Workshops (UCLA, Los Angeles), 1 day\r
+<br />\r
+<br />\r
+\r
+\r
+**websites**    \r
+2011 Duran Duran "All You Need Is Now" http://now.gaffta.org  \r
+2010 Seaquence http://seaquence.org  \r
+2007 Motion Theory [link]\r
+<br />\r
+<br />\r
+\r
+**commercials**    \r
+Budwieser "Superbowl", Motion Theory  \r
+Budwieser "The Game", Motion Theory  \r
+Nike "One", Motion Theory\r
+<br />\r
+<br />\r
+\r
+\r
+**shorts**    \r
+RestFest 2003 Opener, Motion Theory  \r
+The Mirror\r
+<br />\r
+<br />\r
+\r
+\r
+\r
+**music videos**    \r
+Beck "Girl", Motion Theory  \r
+Papa Roach "Getting Away With Murder", Motion Theory\r
+<br />\r
+<br />\r
+\r
+\r
+\r
+**print / tv / radio**  \r
+Art College Radio, San Francisco  \r
+MIT Aerospace Annual  \r
+A'minima #17  \r
+FOCUS Italia, May Issue  \r
+Discover Magazine  \r
+Wired  \r
+Adult Swim, Cartoon Network  \r
+Contemporary Art of Science and Technology  \r
+AD: Architectural Digest  \r
+HDRI\r
+<br />\r
+<br />\r
+\r
+\r
+**awards**  \r
+Creative Review Best in Show 2005, Beck "Girl"  \r
+Type Directors Award, Nike "Golf"  \r
+AIGA, Hewlett Packard "It Consolidates"  \r
+AICP, Hewlett Packard "Hands"  \r
+Screen Network Australia Best in Show  \r
+Shorttakes Film Festival, Best Visual Effects\r
+<br />\r
+<br />\r
+\r
+\r
+**academic honors**  \r
+2002, 2003 UCLA Deans List  \r
+2001 UCLA Merit Scholarship\r
+<br />\r
+<br />\r
+\r
+**credentials**  \r
+Adobe A.C.E. Certified in Photoshop, Illustrator\r
+<br />\r
+<br />\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+**professional activity**    \r
+2012&mdash;cur&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Obscura Digital, Consultant      \r
+2010&mdash;cur&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Bay Area Video Coalition, Youth Instructor   \r
+2005&mdash;cur&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Tessellated Group, Designer  \r
+1999&mdash;cur&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Studio Gabriel Dunne, Owner    \r
+2009&mdash;2010 Gray Area Foundation for the Arts, Studio Director/Resident Artist     \r
+2007&mdash;2008 Stamen Design, Data Visualization Software Developer   \r
+2007&mdash;2008 Google, Inc, Data Visualization Software Developer   \r
+2004&mdash;2006 Motion Theory: Animator, Designer, Software, \r
+<br />\r
+<br />\r
+\r
+**commercial & non/profit clients**  \r
+Ogilvy & Mather  \r
+Goodby, Silverstein & Partners  \r
+Mekanism  \r
+Hewlett Packard  \r
+Nike     \r
+Budweiser  \r
+Cadillac  \r
+Ogilvy & Mather  \r
+The Soup  \r
+Tessellated Group  \r
+Google  \r
+YouTube  \r
+Gray Area Foundation for the Arts  \r
+Bay Area Video Coalition  \r
+Duran Duran\r
+<br />\r
+<br />\r

diff --git a/pages/links b/content/links
similarity index 93%
rename from pages/links
rename to content/links
index 6914b61395fb6328929377379167126643bb6b9b..9c38dae1226a2391c9e3358c8522b2660c9040d1 100755 (executable)
--- a/pages/links
+++ b/content/links
@@ -1,29 +1,30 @@
-title = links
---
-
-+   [quilime.com](http://quilime.com) process blog  
-+   [ssherriff.com](http://ssherriff.com) stephanie sherriff
-+   [onecm.com](http://onecm.com) ryan alexander
-+   [ripevessel.com](http://ripevessel.com) adam roth
-+   [jtnimoy.net](http://jtnimoy.net) joshua nimoy
-+   [oddsympathy.com](http://oddsympathy.com) daniel massey
-+   [carbonworkshop.com](http://carbonworkshop.com) gustavo huber & shelly brown
-+   [keithpasko.com](http://keithpasko.com) keith pasko
-+   [dabkitsch.com/jml/](http://dabkitsch.com/jml/) jeff lubow
-+   [ghost-hack.com](http://ghost-hack.com) michael chang
-+   [flight404.com](http://flight404.com) robert hodgin
-+   [pohflepp.com](http://pohflepp.com) sascha pohflep
-+   [mylinhtrieu.com](http://mylinhtrieu.com) mylinh ttieu nguyen
-+   [fredericeyl.de](http://fredericeyl.de) frédéric eyl 
-+   [thegreeneyl.com](http://thegreeneyl.com) the green eyl 
-+   [universaloscillation.com](http://universaloscillation.com) aaron meyers
-+   [aaronkoblin.com](http://aaronkoblin.com) aaron koblin
-+   [tom-carden.co.uk](http://tom-carden.co.uk) tom carden
-+   [mike.teczno.co](http://mike.teczno.com) michal migurski
-+   [davidrager.org](http://davidrager.org) david rager
-+   [digitanalog.net](http://digitanalog.net) marc nimoy 
-+   [makaga.com](http://makaga.com) matthew gale 
-+   [reas.com](http://rea.com/) casey reas  
-+   [n-e-r-v-o-u-s.com](http://n-e-r-v-o-u-s.com/) nervous system 
-+   [gaffta.org](http://gaffta.org) gray area foundation for the arts (GAFFTA)
-+   [bavc.org](http://bavc.org) bay area video coalition (BAVC)
+title = links\r
+template = page\r
+--\r
+\r
++   [quilime.com](http://quilime.com) process blog  \r
++   [ssherriff.com](http://ssherriff.com) stephanie sherriff\r
++   [onecm.com](http://onecm.com) ryan alexander\r
++   [ripevessel.com](http://ripevessel.com) adam roth\r
++   [jtnimoy.net](http://jtnimoy.net) joshua nimoy\r
++   [oddsympathy.com](http://oddsympathy.com) daniel massey\r
++   [carbonworkshop.com](http://carbonworkshop.com) gustavo huber & shelly brown\r
++   [keithpasko.com](http://keithpasko.com) keith pasko\r
++   [dabkitsch.com/jml/](http://dabkitsch.com/jml/) jeff lubow\r
++   [ghost-hack.com](http://ghost-hack.com) michael chang\r
++   [flight404.com](http://flight404.com) robert hodgin\r
++   [pohflepp.com](http://pohflepp.com) sascha pohflep\r
++   [mylinhtrieu.com](http://mylinhtrieu.com) mylinh ttieu nguyen\r
++   [fredericeyl.de](http://fredericeyl.de) frédéric eyl \r
++   [thegreeneyl.com](http://thegreeneyl.com) the green eyl \r
++   [universaloscillation.com](http://universaloscillation.com) aaron meyers\r
++   [aaronkoblin.com](http://aaronkoblin.com) aaron koblin\r
++   [tom-carden.co.uk](http://tom-carden.co.uk) tom carden\r
++   [mike.teczno.co](http://mike.teczno.com) michal migurski\r
++   [davidrager.org](http://davidrager.org) david rager\r
++   [digitanalog.net](http://digitanalog.net) marc nimoy \r
++   [makaga.com](http://makaga.com) matthew gale \r
++   [reas.com](http://rea.com/) casey reas  \r
++   [n-e-r-v-o-u-s.com](http://n-e-r-v-o-u-s.com/) nervous system \r
++   [gaffta.org](http://gaffta.org) gray area foundation for the arts (GAFFTA)\r
++   [bavc.org](http://bavc.org) bay area video coalition (BAVC)\r

diff --git a/content/tag b/content/tag
deleted file mode 100644 (file)
index 11a8106..0000000
--- a/content/tag
+++ /dev/null
@@ -1,4 +0,0 @@
-title = tag
---
-
-yep.

diff --git a/pages/tag b/content/tags
similarity index 93%
rename from pages/tag
rename to content/tags
index ef0c764f5c35842f9a0c1183bcd43f8f0cd0a4c4..e4bb90b95713f399617023b878f2903d3ce62b85 100755 (executable)
--- a/pages/tag
+++ b/content/tags
@@ -1,30 +1,31 @@
-title = tag
---
-
-<? if (isset($tag)): ?>
-
-<? $entries = get_entries('/', $args = array('tag' => $tag)); ?>
-<? foreach($entries as $entry): ?>
-<?
-if (isset($entry->content_short))
-$entry->content = $entry->content_short .
-'<br /><a class="more" href="' . $entry->url . '">more &rarr;</a><br /><br />';
-?>
-
-<div class="entry">
-<? $this->include_template('entry.html.tpl', array('entry' => $entry)); ?>
-</div>
-
-<? endforeach; ?>
-
-<? else: ?>
-
-
-<ul class="tags">
-<? $tags = get_tags('/'); ksort($tags); ?>
-<? foreach($tags as $tag => $count) : ?>
-<li><a href="/tag/<?=$tag?>"><?=$tag?></a> &times; <?=$count?></li>
-<? endforeach; ?>
-</ul>
-
-<? endif; ?>
+title = tag\r
+template = page\r
+--\r
+\r
+<? if (isset($tag)): ?>\r
+\r
+<? $entries = get_entries('/', $args = array('tag' => $tag)); ?>\r
+<? foreach($entries as $entry): ?>\r
+<?\r
+if (isset($entry->content_short))\r
+$entry->content = $entry->content_short .\r
+'<br /><a class="more" href="' . $entry->url . '">more &rarr;</a><br /><br />';\r
+?>\r
+\r
+<div class="entry">\r
+<? $this->include_template('entry.html.tpl', array('entry' => $entry)); ?>\r
+</div>\r
+\r
+<? endforeach; ?>\r
+\r
+<? else: ?>\r
+\r
+\r
+<ul class="tags">\r
+<? $tags = get_tags('/'); ksort($tags); ?>\r
+<? foreach($tags as $tag => $count) : ?>\r
+<li><a href="/tag/<?=$tag?>"><?=$tag?></a> &times; <?=$count?></li>\r
+<? endforeach; ?>\r
+</ul>\r
+\r
+<? endif; ?>\r

diff --git a/pages/test b/content/test
similarity index 100%
rename from pages/test
rename to content/test

diff --git a/data/content/data.json b/data/content/data.json
index c4b484d6485a31118d046e2bdb52e905786c888b..c74948b77fb23bf1615d7780989e4a07aeafe507 100644 (file)
--- a/data/content/data.json
+++ b/data/content/data.json
@@ -1 +1 @@
-{"entries":[{"config":{"title":"tag","date":null},"title":"tag","filename":"tag","path":"\/Users\/gdunne\/_code\/plog\/content\/tag","fileInfo":{},"timestamp":1347134885,"tags":null,"content":"<p>yep.<\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/tag\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":false,"url":"\/"},"media":"media\/\/tag\/","thumb":"media\/\/tag\/thumb.png","url":"\/tag","edit_url":"\/edit\/\/tag"}]}
\ No newline at end of file
+{"entries":[{"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":"page","date":null},"title":"about","filename":"about","path":"\/Users\/gdunne\/_code\/plog\/content\/about","fileInfo":{},"timestamp":1347136403,"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":{"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/index.php b/index.php
index 32f5b87599af8689cb2569c234d3e8de614bec57..123173ec9b7764c89113f2e517d40c479000cb11 100644 (file)
--- a/index.php
+++ b/index.php
@@ -14,7 +14,6 @@ if ($m->is_multiple())
 if ($m->is_single() || $m->is_page() || $m->is_multiple())
     $v->assign('entry', $m->entry);
 
-
 header("Content-Type: {$m->response_mime_type}; charset=UTF-8");
 $v->render( $m->template, $m->response_format );
 

diff --git a/lib/config.ini b/lib/config.ini
index 1faac9f9015afe758bedafcbea96d0abc13aba9b..592474358a3bdba273956db1fff98f6ebfce0cb3 100644 (file)
--- a/lib/config.ini
+++ b/lib/config.ini
@@ -1,6 +1,6 @@
 [development]
 dev = true
-edit = true
+edit = false
 
 
 [settings]

diff --git a/lib/model.php b/lib/model.php
index 6baedc24bce8150141af627edb0c1a6ad38056bd..f0006fbdc222e17446d494067d51d9e2e33a58d2 100644 (file)
--- a/lib/model.php
+++ b/lib/model.php
@@ -69,7 +69,9 @@ class Model
                        */
 
                        $this->entry->is_single = true;
-                       $this->template = 'single.' . $this->response_format . '.tpl';
+               $this->template = isset($this->entry->config->template) ?
+                                                       $this->entry->config->template . '.' . $this->response_format . '.tpl' :
+                                                       'single.' . $this->response_format . '.tpl';
                }
 
                # if page (file in PAGES dir)
@@ -82,9 +84,7 @@ class Model
 
                # not found
                else {
-
                $this->template = '404.html.tpl';
-
                }
        }
 

diff --git a/pages/about b/pages/about
deleted file mode 100755 (executable)
index 6a53e6c..0000000
--- a/pages/about
+++ /dev/null
@@ -1,6 +0,0 @@
-title = about\r
-ee = \r
---\r
-\r
-This website is a portfolio and archive of my work.\r
-\r

diff --git a/templates/edit.html.tpl b/templates/edit.html.tpl
index 86492384a87673bbb1bb2634830bb6196b611b68..4af0d03dba31c68fd61e8b7c4c8018273f90f724 100644 (file)
--- a/templates/edit.html.tpl
+++ b/templates/edit.html.tpl
@@ -6,7 +6,7 @@
             <input type="button" onClick="window.location = '<?=$entry->url?>'"value="cancel">
             <input type="submit" value="save">
         </div>
-        <textarea name="edited_file_contents"><?=$f;?></textarea>
+        <textarea name="edited_file_contents"><?=htmlentities($f);?></textarea>
     </form>
 </div>
 <? endif; ?>