]> git.quilime.com - plog.git/commitdiff
Cleanin up some stuff.
authorGabriel Dunne <gdunne@quilime.com>
Sun, 16 Jun 2013 00:16:03 +0000 (17:16 -0700)
committerGabriel Dunne <gdunne@quilime.com>
Sun, 16 Jun 2013 00:16:03 +0000 (17:16 -0700)
15 files changed:
css/style.css
data/content/data.json [deleted file]
data/content/tags.json [deleted file]
js/js.js
lib/config.ini
lib/data.php
pages/about [deleted file]
pages/cv [deleted file]
pages/projects
templates/all.html.tpl
templates/entry.html.tpl
templates/footer.html.tpl
templates/index.html.tpl
templates/nav.html.tpl
templates/tags.html.tpl

index b0a9a33e4070098f7ba7705b2837900ddae8ec73..daeed78a5c37085f65de3b0e30e9146715f2b5e2 100644 (file)
@@ -1,17 +1,19 @@
 html, body, table, textarea, input[type="text"] {
-  background:#fff;
+  background:#eee;
   color: #555;
-  font: 11px normal menlo, monaco, "Lucida Console", monospace;;
+  font: 11px normal menlo, monaco, "Lucida Console", monospace;
   letter-spacing:0.05em;
   /*font-family: sans-serif, monaco, monospace;*/
   /*font: 11px/1.5em "Lucida Grande";*/
   line-height: 1.5em;
 }
 body {
-  margin: 2em; }
+  margin: 2em; 
+
+  }
 a {
   border: 0pt none;
-  color:#000;
+  color:#999;
 
   /*font-weight:bold;*/ }
   a img {
@@ -19,6 +21,7 @@ a {
   a.mute {
   text-decoration: none ! important; }
   a:hover, a.mute:hover {
+          color:#d05;
     text-decoration: none; }
 
 
@@ -184,15 +187,45 @@ table, td, tr {
 }
 
 
+
+.entry p {
+     max-width:720px; }
+    .entry.news {
+        margin:0;
+    }
+    .entry.news div.entry {
+      margin:0;
+      padding:0;
+      margin-bottom:8em;
+    }
+    .entry.news .entry .title {
+      display:none;
+    }
+    .entry.news .date {
+      padding-top:0;
+    }
+.entry.news .entry p {
+  margin:0;
+  padding:0;
+}
+
+    .entry.news .metadata {
+    margin:0;
+    }
+    .entry.news .metadata .tags {
+    display:none;
+    }
+
+
+
 .entries li {
   font-weight:normal;
   line-height:1.2em;
 }
-
 .entries.projects li {
   /*display:inline-block;*/
   float:left;
-
+  height:330px;
   width:200px;
   margin:0 2em 2em 0;
 }
@@ -206,6 +239,10 @@ table, td, tr {
   padding-bottom:3em;
   height:350px;
 }
+.entries.projects ul.tags li {
+  height:1.5em;
+  margin:0;
+  }
 .entry {
 }
 .entry .metadata {
@@ -227,12 +264,9 @@ table, td, tr {
 .entry .metadata a {
 }
 .entry .title a {
-
     margin-bottom:1em;
     /*color:#999;*/
 }
-.entry .metadata a:hover {
-   }
 
 .entry .metadata .date {
   color:#666;
@@ -250,6 +284,7 @@ table, td, tr {
 .related.entries li {
 }
 .related a {
+  color:#444;
   text-decoration: none;
   }
 
@@ -282,34 +317,35 @@ table, td, tr {
 
 
 
-.entry p {
-     max-width:720px; }
-    .entry.news {
-        margin:0;
-    }
-    .entry.news div.entry {
-      margin:0;
-      padding:0;
-      margin-bottom:8em;
-    }
-    .entry.news .entry .title {
-      display:none;
-    }
-    .entry.news .date {
-      padding-top:0;
-    }
-.entry.news .entry p {
-margin:0;
-padding:0;
 
+.entries {
+}
+.entries li {
+    margin-bottom:4em;
+    text-align:center;
+}
+.entry h2.title {
+  font-size:12px;
+  font-weight:bold;
+  }
+  ul.entries li {
+    width:200px;
+    height:200px;
+  }
+ul.entries li a {
+  font-weight:bold;
+  text-decoration: none;
+}
+a strong  {
+  color:#000;
+}
+a:hover strong  {
+  color:#f04;
+}
+ul.entries li a:hover {
+  /*text-decoration: underline;*/
 }
 
-    .entry.news .metadata {
-    margin:0;
-    }
-    .entry.news .metadata .tags {
-    display:none;
-    }
 
 
 
@@ -345,28 +381,6 @@ ul.image {
 
 
 
-.entries {
-}
-.entries li {
-    margin-bottom:4em;
-}
-.entry h2.title {
-  font-size:12px;
-  font-weight:bold;
-  }
-  ul.entries li {
-    width:200px;
-    height:200px;
-  }
-ul.entries li a {
-  font-weight:bold;
-  text-decoration: none;
-}
-ul.entries li a:hover {
-  text-decoration: underline;
-}
-
-
 
 .tags {
   display:inline-block;
@@ -378,9 +392,11 @@ ul.entries li a:hover {
   padding:0;
 
 }
+.tag {
+  font-style: italic;
+}
 .tag a {
   text-decoration:none;
-  font-style: italic;
   font-weight:normal !important;  
   line-height: 16px;
   color:#777;
@@ -412,16 +428,27 @@ ul.entries li a:hover {
   display:none;
   cursor: pointer;
 }
+#slidenav {
+margin:.75em 0 0 0;
+}
 #slidenav li {
   width:1em;
-  height:1.5em;
-  line-height:1.5em;
+  height:1em;
+  line-height:1em;
   display:inline-block;
+  margin-right:4px;
+  margin-bottom:4px;
 }
 #slidenav li a {
+  width:100%;
+  height:100%;
+  display:inline-block;
+  background:#ccc;
   text-decoration: none;
+  color:#ccc;
 }
 #slidenav li a.active {
-  color:#f00;
+  color:#444;
+  background:#444;
   text-decoration: none;
 }
diff --git a/data/content/data.json b/data/content/data.json
deleted file mode 100644 (file)
index 5b58bba..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{"entries":[{"config":{"title":"Audio-ShaderToy","date":"2012-04-03","tags":"code audiovisual","gallery":"slides","featured":"1"},"path":"\/Users\/gdunne\/_portfolio\/www\/content\/audioshadertoy\/_config","basename":"audioshadertoy","dirname":"\/Users\/gdunne\/_portfolio\/www\/content","filename":"_config","title":"Audio-ShaderToy","fileInfo":{},"timestamp":"1333436400","tags":["code","audiovisual"],"featured":"1","related":null,"content":"<!--gallery-->\n\n<iframe src=\"http:\/\/player.vimeo.com\/video\/39874057?title=0&amp;byline=0&amp;portrait=0\" width=\"800\" height=\"400\" frameborder=\"0\" webkitAllowFullScreen mozallowfullscreen allowFullScreen><\/iframe>\n\n<p>WebGL + Web Audio live-coding shader toy<br \/>\nGabriel Dunne, Ryan Alexander, Reza Ali<\/p>\n\n<p>Javascript, WebGL\/GLSL<br \/>\n<a href=\"https:\/\/github.com\/quilime\/audio-shadertoy\/\">github<\/a><\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_portfolio\/wwwcomments\/Users\/gdunne\/_portfolio\/www\/content\/audioshadertoy\/_config\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":"audioshadertoy","url":"\/audioshadertoy\/"},"thumb":"\/content\/audioshadertoy\/thumb.png","url":"\/audioshadertoy","edit_url":"\/edit\/audioshadertoy","media_dir":"\/Users\/gdunne\/_portfolio\/www\/content\/audioshadertoy\/media","media":null},{"config":{"featured":"1","title":"NAAG","date":"2012-01-01","tags":"projection sculpture installation"},"path":"\/Users\/gdunne\/_portfolio\/www\/content\/naag\/_config","basename":"naag","dirname":"\/Users\/gdunne\/_portfolio\/www\/content","filename":"_config","title":"NAAG","fileInfo":{},"timestamp":"1325404800","tags":["projection","sculpture","installation"],"featured":"1","related":null,"content":"<p><!--gallery--><\/p>\n\n<p><iframe src=\"http:\/\/player.vimeo.com\/video\/38492062?title=0&amp;byline=0&amp;portrait=0\" width=\"800\" height=\"400\" frameborder=\"0\" webkitAllowFullScreen mozallowfullscreen allowFullScreen><\/iframe><\/p>\n\n<p><iframe width=\"425\" height=\"250\" frameborder=\"0\" scrolling=\"no\" marginheight=\"0\" marginwidth=\"0\" src=\"https:\/\/maps.google.com\/maps?q=28.519986,+77.181352&amp;hl=en&amp;sll=37.269174,-119.306607&amp;sspn=12.161059,23.181152&amp;t=m&amp;ie=UTF8&amp;z=14&amp;ll=28.519986,77.181352&amp;output=embed\"><\/iframe><\/p>\n\n<p>2 channel projection mapped sculpture<br \/>\n12' x 3' x 3'  <\/p>\n\n<p>created in collaboration with Vishal K. Dar  <\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_portfolio\/wwwcomments\/Users\/gdunne\/_portfolio\/www\/content\/naag\/_config\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":"naag","url":"\/naag\/"},"thumb":"\/content\/naag\/thumb.png","url":"\/naag","edit_url":"\/edit\/naag","media_dir":"\/Users\/gdunne\/_portfolio\/www\/content\/naag\/media","media":[{"filename":"ambient.jpg","local":"\/Users\/gdunne\/_portfolio\/www\/content\/naag\/media\/ambient.jpg","url":"\/content\/naag\/media\/ambient.jpg","extension":"jpg"},{"filename":"naag.jpg","local":"\/Users\/gdunne\/_portfolio\/www\/content\/naag\/media\/naag.jpg","url":"\/content\/naag\/media\/naag.jpg","extension":"jpg"},{"filename":"projection.jpg","local":"\/Users\/gdunne\/_portfolio\/www\/content\/naag\/media\/projection.jpg","url":"\/content\/naag\/media\/projection.jpg","extension":"jpg"}]},{"config":{"title":"Monad","date":"2011-12-20","tags":"installation projection sculpture","featured":"1","include_related":"1","comments_enabled":"1"},"path":"\/Users\/gdunne\/_portfolio\/www\/content\/monad\/_config","basename":"monad","dirname":"\/Users\/gdunne\/_portfolio\/www\/content","filename":"_config","title":"Monad","fileInfo":{},"timestamp":"1324368000","tags":["installation","projection","sculpture"],"featured":"1","related":null,"content":"<p>a visualization of relative time lengths, oscillating between the age of the universe, and the current moment.<\/p>\n\n<!--more-->\n\n<h6>installation<\/h6>\n\n<p>Cycles are a fundamental part of the universe. We are thoroughly enmeshed in periodic rhythms that span the frequencies of space and time, and are conscious of a small range on a daily basis: Some are regular like minutes, days, and other are subjective like sleep patterns, the weather, the seasons, and even moods. On a larger magnitude: the age of our bodies, the rise and decline of species, the life cycle of stars. On a smaller, our breathing rate, our heart rate, the audio spectrum of music, speaking, the visible light spectrum, radio waves, cosmic rays, and ultimately the smallest measurable amount of time we deem measurable, described as Planck time. Existence, with its cycles, is rooted in the archetypal, cyclical sinusoidal principals of the Monad.  <\/p>\n\n<h6>installation<\/h6>\n\n<p>Each ring that moves across the surface represents a length of a time cycle. As each ring passes, we hear an audible click. Higher pitched, rapid clicks count the current order of magnitude, ranging from 10^-18 to 10^-43. When passing the visual spectrum, it is shown as color, while the audible spectrum is heard as audible tones.<\/p>\n\n<h6>credits<\/h6>\n\n<p>fabrication assistance: miles stemper, stephanie sherriff<br \/>\naudio engineering: jeff lubow<br \/>\nprojection-alignment software: ryan alexander  <\/p>\n","content_short":"<p>a visualization of relative time lengths, oscillating between the age of the universe, and the current moment.<\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_portfolio\/wwwcomments\/Users\/gdunne\/_portfolio\/www\/content\/monad\/_config\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":"monad","url":"\/monad\/"},"thumb":"\/content\/monad\/thumb.png","url":"\/monad","edit_url":"\/edit\/monad","media_dir":"\/Users\/gdunne\/_portfolio\/www\/content\/monad\/media","media":[{"filename":"monad_wide.jpg","local":"\/Users\/gdunne\/_portfolio\/www\/content\/monad\/media\/monad_wide.jpg","url":"\/content\/monad\/media\/monad_wide.jpg","extension":"jpg"}]},{"config":{"title":"Seaquence","tags":"audiovisual software web code","date":"2010-10-04","featured":"1"},"path":"\/Users\/gdunne\/_portfolio\/www\/content\/seaquence\/_config","basename":"seaquence","dirname":"\/Users\/gdunne\/_portfolio\/www\/content","filename":"_config","title":"Seaquence","fileInfo":{},"timestamp":"1286175600","tags":["audiovisual","software","web","code"],"featured":"1","related":null,"content":"<p>A biologically inspired music and sound toy.   <\/p>\n\n<p><a href=\"http:\/\/seaquence.org\">seaquence.org<\/a><\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_portfolio\/wwwcomments\/Users\/gdunne\/_portfolio\/www\/content\/seaquence\/_config\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":"seaquence","url":"\/seaquence\/"},"thumb":"\/content\/seaquence\/thumb.png","url":"\/seaquence","edit_url":"\/edit\/seaquence","media_dir":"\/Users\/gdunne\/_portfolio\/www\/content\/seaquence\/media","media":[{"filename":"2010-02-20 18.44.19.jpg","local":"\/Users\/gdunne\/_portfolio\/www\/content\/seaquence\/media\/2010-02-20 18.44.19.jpg","url":"\/content\/seaquence\/media\/2010-02-20 18.44.19.jpg","extension":"jpg"}]},{"config":{"title":"ICOSI","date":"july 05 2010","tags":"audiovisual projection installation performance sculpture","featured":"1"},"path":"\/Users\/gdunne\/_portfolio\/www\/content\/icosi\/_config","basename":"icosi","dirname":"\/Users\/gdunne\/_portfolio\/www\/content","filename":"_config","title":"ICOSI","fileInfo":{},"timestamp":"1278313200","tags":["audiovisual","projection","installation","performance","sculpture"],"featured":"1","related":null,"content":"<p>audiovisual installation and performance  <\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_portfolio\/wwwcomments\/Users\/gdunne\/_portfolio\/www\/content\/icosi\/_config\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":"icosi","url":"\/icosi\/"},"thumb":"\/content\/icosi\/thumb.png","url":"\/icosi","edit_url":"\/edit\/icosi","media_dir":"\/Users\/gdunne\/_portfolio\/www\/content\/icosi\/media","media":[{"filename":"4847387674_5419f0b672.jpg","local":"\/Users\/gdunne\/_portfolio\/www\/content\/icosi\/media\/4847387674_5419f0b672.jpg","url":"\/content\/icosi\/media\/4847387674_5419f0b672.jpg","extension":"jpg"},{"filename":"icosigdunne-e1288810334434.jpg","local":"\/Users\/gdunne\/_portfolio\/www\/content\/icosi\/media\/icosigdunne-e1288810334434.jpg","url":"\/content\/icosi\/media\/icosigdunne-e1288810334434.jpg","extension":"jpg"}]},{"config":{"title":"Stars","date":"sep 20 2009","tags":"software projection","featured":"1","gallery":"slides"},"path":"\/Users\/gdunne\/_portfolio\/www\/content\/stars\/_config","basename":"stars","dirname":"\/Users\/gdunne\/_portfolio\/www\/content","filename":"_config","title":"Stars","fileInfo":{},"timestamp":"1253430000","tags":["software","projection"],"featured":"1","related":null,"content":"<p>An exploration of infinite\/finite space. As the viewpoint moves through macro and micro space, the scope and perspective widends  over a variable time length that is performed by hand during installation.<\/p>\n\n<p>projection<br \/>\nc++\/OpenGL<\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_portfolio\/wwwcomments\/Users\/gdunne\/_portfolio\/www\/content\/stars\/_config\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":"stars","url":"\/stars\/"},"thumb":"\/content\/stars\/thumb.png","url":"\/stars","edit_url":"\/edit\/stars","media_dir":"\/Users\/gdunne\/_portfolio\/www\/content\/stars\/media","media":[{"filename":"0118719603860_62e2583e1c_c.jpg","local":"\/Users\/gdunne\/_portfolio\/www\/content\/stars\/media\/0118719603860_62e2583e1c_c.jpg","url":"\/content\/stars\/media\/0118719603860_62e2583e1c_c.jpg","extension":"jpg"},{"filename":"1astars.jpg","local":"\/Users\/gdunne\/_portfolio\/www\/content\/stars\/media\/1astars.jpg","url":"\/content\/stars\/media\/1astars.jpg","extension":"jpg"},{"filename":"4245550315_459070355e.jpg","local":"\/Users\/gdunne\/_portfolio\/www\/content\/stars\/media\/4245550315_459070355e.jpg","url":"\/content\/stars\/media\/4245550315_459070355e.jpg","extension":"jpg"},{"filename":"47_4246324254d9624f87f6.jpg","local":"\/Users\/gdunne\/_portfolio\/www\/content\/stars\/media\/47_4246324254d9624f87f6.jpg","url":"\/content\/stars\/media\/47_4246324254d9624f87f6.jpg","extension":"jpg"},{"filename":"47_roof.jpg","local":"\/Users\/gdunne\/_portfolio\/www\/content\/stars\/media\/47_roof.jpg","url":"\/content\/stars\/media\/47_roof.jpg","extension":"jpg"},{"filename":"47_screen.jpg","local":"\/Users\/gdunne\/_portfolio\/www\/content\/stars\/media\/47_screen.jpg","url":"\/content\/stars\/media\/47_screen.jpg","extension":"jpg"}]}]}
\ No newline at end of file
diff --git a/data/content/tags.json b/data/content/tags.json
deleted file mode 100644 (file)
index 339d479..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{"tags":{"software":6,"installation":5,"structure":4,"process":5,"code":6,"performance":3,"studio":3,"audiovisual":6,"projection":5,"sculpture":8,"web":2,"design":9,"painting":5,"sketchbook":2,"commercial":1,"opengl":1,"processing":1,"photo":2,"video":1,"visualization":1,"typography":3,"drawing":2,"film":1,"animation":1,"print":3}}
\ No newline at end of file
index 82f7d73206502204393f7c962a44b90fdbb36bae..50b72fac67a290cc70c0db50ef7d14efefcc0b02 100644 (file)
--- a/js/js.js
+++ b/js/js.js
@@ -24,6 +24,10 @@ var init = ( function () {
                }
        }
 
+       // $('.projects').masonry({
+ //            itemSelector: '.entries li'
+       // });
+
 
 
        var slides = $('#slides').find('li');
index 84792011ca07d154afcbe33756306d50f6925bdf..dedd0543fe1aacf7614cad304ab9569176aeb8ca 100644 (file)
@@ -1,5 +1,5 @@
 ; settings
-site_title  = GABRIEL DUNNE
+site_title  = GABRIEL LABOV DUNNE
 clean_urls  = 1
 limit       = 100
 ; http://php.net/manual/en/function.date.php
@@ -32,5 +32,5 @@ file_ignores[] = config
 file_ignores[] = .DS_Store
 
 ; dev
-dev = 1
+dev = 0
 edit = 0
index 356f4bcdac6ec900608adeb8c2bcc695fd6eaf03..1fce12770cb526f32d3c8cd4f322f6429c61fd62 100644 (file)
@@ -60,8 +60,6 @@ function get_entries( $path = "", $args = array() )
 
         $entries = sort_entries($entries, $order_by, $order);
 
-
-
         if ($create_datafile) {
             if (!is_dir($data_path)) {
                 if (!mkdir($data_path, 0777, true)) {
@@ -302,6 +300,7 @@ function parse_entry($fileInfo, $page = false)
     $file['edit_url'] = WEB_ROOT . 'edit' . $file['url'];
 
     $file['media_dir'] = join(DIRECTORY_SEPARATOR, array($file['dirname'], $file['basename'], MEDIA));
+    $file['content_dir'] = WEB_ROOT . join(DIRECTORY_SEPARATOR, array(CONTENT_DIR, $file['basename']));
     $file['media'] = is_dir($file['media_dir']) ? (array) get_media( $file['media_dir'] ) : null;
     $file['cat'] = (object) $file['cat'];
     $file['config'] = (object) $file['config'];
diff --git a/pages/about b/pages/about
deleted file mode 100644 (file)
index 88aac08..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-title = about
---
-gabriel labov dunne
-
-studio (at) gabrieldunne (dot) com  
-
-1242 Market St, Floor 2  
-San Francisco, CA 94102 USA
-
diff --git a/pages/cv b/pages/cv
deleted file mode 100755 (executable)
index c591c11..0000000
--- a/pages/cv
+++ /dev/null
@@ -1,152 +0,0 @@
-template = page\r
-title = c/v\r
---\r
-###### edu\r
-2003 B.A. Design | Media Arts, UCLA    \r
-2001 Pont Aven School of Art, France (summer)  \r
-1999 College of Marin, Architecture\r
-<br />\r
-<br />\r
-\r
-\r
-###### exhibitions / projects\r
-2013 [Stars](/stars) SomArts 'NightLight', San Francisco CA  \r
-2012 [Audio ShaderToy](/audioshadertoy) @ Creators Project SF, collab w/ Ryan Alexander, Reza Ali, San Francisco, CA   \r
-2012 [NAAG](/naag), collab w/ Vishal K Dar. Delhi, India  \r
-2010 [Monad](/monad), Prototype, GAFFTA, San Francisco CA   \r
-2010 [Stars](/stars), GAFFTA, San Francisco, CA    \r
-2010 [Seaquence](/seaquence), collab w/ Ryan Alexander, Daniel Massey, GAFFTA, San Francisco CA   \r
-2008 [Cabspotting](/cabspotting), Stamen Design, Design and the Elastic Mind, MoMA NYC Permanent Collection. New York   \r
-2006 [Celestial Mechanics](/celestialmechanics), collab w/Scott Hessels, Interferenze: Naturalis Electronica, Valle Caudina, Italy       \r
-2006 [Celestial Mechanics](/celestialmechanics), Festival Sonar, Barcelona, Spain   \r
-2005 :Output Festival, Amsterdam, Netherlands  \r
-2005 CiberArt: International Festival of New Technologies, Bilbao, Spain  \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, Rennes, France  \r
-2002 Jaquez Gallery Collection, Pont Aven, France  \r
-2002 narr@tive: Digital Storytelling, Hammer Museum, Los Angeles\r
-2002 UCLA Winter DMA Student Show, Los Angeles, CA\r
-<br />\r
-<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 / workshops\r
-2012 Film/Code/Remix, BAVC, San Francisco  \r
-2012 Processing, ACCU, Symantic, Palo Alto     \r
-2012 Processing, ACCU Davis Linux Users Group, Davis, CA    \r
-2011 Open Source: Creative Code. BAVC, San Francisco, 1 yr.    \r
-2011 Processing 101 Workshop, GAFFTA, San Francisco, 2 wk  \r
-2010 Open Source: Coding. BAVC, San Francisco, 1 yr.    \r
-2010 Prototype: Resident Artist Symposium, GAFFTA, San Francisco  \r
-2010 Creative Coding: An Introduction to Processing , GAFFTA, San Francisco, 2 wk  \r
-2009 Creative Coding, GAFFTA, San Francisco, 2 wek    \r
-2009 Introduction to Processing, GAFFTA, San Francisco, wkend    \r
-2007 Processing, collab w/ Aaron Koblin. 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, Maya/Photoshop/Illustrator/After Effects. UCLA, Los Angeles  \r
-2002 Flash/Director Workshop, UCLA, Los Angeles\r
-<br />\r
-<br />\r
-\r
-\r
-###### residencies / collaborations\r
-2011&mdash;2012 Studio Collaboration w/ Vishal K. Dar, New Delhi, India.    \r
-2009&mdash;2010 Gray Area Foundation for the Arts, San Francisco\r
-<br />\r
-<br />\r
-\r
-\r
-\r
-###### professional\r
-2010&mdash;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Bay Area Video Coalition. Youth Instructor   \r
-2005&mdash;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Tessellated Group. Designer  \r
-2009&mdash;2010&nbsp;&nbsp; Gray Area Foundation for the Arts. Studio Director  \r
-2008&mdash;2009&nbsp;&nbsp; Stamen Design. Data Visualization  \r
-2007&mdash;2008&nbsp;&nbsp; Google. Data Visualization  \r
-2004&mdash;2006&nbsp;&nbsp; Motion Theory. Designer, Animator\r
-<br />\r
-<br />\r
-\r
-\r
-###### media / publications / festivals\r
-SIGGRAPH\r
-Creators Project  \r
-Discover Magazine  \r
-Wired  \r
-MIT Aerospace Annual  \r
-A'minima #17  \r
-FOCUS Italia   \r
-AD: Architectural Digest  \r
-Contemporary Art of Science and Technology  \r
-Art College Radio SF  \r
-HDRI Magazine\r
-<br />\r
-<br />\r
-\r
-###### awards\r
-Creative Review Best in Show 2005, Beck "Girl", MotionTheory  \r
-Type Directors Award, Nike "Golf", MotionTheory  \r
-AIGA, Hewlett Packard "It Consolidates", MotionTheory  \r
-AICP, Hewlett Packard "Hands", MotionTheory  \r
-Screen Network Australia Best in Show, "The Pik Me Up"  \r
-Shorttakes Film Festival, Best Visual Effects, "The Mirror"\r
-<br />\r
-<br />\r
-\r
-\r
-<!--\r
-\r
-2004 Text + Architecture & Writing in Architecture, SCIARC, Los Angeles  \r
-2003 narr@tive: Digital Storytelling, Hammer Museum, Los Angeles\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
-**shorts**    \r
-RestFest 2003 Opener, Motion Theory  \r
-The Mirror\r
-<br />\r
-<br />\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
-\r
-\r
-<!--\r
-###### clients\r
-Obscura Digital\r
--->\r
-\r
-\r
index 4dbdf58633c9ab6d582e37595aa5362c595f5a30..db3c02659468c6f64d8788376cd170aedf56a793 100644 (file)
@@ -1,3 +1,4 @@
 template = all
+title = projects
 --
 projects
index e359f71b57bd79dffde4d024216c1966c77e628a..234e0f183cd3668945791d21aeb259eb6cdc25e6 100644 (file)
 <div id="content">
 
 <div id="content">
-    <ul class="entries projects <?=isset($tag)?'tagged':''; ?>">
+    <ul class="entries projects <?=isset($tag)&&$tag!==""?'tagged':''; ?>">
     <? foreach($entries as $entry): ?>
-        <li class="<?=$entry->cat->name?>">
+        <li class="entry <?=$entry->cat->name?>">
             <a href="<?=$entry->url;?>">
                 <img src="<?=$entry->thumb?>" class="thumb" />
                 <br />
                 <strong><?=$entry->title;?></strong>
                 </a>
-                <? if (isset($tag)) : ?>
-                    <p>
-                    <?=strip_tags(isset($entry->content_short) ? $entry->content_short : $entry->content, '<p><br><a>'); ?>
-                    </p>
-                    &mdash;<br />
-                    <ul class="tags">
-                        <? for($i = 0; $i < sizeof($entry->tags); $i++) : $tag = $entry->tags[$i]; ?>
-                            <li class="tag"><a href="<?=WEB_ROOT.'tag/'.$tag?>"><?=$tag?></a></li>
-                        <? endfor; ?>
-                        </ul>                    
-                    <? endif; ?>
+                <br />
+                &mdash;
+                <br />
+                <ul class="tags">
+                    <? for($i = 0; $i < sizeof($entry->tags); $i++) : $tag = $entry->tags[$i]; ?>
+                        <li class="tag"><a href="<?=WEB_ROOT.'tag/'.$tag?>"><?=$tag?></a></li>
+                    <? endfor; ?>
+                    </ul>                    
         </li>
     <? endforeach; ?>
     </ul>
index 27e2cd8523359fb9b3f7c9c6193cdae980ac2619..e830e75261a2df3caa6589be9f29ce46e51f0ee6 100644 (file)
@@ -2,6 +2,7 @@
 
 <h2 class="title"><a href="<?=$entry->url?>"><?=$entry->title?></a></h2>
 
+<span class="date"><?=date('Y', $entry->timestamp)?></span>
 
 <div class="content">
        <? eval('?>' . $entry->content); ?>
 
        <div class="metadata">
 
-               <span class="date"><?=date('Y', $entry->timestamp)?></span>
-
                <? if ($entry->tags): ?>
-                       <br />
                        &mdash;<br />
                        <ul class="tags">
                        <? for($i = 0; $i < sizeof($entry->tags); $i++) : $tag = $entry->tags[$i]; ?>
index 5fe411f4bb718823ba0164c2dfc36fc2d384d231..955eb29b3ada8ae29c60181b723116174f6c1bc5 100644 (file)
@@ -3,4 +3,5 @@
 
 
 <script src="<?=get_base_dir();?>/js/jquery-1.9.1.min.js"></script> 
+<script src="<?=get_base_dir();?>/js/jquery.masonry.js"></script>
 <script src="<?=get_base_dir();?>/js/js.js"></script>
index c20b2988b7a6044cd2b69c9ae6591edb45db4132..7cc59f719a073754e990bb8911860b750d4c05e7 100644 (file)
                 <br />
                 <strong><?=$entry->title;?></strong>
                 </a>
-                <? if (isset($tag)) : ?>
-                    <p>
-                    <?=strip_tags(isset($entry->content_short) ? $entry->content_short : $entry->content, '<p><br><a>'); ?>
-                    </p>
-                    &mdash;<br />
+                <? if (isset($tag)) : ?>                    
+                    <br />&mdash;<br />
                     <ul class="tags">
                         <? for($i = 0; $i < sizeof($entry->tags); $i++) : $tag = $entry->tags[$i]; ?>
                             <li class="tag"><a href="<?=WEB_ROOT.'tag/'.$tag?>"><?=$tag?></a></li>
index 82a89379a806d9dc7d7424518243e9c7a004818f..1f67bb4028377a11d06fc783a4d838862c2054f4 100644 (file)
@@ -11,7 +11,7 @@
     <? endforeach; ?>    
     */
 ?>
-    <? if (isset($entries) && !isset($tag)) {
+    <? if (!isset($entry->is_single)) {
         $en = get_pages('', $args = array(
         'recursive' => false, 
         'order_by' => 'alpha',
     <? foreach($en as $e) : /*print_r($e);*/ ?>
     
         
-    <li><a <?=$request['basename'] == $e->title ? 'class="selected"' : ''?> href="<?=$e->url?>"><?=$e->title?></a></li>
+    <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; ?>
     <? } ?>
     <!-- 
     </ul>
 
 </div>
-
-<? if(isset($tag)): ?>
-<ul class="tags"><li><a href="/tag">tag</a>: <?=$tag?></li></ul>
-<br />
-<br />
-<br />
-<br />
-<? endif; ?>    
-
-
index 07df7f11f22a18b1a34f78186151a848a068f74d..527953d327cfc710c7a7b2b124a7f336bb146441 100644 (file)
@@ -1,16 +1,10 @@
 <!-- tags -->
 
-<? if(isset($tag)): ?>
-<ul class="tags">
-    <li class="tag"><a<?=$tag?></li>
-</ul>
-<? endif; ?>
-
 <? if(!isset($tag)): ?>
 <ul class="tags">
 <? $tags = get_tags('/'); if (isset($_GET['s'])) arsort($tags); else ksort($tags); ?>
 <? foreach($tags as $tag => $count) : ?>
-<li class="tag"><a href="<?=WEB_ROOT?>tag/<?=$tag?>"><?=$tag?></a> &times; <?=$count?></li>
+<li class="tag"><a href="<?=WEB_ROOT?>tag/<?=$tag?>"><?=$tag?></a>&nbsp;&nbsp;<?=$count?></li>
 <? endforeach; ?>
 </ul>
 <? endif; ?>