<?=SITE_TITLE?>, <?=$page

+San Francisco stop frequency (BART and MUNI, daily). +

+ + +

+ + + $base_dir . "/movies/stop_frequency_sf.mov", 'width' => 700, 'height' => 415)); ?> + +

+[video/mov] The shape of San Francisco is instantly recognizable, represented by transit station stop frequency in one day. +

+ + +[more, via Stamen . . .](http://content.stamen.com/som_transbay_tower) diff --git a/content/projects/test_project b/content/projects/test_project deleted file mode 100644 index bc74111..0000000 --- a/content/projects/test_project +++ /dev/null @@ -1,4 +0,0 @@ -title = placeholder project -date = 2010-07-07 --- -test project \ No newline at end of file diff --git a/pages/contact b/pages/contact index db4b9c4..8e77ce9 100644 --- a/pages/contact +++ b/pages/contact @@ -3,5 +3,4 @@ title = contact email: studio@gabrieldunne.com phone: +1 415 493 8496 loc: san francisco, ca - -also: [quilime.com](http://quilime.com) +other: [quilime.com](http://quilime.com) diff --git a/public/css/style.css b/public/css/style.css index 7141c5d..03a15b0 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -1,11 +1,12 @@ body { margin:80px 100px 50px 40px; } -html, body, table { font-family: helvetica; font-size:15px; line-height:1.5em; color:#ccc; background:#121212; } +html, body, table { font-family: helvetica; font-size:14px; line-height:1.5em; color:#ccc; background:#121212; } .nav { position:absolute; z-index:1; top:20px; left:30px; } .nav ul { margin-left:1em; } .nav h1 { margin-bottom:50px;} +.nav { position:fixed; top: 20px; left: 20px; } + -#head { position:absolute; top: 20px; left: 160px; } /*selection*/ ::-moz-selection {background: #08f !important; color:#fff;} @@ -26,6 +27,8 @@ h3 { margin:0 0 0 0; } ol li { list-style-type:decimal; } +img { margin-bottom:0.25em; } + blockquote { font-family:times; background:#000; color:#aaa; margin:0; font-size:15px; line-height:1.4em; padding:2em 4em; font-style:italic; line-height:1.45em; max-width:600px;} @@ -34,59 +37,19 @@ margin:0; font-size:15px; line-height:1.4em; padding:2em 4em; font-style:italic; p { max-width:720px; } ul, li { margin:0; padding:0; list-style-type:none; } -table { margin:0; padding:0; border:0; } -table .column { padding-right:100px; min-width:120px; max-width:400px; } -table .column h2 a { text-decoration:none; } -table h2, table h3 { margin-bottom:2em;} -table .video li, table .image li { margin-bottom:2em; } -table .reader li, table .bookmarks li { margin-bottom:1em; padding-bottom:1em; border-bottom:1px dotted #ddd; } -.reader_links li, .bookmark_links li { padding-top:.75em; margin-bottom:.75em; } -.bookmark_links li a { display:block; } -.bookmark_links li span { font-style: italic; color:#444; } -.image li a { background:none;} - -table.archive td {padding-right:20px; } - -.c_pop { position:absolute; background:#fff; display:none; border:5px outset #000; padding:1em 2em; z-index:5; } -.func { font-weight:bold; color:#444; } +.nav a {font-weight:bold;} -#home_arrow { position: absolute; top:11px; left:23px; margin-left:250px; text-decoration:none; } - -#content { margin-left:180px; min-width:500px; position:absolute; top:20px; padding-bottom:200px; z-index:10;} - #content p { } - ul.inline_content {} - ul.inline_content li .content { } - ul.inline_content li { margin:0 0 150px 0; } - ul.inline_content li h3 { margin-bottom:1em; border-bottom:1px solid #ddd; padding-bottom:4px; } - ul.inline_content ol li { margin:0; padding:0; border:0;} - ul.thumbnails { } - ul.thumbnails li { display:inline-block; margin: 0px 60px 60px 0px; } - ul.thumbnails .thumbnail { width:160px; height:120px; text-align:center; background:#888; } - ul.thumbnails a:hover img { - filter:alpha(opacity=75); - -moz-opacity:0.75; - -khtml-opacity: 0.75; - opacity: 0.75; - } - ul.thumbnails a { text-decoration:none; } - ul.thumbnails .title { } - - .date { color:#ccc;} - .func { margin-bottom:2em; } - .func a { background:#daa; padding:0.2em 1em 0.02em 1em; font-size:9px; text-transform:uppercase;} - - .text { font-family:serif; font-size:15px; line-height:2.2em; margin-top:80px;} - .indent { text-indent:3em; } - -.entry { margin-bottom:100px; } -.entry h2 { border-bottom:1px solid #333; padding-bottom:4px; } -.entry h2 .title-date { font-weight:normal; color:#bbb; } -.entry .metadata { margin-top:20px; font-style:italic; color:#aaa; } +#content { margin-left:180px; min-width:500px; position:absolute; top:20px; padding-bottom:200px; z-index:10; } +.entry { margin-bottom:50px; padding-bottom:50px; border-bottom:1px dotted #232323; } +.entry h2 { padding-bottom:4px; } +.entry h2 .title-date { font-weight:normal; color:#555; font-style:italic; font-size:0.75em; } +.entry .metadata { font-size:0.75em; margin-top:20px; font-style:italic; color:#555; line-height:1.3em; } +.entry .metadata a { color:#555; text-decoration:underline; } +.entry .metadata a:hover { color:#d15; } .entry .metadata .tags li { display:inline-block; margin-right:0.2em; } .caption { font-style:italic; margin-top:5px; color:#444; } -.more, .home { text-decoration:none; color:#000; font-weight:bold; } #footer { margin-top:120px; } #footer .copy a { text-decoration:none; } diff --git a/public/index.php b/public/index.php index ba03ff2..b942251 100644 --- a/public/index.php +++ b/public/index.php @@ -15,13 +15,22 @@ if (is_dir(LOCAL_ROOT . CONTENT_DIR . $url_parts['url']) && $url_parts['url'] != "/") { list($data, $total) = get_entries($url_parts['url']); $t->assign('page_title', preg_replace('{^/|/$}', '', $url_parts['url'])); - $t->assign('data', $data); + $t->assign('data', $data); + + if ($url_parts['url'] == '/projects/') + $template = 'projects.' . $response_format . '.tpl'; } # 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']))); - $template = 'single.'.$response_format.'.tpl'; + $entry = parse_entry(new SplFileInfo(LOCAL_ROOT . CONTENT_DIR . $url_parts['url'])); + $t->assign('data', $entry); + + + if ($entry['cat'] == 'projects') + $template = 'project.'.$response_format.'.tpl'; + else + $template = 'single.'.$response_format.'.tpl'; } # is page else if (is_file( LOCAL_ROOT . PAGE_DIR . DIRECTORY_SEPARATOR . $url_parts['filename'])) { @@ -29,10 +38,11 @@ $t->assign('data', $page); $template = $page['config']['template'] ? $page['config']['template'] . '.' . $response_format . '.tpl' : 'page.' . $response_format . '.tpl'; } - # default (all entries) + # default else { list($data, $total) = get_entries(); $t->assign('data', $data); + $template = 'index.html.tpl'; } # render diff --git a/templates/default.html.tpl b/templates/default.html.tpl index f5f9572..a50c35b 100644 --- a/templates/default.html.tpl +++ b/templates/default.html.tpl @@ -3,7 +3,7 @@ include_template('head-inc.html.tpl') ?> - <?=SITE_TITLE?>, <?=$page_title?> + <?=SITE_TITLE?>: <?=$page_title?> diff --git a/templates/entry.html.tpl b/templates/entry.html.tpl index 6994474..a7b8813 100644 --- a/templates/entry.html.tpl +++ b/templates/entry.html.tpl @@ -9,7 +9,7 @@