From: Gabriel Dunne Date: Mon, 20 Feb 2012 05:11:44 +0000 (-0800) Subject: updated next/prev X-Git-Url: https://git.quilime.com/?a=commitdiff_plain;h=563ed694650e9260c718deae30a6949c012633ee;p=plog.git updated next/prev --- diff --git a/TODO b/TODO index 706a6cf..d3550fe 100644 --- a/TODO +++ b/TODO @@ -1,9 +1,14 @@ TODO - pagination (View) -- prev/next (View) -- static cache generation (wget? curl?) + +- canvas icons for list/thumb/tile views (js) + +- static cache generation (wget? curl?) + - update content.sh to give back help if used incorrectly -nice things -- highlight categories from index \ No newline at end of file + + +done +- prev/next (View) diff --git a/content/code/archlinux_install b/content/code/archlinux_install index 8c8cc9a..c34cb62 100644 --- a/content/code/archlinux_install +++ b/content/code/archlinux_install @@ -3,7 +3,6 @@ date = 2012-01-02 tags = arch linux windows installation tutorial -- - Documentation of the process of installing [archlinux](http://www.archlinux.org/) and Windows 7 in a dual-boot configuration. ## System Specs diff --git a/content/code/bash_profile_linux b/content/code/bash_profile_linux index 6f6550c..7146b56 100644 --- a/content/code/bash_profile_linux +++ b/content/code/bash_profile_linux @@ -7,4 +7,4 @@ export CLICOLOR=1 export LSCOLORS=gxFxCxDxBxgggdabagacad export EDITOR='emacs' - \ No newline at end of file + diff --git a/content/config b/content/config index 759fb8f..94c78ea 100644 --- a/content/config +++ b/content/config @@ -1,2 +1,3 @@ +title = quilime template = index -title = delhi 2011 \ No newline at end of file + diff --git a/content/projects/obsession b/content/projects/.obsession similarity index 91% rename from content/projects/obsession rename to content/projects/.obsession index f28f27c..07c127d 100644 --- a/content/projects/obsession +++ b/content/projects/.obsession @@ -1,5 +1,5 @@ title = obsession -date = 203 +date = 2003-07-04 thumb = http://portfolio.quilime.com/2008/obsession/thumb.png -- diff --git a/content/projects/aero b/content/projects/aero index 3c36527..cb62137 100644 --- a/content/projects/aero +++ b/content/projects/aero @@ -1,5 +1,5 @@ title = aero -date = 2007 +date = 2007-04-01 thumb = http://portfolio.quilime.com/2008/aero/thumb.png -- diff --git a/content/projects/boat b/content/projects/boat index e8147d1..a691a09 100644 --- a/content/projects/boat +++ b/content/projects/boat @@ -1,19 +1,19 @@ title = boat -date = 2007 +date = 2007-01-01 -- - - - + + + - - + + diff --git a/content/projects/bodyneg b/content/projects/bodyneg index da8727f..d931214 100644 --- a/content/projects/bodyneg +++ b/content/projects/bodyneg @@ -1,5 +1,5 @@ title = bodyneg -date = 2008 +date = 2004-06-05 thumb = http://portfolio.quilime.com/2008/bodyneg/thumb.png -- diff --git a/content/projects/cabspotting b/content/projects/cabspotting index 6e333d9..5d05632 100644 --- a/content/projects/cabspotting +++ b/content/projects/cabspotting @@ -1,20 +1,20 @@ title = Cabspotting -date = 2006 +date = 2006-05-01 thumb = http://portfolio.quilime.com/2008/cabspotting/thumb.png -- - - - + + + - - + + diff --git a/content/projects/dots b/content/projects/dots index 57ebc55..272892e 100644 --- a/content/projects/dots +++ b/content/projects/dots @@ -1,5 +1,5 @@ title = dots -date = 2007 +date = 2007-05-02 -- diff --git a/content/projects/icarus b/content/projects/icarus index 384fc8b..67ca1bf 100644 --- a/content/projects/icarus +++ b/content/projects/icarus @@ -1,5 +1,5 @@ title = icarus -date = 2007 +date = 1999-08-05 thumb = http://portfolio.quilime.com/2008/icarus/thumb.png -- diff --git a/content/projects/jellyfish b/content/projects/jellyfish index 3298cac..5188b5b 100644 --- a/content/projects/jellyfish +++ b/content/projects/jellyfish @@ -1,5 +1,5 @@ title = Jellyfish -date = 2008 +date = 2008-05-01 -- diff --git a/content/projects/light b/content/projects/light index f2aa8bd..37918bb 100644 --- a/content/projects/light +++ b/content/projects/light @@ -1,10 +1,12 @@ title = spacelamp -date = 2007 +date = 2007-03-10 thumb = http://portfolio.quilime.com/2008/spacelamp/thumb.png -- + + found plexi (street find by ss). Added lights, hung with wire. The beginnings of exploring interactive sculpture. diff --git a/content/projects/mask b/content/projects/mask index 69acae8..d72fb40 100644 --- a/content/projects/mask +++ b/content/projects/mask @@ -1,5 +1,5 @@ title = mask -date = 2007 +date = 2007-07-02 thumb = http://portfolio.quilime.com/2008/mask/thumb.png -- diff --git a/content/projects/prism b/content/projects/prism index e66e0ad..ea834a3 100644 --- a/content/projects/prism +++ b/content/projects/prism @@ -1,5 +1,5 @@ title = prism -date = 2007 +date = 2007-08-23 thumb = http://portfolio.quilime.com/2008/prism/thumb.png -- diff --git a/content/projects/rattle b/content/projects/rattle index 0422b6d..d87020c 100644 --- a/content/projects/rattle +++ b/content/projects/rattle @@ -1,21 +1,19 @@ title = rattle -date = 2008 +date = 2008-05-02 -- - - - + - + - - + + diff --git a/content/projects/rattles b/content/projects/rattles index 01ea726..bc9b1aa 100644 --- a/content/projects/rattles +++ b/content/projects/rattles @@ -1,5 +1,5 @@ title = Rattles -date = 2006 +date = 2006-05-02 thumb = http://portfolio.quilime.com/2008/rattle/thumb.png -- @@ -8,7 +8,7 @@ Rattles and shakers can be embedded into one another, allowing for more sensitiv - + diff --git a/content/projects/sempernull b/content/projects/sempernull index ceadcd1..62f7b6c 100644 --- a/content/projects/sempernull +++ b/content/projects/sempernull @@ -1,9 +1,18 @@ title = sempernull -date = 2007 +date = 2007-08-12 thumb = http://portfolio.quilime.com/2008/sempernull/thumb.png tag = video installation -- + + + +An exploration of infinite/finite space. The user transitions between macro and micro environments of mathematically infinite scale, limited only by computer processing power. As the viewer moves through multiple spaces, their scope and perspective widends and transcends while space becoms infinitely big and infinitely small simultaneously. + +*non-interactive software* + + + @@ -26,11 +35,7 @@ sempernull

-An exploration of infinite/finite space. The user transitions between macro and micro environments of mathematically infinite scale, limited only by computer processing power. As the viewer moves through multiple spaces, their scope and perspective widends and transcends while space becoms infinitely big and infinitely small simultaneously. - -*non-interactive software* - diff --git a/content/projects/swimtank b/content/projects/swimtank index b84c324..89cac7e 100644 --- a/content/projects/swimtank +++ b/content/projects/swimtank @@ -1,5 +1,5 @@ title = Swimtank -date = 2007 +date = 2007-05-01 -- diff --git a/content/projects/synony b/content/projects/synony index 2ac02b9..f55a9fc 100644 --- a/content/projects/synony +++ b/content/projects/synony @@ -1,8 +1,12 @@ title = synonymovement -date = 2007 +date = 2007-04-10 thumb = http://portfolio.quilime.com/2008/synonymovement/thumb.png -- +synonymovement +*non-interactive software* + + diff --git a/css/style.css b/css/style.css index 09d2c90..0a0c811 100644 --- a/css/style.css +++ b/css/style.css @@ -1,31 +1,31 @@ body, table { - font-size: 12px; + font-size:14px; font-family: arial, monaco, monospace; line-height:1.6em; } -body { +body { background:rgb(25, 25, 25); padding:0; margin:0; color: #ddd; } -a { +a { outline:none; color:rgb(42, 128, 235); text-decoration:none; } -a img { - border:0; +a img { + border:0; } a.visited { } -a.mute { +a.mute { font-weight:normal; color:rgb(129, 144, 144); } -a:hover, a.mute:hover { +a:hover, a.mute:hover { color:f0a;; } @@ -33,48 +33,35 @@ h1 { padding-top:0; margin-top:0; margin-bottom:30px; - -} -h1 a { - background:#121212; -display:block; - margin-left:-1.5em; - padding-left:1.5em; } -h1 a:hover { - color:#ddd; -background:#333; -} -h1, h2, h3, h4, h5, h6 { +h1, h2, h3, h4, h5, h6 { font-weight:normal; color:#666; - font-size:12px; + font-size:14px; } h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { display:block; text-decoration:none; - color:#fff; + color:#666; } -h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover { -background:#161616; +h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover { + color:#fff; } -h1 a:hover { -} -ul, li { - margin:0; padding:0; list-style-type:none; +ul, li { + margin:0; padding:0; list-style-type:none; } -ol { +ol { margin:0; } -ol li { - list-style-type:decimal; +ol li { + list-style-type:decimal; } -blockquote { +blockquote { font-family:serif; font-style:italic; - font-size:1.45em; + font-size:1.45em; line-height:1.3em; margin:0; padding:0; @@ -150,23 +137,22 @@ background:rgba(25,25,25,0.3); .entry h2 { margin-top:40px; } -.entry .metadata { - +.entry .metadata { margin-bottom:30px; - color:#444; + color:#333; } .entry .metadata a { - color:#444; + color:#555; } .entry .metadata a:hover { color:#999; } -.entry .metadata .tags li { - display:inline-block; - margin-right:0.3em; +.entry .metadata .tags li { + display:inline-block; + margin-right:0.3em; } .entry p { - max-width:720px; + max-width:720px; } @@ -186,7 +172,7 @@ background:rgba(25,25,25,0.3); height:100px; border:1px dotted #000; overflow:hidden; - + } diff --git a/index.php b/index.php index b16eaa3..a41ee49 100644 --- a/index.php +++ b/index.php @@ -7,7 +7,6 @@ require 'lib/init.php'; $request = get_request(); - $v = new View ($request); $m = new Model ($request); @@ -30,15 +29,7 @@ else if ($m->is_multiple()) -header("Content-Type: {$m->response_mime_type}; charset=UTF-8"); +header("Content-Type: {$m->response_mime_type}; charset=UTF-8"); $v->render( $m->template ); - - - - - - - - exit; diff --git a/lib/data.php b/lib/data.php index 5cf44bb..3d4a35f 100644 --- a/lib/data.php +++ b/lib/data.php @@ -30,11 +30,11 @@ function get_entries( $path = "", $args = array()) // $finfo = finfo_open(FILEINFO_MIME_TYPE); // $ftype = finfo_file($finfo, join(array($info->getPath(), $info->getFilename()), DIRECTORY_SEPARATOR)); - // finfo_close($finfo); + // finfo_close($finfo); - if ( -// $ftype == 'text/plain' && - !$info->isDir() && + if ( +// $ftype == 'text/plain' && + !$info->isDir() && !in_array( $info->getFilename(), $_FILE_IGNORES )) { $entries[] = parse_entry( $info ); } @@ -50,14 +50,6 @@ function get_entries( $path = "", $args = array()) array_multisort( $time, $order, $entries ); } - - // assign next/prev for each entry - $num_entries = count($entries); - for ($i = $num_entries-1; $i>=0; $i--) { - $entries[$i]['prev_entry'] = isset($entries[$i+1]) ? $entries[$i+1] : null; - $entries[$i]['next_entry'] = isset($entries[$i-1]) ? $entries[$i-1] : null; - } - return $entries; } @@ -152,7 +144,7 @@ function parse_entry($fileInfo, $page = false) $f['timestamp'] = $f['config']['date'] ? date('U', strtotime( $f['config']['date'])) : $fileInfo->getCTime(); $f['tags'] = isset($f['config']['tags']) ? explode(" ", $f['config']['tags']) : null; $f['content'] = Markdown($content); - + if ($passed_more) $f['content_short'] = Markdown($content_short); @@ -172,7 +164,7 @@ function parse_entry($fileInfo, $page = false) } -function get_entry ( $relative_path ) +function get_entry ( $relative_path ) { return parse_entry(new SplFileInfo(join(array(LOCAL_ROOT, CONTENT_DIR, $relative_path), DIRECTORY_SEPARATOR))); } diff --git a/lib/init.php b/lib/init.php index c0d3849..e77e3a2 100644 --- a/lib/init.php +++ b/lib/init.php @@ -1,34 +1,4 @@ '); - define ('TITLE_DELIMITER', ': '); - define ('CONFIG_FILE', 'config'); - - require_once 'data.php'; - require_once 'output.php'; - require_once 'markdown.php'; - require_once 'template.php'; - - - //error_reporting(E_ALL); - //ini_set("display_errors", 1); - -?> -======= -*/ /** * SETUP * diff --git a/lib/model.php b/lib/model.php index e148db2..3cd2c00 100644 --- a/lib/model.php +++ b/lib/model.php @@ -1,11 +1,11 @@ content_request = join(array($this->request['dirname'], $this->request['filename']), DIRECTORY_SEPARATOR ); $this->page_request = $this->request['filename']; @@ -39,7 +40,7 @@ class Model } $this->entries = get_entries( $this->content_request ); $this->page_title = preg_replace('{^/|/$}', '', $this->request['path']); - } + } # if single entry (file in CONTENT dir) @@ -47,25 +48,27 @@ class Model { $this->entry = get_entry( $this->content_request ); - // heavy handed prev/next - $entries = get_entries(); + // prev/next + $entries = get_entries($request['dirname']); + for($i = count($entries)-1; $i>=0; $i--) { if ($this->entry['url'] == $entries[$i]['url']) { - $this->entry['prev_entry'] = $entries[$i]['prev_entry']; - $this->entry['next_entry'] = $entries[$i]['next_entry']; + $this->entry['prev_entry'] = isset($entries[$i-1]) ? $entries[$i-1] : null; + $this->entry['next_entry'] = isset($entries[$i+1]) ? $entries[$i+1] : null; break; } } + $this->entry['is_single'] = true; $this->template = 'single.' . $this->response_format . '.tpl'; } # if page (file in PAGES dir) else if ($this->is_page()) { - $this->page = get_page( $this->page_request ); - $this->template = isset($this->page['config']['template']) ? - $this->page['config']['template'] . '.' . $this->response_format . '.tpl' : + $this->page = get_page( $this->page_request ); + $this->template = isset($this->page['config']['template']) ? + $this->page['config']['template'] . '.' . $this->response_format . '.tpl' : 'page.' . $this->response_format . '.tpl'; } @@ -93,5 +96,5 @@ class Model function is_page() { return is_file(join(array( LOCAL_ROOT, PAGE_DIR, $this->page_request ), DIRECTORY_SEPARATOR )) ? 1 : 0; - } + } } diff --git a/templates/default.html.tpl b/templates/default.html.tpl index b68684f..236b76a 100644 --- a/templates/default.html.tpl +++ b/templates/default.html.tpl @@ -1,31 +1,38 @@ - + include_template('head-inc.html.tpl') ?> - + <?=SITE_TITLE?><?=$this->page_title(TITLE_DELIMITER);?> - + - - + +
+ - more →

'; - $this->include_template('entry.html.tpl', array('entry' => $entry)); + $this->include_template('entry.html.tpl', array('entry' => $entry)); + ?> + -
- +
- include_template('footer.html.tpl') ?> include_template('nav.html.tpl') ?> + include_template('footer.html.tpl') ?> diff --git a/templates/entry.html.tpl b/templates/entry.html.tpl index e26f83d..e5bb415 100644 --- a/templates/entry.html.tpl +++ b/templates/entry.html.tpl @@ -1,15 +1,16 @@

- +

-
+
- # -
+ #
+ +
diff --git a/templates/index.html.tpl b/templates/index.html.tpl index 14a72f6..1b7b7be 100644 --- a/templates/index.html.tpl +++ b/templates/index.html.tpl @@ -10,13 +10,8 @@
- - - - -
@@ -94,11 +89,6 @@
- - - - - -