Cleaned up project list

diff --git a/css/style.css b/css/style.css
index fac779a7a476fa72f7ef0da3b53e27dfd9fb05e0..c3cc13c0405fbe3d054cdfb9d1d0aaf16d366702 100644 (file)
--- 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 7c82d5c7584cd96cd955c936599c8858ef3e2eb5..030650770544260988e5f030f4196476f4995bad 100644 (file)
--- 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 10a1585c52b2ed8f9f44e1a5c1d04e532dc6121f..539d4d6b8b6e00277ede713c0d75a25fb7e59930 100755 (executable)
--- a/pages/bio
+++ b/pages/bio
@@ -6,7 +6,7 @@ template = page
 </div>\r
 -->\r
 \r
-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. \r
+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. \r
 \r
 He is a designer and consultant for international clients and collaborators, and serves as an instructor for youth and adult.  \r
 <br />\r

diff --git a/pages/.tag b/pages/tag
similarity index 60%
rename from pages/.tag
rename to pages/tag
index dba00efebb2252e70ca5f180f47a17d91d334056..7da481115897260815fc43b82077322629d3c5bb 100644 (file)
--- 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 a663c0000741c27516cd64319ec5b403a1af951c..f2be0c93b78c2489d20aba25a9ad23b56e859995 100644 (file)
--- 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 6ae80b2ce9ab3a4c987a9c92b4fbc22bdfa0b3d7..8298d64dd7b11d6a30220c038c7e52c4ed029c98 100644 (file)
--- 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 c881693d48653cd6118aa4568ddcab9992968cba..872495e69e42640b6868f198d3c50338e2f6043c 100644 (file)
--- 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 93f216e3eb8aa17944c530526e7ea3e3f1b55020..5bf408beb289475e1d29b6b44dcd3ef17493fd1a 100644 (file)
--- 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 (file)
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 7e2d030b43629d5541a6fab86da128503a2263bc..4a08f964ced73dcbdd1b16beb4d1959a2900acaa 100644 (file)
--- 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') ?>