From bdfb8e53095fc455d6b70408b20bed0984e8b283 Mon Sep 17 00:00:00 2001
From: Gabriel Dunne <gdunne@quilime.com>
Date: Wed, 27 Feb 2013 13:33:59 -0800
Subject: [PATCH] Added about and some CSS changes

---
 css/style.css             | 68 +++++++++++++++++++--------------------
 lib/config.ini            |  2 +-
 pages/{cv => about}       |  2 +-
 pages/contact             | 15 ++++++---
 templates/index.html.tpl  | 22 +++++++++++--
 templates/nav.html.tpl    |  2 ++
 templates/single.html.tpl |  6 ++--
 7 files changed, 71 insertions(+), 46 deletions(-)
 rename pages/{cv => about} (99%)

diff --git a/css/style.css b/css/style.css
index 2cb7b32..f11e331 100644
--- a/css/style.css
+++ b/css/style.css
@@ -13,7 +13,6 @@ body {
 a {
   border: 0pt none;
   color:#000;
-  text-decoration: underline;
 
   /*font-weight:bold;*/ }
   a img {
@@ -31,6 +30,7 @@ h1, h2, h3, h4, h5, h6 {
   font-size:1em; }
 h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
   color:#000;
+  text-decoration: none;
 }
 h1 {
   font-size: 218%;
@@ -50,7 +50,7 @@ h6 {
 }
 
 input[type="text"], textarea {
-  color:#000;
+  color:#888;
   padding:0.5em;
 }
 
@@ -138,9 +138,10 @@ table, td, tr {
 
 
 #nav {
-  margin-bottom:4em; }
+  margin-bottom:4em; 
+}
 #nav a {
-  font-weight:bold;
+
 }
 #nav a.mute {  font-weight: normal }
 #nav li, ul.nav {
@@ -149,8 +150,11 @@ table, td, tr {
   margin:0;
 }
 #nav li {
+line-height:2.25em;  
   }
   #nav .nav a {
+
+  font-size:130%;    
     text-decoration:none;
   }
   #nav .nav a:hover {
@@ -174,7 +178,7 @@ color:#f00;
 
 
 .entries li {
-  margin:0.5em 0;
+line-height:2.25em;
 }
 
 
@@ -300,7 +304,7 @@ ul.image {
 .tags {
   display:inline-block;
   font-style: italic;
-  font-size:10px;
+  border-top:1px solid #000;
 }
 .tags .tag {
   margin:0.3em 0;
@@ -313,34 +317,30 @@ ul.image {
   }
 
 
-        ul.tags {
-            margin-right:5em;
-            float:left;
-            margin-bottom:2em;
-        }
-        ul.tags a {
-        }
-        ul.tags li.sel a{
-            font-weight:bold;
-            text-decoration: underline;
-        }
-        ul.tags li.sel {
-            color:#777;
-        }
-        ul.entries {
-            float:left;
-            font-size: 130%;
-        }
-        ul.entries li {
-            margin-bottom:1em;
-            text-transform: capitalize;
-        }
-        ul.entries li a {
-            text-decoration: none;
-        }
-        ul.entries li a:hover {
-            text-decoration: underline;
-        }
+ul.tags {
+    margin-bottom:2em;
+}
+ul.tags a {
+}
+ul.tags li.sel a{
+    font-weight:bold;
+    text-decoration: underline;
+}
+ul.tags li.sel {
+    color:#777;
+}
+ul.entries {
+    font-size: 130%;
+}
+ul.entries li {
+    text-transform: capitalize;
+}
+ul.entries li a {
+    text-decoration: none;
+}
+ul.entries li a:hover {
+    text-decoration: underline;
+}
 
 
 
diff --git a/lib/config.ini b/lib/config.ini
index e49c613..57f69af 100644
--- a/lib/config.ini
+++ b/lib/config.ini
@@ -1,5 +1,5 @@
 ; settings
-site_title  = GABRIEL LABOV DUNNE
+site_title  = Gabriel Dunne
 clean_urls  = 1
 limit       = 10
 ; http://php.net/manual/en/function.date.php
diff --git a/pages/cv b/pages/about
similarity index 99%
rename from pages/cv
rename to pages/about
index fa89131..336c35e 100644
--- a/pages/cv
+++ b/pages/about
@@ -1,4 +1,4 @@
-title = c/v
+title = About
 --
 
 b.1981, San Francisco
diff --git a/pages/contact b/pages/contact
index 9d49159..fbe0555 100755
--- a/pages/contact
+++ b/pages/contact
@@ -1,13 +1,20 @@
 template = page
+title = Contact
 --
 
-[studio@gabrieldunne.com](studio@gabrieldunne.com)  
+studio  
 
-email list
-<input type="text">
+1242 Market St, FL 2  
+San Francisco, CA USA 94102  
++1 415 493 8496   
+
+[studio@gabrieldunne.com](mailto:studio@gabrieldunne.com)  
+
+
+email list  
+<input type="text" value="you@email.com" onClick="this.value=''">
 <input type="button" value="subscribe">
 <input type="button" value="unsubscribe">
 
 <a href="http://quilime.com">blog</a>  
-<a href="http://media.quilime.com/aggregate/">image aggregate</a>
 
diff --git a/templates/index.html.tpl b/templates/index.html.tpl
index 4636bf7..823fbe1 100644
--- a/templates/index.html.tpl
+++ b/templates/index.html.tpl
@@ -8,16 +8,22 @@
 </head>
 <body>
 
-    <? $this->include_template('nav.html.tpl') ?>
+    <? $this->include_template('nav.html.tpl', array('index' => true)) ?>
 
 <div id="content">
 
-    <ul class="tags">
+<!--     <ul class="tags">
     <? $tags = get_tags('/'); ksort($tags); ?>
     <? foreach($tags as $t => $count) : ?>
         <li class="tag <?=$tag == $t?'sel':''?>"><a href="<?=WEB_ROOT?>?tag=<?=$t?>"><?=$t?></a></li>
     <? endforeach; ?>
-    </ul>   
+    </ul>    -->
+
+    <? if(isset($tag)): ?>
+    <ul class="tags">
+        <li class="tag"><?=$tag?></li>
+    </ul>
+    <? endif; ?>
 
     <ul class="entries">
     <? foreach($entries as $entry): ?>
@@ -26,6 +32,16 @@
         <? endforeach; ?>
     </ul>
 
+    <? if(!isset($tag)): ?>
+    <br /><br /><br />
+    <ul class="tags">
+    <? $tags = get_tags('/'); ksort($tags); ?>
+    <? foreach($tags as $tag => $count) : ?>
+    <li class="tag"><a href="<?=WEB_ROOT?>?tag=<?=$tag?>"><?=$tag?></a> &times; <?=$count?></li>
+    <? endforeach; ?>
+    </ul>  
+    <? endif; ?>  
+
 </div>
 
     <? $this->include_template('footer.html.tpl') ?>
diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl
index 8155b8b..66f5431 100644
--- a/templates/nav.html.tpl
+++ b/templates/nav.html.tpl
@@ -3,6 +3,7 @@
     <ul class="nav">
 
     <li class="home"><a href="<?=WEB_ROOT?>"><?=SITE_TITLE?></a></li>
+    <? if (isset($index) && $index && !isset($tag)) : ?>
     <? $en = get_pages('', $args = array(
         'recursive' => false, 
         'order_by' => 'alpha',
@@ -14,6 +15,7 @@
     <!-- <li>
     <? $this->include_template('nextprev.html.tpl') ?>
     </li> -->
+    <? endif; ?>
     </ul>
 
     
diff --git a/templates/single.html.tpl b/templates/single.html.tpl
index 0d85c7b..6daf7d3 100644
--- a/templates/single.html.tpl
+++ b/templates/single.html.tpl
@@ -16,9 +16,9 @@
 
 <div id="content" class="single entry">
 
-	    <div class="entry">
-	    <? $this->include_template('entry.html.tpl', array('entry' => $entry, 'single' => true)); ?>
-	    </div>
+    <div class="entry">
+    <? $this->include_template('entry.html.tpl', array('entry' => $entry, 'single' => true)); ?>
+    </div>
         
 </div>
 
-- 
2.34.1