Updates, back to black.

diff --git a/css/style.css b/css/style.css
index 59c75d375dec53c6c8b2e4f189b51c0b957835cd..cb5072ca874619bb6f43a397f7b3684144e8d551 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -1,7 +1,7 @@
 
 html, body, table, textarea, input[type="text"] {
-  background:#eee;
-  color: #000;
+  background:#222;
+  color: #999;
   font-size: 12px;
   font-weight: normal;
   font-family: sans-serif;
@@ -16,24 +16,24 @@ body {
 }
 a {
   border: 0pt none;
-  color:#111;
-  /*font-weight:bold;*/ }
+  color:#1EE4E4;
+  font-weight:bold; }
   a img {
     border: 0pt none; }
   a.mute {
   text-decoration: none ! important; }
   a:hover, a.mute:hover {
-          color:#d05;
+          color:#d26;
     text-decoration: none; }
 
 
 h1, h2, h3, h4, h5, h6 {
   /*font-family: helvetica, arial, verdana, sans-serif;*/
   font-weight: normal;
-  color: #777;
-  font-size:1em; line-height: 1.5em; }
+  color: #555;
+font-size:1em;  
+}
 h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
-  color:#000;
   text-decoration: none;
 }
 h1 {
@@ -100,9 +100,6 @@ table, td, tr {
 
 #content {
   /*display:none;*/
-  margin-left:150px;  
-  position:absolute;
-  top:2em;
   padding-bottom: 20px;
   padding-top:0;
 }
@@ -153,7 +150,7 @@ table, td, tr {
 
 
 #nav {
-  /*margin-bottom:4em; */
+  margin-bottom:4em; 
 }
 #nav a {
   
@@ -165,21 +162,23 @@ table, td, tr {
   margin:0;
 }
 #nav li {
+  display:inline-block;
+  margin-right:2em;
 margin-bottom:0.2em;
   }
   .nav a {
-  color:#444;
     text-decoration:none;
   }
   .nav a:hover {
-    color:#f00;
   }
   #nav .nav {
-    margin-bottom:2em;
   }
 #nav li.home {
+
   }
 #nav li.home a {
+  font-size:1.2em;  
+  color:#fff;
   }
 
 
@@ -316,8 +315,6 @@ height:auto;
 }
 .entry .title a {
     margin-bottom:1em;
-    font-weight:normal;
-    color:#999;
 }
 
 .entry .metadata .date {
@@ -387,12 +384,6 @@ 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;*/
 }

diff --git a/lib/config.ini b/lib/config.ini
index cd2b48dcddce096765c17a049e8b51513ed990ae..61015b7c8de9082f42a4a0eba4e476a3101850b0 100644 (file)
--- a/lib/config.ini
+++ b/lib/config.ini
@@ -1,5 +1,5 @@
 ; settings
-site_title  = Gabriel Dunne
+site_title  = gabriel labov dunne
 clean_urls  = 1
 limit       = 1000
 ; http://php.net/manual/en/function.date.php

diff --git a/lib/data.php b/lib/data.php
index 55077f6fbc1eeab6cb899bdd308ae48f9d9e3dc9..d6fdac807461c89d3508ef908805db2dbacae6a0 100644 (file)
--- a/lib/data.php
+++ b/lib/data.php
@@ -304,7 +304,7 @@ function parse_entry($fileInfo, $page = false)
     $file['parentdir'] = basename($file['dirname']);
     //$file['dirname'] = dirname($fileInfo->getPath());
     $file['filename'] = $fileInfo->getFilename();    
-    $file['title'] = isset($file['config']['title']) ? $file['config']['title'] : ($page ? $file['filename'] : $file['basename']);
+    $file['title'] = isset($file['config']['title']) ? htmlentities($file['config']['title']) : ($page ? $file['filename'] : $file['basename']);
     $file['fileInfo'] = $fileInfo;
     $file['config']['date'] = isset($file['config']['date']) ? $file['config']['date'] : null;
     $file['timestamp'] = $file['config']['date'] ? date('U', strtotime( $file['config']['date'])) : $fileInfo->getCTime();

diff --git a/pages/info b/pages/bio
similarity index 91%
rename from pages/info
rename to pages/bio
index 0e14595026a0044dbb3de5d9de5a6242ce1de032..56c949ba6b780cad478df54049040e41eff0b3c3 100755 (executable)
--- a/pages/info
+++ b/pages/bio
@@ -1,13 +1,9 @@
 template = page\r
 --\r
-<!--\r
-<div style="float:right;">\r
-<img src="http://media.quilime.com/files/img/IMG_1881.jpg" />\r
-</div>\r
--->\r
 \r
+<img src="http://media.quilime.com/files/img/IMG_1881.jpg" />\r
 \r
-1981 Born, Gabriel Labov Dunne, San Francisco, USA  \r
+b.1981 San Francisco, USA  \r
 \r
 \r
 ###### contact\r
@@ -16,14 +12,12 @@ studio at gabrieldunne dot com
 ###### network    \r
 [blog](http://quilime.com)  \r
 [twitter](http://twitter.com/quilime)  \r
-[github](http://github.com/quilime)  \r
-[flickr](http://flickr.com/photos/quilime)\r
 <br />\r
 \r
 \r
-\r
 ###### exhibition\r
-2013 Supernova 9-27, David Bower Center, Berkeley CA\r
+2013 11 01 #SENSES, CODAME Arts + Tech Festival, San Francisco CA  \r
+2013 Supernova 9-27, David Bower Center, Berkeley CA  \r
 2013 SOMArts Night Light, San Francisco CA  \r
 2013 ArtHackDay "Lethal Software", San Francisco CA  \r
 2012 Audio ShaderToy, Creators Project, San Francisco, CA   \r
@@ -31,8 +25,8 @@ studio at gabrieldunne dot com
 2010 PROTOTYPE, Gray Area, San Francisco CA   \r
 2010 Powers of 10, Gray Area, San Francisco, CA    \r
 2010 Seaquence, Gray Area, San Francisco CA   \r
-2008 Cabspotting, Stamen Design, Design and the Elastic Mind, NYC MoMA  Permanent Collection. New York, NY     \r
-2006 SIGGRAPH, Boston  \r
+2008 Cabspotting, Stamen Design, Design and the Elastic Mind, NYC MoMA, NYC       \r
+2006 SIGGRAPH, Boston MA  \r
 2006 Interferenze: Naturalis Electronica, Valle Caudina, Italy       \r
 2006 Festival Sonar, Barcelona, Spain   \r
 2005 SIGGRAPH, Los Angeles  \r
@@ -116,7 +110,7 @@ But Does It Float
 Creativity Online  \r
 \r
 \r
-###### cv  \r
+###### cv \r
 Tessellated Group  \r
 Obscura Digital  \r
 BAVC  \r
@@ -127,9 +121,8 @@ Motion Theory
 <br />\r
 \r
 \r
-<!--\r
-\r
 \r
+<!--\r
 ###### clients\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
@@ -141,8 +134,6 @@ Motion Theory
 <br />\r
 \r
 \r
-\r
-\r
 ###### awards\r
 Creative Review Best in Show 2005, Beck "Girl", MotionTheory  \r
 Type Directors Award, Nike "Golf", MotionTheory  \r

diff --git a/pages/cv b/pages/cv
index 530c7c1cb751ded668a4f85c7f7a9018c1eaffa0..ee8d53950b08e89e297a647848c37f2ea212a16e 100644 (file)
--- a/pages/cv
+++ b/pages/cv
@@ -5,6 +5,7 @@ hide = true
 
 
 ###### exhibition / performance / projects
+2013 11 01 #SENSES, CODAME Arts + Tech Festival, San Francisco CA  
 2013 SOMArts NightLight, San Francisco CA  
 2013 ArtHackDay, San Francisco CA  
 2012 Audio ShaderToy, Creators Project, San Francisco, CA   

diff --git a/templates/footer.html.tpl b/templates/footer.html.tpl
index 84da47af0be7078f3d3f981bd732e958f884e642..6cbe7d61dab5eef3aedf5670d0dbe3bceef2ae4a 100644 (file)
--- a/templates/footer.html.tpl
+++ b/templates/footer.html.tpl
@@ -2,3 +2,12 @@
 <!-- footer -->
 <script src="<?=get_base_dir();?>/js/jquery-1.9.1.min.js"></script> 
 <script src="<?=get_base_dir();?>/js/js.js"></script>
+
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-7398543-1', 'gabrieldunne.com');
+  ga('send', 'pageview');
+</script>

diff --git a/templates/index.html.tpl b/templates/index.html.tpl
index e59ada155c9c7b4ae07c847904605a8ede6c43c1..73178ddd960659b483a1f156c3cf6fedc8a1017b 100644 (file)
--- a/templates/index.html.tpl
+++ b/templates/index.html.tpl
@@ -9,9 +9,9 @@
 
 <div id="content">
 
-       <a href="/projects/vaticadahlia">
-               <img src="http://farm3.staticflickr.com/2807/9764237505_233e33bb60_c.jpg" />
-       </a>
+       <a href="http://gabrieldunne.com/projects/tetrafield">
+               <img src="http://media.quilime.com/files/projects/tetrafield/IMG_6614-3.jpg" />
+       <a href="">
 
 </div>
 

diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl
index a92e9f1273ab8b9d39d44bf7bb6b321873d62bb5..49cdf1faa8a9cb3511d5febc9dd31772b312932a 100644 (file)
--- a/templates/nav.html.tpl
+++ b/templates/nav.html.tpl
@@ -5,7 +5,12 @@
 <div id="nav">
     <ul class="nav">
 
-    <li class="home"><a href="<?=WEB_ROOT?>"><?=SITE_TITLE?></a></li>        
+    <li class="home">
+        <a href="<?=WEB_ROOT?>">
+            <?=SITE_TITLE?>
+        </a>
+    </li> 
+
     <? // if (!isset($entry->is_single)) {
         $en = get_pages('', $args = array(
         'recursive' => false, 
@@ -13,8 +18,9 @@
         'order' => SORT_ASC
         ) ); ?>
 
-<li><a href="/info">about</a></li>        
-<li><a href="/projects/">projects</a></li>
+<li><a href="/bio">bio</a></li>        
+<li><a href="/projects/">work</a></li>
+<li><a href="/archive/">archive</a></li>
 <!-- <li><a href="/tag">tags</a></li> -->
 
 <br />