From a89387dd9287d8e5aa6d75424666b59ba68f161d Mon Sep 17 00:00:00 2001 From: Gabriel Dunne Date: Fri, 10 May 2013 01:33:14 -0700 Subject: [PATCH] Moved a bunch of stuff out of 'process' --- content/audioshadertoy | 1 + content/{process => }/boat | 0 content/config | 3 +-- content/{process => }/egg | 0 content/{process => }/ganson | 0 content/icosi | 1 + content/{process => }/icosi_fab | 0 content/{process => }/icosi_gaffta | 0 content/{process => }/icosi_gaffta2 | 0 content/{process => }/icosi_process | 0 content/{process => }/icosi_studio | 0 content/{process => }/mask | 0 content/{process => }/modulations | 2 +- content/monad | 2 ++ content/{process => }/monad_ceiling | 0 content/{process => }/monad_install | 0 content/{process => }/monad_move | 0 content/naag | 1 + content/nosreves | 2 +- content/{process => }/platform | 0 content/process/config | 3 --- content/seaquence | 1 + content/{process => }/spacelamp | 0 content/{process => }/spectrum | 0 content/stars | 4 +++- content/{process => }/wawawa | 0 content/web | 2 +- css/style.css | 19 ++++++++++++++---- data/content/data.json | 2 +- data/content/tags.json | 2 +- lib/data.php | 10 +++++++++- lib/model.php | 7 ++++++- pages/.contact | 18 +++++++++++++++++ pages/contact | 4 ---- pages/{.cv => cv} | 20 +++++++++++-------- templates/featured.html.tpl | 31 +++++++++++++++++++++++++++++ templates/nav.html.tpl | 18 ++++++----------- 37 files changed, 112 insertions(+), 41 deletions(-) rename content/{process => }/boat (100%) rename content/{process => }/egg (100%) rename content/{process => }/ganson (100%) rename content/{process => }/icosi_fab (100%) rename content/{process => }/icosi_gaffta (100%) rename content/{process => }/icosi_gaffta2 (100%) rename content/{process => }/icosi_process (100%) rename content/{process => }/icosi_studio (100%) rename content/{process => }/mask (100%) rename content/{process => }/modulations (85%) rename content/{process => }/monad_ceiling (100%) rename content/{process => }/monad_install (100%) rename content/{process => }/monad_move (100%) rename content/{process => }/platform (100%) delete mode 100755 content/process/config rename content/{process => }/spacelamp (100%) rename content/{process => }/spectrum (100%) rename content/{process => }/wawawa (100%) create mode 100755 pages/.contact rename pages/{.cv => cv} (84%) create mode 100644 templates/featured.html.tpl diff --git a/content/audioshadertoy b/content/audioshadertoy index 2c4b093..cbc4678 100755 --- a/content/audioshadertoy +++ b/content/audioshadertoy @@ -2,6 +2,7 @@ title = Audio-ShaderToy date = 2012-04-03 tags = installation code audiovisual gallery = slides +featured = true --   diff --git a/content/process/boat b/content/boat similarity index 100% rename from content/process/boat rename to content/boat diff --git a/content/config b/content/config index 549ef5b..d5582a5 100755 --- a/content/config +++ b/content/config @@ -1,4 +1,3 @@ -title = index template = index -all_entries = true +show_featured = true -- diff --git a/content/process/egg b/content/egg similarity index 100% rename from content/process/egg rename to content/egg diff --git a/content/process/ganson b/content/ganson similarity index 100% rename from content/process/ganson rename to content/ganson diff --git a/content/icosi b/content/icosi index 2ed7b5e..23e2160 100755 --- a/content/icosi +++ b/content/icosi @@ -1,6 +1,7 @@ title = ICOSI date = july 05 2010 tags = audiovisual projection installation performance sculpture +featured = true -- audiovisual performance 7.5' x 7.5' x 1' diff --git a/content/process/icosi_fab b/content/icosi_fab similarity index 100% rename from content/process/icosi_fab rename to content/icosi_fab diff --git a/content/process/icosi_gaffta b/content/icosi_gaffta similarity index 100% rename from content/process/icosi_gaffta rename to content/icosi_gaffta diff --git a/content/process/icosi_gaffta2 b/content/icosi_gaffta2 similarity index 100% rename from content/process/icosi_gaffta2 rename to content/icosi_gaffta2 diff --git a/content/process/icosi_process b/content/icosi_process similarity index 100% rename from content/process/icosi_process rename to content/icosi_process diff --git a/content/process/icosi_studio b/content/icosi_studio similarity index 100% rename from content/process/icosi_studio rename to content/icosi_studio diff --git a/content/process/mask b/content/mask similarity index 100% rename from content/process/mask rename to content/mask diff --git a/content/process/modulations b/content/modulations similarity index 85% rename from content/process/modulations rename to content/modulations index ef22a7f..686bf35 100755 --- a/content/process/modulations +++ b/content/modulations @@ -1,4 +1,4 @@ -title = LVP @ CCRMA Modulations w/ Chris Carlson +title = LVP w/ Chris Carlson date = may 10 2012 tags = code performance -- diff --git a/content/monad b/content/monad index 919f776..dd3d3a2 100755 --- a/content/monad +++ b/content/monad @@ -1,5 +1,7 @@ date = 2011-12-20 tags = installation projection sculpture +featured = true +gallery = slides -- A one dimensional visualization of the universe represented as varying length of time, oscillate between the age of the universe, and the current moment of experience. diff --git a/content/process/monad_ceiling b/content/monad_ceiling similarity index 100% rename from content/process/monad_ceiling rename to content/monad_ceiling diff --git a/content/process/monad_install b/content/monad_install similarity index 100% rename from content/process/monad_install rename to content/monad_install diff --git a/content/process/monad_move b/content/monad_move similarity index 100% rename from content/process/monad_move rename to content/monad_move diff --git a/content/naag b/content/naag index 1ee3d0a..28cd6a5 100755 --- a/content/naag +++ b/content/naag @@ -1,3 +1,4 @@ +featured = true title = NAAG date = 2012-01-01 tags = projection sculpture installation diff --git a/content/nosreves b/content/nosreves index 6021acb..4f4428c 100755 --- a/content/nosreves +++ b/content/nosreves @@ -1,5 +1,5 @@ title = nos reves tags = print design -gallery = stacked +gallery = slides -- Dreams are interwoven with visuals and emotion. Nos Revés is a book of dream scenarios, categorized in specific themes. Each dream theme is articulated with a unique design. diff --git a/content/process/platform b/content/platform similarity index 100% rename from content/process/platform rename to content/platform diff --git a/content/process/config b/content/process/config deleted file mode 100755 index 26bf504..0000000 --- a/content/process/config +++ /dev/null @@ -1,3 +0,0 @@ -title = process -template = index --- diff --git a/content/seaquence b/content/seaquence index e0c7bd7..a47c8ee 100755 --- a/content/seaquence +++ b/content/seaquence @@ -1,6 +1,7 @@ title = Seaquence tags = audiovisual software web date = 2010-10-04 +featured = true -- Seaquence: A biology-inspired sound toy. Created in collaboration with Ryan Alexander and Daniel Massey during a residency at Gray Area, San Francisco. diff --git a/content/process/spacelamp b/content/spacelamp similarity index 100% rename from content/process/spacelamp rename to content/spacelamp diff --git a/content/process/spectrum b/content/spectrum similarity index 100% rename from content/process/spectrum rename to content/spectrum diff --git a/content/stars b/content/stars index 7e5cb5e..1fd3040 100755 --- a/content/stars +++ b/content/stars @@ -1,6 +1,8 @@ title = Stars date = sep 20 2009 -tags = audiovisual software c++ +tags = software cpp +featured = true +gallery = slides -- variable-length generative software loop diff --git a/content/process/wawawa b/content/wawawa similarity index 100% rename from content/process/wawawa rename to content/wawawa diff --git a/content/web b/content/web index 7595584..320cec3 100755 --- a/content/web +++ b/content/web @@ -1,6 +1,6 @@ title = Web date = jun 4 2007 -tags = visual software +tags = software gallery = slides -- diff --git a/css/style.css b/css/style.css index 8cd7faf..f972a53 100644 --- a/css/style.css +++ b/css/style.css @@ -179,16 +179,19 @@ line-height:2.25em; .entries li { - line-height:2.25em; + line-height:1.2em; } .entries.projects li { - display:inline-block; - margin:1em; + /*display:inline-block;*/ + float:left; + height:200px; + margin:0 1em 1em 0; } .entries.projects li .thumb { max-width:200px; max-height:200px; + margin-bottom:0.3em; } .entry { @@ -372,13 +375,21 @@ ul.entries li a:hover { #slides { - display: none + display: none; + } .gallery_container { + } + .slidesjs-container { + background:#000; + } + a.slidesjs-previous { + } .slidesjs-navigation, .slidesjs-pagination li a { text-decoration: none; + } .slidesjs-pagination li, .slidesjs-navigation { display:inline-block; diff --git a/data/content/data.json b/data/content/data.json index 6453605..d1b5456 100644 --- a/data/content/data.json +++ b/data/content/data.json @@ -1 +1 @@ -{"entries":[{"config":{"title":"nos reves","tags":"print design","gallery":"stacked","date":null},"title":"nos reves","filename":"nosreves","path":"\/Users\/gdunne\/_portfolio\/www\/content\/nosreves","fileInfo":{},"timestamp":1368161687,"tags":["print","design"],"content":"

Dreams are interwoven with visuals and emotion. Nos Rev\u00e9s is a book of dream scenarios, categorized in specific themes. Each dream theme is articulated with a unique design.<\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_portfolio\/wwwcomments\/\/Users\/gdunne\/_portfolio\/www\/content\/nosreves\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":"","url":"\/\/"},"thumb":"media\/\/\/nosreves\/thumb.png","url":"\/nosreves","edit_url":"\/edit\/\/nosreves","media_dir":"media\/\/\/nosreves\/","media":{"5":{"filename":"thumb.png","local":"\/Users\/gdunne\/_portfolio\/www\/media\/\/\/nosreves\/thumb.png","url":"\/media\/\/\/nosreves\/thumb.png","extension":"png"},"4":{"filename":"rep.jpg","local":"\/Users\/gdunne\/_portfolio\/www\/media\/\/\/nosreves\/rep.jpg","url":"\/media\/\/\/nosreves\/rep.jpg","extension":"jpg"},"3":{"filename":"nosreves.jpg","local":"\/Users\/gdunne\/_portfolio\/www\/media\/\/\/nosreves\/nosreves.jpg","url":"\/media\/\/\/nosreves\/nosreves.jpg","extension":"jpg"},"2":{"filename":"nonseq.jpg","local":"\/Users\/gdunne\/_portfolio\/www\/media\/\/\/nosreves\/nonseq.jpg","url":"\/media\/\/\/nosreves\/nonseq.jpg","extension":"jpg"},"1":{"filename":"intro.jpg","local":"\/Users\/gdunne\/_portfolio\/www\/media\/\/\/nosreves\/intro.jpg","url":"\/media\/\/\/nosreves\/intro.jpg","extension":"jpg"},"0":{"filename":"confined.jpg","local":"\/Users\/gdunne\/_portfolio\/www\/media\/\/\/nosreves\/confined.jpg","url":"\/media\/\/\/nosreves\/confined.jpg","extension":"jpg"}}},{"config":{"title":"Audio-ShaderToy","date":"2012-04-03","tags":"installation code audiovisual","gallery":"slides"},"title":"Audio-ShaderToy","filename":"audioshadertoy","path":"\/Users\/gdunne\/_portfolio\/www\/content\/audioshadertoy","fileInfo":{},"timestamp":"1333436400","tags":["installation","code","audiovisual"],"content":"

 \n<\/p>\n\n