]> git.quilime.com - plog.git/commitdiff
git.quilime.com / plog.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 28f76e4)
Single page again.
authorGabriel Dunne <gdunne@quilime.com>
Tue, 18 Jun 2013 00:44:28 +0000 (17:44 -0700)
committerGabriel Dunne <gdunne@quilime.com>
Tue, 18 Jun 2013 00:44:28 +0000 (17:44 -0700)
css/style.css patch | blob | history
lib/config.ini patch | blob | history
lib/data.php patch | blob | history
pages/bio patch | blob | history
pages/projects [deleted file] patch | blob | history
templates/all.html.tpl patch | blob | history
templates/entry.html.tpl patch | blob | history
templates/projects.html.tpl patch | blob | history

diff --git a/css/style.css b/css/style.css
index 0bc36c04e18ae3f4de33f7cbd06df123f77c9c3c..4c65d3b1714fc2b7c3bde04a0d0900b101e57d73 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -225,7 +225,7 @@ table, td, tr {
 .entries.projects li {
   /*display:inline-block;*/
   float:left;
-  height:330px;
+  height:250px;
   width:200px;
   margin:0 2em 2em 0;
 }
diff --git a/lib/config.ini b/lib/config.ini
index 50af06059923f6bc8619dbe5e232ccba00a871f1..84792011ca07d154afcbe33756306d50f6925bdf 100644 (file)
--- a/lib/config.ini
+++ b/lib/config.ini
@@ -9,7 +9,7 @@ date_format = M d Y
 ; local locations
 web_root    = /
 data        = cache
-content     = _content
+content     = content
 comments    = comments
 templates   = templates
 pages       = pages
diff --git a/lib/data.php b/lib/data.php
index 4a1f99feb00fc9741bdb9bedee5d26eaa3f90e77..605aa7d10ae08c5bff235117b90b9e9d46b41ae0 100644 (file)
--- a/lib/data.php
+++ b/lib/data.php
@@ -293,8 +293,9 @@ function parse_entry($fileInfo, $page = false)
     if ($passed_more)
         $file['content_short'] = Markdown($content_short);
 
-    $file['comments_enabled'] = isset($f['config']['comments']) && $f['config']['comments'];
-    $file['comments'] = new Comments($fileInfo);  
+    if (isset($f['config']['comments']) && $f['config']['comments']) {
+        $file['comments'] = new Comments($fileInfo);  
+    }
 
     $cat = clean_slashes(str_replace(rtrim(LOCAL_ROOT . '/' . CONTENT_DIR, "/"), "", $fileInfo->getPath()));
     
diff --git a/pages/bio b/pages/bio
index 8a52122870e35df3f4292179ff24aa5c98a0ca78..ca95c626f4de54947b7bc59e357ad977b704582f 100755 (executable)
--- a/pages/bio
+++ b/pages/bio
@@ -1,7 +1,7 @@
 template = page\r
 title = bio\r
 --\r
-<div style="float:right">\r
+<div style="float:right;display:none;">\r
 <img src="http://media.quilime.com/files/img/IMG_1881.jpg" />\r
 </div>\r
 \r
diff --git a/pages/projects b/pages/projects
deleted file mode 100644 (file)
index db3c026..0000000
--- a/pages/projects
+++ /dev/null
@@ -1,4 +0,0 @@
-template = all
-title = projects
---
-projects
diff --git a/templates/all.html.tpl b/templates/all.html.tpl
index 162f1b13a47ba1afabba55301e951e26d5fd3feb..4a1948687351d2a06840c55fe52696300a45eb89 100644 (file)
--- a/templates/all.html.tpl
+++ b/templates/all.html.tpl
@@ -1,7 +1,7 @@
 <html>
 <head>
     <? $this->include_template('head-inc.html.tpl') ?>
-    <title><?=SITE_TITLE?></title>
+    <title><?=SITE_TITLE?><?=$this->page_title(TITLE_DELIMITER);?></title>
 </head>
 <body>
 
@@ -14,7 +14,6 @@
     $tag = "";
 ?>
 
-<div id="content">
 
 <div id="content">
     <ul class="entries projects <?=isset($tag)&&$tag!==""?'tagged':''; ?>">
@@ -36,10 +35,8 @@
         </li>
     <? endforeach; ?>
     </ul>
-
 </div>
 
-</div>
 
     <? $this->include_template('pagination.html.tpl') ?>
 
diff --git a/templates/entry.html.tpl b/templates/entry.html.tpl
index e830e75261a2df3caa6589be9f29ce46e51f0ee6..4b3758d5e30d36642daf49e2747b876e301fd11b 100644 (file)
--- a/templates/entry.html.tpl
+++ b/templates/entry.html.tpl
@@ -41,7 +41,7 @@
 <? endif; ?>
 
 <? 
-if (isset($entry->is_single) && $entry->is_single && $entry->comments_enabled)
+if (isset($entry->is_single) && $entry->is_single && isset($entry->comments))
        $this->include_template('comments.html.tpl', array('entry' => $entry));
 ?>
 
diff --git a/templates/projects.html.tpl b/templates/projects.html.tpl
index 7462997c5f8293ec67f9e7c0cc8842792a100fda..d781ae86c131adb7e587513a79873500f84c5df6 100644 (file)
--- a/templates/projects.html.tpl
+++ b/templates/projects.html.tpl
@@ -1,10 +1,7 @@
 <html>
-<head>
-    
+<head>    
     <? $this->include_template('head-inc.html.tpl') ?>
-    
     <title><?=SITE_TITLE?><?=$this->page_title(TITLE_DELIMITER);?></title>
-    
 </head>
 <body>
     
@@ -20,26 +17,43 @@
 
     <br />
 
-    <ul>
-    <? $entry = 0; foreach($entries as $entry): ?>
+    <ul style="float:left;">
+    <? foreach($entries as $entry): ?>    
         <li>
-        <a href="<?=$entry->url?>"><?=$entry->title?></a>
+            <a href="<?=$entry->url;?>">
+                <strong><?=$entry->title;?></strong>
+            </a>
         </li>
-    <? endforeach; ?>   
+    <? endforeach; ?>    
     </ul>
 
-    <br /><br />
-
-<!--     <h2>tags</h2>
-    <ul class="tags">
-    <? $tags = get_tags($entry->cat->url); ksort($tags); ?>
-    <? foreach($tags as $tag => $count) : ?>
-    <li class="tag"><a href="<?=WEB_ROOT?><?=$entry->cat->url?>tag/<?=$tag?>"><?=$tag?></a> &times; <?=$count?></li>
+    <ul style="margin-left:200px;" class="entries projects <?=isset($tag)&&$tag!==""?'tagged':''; ?>">
+    <? foreach($entries as $entry): ?>
+        <li class="entry <?=$entry->cat->name?>">
+            <a href="<?=$entry->url;?>">
+                <img src="<?=$entry->thumb;?>" class="thumb" />
+                <br />
+                <strong><?=$entry->title;?></strong>
+                </a>
+                <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>                
+        </li>
     <? endforeach; ?>
-    </ul>     -->
+    </ul>
 </div>
 
 <? $this->include_template('footer.html.tpl') ?>
 
 </body>
 </html>
+
+
+
+
+
Unnamed repository; edit this file 'description' to name the repository.