trying commercial out

diff --git a/css/style.css b/css/style.css
index a5ec9074d7e57648b7fb6e5d1fe72b513366dd71..720876340759b65f8c69f1051807a10e045ac7d6 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -13,7 +13,7 @@ body {
 }
 a {
   border: 0pt none;
-  color:#444;
+  color:#111;
 
   /*font-weight:bold;*/ }
   a img {
@@ -80,14 +80,13 @@ ol li {
     list-style-type:decimal;
 }
 blockquote {
-    /*font-family:serif;*/
+    font-family:serif;
     font-style:italic;
-    font-size:1.2em;
-    color:#999;
+    font-size:1.75em;
+    color:#333;
     line-height:1.3em;
     margin:0;
     padding:1em;
-    background:#ddd;
     max-width:600px;
 }
 pre {

diff --git a/lib/data.php b/lib/data.php
index 7034b83ae1eb9674fd8b306015460bf7e423acf9..300eb1f0bd34e508d9ad250461c0f6a16c0032ec 100644 (file)
--- a/lib/data.php
+++ b/lib/data.php
@@ -171,6 +171,9 @@ function get_dirs( $path = "", $args = array())
                $d['url'] = WEB_ROOT . '?p=' . clean_slashes($d['url'], true);
             $d['name'] = str_replace($path, "",  $info->getRealPath());
             
+            $cfg = $info->getRealPath() . DIRECTORY_SEPARATOR . CONFIG_FILE;
+
+            $d['entry'] = parse_entry(new SplFileInfo($cfg));
 
             //echo $info->pathName;
             //if (file_exists($info->getPathName() . DIRECTORY_SEPARATOR . CONFIG_FILE)) {
@@ -178,7 +181,7 @@ function get_dirs( $path = "", $args = array())
                 //print_r($e);
             //}
 
-            $d['title'] =  ltrim($d['name'],"/");
+            $d['title'] = isset($d['entry']->title) ? $d['entry']->title : ltrim($d['name'],"/");
                        $dirs[] = (object) $d;
                }
        }
@@ -325,6 +328,7 @@ function parse_entry($fileInfo, $page = false)
 
 
     $file['path'] = $fileInfo->getRealPath();
+    $file['hide'] = isset($file['config']['hide']) ? $file['config']['hide'] : null;
     
     $web_accessable_root = str_replace(CONTENT_DIR, "", $file['dirname']);
 

diff --git a/pages/.all b/pages/.all
new file mode 100644 (file)
index 0000000..b085807
--- /dev/null
+++ b/pages/.all
@@ -0,0 +1,4 @@
+template = all
+title = all work
+--
+all work

diff --git a/pages/.projects b/pages/.projects
deleted file mode 100644 (file)
index 35838e8..0000000
--- a/pages/.projects
+++ /dev/null
@@ -1,4 +0,0 @@
-template = all
-title = all projects
---
-projects

diff --git a/templates/archive.html.tpl b/templates/archive.html.tpl
index c4a3320dcc3e364b919c3004bd9b0d6f21787b3b..3b7247680ed3a0f245c0f9d257e1a0c3e1787a25 100644 (file)
--- a/templates/archive.html.tpl
+++ b/templates/archive.html.tpl
@@ -8,13 +8,12 @@
 <? $this->include_template('nav.html.tpl', array('index' => true)) ?>
 
 <?
-    $m = new Model(get_request(''), 1);
+    $m = new Model(get_request('archive/'), 1);
     $entries = $m->entries;
     $this->assign('pagination', $m->pagination);
     $tag = "";
 ?>
 
-
 <div id="content">
     <ul class="entries projects <?=isset($tag)&&$tag!==""?'tagged':''; ?>">
     <? foreach($entries as $entry): ?>

diff --git a/templates/index.html.tpl b/templates/index.html.tpl
index 90cbd5b872fbda83edc3ea34137a761852573b1e..f90ae096bbec04e11faf1471f948eaca1fb9e957 100644 (file)
--- a/templates/index.html.tpl
+++ b/templates/index.html.tpl
@@ -13,7 +13,6 @@
         <li class="<?=$entry->cat->name?>">
             <!-- style="<?=$entry->config->style?>" -->
 
-
             <a href="<?=$entry->url;?>">
                 <img src="<?=$entry->thumb?>" class="thumb" />
                 <br />

diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl
index 872495e69e42640b6868f198d3c50338e2f6043c..ac21e46d84039bd49f61ca646388fcb0c7efbaf4 100644 (file)
--- a/templates/nav.html.tpl
+++ b/templates/nav.html.tpl
@@ -10,14 +10,14 @@
         ) ); ?>
     <? $dirs = get_dirs('', array('recursive'=>0)); ?>
     <? foreach($dirs as $e) : ?>
-    <li><a href="<?=$e->url?>"><?=$e->title?></a></li>
+        <? if ($e->entry->hide) continue; ?>
+        <li><a href="<?=$e->url?>"><?=$e->title?></a>
+        </li>
     <? endforeach; ?>          
     <? foreach($en as $e) : ?>
     <li>
         <a <?=$request['basename'] == $e->title ? 'class="selected"' : ''?> href="<?=$e->url?>"><?=$e->title?></a>
-
         <? if ($e->title == 'tag' && isset($tag)): ?>&nbsp;<span class="tag"><?=$tag;?></span><? endif; ?>
-        
     </li>
     <? endforeach; ?>
     <? //} ?>

diff --git a/templates/project.list.html.tpl b/templates/project.list.html.tpl
new file mode 100644 (file)
index 0000000..5846ff4
--- /dev/null
+++ b/templates/project.list.html.tpl
@@ -0,0 +1,25 @@
+<html>
+<head>    
+    <? $this->include_template('head-inc.html.tpl') ?>
+    <title><?=SITE_TITLE?><?=$this->page_title(TITLE_DELIMITER);?></title>
+</head>
+<body>
+    
+<? $this->include_template('nav.html.tpl') ?>
+
+<? if (EDIT) $this->include_template('edit.html.tpl'); ?>
+    
+<div id="content">
+    
+    <? if (isset($entry->content)): ?>
+        <? eval('?>' . $entry->content); ?>
+    <? endif; ?>
+
+    <? $this->include_template('projectlist.html.tpl') ?>
+    
+</div>
+
+<? $this->include_template('footer.html.tpl') ?>
+
+</body>
+</html>

diff --git a/templates/projectlist.html.tpl b/templates/projectlist.html.tpl
index 3ea35f3a39f93e3cd0b4690f3331781d82cc1871..4e05203e944839a944935e17e4968a765cca5b9f 100644 (file)
--- a/templates/projectlist.html.tpl
+++ b/templates/projectlist.html.tpl
@@ -1,6 +1,8 @@
 <?
-$m = new Model(get_request('projects/'), 0);
+$r =  $this->_tpl_vars['request']['dirname'] ? $this->_tpl_vars['request']['dirname'] : $this->_tpl_vars['request']['basename'];
+$m = new Model(get_request($r . '/'), 0);
 $projects = $m->entries;
+
 ?>
 <ul class="projectlist">
 <? foreach($projects as $entry): ?>
@@ -9,3 +11,4 @@ $projects = $m->entries;
     </li>
 <? endforeach; ?>
 </ul>
+

diff --git a/templates/projects.html.tpl b/templates/projects.html.tpl
index 0f0b1e13be30f758c411b761e70a239a94036443..709ec5da39fea8892dd7531f102f6902ff3f8b33 100644 (file)
--- a/templates/projects.html.tpl
+++ b/templates/projects.html.tpl
@@ -9,19 +9,42 @@
 
 <? if (EDIT) $this->include_template('edit.html.tpl'); ?>
     
-<? $this->include_template('projectlist.html.tpl') ?>
-
 <div id="content">
     
     <? if (isset($entry->content)): ?>
         <? eval('?>' . $entry->content); ?>
     <? endif; ?>
 
-    <!--   
-    <ul>
+
+<? if (!isset($_GET['s'])): ?>
+
+    <div class="sort">
+    view by list <a href="?s">images</a>
+    <br />
+    <br />
+    </div>
+
+    <? $this->include_template('projectlist.html.tpl') ?>
+
+<? else: ?>
+
+    <div class="sort">
+    view by <a href="?">list</a> images
+    <br />
+    <br />
+    <br />
+    </div>
+
+
+    <ul class="entries projects">    
     <? foreach($entries as $entry): ?>
         <li class="entry <?=$entry->cat->name?>">
-            <a href="<?=$entry->url;?>"><?=$entry->title;?></a>
+            <a href="<?=$entry->url;?>">
+                <img src="<?=$entry->thumb?>" class="thumb" />
+                <br />
+                <strong><?=$entry->title;?></strong>
+                </a>   
+                <!--         
                  <br />
                 &mdash;
                 <br />
@@ -30,10 +53,13 @@
                         <li class="tag"><a href="<?=WEB_ROOT.'tag/'.$tag?>"><?=$tag?></a></li>
                     <? endfor; ?>
                 </ul>     
+            -->
         </li>
     <? endforeach; ?>
     </ul>
-    -->
+
+    <? endif; ?>
+
     
 </div>
 

diff --git a/templates/single.html.tpl b/templates/single.html.tpl
index 4a08f964ced73dcbdd1b16beb4d1959a2900acaa..59c9d8d189fe8f1bd186c44b6f2ff59d990f3988 100644 (file)
--- a/templates/single.html.tpl
+++ b/templates/single.html.tpl
@@ -12,6 +12,7 @@
 
 <? if (EDIT) $this->include_template('edit.html.tpl'); ?>
 
+
 <? $this->include_template('projectlist.html.tpl') ?>
 
 <div id="content" class="single entry">