From: Gabriel Dunne Date: Mon, 20 Feb 2012 08:55:07 +0000 (-0800) Subject: cleaned up key commands X-Git-Url: https://git.quilime.com/?a=commitdiff_plain;h=37bb4eb32471cd2e20b0dc2194f19a1e4a354f94;p=plog.git cleaned up key commands --- diff --git a/content/projects/aero b/content/projects/aero index cb62137..bc97f42 100644 --- a/content/projects/aero +++ b/content/projects/aero @@ -4,6 +4,5 @@ thumb = http://portfolio.quilime.com/2008/aero/thumb.png -- -aero -ceramic. 6" x 3" x 3" +*ceramic. 6" x 3" x 3"* diff --git a/content/projects/dots b/content/projects/dots index 272892e..1172ba2 100644 --- a/content/projects/dots +++ b/content/projects/dots @@ -21,7 +21,7 @@ and unusual soundscape as time passes. -->

-medium: software +interactive software written in c++

diff --git a/content/projects/light b/content/projects/light index 37918bb..104e3f8 100644 --- a/content/projects/light +++ b/content/projects/light @@ -9,6 +9,4 @@ 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. - -*medium: incandescent lights, acrylic* +*christmas lights, acrylic* diff --git a/content/projects/sempernull b/content/projects/sempernull index 62f7b6c..0a7d478 100644 --- a/content/projects/sempernull +++ b/content/projects/sempernull @@ -4,35 +4,29 @@ 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* - - - - - - - + + + - + -

-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 89cac7e..68bac05 100644 --- a/content/projects/swimtank +++ b/content/projects/swimtank @@ -12,7 +12,7 @@ The observer is allowed to control the "Kite" on the X and Y axis, while depth p in space is a sinusoidal rhythm. --> -*medium: software* +*interactive software written in c++* diff --git a/content/projects/synony b/content/projects/synony index f55a9fc..6edb0cc 100644 --- a/content/projects/synony +++ b/content/projects/synony @@ -3,28 +3,20 @@ date = 2007-04-10 thumb = http://portfolio.quilime.com/2008/synonymovement/thumb.png -- -synonymovement -*non-interactive software* - - - - - - + + + - + - - -synonymovement -*non-interactive software* +*non-interactive software written in c++* diff --git a/css/style.css b/css/style.css index 0a0c811..8ec1681 100644 --- a/css/style.css +++ b/css/style.css @@ -40,7 +40,6 @@ h1, h2, h3, h4, h5, h6 { font-size:14px; } h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { - display:block; text-decoration:none; color:#666; } @@ -129,10 +128,8 @@ background:rgba(25,25,25,0.3); margin-bottom:5px; } .entry h1 a { - display:block; } .entry h1 a:hover { - } .entry h2 { margin-top:40px; diff --git a/js/js.js b/js/js.js index e99e654..7b4f3d7 100644 --- a/js/js.js +++ b/js/js.js @@ -2,25 +2,71 @@ var init = ( function () { - var LEFT = 37, RIGHT = 39; + var LEFT = 37, UP = 38, RIGHT = 39; + + PARENT_CAT = typeof(PARENT_CAT) != "undefined" ? PARENT_CAT : ''; + PREV_ENTRY = typeof(PREV_ENTRY) != "undefined" ? PREV_ENTRY : ''; + NEXT_ENTRY = typeof(NEXT_ENTRY) != "undefined" ? NEXT_ENTRY : ''; document.onkeypress = function(e) { switch (e.keyCode) { - case LEFT : nextEntry(); break; - case RIGHT : prevEntry(); break; + case UP : + if (PARENT_CAT && window.pageYOffset == 0) + window.location = PARENT_CAT; + break; + case LEFT : + if (PREV_ENTRY) + window.location = PREV_ENTRY; + break; + case RIGHT : + if (NEXT_ENTRY) + window.location = NEXT_ENTRY; + break; } } - function prevEntry() { - if (typeof(PREV_ENTRY) != "undefined") { - window.location = PREV_ENTRY; - } - } +})(); - function nextEntry() { - if (typeof(NEXT_ENTRY) != "undefined") { - window.location = NEXT_ENTRY; - } - } -})(); +function fadeOut( elem, time ) +{ + var startOpacity = elem.style.opacity || 1; + elem.style.opacity = startOpacity; + (function go() { + elem.style.opacity -= startOpacity / ( time / 100 ); + + // for IE + elem.style.filter = 'alpha(opacity=' + elem.style.opacity * 100 + ')'; + + if( elem.style.opacity > 0 ) + setTimeout( go, 100 ); + else + elem.style.display = 'none'; + })(); +} + + +function fadeIn( elem, time ) +{ + if (elem.style.opacity == 0) + elem.style.opacity = .1; + + var startOpacity = elem.style.opacity || .1; + elem.style.opacity = startOpacity; + + (function go() { + elem.style.opacity += startOpacity ( time / 100 ) ; + + console.log(elem.style.opacity); + + //console.log(elem.style.opacity); + + // for IE + elem.style.filter = 'alpha(opacity=' + elem.style.opacity * 100 + ')'; + + if( elem.style.opacity < 1 ) + setTimeout( go, 100 ); + else + elem.style.display = 'none'; + })(); +} diff --git a/pages/about b/pages/about index 7673dff..c9a09de 100644 --- a/pages/about +++ b/pages/about @@ -1,26 +1,34 @@ title = about -- -#about -quilime is a codification of projects, process and resources by **gabriel dunne** ([www](http://gabrieldunne.com), [email](mailto:gdunne@quilime.com)) +quilime is a codification of projects, process and resources -quilime is powered by plog, a static-file **p**roject+**log**ging engine. +all content © 1999—2012 **gabriel dunne** ([www](http://gabrieldunne.com), [email](mailto:gdunne@quilime.com)) -other projects + +Creative Commons License + +
+ +related [clmpr](http://clmpr.com/quilime/) [aggregate](http://media.quilime.com/aggregate/) [git.quilime.com](http://git.quilime.com) -elsewhere on the internets +elsewhere [flickr](http://flickr.com/photos/quilime/) [vimeo](http://vimeo.com/quilime/) [github](http://github.com/quilime/) -[@quilime](http://twitter.com/quilime/) +[twitter](http://twitter.com/quilime/) +
+ +running on plog, a custom static-file **p**roject+**log**ging engine. + diff --git a/templates/default.html.tpl b/templates/default.html.tpl index 236b76a..e2e3fae 100644 --- a/templates/default.html.tpl +++ b/templates/default.html.tpl @@ -1,38 +1,28 @@ - include_template('head-inc.html.tpl') ?> - <?=SITE_TITLE?><?=$this->page_title(TITLE_DELIMITER);?> - -
- - more →

'; - - $this->include_template('entry.html.tpl', array('entry' => $entry)); - ?> - + more →

'; ?> + - unset($entry); + include_template('entry.html.tpl', array('entry' => $entry)); ?> - ?> +
- include_template('nav.html.tpl') ?> - 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 e5bb415..0736718 100644 --- a/templates/entry.html.tpl +++ b/templates/entry.html.tpl @@ -1,7 +1,7 @@

- + —

diff --git a/templates/footer.html.tpl b/templates/footer.html.tpl index ec5b922..b7c1734 100644 --- a/templates/footer.html.tpl +++ b/templates/footer.html.tpl @@ -2,3 +2,4 @@ + diff --git a/templates/index.html.tpl b/templates/index.html.tpl index 1b7b7be..1fbef0a 100644 --- a/templates/index.html.tpl +++ b/templates/index.html.tpl @@ -62,7 +62,7 @@ var canvas = document.getElementById('thumb_'); if(canvas && canvas.getContext) { var ctx = canvas.getContext('2d'); - ctx.strokeStyle = "#1d1d1d"; + ctx.strokeStyle = "rgba(42, 128, 235, .25)"; ctx.fillStyle = "#121212"; ctx.fillRect (0, 0, 100, 100); ctx.fill(); diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl index a1df5ed..76cedc8 100644 --- a/templates/nav.html.tpl +++ b/templates/nav.html.tpl @@ -48,7 +48,6 @@

- content 0)); ?>
    • @@ -57,7 +56,6 @@

    - static
  • photo
  • aggregate
  • links
    • @@ -69,6 +67,11 @@ include_template('nextprev.html.tpl'); ?> + diff --git a/templates/nextprev.html.tpl b/templates/nextprev.html.tpl index 432c04a..f7fccfc 100644 --- a/templates/nextprev.html.tpl +++ b/templates/nextprev.html.tpl @@ -1,7 +1,12 @@ + + + - -↑ - -

    + ↑ + +

    + - - - → - - + + → + + -

    +

    - - ← - - + + ← + +     - diff --git a/templates/page.html.tpl b/templates/page.html.tpl index 8d6d1ab..7087ec9 100644 --- a/templates/page.html.tpl +++ b/templates/page.html.tpl @@ -3,7 +3,7 @@ include_template('head-inc.html.tpl') ?> - <?=SITE_TITLE?><?=TITLE_DELIMITER?> <?=$data['title']?> + <?=SITE_TITLE?><?=TITLE_DELIMITER?><?=$page['title']?> @@ -17,7 +17,6 @@
    include_template('nav.html.tpl') ?> - include_template('footer.html.tpl') ?> diff --git a/templates/projects.html.tpl b/templates/projects.html.tpl index e2e8da2..c28f971 100644 --- a/templates/projects.html.tpl +++ b/templates/projects.html.tpl @@ -25,12 +25,11 @@ -