From: Gabriel Dunne <gdunne@quilime.com>
Date: Tue, 18 Jun 2013 04:17:14 +0000 (-0700)
Subject: Getting log working
X-Git-Url: https://git.quilime.com/?a=commitdiff_plain;h=547962c47d968bf817a0f13e5fbe5c8c8cdedb34;p=plog.git

Getting log working
---

diff --git a/css/style.css b/css/style.css
index a3c74a1..870db98 100644
--- a/css/style.css
+++ b/css/style.css
@@ -255,6 +255,12 @@ table, td, tr {
 .entries.log li {
 height:auto;
   }
+.entries.log .entry {
+  margin-bottom:200px;
+  }  
+.entries.log .entry {
+  
+}
 
 
 .entries.projects ul.tags li {
@@ -340,7 +346,6 @@ height:auto;
 }
 .entries li {
     margin-bottom:4em;
-    text-align:center;
 }
 .entry h2.title {
   font-size:12px;
@@ -378,7 +383,9 @@ ul.entries li a:hover {
   margin-bottom:40px;
   width:120px; }
 .projects li {
-  margin-bottom:2em; }
+  margin-bottom:2em; 
+  text-align:center;
+}
 
 
 
diff --git a/templates/entry.html.tpl b/templates/entry.html.tpl
index fe67574..213ad45 100644
--- a/templates/entry.html.tpl
+++ b/templates/entry.html.tpl
@@ -14,7 +14,7 @@
 	<? eval('?>' . $entry->content); ?>
 </div>
 
-<? if (isset($entry->is_single) && $entry->is_single) : ?>
+<? if ((isset($entry->is_single) && $entry->is_single) || $show_metadata) : ?>
 
 	<div class="metadata">
 
diff --git a/templates/log.html.tpl b/templates/log.html.tpl
index ac54b44..4412518 100644
--- a/templates/log.html.tpl
+++ b/templates/log.html.tpl
@@ -19,10 +19,12 @@
     <? $entry = 0; foreach($entries as $entry): ?>
     <div class="entry">
     <?
-        //if (isset($entry->content_short))
-        //$entry->content = $entry->content_short . '<br /><a class="more" href="' . $entry->url . '">more &rarr;</a><br /><br />';
-        $this->include_template('entry.html.tpl', array('entry' => $entry));
+        if (isset($entry->content_short))
+        $entry->content = $entry->content_short . '<br /><a class="more" href="' . $entry->url . '">more &rarr;</a><br /><br />';
+        else
+        $this->include_template('entry.html.tpl', array('entry' => $entry, 'show_metadata' => true));
     ?>
+
     </div>
     <? endforeach; ?>
 
diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl
index efd5e15..b3253b5 100644
--- a/templates/nav.html.tpl
+++ b/templates/nav.html.tpl
@@ -5,10 +5,7 @@
     
 
     
-    <? $dirs = get_dirs('', array('recursive'=>0)); ?>
-    <? foreach($dirs as $e) : ?>
-    <li><a href="<?=$e->url?>"><?=$e->title?></a></li>
-    <? endforeach; ?>    
+  
     
 
     <? if (!isset($entry->is_single)) {
@@ -17,6 +14,10 @@
         'order_by' => 'alpha',
         'order' => SORT_ASC
         ) ); ?>
+    <? $dirs = get_dirs('', array('recursive'=>0)); ?>
+    <? foreach($dirs as $e) : ?>
+    <li><a href="<?=$e->url?>"><?=$e->title?></a></li>
+    <? endforeach; ?>          
     <? foreach($en as $e) : /*print_r($e);*/ ?>