From 2d8cf998e8a19802976c12d9368422c42bf9e33e Mon Sep 17 00:00:00 2001
From: Gabriel Dunne <gdunne@quilime.com>
Date: Wed, 3 Jul 2013 17:09:21 -0700
Subject: [PATCH] Cleaned up project list

---
 css/style.css                       | 16 +++++++++------
 lib/model.php                       |  2 +-
 pages/bio                           |  2 +-
 pages/{.tag => tag}                 |  1 +
 templates/entry.html.tpl            |  4 ++--
 templates/index.html.tpl            |  4 ++--
 templates/nav.html.tpl              |  2 +-
 templates/projects.html.tpl         |  3 ++-
 templates/single-wprojects.html.tpl | 30 -----------------------------
 templates/single.html.tpl           |  4 +++-
 10 files changed, 23 insertions(+), 45 deletions(-)
 rename pages/{.tag => tag} (60%)
 delete mode 100644 templates/single-wprojects.html.tpl

diff --git a/css/style.css b/css/style.css
index fac779a..c3cc13c 100644
--- a/css/style.css
+++ b/css/style.css
@@ -60,6 +60,10 @@ input[type="text"], textarea {
   clear:both;
 }
 
+.serif {
+  font-family:serif;
+}
+
 p {
   max-width:760px; 
   }
@@ -102,13 +106,14 @@ table, td, tr {
 #content {
   /*display:none;*/
   padding-bottom: 20px;
+  position:absolute;
+  top:13em;
+  padding-top:0;
 }
 #content.single {
-    padding-top:0;
-    margin-left:200px;
+  margin-left:200px;  
 }
 
-
 #nextprev {
     padding:0 50px 10px 150px;
 }
@@ -153,7 +158,6 @@ table, td, tr {
 
 #nav {
   margin-bottom:4em; 
-  line-height:2em;
 }
 #nav a {
   font-weight:bold;
@@ -165,7 +169,7 @@ table, td, tr {
   margin:0;
 }
 #nav li {
-
+margin-bottom:0.2em;
   }
   #nav .nav a {
     text-decoration:none;
@@ -396,7 +400,7 @@ ul.entries li a:hover {
 }
 .projectlist {
   position:absolute;
-  top:130px;
+  left:2em;
 }
 .projectlist li {
   text-transform: lowercase !important;
diff --git a/lib/model.php b/lib/model.php
index 7c82d5c..0306507 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-wprojects.' . $this->response_format . '.tpl';
+    							'single.' . $this->response_format . '.tpl';
 		}
 
 		# if page (file in PAGES dir)
diff --git a/pages/bio b/pages/bio
index 10a1585..539d4d6 100755
--- a/pages/bio
+++ b/pages/bio
@@ -6,7 +6,7 @@ template = page
 </div>
 -->
 
-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. 
+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. 
 
 He is a designer and consultant for international clients and collaborators, and serves as an instructor for youth and adult.  
 <br />
diff --git a/pages/.tag b/pages/tag
similarity index 60%
rename from pages/.tag
rename to pages/tag
index dba00ef..7da4811 100644
--- a/pages/.tag
+++ b/pages/tag
@@ -1,2 +1,3 @@
 template = tag
+hide = true
 --
diff --git a/templates/entry.html.tpl b/templates/entry.html.tpl
index a663c00..f2be0c9 100644
--- a/templates/entry.html.tpl
+++ b/templates/entry.html.tpl
@@ -18,14 +18,14 @@
 
 	<div class="metadata">
 
-<!-- 		<? if ($entry->tags): ?>
+ 		<? if ($entry->tags): ?>
 			&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 /> -->
+		<? endif; ?><br />
 
 		<? if ($entry->related): ?>
 			&mdash;<br />		
diff --git a/templates/index.html.tpl b/templates/index.html.tpl
index 6ae80b2..8298d64 100644
--- a/templates/index.html.tpl
+++ b/templates/index.html.tpl
@@ -17,14 +17,14 @@
                 <strong><?=$entry->title;?></strong>
                 </a>
                 <? if (!isset($entry->config->show_featured) && isset($tag)): ?>
-<!--                 <br />
+                 <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>
                 <? endif ;?>
         </li>
     <? endforeach; ?>
diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl
index c881693..872495e 100644
--- a/templates/nav.html.tpl
+++ b/templates/nav.html.tpl
@@ -16,7 +16,7 @@
     <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; ?>
+        <? if ($e->title == 'tag' && isset($tag)): ?>&nbsp;<span class="tag"><?=$tag;?></span><? endif; ?>
         
     </li>
     <? endforeach; ?>
diff --git a/templates/projects.html.tpl b/templates/projects.html.tpl
index 93f216e..5bf408b 100644
--- a/templates/projects.html.tpl
+++ b/templates/projects.html.tpl
@@ -9,13 +9,14 @@
 
 <? if (EDIT) $this->include_template('edit.html.tpl'); ?>
     
+<? $this->include_template('projectlist.html.tpl') ?>
+
 <div id="content">
     
     <? if (isset($entry->content)): ?>
         <? eval('?>' . $entry->content); ?>
     <? endif; ?>
 
-    <? $this->include_template('projectlist.html.tpl') ?>
     <!--        
     <ul>
     <? foreach($entries as $entry): ?>
diff --git a/templates/single-wprojects.html.tpl b/templates/single-wprojects.html.tpl
deleted file mode 100644
index 4a08f96..0000000
--- a/templates/single-wprojects.html.tpl
+++ /dev/null
@@ -1,30 +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'); ?>
-
-<? $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>
diff --git a/templates/single.html.tpl b/templates/single.html.tpl
index 7e2d030..4a08f96 100644
--- a/templates/single.html.tpl
+++ b/templates/single.html.tpl
@@ -12,12 +12,14 @@
 
 <? 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') ?>
-- 
2.34.1