Added Archive mode

diff --git a/css/style.css b/css/style.css
index 870db98ba5eac8be0334e0d6e44fbe9adf4cf819..5cde8853efa8a2991571d74f0c936242ec376c15 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -78,7 +78,9 @@ blockquote {
     color:#999;
     line-height:1.3em;
     margin:0;
-    padding:0;
+    padding:1em;
+    background:#ddd;
+    max-width:600px;
 }
 pre {
     padding:10px 20px;

diff --git a/lib/config.ini b/lib/config.ini
index 84792011ca07d154afcbe33756306d50f6925bdf..456788bbb1b99dd5e482bd707a1fe4945f739010 100644 (file)
--- a/lib/config.ini
+++ b/lib/config.ini
@@ -1,7 +1,7 @@
 ; settings
-site_title  = GABRIEL DUNNE
+site_title  = GABRIEL L DUNNE
 clean_urls  = 1
-limit       = 100
+limit       = 1000
 ; http://php.net/manual/en/function.date.php
 ; ie, M d Y, h:i:s A T
 date_format = M d Y

diff --git a/lib/data.php b/lib/data.php
index 5e288b60e5d30cbfd03d9063f67c3b04d17f2fa6..892e78ea2f03ea890a46fdd1bb68e436b13097bf 100644 (file)
--- a/lib/data.php
+++ b/lib/data.php
@@ -12,6 +12,7 @@ function get_entries( $path = "", $args = array() )
     $order = empty($args['order']) ? SORT_DESC : $args['order'];
     $tag = empty($args['tag']) ? null : $args['tag'];
     $show_featured = isset($args['show_featured']) ? $args['show_featured'] : 0;
+    $archived = isset($args['archived']) ? $args['archived'] : 0;
 
     $local_path = rtrim(LOCAL_ROOT . '/' . CONTENT_DIR . '/' . $path, "/");
     $data_path  = rtrim(LOCAL_ROOT . '/' . DATA_DIR . '/' . CONTENT_DIR . '/' . $path, '/');
@@ -72,6 +73,13 @@ function get_entries( $path = "", $args = array() )
             }
         }
     }    
+    if ($archived) {
+        foreach ($data->entries as $i => $entry) {
+            if (!$entry->archived) {
+                unset($data->entries[$i]);
+            }
+        }
+    }        
     if (isset($tag)) {
         foreach ($data->entries as $i => $entry) {
             if (
@@ -290,6 +298,7 @@ function parse_entry($fileInfo, $page = false)
     $file['timestamp'] = $file['config']['date'] ? date('U', strtotime( $file['config']['date'])) : $fileInfo->getCTime();
     $file['tags'] = isset($file['config']['tags']) ? explode(" ", $file['config']['tags']) : null;
     $file['featured'] = isset($file['config']['featured']) ? $file['config']['featured'] : null;
+    $file['archived'] = isset($file['config']['archived']) ? $file['config']['archived'] : null;
     $file['related'] = isset($file['config']['related']) ? explode(" ", $file['config']['related']) : null;
 
     $file['content'] = Markdown($content);

diff --git a/lib/model.php b/lib/model.php
index 85cd0f8c82656f63d6d4d4cf4e40fd590cf38b99..acb213ab4ba5d4bb94d2d1b51884c4cbc5d8dc62 100644 (file)
--- a/lib/model.php
+++ b/lib/model.php
@@ -86,6 +86,9 @@ class Model
                if (isset($this->config->config->show_featured) && !$this->tag) {
                        $entries_args['show_featured'] = true;
                }
+               if (isset($this->config->config->archived) && !$this->tag) {
+                       $entries_args['archived'] = true;
+               }               
                $this->entries = get_entries( $request['path'], $entries_args);
 
                // pagination

diff --git a/pages/cv b/pages/about
similarity index 94%
rename from pages/cv
rename to pages/about
index 0fde03233e0cb8b8c3949096bc9f49c97583547d..f8cc16c8467dbe33255315420451c90b92c650bb 100755 (executable)
--- a/pages/cv
+++ b/pages/about
@@ -1,5 +1,4 @@
 template = page\r
-title = c/v\r
 --\r
 <div style="float:right;display:none;">\r
 <img src="http://media.quilime.com/files/img/IMG_1881.jpg" />\r
@@ -8,7 +7,8 @@ title = c/v
 Gabriel Labov Dunne  \r
 studio (at) gabrieldunne (dot) com  \r
 1242 Market St, FL 2  \r
-San Francisco, CA 94102\r
+San Francisco, CA 94102  \r
+[blog](http://quilime.com)\r
 <br />\r
 <br />\r
 \r
@@ -20,7 +20,7 @@ San Francisco, CA 94102
 <br />\r
 \r
 \r
-###### select exhibitions / projects\r
+###### exhibition\r
 2013 [Stars](/stars) SomArts 'NightLight', San Francisco CA  \r
 2013 [FaceReplace](/facereplace) @ ArtHackDay "Lethal Software, San Francisco CA  \r
 2012 [Audio ShaderToy](/audioshadertoy) @ Creators Project SF, collab w/ Ryan Alexander, Reza Ali, San Francisco, CA   \r
@@ -55,7 +55,7 @@ San Francisco, CA 94102
 <br />\r
 \r
 \r
-###### talks / teaching / workshops\r
+###### talks / teaching\r
 2012 Film/Code/Remix, BAVC, San Francisco  \r
 2012 Processing, ACCU, Symantic, Palo Alto     \r
 2012 Processing, ACCU Davis Linux Users Group, Davis, CA    \r

diff --git a/templates/archive.html.tpl b/templates/archive.html.tpl
index 204ac1733d034604d18739527414f4accd5c9c47..c4a3320dcc3e364b919c3004bd9b0d6f21787b3b 100644 (file)
--- a/templates/archive.html.tpl
+++ b/templates/archive.html.tpl
@@ -1,28 +1,46 @@
 <html>
 <head>
-    
     <? $this->include_template('head-inc.html.tpl') ?>
-    
     <title><?=SITE_TITLE?><?=$this->page_title(TITLE_DELIMITER);?></title>
-    
 </head>
 <body>
-    
-    
-<div id="content">
 
-    <ul class="archive">
+<? $this->include_template('nav.html.tpl', array('index' => true)) ?>
+
+<?
+    $m = new Model(get_request(''), 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): ?>
-    <li>
-        &mdash; <a class="more" href="<?= $entry['url']; ?>"><?= $entry['title']; ?></a>
-    </li>
-    <? endforeach; ?>   
+        <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>
-    
 </div>
 
+
+    <? $this->include_template('pagination.html.tpl') ?>
+
     <? $this->include_template('footer.html.tpl') ?>
-    <? $this->include_template('nav.html.tpl') ?>
 
 </body>
 </html>

diff --git a/templates/entry.html.tpl b/templates/entry.html.tpl
index 213ad45a38d085dc5c0cecdcd557ec487fded0a3..0ec7762cf983a6b2593209ae917458ca0294ea26 100644 (file)
--- 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) || $show_metadata) : ?>
+<? if ((isset($entry->is_single) && $entry->is_single) || (isset($show_metadata) && $show_metadata)) : ?>
 
        <div class="metadata">
 

diff --git a/templates/tags.html.tpl b/templates/tags.html.tpl
index 527953d327cfc710c7a7b2b124a7f336bb146441..274f4a915dfa9aed8ea8e8950d9a4f369191dde9 100644 (file)
--- a/templates/tags.html.tpl
+++ b/templates/tags.html.tpl
@@ -4,7 +4,12 @@
 <ul class="tags">
 <? $tags = get_tags('/'); if (isset($_GET['s'])) arsort($tags); else ksort($tags); ?>
 <? foreach($tags as $tag => $count) : ?>
-<li class="tag"><a href="<?=WEB_ROOT?>tag/<?=$tag?>"><?=$tag?></a>&nbsp;&nbsp;<?=$count?></li>
+<li class="tag">
+       <a href="<?=WEB_ROOT?>tag/<?=$tag?>"><?=$tag?></a>
+<? if (isset($_GET['s'])): ?>
+       &nbsp;&nbsp;<?=$count?> 
+<? endif; ?>
+</li>
 <? endforeach; ?>
 </ul>
 <? endif; ?>