<?=$entry->title;?>

From a514b8e77071560425ebcea86e6da67a934dc6cf Mon Sep 17 00:00:00 2001 From: Gabriel Dunne Date: Sat, 8 Sep 2012 18:39:42 -0700 Subject: [PATCH] Editing working, Tags working, Templates working. --- content/links | 2 +- content/log/temple | 14 +++++----- content/log/water_is_life | 16 ++++++------ content/tag | 18 +++++-------- content/test | 1 - data/content/data.json | 2 +- data/content/log/data.json | 2 +- data/content/tags.json | 2 +- index.php | 3 --- js/js.js | 44 -------------------------------- lib/config.ini | 4 +-- lib/data.php | 4 +-- lib/model.php | 5 +--- templates/edit.html.tpl | 17 ++++++++++--- templates/footer.html.tpl | 6 ++--- templates/head-inc.html.tpl | 35 ++----------------------- templates/nav.html.tpl | 11 ++++++-- templates/nextprev.html.tpl | 51 ++++++++++--------------------------- templates/projects.html.tpl | 5 +--- templates/single.html.tpl | 2 +- test.php | 1 + 21 files changed, 75 insertions(+), 170 deletions(-) diff --git a/content/links b/content/links index 9c38dae..06dc8fb 100755 --- a/content/links +++ b/content/links @@ -15,7 +15,7 @@ template = page + [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 ++ [fredericeyl.de](http://fredericeyl.de) frederic eyl + [thegreeneyl.com](http://thegreeneyl.com) the green eyl + [universaloscillation.com](http://universaloscillation.com) aaron meyers + [aaronkoblin.com](http://aaronkoblin.com) aaron koblin diff --git a/content/log/temple b/content/log/temple index e56d25a..1ad83bf 100755 --- a/content/log/temple +++ b/content/log/temple @@ -1,7 +1,7 @@ -date = feb 20 2012 -title = temple -tags = photo --- - -

- +date = feb 20 2012 +title = temple +tags = photo india +-- + +

+ diff --git a/content/log/water_is_life b/content/log/water_is_life index b04bcc7..656d70f 100755 --- a/content/log/water_is_life +++ b/content/log/water_is_life @@ -1,8 +1,8 @@ -title = Water Is Life -date = Oct 23 2011 06:04:38 PM -tags = water photo --- - -

- -near Quotar Minar in Dadabari. +title = Water Is Life +date = Oct 23 2011 06:04:38 PM +tags = india photo +-- + +

+ +near Quotar Minar in Dadabari. diff --git a/content/tag b/content/tag index 946308d..0c8fe71 100755 --- a/content/tag +++ b/content/tag @@ -5,21 +5,17 @@ template = page $tag)); ?> -content_short)) -$entry->content = $entry->content_short . -'
more →

'; -?> - -

-include_template('entry.html.tpl', array('entry' => $entry)); ?> -

- + content_short)) + $entry->content = $entry->content_short . + '
more →

'; + ?> +

+ include_template('entry.html.tpl', array('entry' => $entry)); ?> +

Lives and works in San Francisco Bay Area.<\/p>\n\n

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":"

edu<\/strong>
\n2003 B.A. Design | Media Arts, UCLA
\n2001 Pont Aven School of Art, France
\n1999 College of Marin, Architecture\n
\n
<\/p>\n\n

select exhibition + performance<\/strong>
\n2012 CCRMA Show. Live Visuals.
\n2012 Creators Project SF, San Francisco. \"Audio Shader Toy\", Installation (collab).
\n2012 India Art Fair, Delhi, India. Collaboration with Vishal K Dar.\n2011 Sepalcure, Shigeto, Simple & Santa, GAFFTA, San Francisco. Live visuals. →<\/a>
\n2010 Milieux Sonores: Sound and Imaginary Space, GAFFTA, San Francisco. Live A\/V performance.
\n2010 Biennial of the Americas, Denver. Live A\/V performance.
\n2010 Prototype, GAFFTA, San Francisco. Installation.
\n2010 Powers of Ten, GAFFTA. Installation.
\n2008 Design and the Elastic Mind, MoMA NYC Permanent Collection. Collab w\/Stamen Design.
\n2006 Interferenze: Naturalis Electronica, Valle Caudina, Italy.
\n2006 Japan Media Arts Festival, Tokyo, Japan
\n2006 Festival Sonar, Barcelona, Spain
\n2006 SIGGRAPH, Boston
\n2005 New Wight Gallery MFA Show, UCLA, Los Angeles, CA (collab.)
\n2005 SIGGRAPH, Los Angeles
\n2005 :Output International Design Competition, Amsterdam, Netherlands
\n2005 CiberArt: International Festival of New Technologies, Bilbao, Spain
\n2004 Traffic, New Wight Gallery, UCLA, Los Angeles, CA. Collab w\/Scott Hessels.
\n2003 Sur(Face), Design Media Arts EDA, Los Angeles, CA
\n2003 Eyberrations Digital Film Festival, Irvine, CA
\n2002 Melbourne International Film Festival\", Melbourne, Australia
\n2002 Experimental Works On Paper, Paris, France
\n2002 Experimental Works On Paper, Rennes, France
\n2002 Jaquez Gallery Collection, Pont Aven, France. Permanent Collection.\n
\n
<\/p>\n\n

residencies \/ collaborations<\/strong>
\n2011 Studio Collaboration w\/ Studio Vishal K. Dar
\n2009—2010 Residency, Gray Area Foundation for the Arts\n
\n
<\/p>\n\n

public collections<\/strong>
\nNew York Museum of Modern Art, NY
\nJaquez Gallery Collection, Pont Aven, France\n
\n
<\/p>\n\n

talks<\/strong>
\n2010 \"Prototype\" Resident Artist Symposium, Gray Area, San Francisco
\n2004 Text + Architecture & Writing in Architecture, SCIARC, Los Angeles
\n2003 narr@tive: Digital Storytelling, Hammer Museum, Los Angeles\n
\n
<\/p>\n\n

teaching\/advisory<\/strong>
\n2012 Film\/Code Remix (Youth Program, BAVC, San Francisco), co-teach with Jonathan McIntosh. 1 yr.
\n2011 Creative Code (Youth Program, BAVC, San Francisco), 1 yr.
\n2011 Processing 101 Workshop(Certificate Program, Gray Area, San Francisco), 2 wk
\n2010 Open Source (Youth Program, BAVC, San Francisco), 1 yr.
\n2010 Creative Coding: An Introduction to Processing (Gray Area, San Francisco), 2 wk
\n2009 Creative Coding (Gray Area, San Francisco), 2 wek
\n2009 Introduction to Processing (Gray Area, San Francisco), weekend
\n2007 Processing (Makers Faire, San Mateo), 2 hr
\n2005 Programming and Design (UCLA student workshops, Los Angeles), 1 semester
\n2004 Maya Workshop Series (UCLA, Los Angeles), 1 semester
\n2003 Typography Workshop Series (UCLA, Los Angeles), 1 day
\n2003 Adobe Software Workshops, Photoshop\/Illustrator\/After Effects (UCLA, Los Angeles), Lead Instructor, 1 day each
\n2002 Macromedia Design Student Workshops (UCLA, Los Angeles), 1 day\n
\n
<\/p>\n\n

websites<\/strong>
\n2011 Duran Duran \"All You Need Is Now\" http:\/\/now.gaffta.org
\n2010 Seaquence http:\/\/seaquence.org
\n2007 Motion Theory [link]\n
\n
<\/p>\n\n

commercials<\/strong>
\nBudwieser \"Superbowl\", Motion Theory
\nBudwieser \"The Game\", Motion Theory
\nNike \"One\", Motion Theory\n
\n
<\/p>\n\n

shorts<\/strong>
\nRestFest 2003 Opener, Motion Theory
\nThe Mirror\n
\n
<\/p>\n\n

music videos<\/strong>
\nBeck \"Girl\", Motion Theory
\nPapa Roach \"Getting Away With Murder\", Motion Theory\n
\n
<\/p>\n\n

print \/ tv \/ radio<\/strong>
\nArt College Radio, San Francisco
\nMIT Aerospace Annual
\nA'minima #17
\nFOCUS Italia, May Issue
\nDiscover Magazine
\nWired
\nAdult Swim, Cartoon Network
\nContemporary Art of Science and Technology
\nAD: Architectural Digest
\nHDRI\n
\n
<\/p>\n\n

awards<\/strong>
\nCreative Review Best in Show 2005, Beck \"Girl\"
\nType Directors Award, Nike \"Golf\"
\nAIGA, Hewlett Packard \"It Consolidates\"
\nAICP, Hewlett Packard \"Hands\"
\nScreen Network Australia Best in Show
\nShorttakes Film Festival, Best Visual Effects\n
\n
<\/p>\n\n

academic honors<\/strong>
\n2002, 2003 UCLA Deans List
\n2001 UCLA Merit Scholarship\n
\n
<\/p>\n\n

credentials<\/strong>
\nAdobe A.C.E. Certified in Photoshop, Illustrator\n
\n
<\/p>\n\n

professional activity<\/strong>
\n2012—cur Obscura Digital, Consultant
\n2010—cur Bay Area Video Coalition, Youth Instructor
\n2005—cur Tessellated Group, Designer
\n1999—cur Studio Gabriel Dunne, Owner
\n2009—2010 Gray Area Foundation for the Arts, Studio Director\/Resident Artist
\n2007—2008 Stamen Design, Data Visualization Software Developer
\n2007—2008 Google, Inc, Data Visualization Software Developer
\n2004—2006 Motion Theory: Animator, Designer, Software, \n
\n
<\/p>\n\n

commercial & non\/profit clients<\/strong>
\nOgilvy & Mather
\nGoodby, Silverstein & Partners
\nMekanism
\nHewlett Packard
\nNike
\nBudweiser
\nCadillac
\nOgilvy & Mather
\nThe Soup
\nTessellated Group
\nGoogle
\nYouTube
\nGray Area Foundation for the Arts
\nBay Area Video Coalition
\nDuran Duran\n
\n
<\/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":"

Gabriel Dunne
\n1242 Market St\nFloor 2
\nSan Francisco, CA USA 94102 <\/p>\n\n

studio at gabrieldunne dot com <\/p>\n\n

+ 1 415 493 8496 <\/p>\n\n

<\/p>\n\n

-

- false, 'order_by' => 'alpha', @@ -13,4 +11,13 @@
title?>
+ +

diff --git a/templates/nextprev.html.tpl b/templates/nextprev.html.tpl index f7fccfc..dc91cc5 100644 --- a/templates/nextprev.html.tpl +++ b/templates/nextprev.html.tpl @@ -1,43 +1,18 @@ - - - - - - - - - ↑ - - - -

- - - - - → - +cat->url) && $entry->cat->url != '/' ) : ?> + ↑ +

- - ← - - - +is_single)) : ?> + next_entry)) : ?> + → + + +

+ prev_entry)) : ?> + ← + + - - - - diff --git a/templates/projects.html.tpl b/templates/projects.html.tpl index ff149e3..f22a400 100644 --- a/templates/projects.html.tpl +++ b/templates/projects.html.tpl @@ -11,8 +11,6 @@ include_template('nav.html.tpl') ?>
- -

@@ -22,8 +20,7 @@ title?>
-
- +
include_template('footer.html.tpl') ?> diff --git a/templates/single.html.tpl b/templates/single.html.tpl index 67308e8..b322ae1 100644 --- a/templates/single.html.tpl +++ b/templates/single.html.tpl @@ -3,7 +3,7 @@ include_template('head-inc.html.tpl') ?> - <?=$entry->title;?> + <?=SITE_TITLE?><?=$this->page_title(TITLE_DELIMITER);?> diff --git a/test.php b/test.php index 9bab046..c66d0f7 100644 --- a/test.php +++ b/test.php @@ -15,3 +15,4 @@ class AllTests extends TestSuite { } exit; + -- 2.34.1