From 74c92c63bc68ab7bd76267036804d03fc0afd73e Mon Sep 17 00:00:00 2001
From: Gabriel Dunne <gdunne@quilime.com>
Date: Wed, 3 Jul 2013 16:49:08 -0700
Subject: [PATCH] Project list hoo ha

---
 css/style.css                       |  9 +++++++++
 lib/model.php                       |  2 +-
 pages/.contact                      |  2 +-
 pages/bio                           |  2 +-
 templates/nav.html.tpl              | 11 +++++++----
 templates/projectlist.html.tpl      | 11 +++++++++++
 templates/projects.html.tpl         | 21 ++++++++------------
 templates/single-wprojects.html.tpl | 30 +++++++++++++++++++++++++++++
 8 files changed, 68 insertions(+), 20 deletions(-)
 create mode 100644 templates/projectlist.html.tpl
 create mode 100644 templates/single-wprojects.html.tpl

diff --git a/css/style.css b/css/style.css
index d21bb17..fac779a 100644
--- a/css/style.css
+++ b/css/style.css
@@ -105,8 +105,10 @@ table, td, tr {
 }
 #content.single {
     padding-top:0;
+    margin-left:200px;
 }
 
+
 #nextprev {
     padding:0 50px 10px 150px;
 }
@@ -392,6 +394,13 @@ ul.entries li a:hover {
   margin-bottom:2em; 
   text-align:center;
 }
+.projectlist {
+  position:absolute;
+  top:130px;
+}
+.projectlist li {
+  text-transform: lowercase !important;
+}
 
 
 
diff --git a/lib/model.php b/lib/model.php
index 0306507..7c82d5c 100644
--- a/lib/model.php
+++ b/lib/model.php
@@ -122,7 +122,7 @@ class Model
 
     		$this->template = isset($this->entry->config->template) ?
     							$this->entry->config->template . '.' . $this->response_format . '.tpl' :
-    							'single.' . $this->response_format . '.tpl';
+    							'single-wprojects.' . $this->response_format . '.tpl';
 		}
 
 		# if page (file in PAGES dir)
diff --git a/pages/.contact b/pages/.contact
index 3e4c216..b1014e1 100755
--- a/pages/.contact
+++ b/pages/.contact
@@ -1,5 +1,5 @@
 template = page
-title = Contact
+title = contact
 --
 
 1242 Market St, FL 2  
diff --git a/pages/bio b/pages/bio
index 539d4d6..10a1585 100755
--- a/pages/bio
+++ b/pages/bio
@@ -6,7 +6,7 @@ template = page
 </div>
 -->
 
-Gabriel Dunne (b. 1981, San Francisco) works with multiple mediums and technologies to explore audiovisual vibration, space, structures, and rhythms of the perceivable and imperceivable universe. His work has shown internationally in solo and group exhibitions, performances, galleries, public space, and has featured in music videos, sound works, and film. 
+Gabriel Dunne (b. 1981, San Francisco) works with many mediums and technologies to explore audiovisual vibration, space, structures, and rhythms of the perceivable and imperceivable universe. His work has shown internationally in solo and group exhibitions, performances, galleries, public space, and has featured in music videos, sound works, and film. 
 
 He is a designer and consultant for international clients and collaborators, and serves as an instructor for youth and adult.  
 <br />
diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl
index 38cf4f0..c881693 100644
--- a/templates/nav.html.tpl
+++ b/templates/nav.html.tpl
@@ -2,7 +2,7 @@
     <ul class="nav">
 
     <li class="home"><a href="<?=WEB_ROOT?>"><?=SITE_TITLE?></a></li>        
-    <? if (!isset($entry->is_single)) {
+    <? // if (!isset($entry->is_single)) {
         $en = get_pages('', $args = array(
         'recursive' => false, 
         'order_by' => 'alpha',
@@ -12,12 +12,15 @@
     <? foreach($dirs as $e) : ?>
     <li><a href="<?=$e->url?>"><?=$e->title?></a></li>
     <? endforeach; ?>          
-    <? foreach($en as $e) : /*print_r($e);*/ ?>        
+    <? foreach($en as $e) : ?>
     <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; ?>
+        <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; ?>
-    <? } ?>
+    <? //} ?>
 
     <!-- 
     <li>
diff --git a/templates/projectlist.html.tpl b/templates/projectlist.html.tpl
new file mode 100644
index 0000000..3ea35f3
--- /dev/null
+++ b/templates/projectlist.html.tpl
@@ -0,0 +1,11 @@
+<?
+$m = new Model(get_request('projects/'), 0);
+$projects = $m->entries;
+?>
+<ul class="projectlist">
+<? foreach($projects as $entry): ?>
+    <li>
+        <a href="<?=$entry->url;?>"><?=$entry->title;?></a>
+    </li>
+<? endforeach; ?>
+</ul>
diff --git a/templates/projects.html.tpl b/templates/projects.html.tpl
index 92fd309..93f216e 100644
--- a/templates/projects.html.tpl
+++ b/templates/projects.html.tpl
@@ -15,33 +15,28 @@
         <? eval('?>' . $entry->content); ?>
     <? endif; ?>
 
-    <ul class="entries projects <?=isset($tag)&&$tag!==""?'tagged':''; ?>">
+    <? $this->include_template('projectlist.html.tpl') ?>
+    <!--        
+    <ul>
     <? foreach($entries as $entry): ?>
         <li class="entry <?=$entry->cat->name?>">
-            <a href="<?=$entry->url;?>">
-                <img src="<?=$entry->thumb;?>" class="thumb" />
-                <br />
-                <strong><?=$entry->title;?></strong>
-                </a>
-<!--                 <br />
+            <a href="<?=$entry->url;?>"><?=$entry->title;?></a>
+                 <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>     -->            
+                </ul>     
         </li>
     <? endforeach; ?>
     </ul>
+    -->
+    
 </div>
 
 <? $this->include_template('footer.html.tpl') ?>
 
 </body>
 </html>
-
-
-
-
-
diff --git a/templates/single-wprojects.html.tpl b/templates/single-wprojects.html.tpl
new file mode 100644
index 0000000..4a08f96
--- /dev/null
+++ b/templates/single-wprojects.html.tpl
@@ -0,0 +1,30 @@
+<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'); ?>
+
+<? $this->include_template('projectlist.html.tpl') ?>
+
+<div id="content" class="single entry">
+
+    <div class="entry">
+    <? $this->include_template('entry.html.tpl', array('entry' => $entry, 'single' => true)); ?>
+    </div>
+
+</div>
+
+<? $this->include_template('footer.html.tpl') ?>
+
+<script language="javascript" src="<?=WEB_ROOT?>js/single.js"></script>
+
+</body>
+</html>
-- 
2.34.1