merge from master

diff --cc public/css/style.css
index bc8109a1176ffff60cc481bfa228810c48e63ca0,f2017e73f441df11f19726cb6e47001f60641b1f..746fa2fecbfa10f2f4edf08a4b653d63fa69058e
--- 1/public/css/style.css
--- 2/public/css/style.css
+++ b/public/css/style.css
@@@ -20,10 -13,10 +13,10 @@@ a:hover, a.mute:hover { color:#d15; tex
  h1, h2, h3, h4, h5, h6 {  font-size:1em; }
  h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { }
  h1 { margin:0 0 3em 0; }
 -h2 { margin:0 0 0.5em 0;  }
 +h2 { margin:0 0 0.5em 0; }
  h3 { margin:0 0 0 0; }
  
+ ul, li { margin:0; padding:0; list-style-type:none; }
  ol li { list-style-type:decimal; }
  
  blockquote { font-family:times; background:#000; color:#aaa;
@@@ -45,48 -52,13 +52,5 @@@ table .reader li, table .bookmarks li 
  .bookmark_links li span { font-style: italic; color:#444; }
  .image li a { background:none;}
  
- table.archive td {padding-right:20px; }
- 
- .c_pop { position:absolute; background:#fff; display:none; border:5px outset #000; padding:1em 2em; z-index:5; } 
- 
- .func { font-weight:bold; color:#444; }
- 
- #home_arrow { position: absolute; top:11px; left:23px; margin-left:250px; text-decoration:none; }
- 
- #content { margin-left:120px; min-width:500px; position:absolute; top:20px; padding-bottom:200px; z-index:10;}
-     #content p {  }
-     ul.inline_content {}
-     ul.inline_content li .content { } 
-     ul.inline_content li { margin:0 0 150px 0; }
-     ul.inline_content li h3 { margin-bottom:1em; border-bottom:1px solid #ddd; padding-bottom:4px; }
-     ul.inline_content ol li { margin:0; padding:0; border:0;}
-     ul.thumbnails    { }
-     ul.thumbnails li { display:inline-block; margin: 0px 60px 60px 0px; }
-     ul.thumbnails .thumbnail { width:160px; height:120px; text-align:center; background:#888; }
-     ul.thumbnails a:hover img { 
-         filter:alpha(opacity=75);
-         -moz-opacity:0.75;
-         -khtml-opacity: 0.75;
-         opacity: 0.75;
-     }     
-     ul.thumbnails a { text-decoration:none;  }   
-     ul.thumbnails .title {  }
-     
-     .date { color:#ccc;}    
-     .func { margin-bottom:2em; }
-     .func a { background:#daa;  padding:0.2em 1em 0.02em 1em; font-size:9px; text-transform:uppercase;}
- 
-     .text { font-family:serif; font-size:15px; line-height:2.2em;  margin-top:80px;}
-     .indent { text-indent:3em; }
-     
- .entry { margin-bottom:100px; }
- .entry h2 { padding-bottom:4px; font-size:1.3em; }
- .entry h2 .title-date { font-weight:normal; color:#bbb; }
- .entry .metadata { margin-top:20px; font-style:italic; color:#aaa; }
- .entry .metadata .tags li { display:inline-block; margin-right:1em; }
-     
- .caption { font-style:italic; margin-top:5px; color:#444; }
- .more, .home { text-decoration:none; color:#000; font-weight:bold; }
- 
  #footer {  margin-top:120px; }    
--#footer .copy a { text-decoration:none; }
 -
 -
 -
 -
 -
 -
 -
 -
++#footer .copy a { text-decoration:none; }

diff --cc templates/nav.html.tpl
index c3f612a0dc33d6988aeabb4e565a41fc40026964,035739203383609dfeac4dac3b4f7f1015b0f010..02ad92106fd926ca5f31ef9505ef44a85e752c6b
--- 1/templates/nav.html.tpl
--- 2/templates/nav.html.tpl
+++ b/templates/nav.html.tpl
@@@ -1,12 -1,11 +1,10 @@@
  <ul class="nav">         
  
-       <li><h2><a href="/"><?=SITE_TITLE;?></a></h2></li>
-       
-       <br />
-       
+       <li><h1><a href="/"><?=SITE_TITLE;?></a></h1></li>
 -      
 -      
 -      <? $dirs = get_dirs("/", array('recursive' => 0)); ?>
 -      <? foreach($dirs as $d) : ?>
 -      <li><a href="<?=get_base_dir();?>/<?=$d?>"><?=$d?></a></li>
++
 +      <? $dirs = get_dirs("", array('recursive' => 0)); ?>
 +      <? foreach($dirs as $dir) : ?>
 +      <li><a href="<?=$dir['url']?>"><?=$dir['name']?></a></li>
        <? endforeach; ?>
        
        <br />