Updates to the design.

diff --git a/css/style.css b/css/style.css
index e3e4173e9a271f0ab043a4e1894443badb8409ea..c687be7d3e203fab6c9813ea72893d17d6ccca65 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -100,9 +100,9 @@ table, td, tr {
 
 #content {
   /*display:none;*/
-  margin-left:200px;  
+  margin-left:100px;  
   position:absolute;
-  top:7em;
+  top:10em;
   padding-bottom: 20px;
   padding-top:0;
 }
@@ -167,11 +167,11 @@ table, td, tr {
 #nav li {
 margin-bottom:0.2em;
   }
-  #nav .nav a {
+  .nav a {
   color:#444;
     text-decoration:none;
   }
-  #nav .nav a:hover {
+  .nav a:hover {
     color:#f00;
   }
   #nav .nav {
@@ -234,7 +234,7 @@ margin-bottom:0.2em;
 .entries.projects li {
   /*display:inline-block;*/
   float:left;
-  height:250px;
+  height:350px;
   width:200px;
   margin:0 2em 2em 0;
 }

diff --git a/lib/config.ini b/lib/config.ini
index 2e03ef8c415ff634331a4452f329bee80b2724ef..cd2b48dcddce096765c17a049e8b51513ed990ae 100644 (file)
--- a/lib/config.ini
+++ b/lib/config.ini
@@ -1,6 +1,5 @@
 ; settings
 site_title  = Gabriel Dunne
->>>>>>> 023e52b52d9d2b10f550646e41a34cc3ac2d3cb2
 clean_urls  = 1
 limit       = 1000
 ; http://php.net/manual/en/function.date.php

diff --git a/lib/data.php b/lib/data.php
index 93bede0045f99166c5940ceab70fcfcb555b1b9f..55077f6fbc1eeab6cb899bdd308ae48f9d9e3dc9 100644 (file)
--- a/lib/data.php
+++ b/lib/data.php
@@ -301,6 +301,7 @@ function parse_entry($fileInfo, $page = false)
     $pathparts = array_slice($get_pathparts, $content_key);
     $file['dirname'] = dirname(join($pathparts, DIRECTORY_SEPARATOR));
     $file['basename'] = basename(join($pathparts, DIRECTORY_SEPARATOR));
+    $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']);

diff --git a/lib/model.php b/lib/model.php
index 030650770544260988e5f030f4196476f4995bad..791066c7e4987aff878a63bea579a6287a0576ff 100644 (file)
--- a/lib/model.php
+++ b/lib/model.php
@@ -38,9 +38,9 @@ class Model
                # custom request for '/tag/*'
                if (isset($this->request['dirname']) && $this->request['dirname'] == 'tag') {
                        $this->tag = $request['basename'];
-                       $request['dirname'] = 
-                       $request['basename'] = 
-                       $request['filename'] = 
+                       $request['dirname'] = "";
+                       $request['basename'] = $this->request['basename'];
+                       $request['filename'] = "";
                        $request['path'] = null;
                        $request['extension'] = 'html';
                        $this->request = $request;
@@ -48,7 +48,6 @@ class Model
 
            # if multiple (multiple files in CONTENT dir)
            if ($this->is_multiple()) {
-
                    if ($this->has_config() && !$_cfg) {
                        $this->config = parse_config( $request['path'] );
                        if (isset($this->config->config->template)) {
@@ -61,6 +60,7 @@ class Model
 
                $entries_args = array();
                if ($this->tag) {
+                       $this->template = 'projects.html.tpl';
                        $entries_args = array('tag' => $this->tag);
                }
                if (isset($this->config->config->show_featured) && !$this->tag) {

diff --git a/pages/info b/pages/info
index 9d68176d53685d82a7ec8a122c5417625bb25797..1f2730f094c0a857cafa49308da6881bb0ba9142 100755 (executable)
--- a/pages/info
+++ b/pages/info
@@ -22,24 +22,6 @@ studio at gabrieldunne dot com
 \r
 \r
 \r
-\r
-###### edu\r
-2003 B.A., Design | Media Art, UCLA     \r
-2001 Pont Aven School of Art (summer)  \r
-1999 College of Marin  \r
-<br />\r
-\r
-###### performance\r
-2013 Vatica Dahlia "Rites", Brooklyn, NY  \r
-2013 ATOM TM, Live Visuals, San Francisco, CA  \r
-2012 UP Festival, Live Visuals, San Francisco, CA    \r
-2012 CCRMA Modulations, Live Visuals, San Francisco, CA     \r
-2011 Sepalcure, Shigeto, Simple & Santa. Live visuals. Gray Area, San Francisco, CA  \r
-2011 ICOSI, Milieux Sonores: Sound and Imaginary Space, GAFFTA, San Francisco, CA    \r
-2010 ICOSI, Biennial of the Americas. Denver, CO\r
-<br />\r
-\r
-\r
 ###### exhibition\r
 2013 Supernova 9-27, David Bower Center, Berkeley CA\r
 2013 SOMArts Night Light, San Francisco CA  \r
@@ -56,6 +38,7 @@ studio at gabrieldunne dot com
 2005 SIGGRAPH, Los Angeles  \r
 2005 :Output Festival, Amsterdam, Netherlands  \r
 2005 CiberArt: International Festival of New Technologies, Bilbao, Spain  \r
+2005 "Celestial Mechanics", M.F.A. Show, UCLA, Los Angles, CA  \r
 2003 Sur(Face), UCLA, Los Angeles, CA  \r
 2003 Eyberrations Digital Film Festival, Irvine, CA  \r
 2002 Melbourne International Film Festival, Melbourne, Australia  \r
@@ -66,8 +49,19 @@ studio at gabrieldunne dot com
 <br />\r
 \r
 \r
-###### teaching / lectures\r
-2013 Processing Workshop, Upload Festival, San Francisco,    \r
+###### performance\r
+2013 Vatica Dahlia "Rites", Brooklyn, NY  \r
+2013 ATOM TM, Live Visuals, San Francisco, CA  \r
+2012 UP Festival, Live Visuals, San Francisco, CA    \r
+2012 CCRMA Modulations, Live Visuals, San Francisco, CA     \r
+2011 Sepalcure, Shigeto, Simple & Santa. Live visuals. Gray Area, San Francisco, CA  \r
+2011 ICOSI, Milieux Sonores: Sound and Imaginary Space, GAFFTA, San Francisco, CA    \r
+2010 ICOSI, Biennial of the Americas. Denver, CO\r
+<br />\r
+\r
+\r
+###### teaching / talks\r
+2013 Creating GIFs w/Processing, Upload Festival, San Francisco,    \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
@@ -87,6 +81,19 @@ studio at gabrieldunne dot com
 <br />\r
 \r
 \r
+\r
+\r
+\r
+\r
+\r
+\r
+###### edu\r
+2003 B.A., Design | Media Art, UCLA     \r
+2001 Pont Aven School of Art (summer)  \r
+1999 College of Marin  \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

diff --git a/templates/entry.html.tpl b/templates/entry.html.tpl
index 1f98cf96dace996271dbc0c77527f8d8b905468b..1b2e4b5891d9966ef36380a29e21fdf24004244b 100644 (file)
--- a/templates/entry.html.tpl
+++ b/templates/entry.html.tpl
@@ -18,8 +18,6 @@
 
        <div class="metadata">
 
-               <!--
-
                <? if ($entry->tags): ?>
                        &mdash;<br />
                        <ul class="tags">
@@ -28,7 +26,6 @@
                        <? endfor; ?>
                        </ul>
                <? endif; ?><br />
-               -->
 
                <? if ($entry->related): ?>
                        &mdash;<br />           

diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl
index 65c432ddc1498b9cf85c5e8a7dfbab2e33fbc772..3ddf1d6fce9f6def3fb88c798a20e5b242a8ecae 100644 (file)
--- a/templates/nav.html.tpl
+++ b/templates/nav.html.tpl
@@ -1,7 +1,7 @@
-<div class="navprojectlist">
+<!-- <div class="navprojectlist">
 <? $this->include_template('projectlist.html.tpl') ?>
 </div>
-
+ -->
 <div id="nav">
     <ul class="nav">
 
@@ -12,7 +12,10 @@
         'order_by' => 'alpha',
         'order' => SORT_ASC
         ) ); ?>
+
 <li><a href="/info">about</a></li>        
+<li><a href="/projects/">projects</a></li>
+<li><a href="/tag">tags</a></li>
 
 <br />
 <!-- <li><a style="font-weight:normal" href="/projects/">projects</a></li> -->

diff --git a/templates/project.list.html.tpl b/templates/project.list.html.tpl
deleted file mode 100644 (file)
index 5846ff4..0000000
--- a/templates/project.list.html.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<html>
-<head>    
-    <? $this->include_template('head-inc.html.tpl') ?>
-    <title><?=SITE_TITLE?><?=$this->page_title(TITLE_DELIMITER);?></title>
-</head>
-<body>
-    
-<? $this->include_template('nav.html.tpl') ?>
-
-<? if (EDIT) $this->include_template('edit.html.tpl'); ?>
-    
-<div id="content">
-    
-    <? if (isset($entry->content)): ?>
-        <? eval('?>' . $entry->content); ?>
-    <? endif; ?>
-
-    <? $this->include_template('projectlist.html.tpl') ?>
-    
-</div>
-
-<? $this->include_template('footer.html.tpl') ?>
-
-</body>
-</html>

diff --git a/templates/projectlist.html.tpl b/templates/projectlist.html.tpl
index 9bdaa2687c956466b24761414cf5450e54b74d46..4d1d8206785752b916148b8a79e1438d18e8d9a3 100644 (file)
--- a/templates/projectlist.html.tpl
+++ b/templates/projectlist.html.tpl
@@ -1,26 +1,26 @@
 <?
-$r =  isset($this->_tpl_vars['request']['dirname']) ? $this->_tpl_vars['request']['dirname'] : $this->_tpl_vars['request']['basename'] . '/';
-$m = new Model(get_request($r), 0);
-$projects = $m->entries;
+//$r = isset($this->_tpl_vars['request']['dirname']) ? $this->_tpl_vars['request']['dirname'] : $this->_tpl_vars['request']['basename'] . '/';
+$m = new Model(get_request(''), 0);
+$entries = $m->entries;
 ?>
 
 
 <ul class="projectlist">
-
-<!-- <li><strong>projects</strong></li> -->
-
 <? 
 $d = 0;
-foreach($projects as $entry): 
+$ee = array();
+foreach($entries as $entry): 
+       // echo $entry->parentdir;
        $nd = date("Y", $entry->timestamp);
        if ($d != $nd) {
                // echo "<br />";
                // echo $nd;
                $d = $nd;
        }
-?>
+       ?>
     <li>
         <a href="<?=$entry->url;?>"><?=$entry->title;?></a>
     </li>
 <? endforeach; ?>
+
 </ul>

diff --git a/templates/projects.html.tpl b/templates/projects.html.tpl
index 1d3c4299bd6d466ef56d7e2183fb03b06c6f289b..115a3bfac5e8b8fc045720c91608850d0349b1d3 100644 (file)
--- a/templates/projects.html.tpl
+++ b/templates/projects.html.tpl
@@ -35,23 +35,26 @@
     </div>
  -->
     <ul class="entries projects">    
-    <? foreach($entries as $entry): ?>
-        <li class="entry <?=$entry->cat->name?>">
-            <a href="<?=$entry->url;?>">
-                <img src="<?=$entry->thumb?>" class="thumb" />
+    <? foreach($entries as $e): ?>
+        <li class="entry <?=$e->cat->name?>">
+            <a href="<?=$e->url;?>">
+                <img src="<?=$e->thumb?>" class="thumb" />
                 <br />
-                <strong><?=$entry->title;?></strong>
+                <strong><?=$e->title;?></strong>
+                
                 </a>   
-                <!--         
+
+                <? //if ($entry->basename != 'projects') : ?>
                  <br />
                 &mdash;
                 <br />
                 <ul class="tags">
-                    <? for($i = 0; $i < sizeof($entry->tags); $i++) : $tag = $entry->tags[$i]; ?>
+                    <? for($i = 0; $i < sizeof($e->tags); $i++) : $tag = $e->tags[$i]; ?>
                         <li class="tag"><a href="<?=WEB_ROOT.'tag/'.$tag?>"><?=$tag?></a></li>
                     <? endfor; ?>
                 </ul>     
-            -->
+            <? //endif; ?>
+
         </li>
     <? endforeach; ?>
     </ul>

diff --git a/templates/single.html.tpl b/templates/single.html.tpl
index 398403dc9637501294c141ddaa5b32aa5eeb933b..2d48e5da75055b82f94070f68bdfb2c950f72353 100644 (file)
--- a/templates/single.html.tpl
+++ b/templates/single.html.tpl
@@ -12,10 +12,6 @@
 
 <? if (EDIT) $this->include_template('edit.html.tpl'); ?>
 
-<!-- 
-<? $this->include_template('projectlist.html.tpl') ?>
- -->
-
 <div id="content" class="single entry">
 
     <div class="entry">