]> 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: 8b8ff35)
new templates, new index file
authorGabriel Dunne <gdunne@quilime.com>
Sat, 10 Jul 2010 01:14:58 +0000 (18:14 -0700)
committerGabriel Dunne <gdunne@quilime.com>
Sat, 10 Jul 2010 01:14:58 +0000 (18:14 -0700)
public/index.php patch | blob | history
templates/default.html.tpl patch | blob | history
templates/default.txt.tpl patch | blob | history
templates/page.html.tpl patch | blob | history
templates/single.html.tpl patch | blob | history

diff --git a/public/index.php b/public/index.php
index d7221da6cd3ead4debbb8cd3b5d8c1fed0dfb6fb..f73f29e5e525672840eafe136ac4d2f4a8f80a95 100644 (file)
--- a/public/index.php
+++ b/public/index.php
@@ -6,35 +6,39 @@
 
        list($response_format, $response_mime_type) = parse_format($url_parts['extension'], 'html');    
        
-       # setup template
        $t = get_template_instance();   
        $t->response_format = $response_format;
        $t->assign('view', $_GET['v']);
                
-       # is folder
-       if (is_dir(LOCAL_ROOT . CONTENT_DIR . $url_parts['url']) && $url_parts['url'] != "/") {
-               list($data, $total) = get_entries($url_parts['url']);
+       # content folder
+       if (is_dir(LOCAL_ROOT . CONTENT_DIR . DIRECTORY_SEPARATOR . $url_parts['url']) && $url_parts['url'] != "/") {
+               list($data, $total) = get_data(array($url_parts['url']));
+               $t->assign('page_title', preg_replace('{^/|/$}', '', $url_parts['url']));
                $t->assign('data', $data);              
        }
-       # is file
-       else if (is_file( LOCAL_ROOT . CONTENT_DIR . $url_parts['url'])) {
-               $t->assign('single', true);             
-               $t->assign('data', parse_entry(new SplFileInfo(LOCAL_ROOT . CONTENT_DIR . $url_parts['url'])));
+       # single file
+       else if (is_file( LOCAL_ROOT . CONTENT_DIR . $url_parts['dirname'] . DIRECTORY_SEPARATOR . $url_parts['filename'])) {
+               $t->assign('single', true);
+               $t->assign('data', parse_file(LOCAL_ROOT . CONTENT_DIR . $url_parts['dirname'] . DIRECTORY_SEPARATOR . $url_parts['filename']));
                $template = 'single.'.$response_format.'.tpl';          
        }
-       # is page
-       else if (is_file( LOCAL_ROOT . PAGE_DIR . $url_parts['url'])) {
-               $page = parse_entry(new SplFileInfo(LOCAL_ROOT . PAGE_DIR . $url_parts['url']), 1);
-               $t->assign('data', $page);
-               $template = $page['config']['template'] ? $page['config']['template'] . '.' . $response_format . '.tpl' : 'page.' . $response_format . '.tpl';
+       # page
+       else if (is_file( LOCAL_ROOT . PAGE_DIR . DIRECTORY_SEPARATOR . $url_parts['filename'] )) {
+               $t->assign('data', parse_file(LOCAL_ROOT . PAGE_DIR . DIRECTORY_SEPARATOR . $url_parts['filename']));
+               $template = 'page.' . $response_format . '.tpl';
        }
-       # default (all entries)
+       # direct template
+       else if (is_file( LOCAL_ROOT . TEMPLATE_DIR . DIRECTORY_SEPARATOR . $url_parts['filename'] .'.'. $response_format . '.tpl')) {
+               $template = $url_parts['filename'] . '.' . $response_format . '.tpl';           
+       }
+       # default (index)
        else {
-               list($data, $total) = get_entries();
+               list($data, $total) = get_data();
                $t->assign('data', $data);              
        }
        
-       # render
+       
+       # render template
        $t->assign('total', $total);    
     header("Content-Type: {$response_mime_type}; charset=UTF-8");
        $t->render($template);
diff --git a/templates/default.html.tpl b/templates/default.html.tpl
index 678ebc3cc17c7b7886837d3948a478821d26ab82..f5f95724c21fd4547385adedc081effa1fb34cc7 100644 (file)
--- a/templates/default.html.tpl
+++ b/templates/default.html.tpl
@@ -3,7 +3,7 @@
     
     <? $this->include_template('head-inc.html.tpl') ?>
     
-    <title><?=SITE_TITLE?><?=$this->title();?></title>
+    <title><?=SITE_TITLE?>, <?=$page_title?></title>
     
 </head>
 <body>
@@ -12,7 +12,7 @@
     
 <div id="content">
 
-       <? if (sizeof($data) > 0) foreach($data as $entry): ?>
+       <? foreach($data as $entry): ?>
        <? $this->include_template('entry.html.tpl', array('data' => $entry)); ?>
        <? endforeach; ?>       
        
diff --git a/templates/default.txt.tpl b/templates/default.txt.tpl
index bfef63c15af8f89bba69d184f73d37b21c2afe5f..eac9fb233a36720a1a9e144ddd933f5c2018f950 100644 (file)
--- a/templates/default.txt.tpl
+++ b/templates/default.txt.tpl
@@ -1,4 +1,4 @@
-title : <?=SITE_TITLE?><?=$this->title()."\n"; ?>
+title : <?=SITE_TITLE?>, <?=$page_title . "\n"; ?>
 author : gabriel dunne
 email : gdunne at quilime dot com
 copyright : 1997 - <?=date('Y');?>
diff --git a/templates/page.html.tpl b/templates/page.html.tpl
index 159c659502245bfbd0de8801c1bdcca2627e5c75..295ad02302bae5e7ad086fb2eb42900460fde509 100644 (file)
--- a/templates/page.html.tpl
+++ b/templates/page.html.tpl
@@ -3,7 +3,7 @@
     
     <? $this->include_template('head-inc.html.tpl') ?>
     
-    <title><?=SITE_TITLE?><?=$this->title();?></title>
+    <title><?=SITE_TITLE?>, <?=$data['title']?></title>
     
 </head>
 <body>
@@ -12,6 +12,8 @@
     
 <div id="content">
        
+       <h1><?=$data['title']?></h1>
+
        <?=$data['content'];?>
        
 </div>
diff --git a/templates/single.html.tpl b/templates/single.html.tpl
index ccb8623b9a115685f90500066ad3c18867f6bbcc..e169285f49edcd4c73bb434c801687931adffdcc 100644 (file)
--- a/templates/single.html.tpl
+++ b/templates/single.html.tpl
@@ -3,7 +3,7 @@
     
     <? $this->include_template('head-inc.html.tpl') ?>
     
-    <title><?=SITE_TITLE?><?=$this->title(); ?></title>
+    <title><?=SITE_TITLE?>, <?=$data['title'];?></title>
     
 </head>
 <body>
Unnamed repository; edit this file 'description' to name the repository.