]> git.quilime.com - plog.git/commitdiff
merged in backend cleanup
authorGabriel Dunne <gdunne@quilime.com>
Fri, 6 Jan 2012 11:44:12 +0000 (03:44 -0800)
committerGabriel Dunne <gdunne@quilime.com>
Fri, 6 Jan 2012 11:44:12 +0000 (03:44 -0800)
59 files changed:
1  2 
.htaccess
content/code/config
content/journal/2008-11-17_buttons
content/journal/2009-12-13_mandala
content/journal/2009-12-18_taper
content/journal/2010-01-13_relative_time
content/journal/2010-01-22_cone
content/journal/2010-07-01_icosi
content/journal/2010-07-29_icosi
content/journal/2010-12-01_icosi
content/journal/2011-09-22_arrive
content/journal/2011-09-27_habitat
content/journal/2011-09-28_sriyantra
content/journal/2011-10 16 _beg
content/journal/2011-10-04_dreams
content/journal/2011-10-05_islands
content/journal/2011-10-06_alphabet
content/journal/2011-10-06_dushera
content/journal/2011-10-06_overlords
content/journal/2011-10-20_smog
content/journal/2011-10-23_water_is_life
content/projects/aero
content/projects/audio
content/projects/boat
content/projects/bodyneg
content/projects/cabspotting
content/projects/dots
content/projects/egg
content/projects/icarus
content/projects/jellyfish
content/projects/light
content/projects/mask
content/projects/obsession
content/projects/prism
content/projects/rattle
content/projects/rattles
content/projects/sempernull
content/projects/stars
content/projects/swimtank
content/projects/synony
content/projects/tessellated
content/projects/web
css/style.css
index.php
lib/init.php
lib/output.php
pages/about
pages/links
templates/404.html.tpl
templates/archive.html.tpl
templates/entry.html.tpl
templates/head-inc.html.tpl
templates/index.html.tpl
templates/nav.html.tpl
templates/nextprev.html.tpl
templates/page.html.tpl
templates/photo.html.tpl
templates/projects.html.tpl
templates/single.html.tpl

diff --cc .htaccess
index a57877b5bb07b5dfb48998d77d239a1520d04548,89375dbf2ea4e3bde6f36118c7acedd112b145b4..748369a5c69718ef3db5b7c3e2098257392b125b
+++ b/.htaccess
@@@ -1,9 -1,15 +1,6 @@@
- <IfModule mod_rewrite.c>
++Options +FollowSymLinks
 +RewriteEngine On
- RewriteBase /
 -
 -
 -# clean urls
 -
 -
 -# <IfModule mod_rewrite.c>
 -# RewriteEngine On
 -# RewriteBase /
 -# RewriteCond %{REQUEST_FILENAME} !-f
 -# RewriteCond %{REQUEST_FILENAME} !-d
 -# RewriteRule . index.php [L]
 -# </IfModule>
 -
 -
 +RewriteCond %{REQUEST_FILENAME} !-f
 +RewriteCond %{REQUEST_FILENAME} !-d
- RewriteRule . index.php [L]
- </IfModule>
++RewriteRule (.*) index.php?p=$1 [L]
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..c7fa76b899e62f22dfc912a6841df4390ffb71b7
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++template = archive
index 0901b737696d2ccc2e5344a83fbcca83996b5ed4,0000000000000000000000000000000000000000..0901b737696d2ccc2e5344a83fbcca83996b5ed4
mode 100644,000000..100644
--- /dev/null
index 14255acb5d733093a5b7799eb732fd30d57c4339,0000000000000000000000000000000000000000..14255acb5d733093a5b7799eb732fd30d57c4339
mode 100644,000000..100644
--- /dev/null
index a92860cc26b8cbca5e0f6bf8d7da926b9e4a0933,0000000000000000000000000000000000000000..a92860cc26b8cbca5e0f6bf8d7da926b9e4a0933
mode 100644,000000..100644
--- /dev/null
index 294483818617cfb8456c23df576aa7b8fa603736,0000000000000000000000000000000000000000..294483818617cfb8456c23df576aa7b8fa603736
mode 100644,000000..100644
--- /dev/null
index a937eb326ad060f5cc4c06f1a89fba43e137e51b,0000000000000000000000000000000000000000..a937eb326ad060f5cc4c06f1a89fba43e137e51b
mode 100644,000000..100644
--- /dev/null
index ef966c3ce00c2ad839c0c4bc342650e8c58e55d8,0000000000000000000000000000000000000000..ef966c3ce00c2ad839c0c4bc342650e8c58e55d8
mode 100644,000000..100644
--- /dev/null
index 817c5793fbe683f55fa52ab2ccf0caea0aefda29,0000000000000000000000000000000000000000..817c5793fbe683f55fa52ab2ccf0caea0aefda29
mode 100644,000000..100644
--- /dev/null
index 5bbd8d27c3b5496af482218b374b1744ddfd5a6f,0000000000000000000000000000000000000000..5bbd8d27c3b5496af482218b374b1744ddfd5a6f
mode 100644,000000..100644
--- /dev/null
index 0000000000000000000000000000000000000000,7b269eb8637b0ddec08c1a29257a75fdd2f58728..7b269eb8637b0ddec08c1a29257a75fdd2f58728
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..5c71cf1a552b85d4b86d7314624be431f2855264
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,16 @@@
++title = habitat
++date = 2011-9-27
++--
++
++
++<a href="http://www.flickr.com/photos/quilime/6272674574/sizes/z/in/photostream/">
++<img src="http://farm7.staticflickr.com/6215/6272674574_697ee1c5e7_z.jpg" />
++</a>
++
++<br />
++
++<a href="http://www.flickr.com/photos/quilime/6272150991/sizes/z/in/photostream/">
++<img src="http://farm7.staticflickr.com/6227/6272150991_1d7339a83d_z.jpg" />
++</a>
++
++
index 0000000000000000000000000000000000000000,e2fc30a9480c9491670ccaa16d96546ca7bde0c7..2fe3e17fae77e7e1203ebdbf474aa282a6811821
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,55 +1,55 @@@
 -<!--<img src="media/sriyantra/sri_light.png">  -->
 -<img src="media/sriyantra/sri_bindu.png">  
+ date = 2011-09-28
+ title = sri yantra
+ --
 -<img src="media/sriyantra/kali-yantra.jpg" />    
 -Kali &rarr; goddess of eternal energy. "She who destroys all". The goddess of time and change. The ultimate reality.
++<!--<img src="http://media.quilime.com/files/projects/india/sriyantra/sri_light.png">  -->
++<img src="http://media.quilime.com/files/projects/india/sriyantra/sri_bindu.png">  
+ <!--<img src="media/sriyantra/sri_dark.png">  -->
+ Shri Yantra
 -<img src="media/sriyantra/sri_guides.png" />  
++<img src="http://media.quilime.com/files/projects/india/sriyantra/kali-yantra.jpg" />    
++Kali &rarr; goddess of eternal energy. The goddess of time and change. The ultimate reality.
+ > The Sri Chakra or Shri Yantra of Tripura Sundari is a yantra or mandala formed by nine interlocking triangles surrounding the bindu. Four of these triangles are orientated upright representing Shiva or the Masculine. Five of these triangles are inverted triangles represent Shakti or the Feminine. Because it is composed of nine triangles, it is also known as the Navayoni Chakra.[1]
 -<img src="media/sriyantra/datta5.jpg" />
++<img src="http://media.quilime.com/files/projects/india/sriyantra/sri_guides.png" />  
+ <em>sri yantra guides</em>  
+ > Together the nine triangles are interlaced in such a way as to form 43 smaller triangles in a web symbolic of the entire cosmos or a womb symbolic of creation. Together they express Advaita or non-duality. This is surrounded by a lotus of eight petals, a lotus of sixteen petals, and an earth square resembling a temple with four doors.[1]
+ > The Shri Chakra is also known as the nava chakra because it can also be seen as having nine levels. Each level corresponds to a mudra, a yogini, and a specific form of the deity Tripura Sundari along with her mantra. These levels starting from the outside or bottom layer are:[1]
+ 1. Trailokya Mohana or Bhupara, a square of three lines with four portals
+ 2. Sarvasa Paripuraka, a sixteen-petal lotus
+ 3. Sarva Sankshobahana, an eight-petal lotus
+ 4. Sarva Saubhagyadayaka, composed of fourteen small triangles
+ 5. Sarvarthasadhaka, composed of ten small triangles
+ 6. Sarva Rakshakara, composed of ten small triangles
+ 7. Sarva Rohahara, composed of eight small triangles
+ 8. Sarva siddhi prada, composed of 1 small triangle
+ 9. Sarvanandamaya, composed of a point or bindu 
+ > The Sri Chakra (called the Shri Yantra) is the symbol of Hindu tantra, which is based on the Hindu philosophy of Kashmir Shaivism.
+ Vijnanamaya &mdash; spiritual body composed of prayer and fortified by meditation
+ Anandamaya &mdash; body of the joy of union with god
+ > &mdash;he who realizes the truth of the body can then come to tknow the truth of the universe
+ Payodhi-jala &mdash; primordial waters, force of the manifested universe
+ > A fourth dimension of aesthetic sense, where all is in ourselves, ourselves in all &mdash;Aurobindo
+ Tantra: analogies between the individual and the cosmos, and the life forces which govern them
+ > reflections of what is taking place in real life and reminding thought visions of our true nature
++<img src="http://media.quilime.com/files/projects/india/sriyantra/datta5.jpg" />
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..987e6187d136722ca8dcce4fda1c09e1cb50f002
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,11 @@@
++title = beg
++date = Oct 16 2011, 15:34:03
++--
++
++
++
++<a href="http://www.flickr.com/photos/quilime/6200087309/sizes/l/in/photostream/">
++<img src="http://farm7.staticflickr.com/6174/6200087309_3cd592be3d_z.jpg">
++</a>
++
++They move their mouths into a sad frown, they use their eyes, they tap on the windows. 
index 0000000000000000000000000000000000000000,62e1f080273653859ce206654533a876b2799496..661b0d7bcce0c4c0a7acbd444fc1328f624c44a3
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -date = Tue, Oct 4 2011, 12:46:34; IST 
+ title = dreams
 -My dreams have been incredibly vivid. probably due to the heat. sleeping at odd hours. been working in the studio most of the day at Vishal's house, so I haven't been going out as much as I would like. It's also incredibly hot outside, averaging about 36 degrees C, which is about 95 F.
++date = Oct 4 2011, 12:46:34
+ --
++My dreams have been incredibly vivid. probably due to the heat. sleeping at odd hours. been working in the studio most of the day at Vishal's house, so I haven't been going out as much as I would like. It's also incredibly hot outside, averaging about 36 degrees C, which is about 95 F.
index 0000000000000000000000000000000000000000,a762a2e1c9d611dc80a262f4c47ba0ab4f4d811b..e3fd573e895623fb50fc769074c79e840d662719
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,7 +1,7 @@@
 -date = Wed, Oct 05 2011, 03:53:55 PM; IST
+ title = islands
++date = Oct 05 2011, 03:53:55 PM
+ --
+ > Imagine that every man's mind is an island, surrounded by ocean. Each seems isolated, yet in reality all are linked by the bedrock from which they spring. If the ocean were to vanish, that would be the end of the islands. They would all be part of one continent, but their individuality would be gone.
+ > &mdash;"The Inspector" Overlord. <u>Childhoods End</u>, Arthur C. Clark. p.176
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..de750a9b232d566f6953b2d38ddf157d15f42198
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,18 @@@
++date = 2011-10-06
++title = alphabet
++--
++
++consanants
++
++<img src="http://media.quilime.com/files/projects/india/lang/hindi_cons.gif">
++<br /><br /><br />
++
++vowels
++
++<img src="http://media.quilime.com/files/projects/india/lang/hindi_vwl.gif">
++<br /><br /><br />
++
++numbers
++
++<img src="http://media.quilime.com/files/projects/india/lang/hindi_num.gif">
++<br /><br /><br />
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..a753cc2bd494e149012cf66b5b93c1809cbeed83
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,10 @@@
++title = dushera
++date = Oct 06 2011, 06:00:16 PM
++draft = true
++--
++
++<a href="http://www.flickr.com/photos/quilime/6265932597/sizes/l/in/photostream/">
++<img src="http://farm7.staticflickr.com/6098/6265932597_c89ec37c99_z.jpg" />
++</a>
++
++dushera
index 0000000000000000000000000000000000000000,3ba9abb2dbe5057be8314613169cb29a55610d20..a8a052c6b8855c2eecb9a12ba617a22f65aeb8c8
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,7 +1,7 @@@
 -date = Wed, Oct 05 2011, 03:17:57 PM; IST
+ title = childhoods end
++date = Oct 05 2011, 03:17:57 PM
+ --
+ > The case of India is particularly instructive. The main difference between us and the British in India was that they had no real motives for going there&mdash;no conscious objectives, that is, except such trivial and temporary ones as trade or hostility to other European powers. They found themselves possessors of an empire before they knew what to do with it, and were never really happy until they had got rid of it again.
+ > &mdash;"The Inspector" Overlord. <u>Childhoods End</u>, Arthur C. Clark. p.161
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..0cb9c3e74000e8cc7e63a39a9be8c040353d6284
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,7 @@@
++title = sun
++date = Oct 23 2011, 06:06:33 PM
++--
++
++<a href="http://www.flickr.com/photos/quilime/6265929413/sizes/l/in/photostream/">
++<img src="http://farm7.staticflickr.com/6230/6265929413_f47dddb458_z.jpg" />
++</a>
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..035decaaf935230fe2b5e14e5fb706c67bb7980c
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,8 @@@
++title = Water Is Life
++date = Oct 23 2011 06:04:38 PM
++draft = true
++--
++
++<a href="http://www.flickr.com/photos/quilime/6266458764/sizes/l/in/photostream/"><img src="http://farm7.staticflickr.com/6034/6266458764_6f71bd0a7e_z.jpg"></a>
++
++near Quotar Minar in Dadabari.
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..ff7c06062d4ed40920bf24e1e8750fa1312d7baa
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,12 @@@
++title = aero
++date = 2007
++thumb = http://portfolio.quilime.com/2008/aero/thumb.png
++--
++
++<img src="http://portfolio.quilime.com/2008/aero//aero.jpg" />
++
++<p>
++aero
++<br/>
++<em>ceramic. 6" x 3" x 3"</em>
++</p>
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..00311f62d22d0dc425467cd1b1c0169bccb93935
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,17 @@@
++title = audio
++date = 2007
++--
++
++<img src="http://portfolio.quilime.com/new/content/08_Audio/images/sample.jpg">
++
++Soundscape to be accompanied by visual software. Audio is improvised with custom software and traditional instruments. All audio has a visual component in the form of the visual software instruments and tools used in its creation.
++
++<object height="16" width="300">
++<param name="kioskmode" value="true">
++<param name="src" value="http://portfolio.quilime.com/new/content/08_Audio/sound/audio.mp3">
++<param name="autoplay" value="false">
++<param name="controller" value="true">
++<embed height="16" src="http://portfolio.quilime.com/new/content/08_Audio/sound/audio.mp3" type="video/quicktime" width="300" controller="true" autoplay="false" kioskmode="true">
++</object>
++
++*medium: software, synthesizer, ableton live*
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..3f5776c06f3a029fd4de42b6e410f2fb186b3bf9
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,23 @@@
++title = boat
++date = 2007
++--
++
++
++<object classid="clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b" id="qt_object" width="535" height="374" codebase="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0">
++<param name="type" value="video/quicktime">
++<param name="name" value="qt_object">
++<param name="nocache" value="true">
++<param name="autoplay" value="true">
++<param name="kioskmode" value="true">
++<param name="controller" value="true">
++<param name="loop" value="true">
++<param name="bgcolor" value="#000000">
++<param name="src" value="http://portfolio.quilime.com/2008/boat/boat.mov">
++<param name="pluginspage" value="http://www.apple.com/quicktime/download/indext.html">                
++<embed name = "qt_object" width="535" height="374" controller="true" loop="true" autoplay="true" src="http://portfolio.quilime.com/2008/boat/boat.mov" kioskmode="true" nocache="true" type="video/quicktime" bgcolor="#000000" border="0" pluginspage="http://www.apple.com/quicktime/download/indext.html" enablejavascript="true">
++</embed>
++</object>
++
++
++boat
++*photo timelapse*
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..276b85e29ba2106e1f7b36d6d85267814ed01034
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,12 @@@
++title = bodyneg
++date = 2008
++thumb = http://portfolio.quilime.com/2008/bodyneg/thumb.png
++--
++
++<img src="http://portfolio.quilime.com/2008/bodyneg/BODYNEG.jpg">
++
++<p>
++bodyneg
++<br/>
++<em>ink press, 5 wall-mounted panels. 8' x 4' x 2'</em>
++</p>
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..6e333d9ab976396d3f5464dccbec76279e03b5f7
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,28 @@@
++title = Cabspotting
++date = 2006
++thumb = http://portfolio.quilime.com/2008/cabspotting/thumb.png
++--
++
++<object classid="clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b" id="qt_object" width="800" height="516" codebase="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0">
++<param name="type" value="video/quicktime">
++<param name="name" value="qt_object">
++<param name="nocache" value="true">
++<param name="autoplay" value="true">
++<param name="kioskmode" value="true">
++<param name="controller" value="true">
++<param name="loop" value="true">
++<param name="bgcolor" value="#000000">
++<param name="src" value="http://portfolio.quilime.com/2008/cabspotting/cabspotting_web.mov">
++<param name="pluginspage" value="http://www.apple.com/quicktime/download/indext.html">                
++<embed name = "qt_object" width="800" height="516" controller="true" loop="true" autoplay="true" src="http://portfolio.quilime.com/2008/cabspotting/cabspotting_web.mov" kioskmode="true" nocache="true" type="video/quicktime" bgcolor="#000000" border="0" pluginspage="http://www.apple.com/quicktime/download/indext.html" enablejavascript="true">
++</embed>
++</object>
++
++
++Representing and analyzing spatial information, Cabspotting investigates the complexities of the San Francisco Bay Area as an exploration of GPS data generated by Yellow Cab taxis in San Francisco.
++
++yellow dots = metered taxis
++white dots = unmetered taxis
++visual software written with Processing
++
++San Francisco taxi visualization created with Stamen Design show at Design and the Elastic Mind, New York MoMA.
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..57ebc559714fcd9708b337760b0b3ecc61080a91
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,39 @@@
++title = dots
++date = 2007
++--
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/01_Dots/images/out.0033.png">
++
++
++<p>
++
++Human generated tones are rendered with lines. The software manipulates these tones via random visual noise, making both audio and visual more chaotic of time. Tones start rigid and rhythmic, slowly degenerating into an organic, complex and chaotic system of overlapping frequencies and polyrhythms.
++
++
++
++<!--
++"Dots" is an interaction between human and computational order and chaos. 
++Notes are generated in an circular ordered, repetitive pattern. Connection lines 
++represent human-played audio tones, line length representing pitch. 
++While notes are played by the human musician, the notes wander away from their original 
++places, warping and distorting the connecting lines, resulting in a more chaotic 
++and unusual soundscape as time passes.
++-->
++</p>
++<p>
++<em>medium: software</em>
++</p>
++
++<!--more-->
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/01_Dots/images/out.0206.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/01_Dots/images/out.0760.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/01_Dots/images/out.1373.png">
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..b58df0262991ce6ecdc2a7b36c7c5909a3a78eee
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,11 @@@
++title = egg
++date = 2007
++thumb = http://portfolio.quilime.com/2008/egg/thumb.png
++--
++
++<img src="http://portfolio.quilime.com/2008/egg/egg.jpg">
++
++<p>
++egg<br/>
++<em>marker, wire. 4" x 2.5"</em>
++</p>
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..384fc8b9ffd76565cef2357c0e4e3c045901bc3a
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,11 @@@
++title = icarus
++date = 2007
++thumb = http://portfolio.quilime.com/2008/icarus/thumb.png
++--
++<img src="http://portfolio.quilime.com/2008/icarus/icarus.jpg" />
++
++<p>
++icarus and deadalus
++<br/>
++<em>balsa wood. 16" x 16" x 4"</em>
++</p>
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..3298cacb6490241fefe4e2d8df901ac4887c6add
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,43 @@@
++title = Jellyfish
++date = 2008
++--
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/02_Jellyfish/images/jellies.0237.png">
++
++Organic forms react to the user and each other. Their motions and position in space create and/or affect audio. A tenticles depth in space is correlated to volume, while its color is linked to a tone in the audio spectrum. Interaction with the tentacle instrument is smooth, undulating, jellyfish-like.
++
++<!--"Jellyfish" is an interactive soundscape that explores the interaction between 
++a life-like programmed intelligence, and a human user. Tentacles respond and modify audio or controller inputs, affecting the audio tones that each tenticle eminates. A tenticles depth in space is correlated to volume, while color is related to tone in the audio spectrum.-->
++
++
++*medium: software*
++
++<!--more-->
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/02_Jellyfish/images/jellies.0284.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/02_Jellyfish/images/jellies.1075.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/02_Jellyfish/images/jellies.1137.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/02_Jellyfish/images/out.0389.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/02_Jellyfish/images/zout.0325.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/02_Jellyfish/images/zzout.0484.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/02_Jellyfish/images/zzout.0624.png">
++
++
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..f2aa8bdf0215c44f62dd5ab53a90b6c900740444
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,12 @@@
++title = spacelamp
++date = 2007
++thumb = http://portfolio.quilime.com/2008/spacelamp/thumb.png
++--
++
++<img src="http://portfolio.quilime.com/new/content/07_Light/images/light2.jpg">
++
++<img src="http://portfolio.quilime.com/new/content/07_Light/images/noton.jpg">
++
++found plexi (street find by ss). Added lights, hung with wire. The beginnings of exploring interactive sculpture.
++
++*medium: incandescent lights, acrylic*
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..69acae83d0916e8548c9d7c5d6e990bdc7130ded
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,8 @@@
++title = mask
++date = 2007
++thumb = http://portfolio.quilime.com/2008/mask/thumb.png
++--
++
++<img src="http://portfolio.quilime.com/2008/mask/mask.jpg" />
++
++graphite on plywood. 12" x 12"
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..f28f27c534b420612f1aeb171de36ff4c283ae9b
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,10 @@@
++title = obsession
++date = 203
++thumb = http://portfolio.quilime.com/2008/obsession/thumb.png
++--
++<img src="obsession/detail.jpg">
++
++<p>
++obsession<br/>
++<em>copper wire, masonite. 3.5' x 4.5'</em>
++</p>
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..e66e0adf89efebbf41eae5e9dcab9f94a3ddf0b9
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,9 @@@
++title = prism
++date = 2007
++thumb = http://portfolio.quilime.com/2008/prism/thumb.png
++--
++
++<img src="http://portfolio.quilime.com/2008/prism/3.jpg" />
++
++oil on canvas. 4' x 3'
++
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..c31c4ec0bca23f2b53122b37d5516f68314c7ea3
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,26 @@@
++title = rattle
++date = 2008
++--
++
++
++
++<object classid="clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b" id="qt_object" width="640" height="496" codebase="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0">
++<param name="type" value="video/quicktime">
++<param name="name" value="qt_object">
++<param name="nocache" value="true">
++<param name="autoplay" value="true">
++<param name="kioskmode" value="true">
++<param name="controller" value="true">
++<param name="loop" value="true">
++<param name="bgcolor" value="#000000">
++<param name="src" value="http://portfolio.quilime.com/2008/rattle/rattle.mov">
++<param name="pluginspage" value="http://www.apple.com/quicktime/download/indext.html">                
++<embed name = "qt_object" width="640" height="496" controller="true" loop="true" autoplay="true" src="http://portfolio.quilime.com/2008/rattle/rattle.mov" kioskmode="true" nocache="true" type="video/quicktime" bgcolor="#000000" border="0" pluginspage="http://www.apple.com/quicktime/download/indext.html" enablejavascript="true">
++</embed>
++</object>
++
++<p>
++rattle
++<br/>
++<em>synthesiser (interactive)<em>
++</p>
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..d0a793f5813c8f8de64408c552b7eff16f0ad54c
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,58 @@@
++title = Rattles
++date = 2006
++thumb = http://portfolio.quilime.com/2008/rattle/thumb.png
++--
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/03_Rattles/images/rattleFlowers.0077.png">
++
++
++Particles are jostled and shaken as in a rattle. The sonic possibilities of their collisions and movement are given freedom and sonic depth via software.
++Rattles and shakers can be embedded into one another, allowing for more sensitivity, sonic subtlety, and layers when making music. Interaction with the digital rattle is as simple and dynamic as its physical counterpart.
++
++<!--
++The interaction with "Rattles" is identicle to the traditional percussive instrument.
++The visual shape, texture, or size of each interior rattler represents a unique audio 
++tone, either percussive or melodic. The resulting soundscape of the rattle instrument is 
++therefore unique and rich with sonic subtlety and variation, transforming the traditional 
++"rattle" into an instrument with a necesarry visual component. 
++Rattles can be embedded into one another, allowing for more 
++sensitivity, sonic subtlety, and layers.
++-->
++
++*medium: software*
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/03_Rattles/images/rattleFlowers.0118.png">
++
++<br />
++
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/03_Rattles/images/rattleFlowers.0239.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/03_Rattles/images/rattleMag.0077.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/03_Rattles/images/rattleMag.0344.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/03_Rattles/images/rattleSnow.0389.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/03_Rattles/images/rattleSnow.0884.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/03_Rattles/images/zrattleSnow.0479.png">
++
++<br />
++
++
++
++
++
++
++
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..a304ce51ca0f6c56c669fb7bae4d8ff7eccc1e62
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,26 @@@
++title = sempernull
++date = 2007
++thumb = http://portfolio.quilime.com/2008/sempernull/thumb.png
++--
++
++
++<object classid="clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b" id="qt_object" width="640" height="496" codebase="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0">
++<param name="type" value="video/quicktime">
++<param name="name" value="qt_object">
++<param name="nocache" value="true">
++<param name="autoplay" value="true">
++<param name="kioskmode" value="true">
++<param name="controller" value="true">
++<param name="loop" value="true">
++<param name="bgcolor" value="#000000">
++<param name="src" value="http://portfolio.quilime.com/2008/sempernull/stars.mov">
++<param name="pluginspage" value="http://www.apple.com/quicktime/download/indext.html">                
++<embed name = "qt_object" width="640" height="496" controller="true" loop="true" autoplay="true" src="http://portfolio.quilime.com/2008/sempernull/stars.mov" kioskmode="true" nocache="true" type="video/quicktime" bgcolor="#000000" border="0" pluginspage="http://www.apple.com/quicktime/download/indext.html" enablejavascript="true">
++</embed>
++</object>
++
++<p>
++sempernull
++<br/>
++<em>video installation<em>
++</p>
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..8bad75f68725e8870bd2e13e8d121391fd334cff
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,51 @@@
++title = Stars
++data = 2007
++--
++
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/04_Stars/images/astars.01577.png">
++
++
++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.
++
++*medium: software*
++
++<!--more-->
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/04_Stars/images/astars.10535.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/04_Stars/images/astars.20144.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/04_Stars/images/astars.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/04_Stars/images/god.0027.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/04_Stars/images/god.0135.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/04_Stars/images/god.0253.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/04_Stars/images/god.0385.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/04_Stars/images/god.0498.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/04_Stars/images/god.0710.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/04_Stars/images/god.0898.png">
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..b84c324f1e78e45ba9b3223e230f98df85382366
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,62 @@@
++title = Swimtank
++date = 2007
++--
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/05_Swim_Tank/images/fish_close.0261.png">
++
++A form follows an infinite path drawn by you, 
++and then reacts to its own trail. You can control the form on two axis, while the depth of the path follows a sinusoidal rhythm that is affected by paths previously drawn.
++
++<!--Exploratory, infinitely looping game.
++The observer is allowed to control the "Kite" on the X and Y axis, while depth position
++in space is a sinusoidal rhythm.
++-->
++
++*medium: software*
++
++<!--more-->
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/05_Swim_Tank/images/fish_close.0565.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/05_Swim_Tank/images/fishtank.0142.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/05_Swim_Tank/images/fishtank.0305.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/05_Swim_Tank/images/fishtank.0648.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/05_Swim_Tank/images/fishtank.1717.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/05_Swim_Tank/images/fishtank.2295.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/05_Swim_Tank/images/fishtank.4604.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/05_Swim_Tank/images/fishtank.4980.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/05_Swim_Tank/images/fishtank.6082.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/05_Swim_Tank/images/fishtank.6510.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/05_Swim_Tank/images/fishtank.6677.png">
++
++<br />
++
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..d5f5b9a56b858b8f67357ed49527d3d565951ba6
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,27 @@@
++title = synonymovement
++date = 2007
++thumb = http://portfolio.quilime.com/2008/synonymovement/thumb.png
++--
++
++
++<object classid="clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b" id="qt_object" width="640" height="496" codebase="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0">
++<param name="type" value="video/quicktime">
++<param name="name" value="qt_object">
++<param name="nocache" value="true">
++<param name="autoplay" value="true">
++<param name="kioskmode" value="true">
++<param name="controller" value="true">
++<param name="loop" value="true">
++<param name="bgcolor" value="#000000">
++<param name="src" value="http://portfolio.quilime.com/2008/synonymovement/synonymovement.mov.mov">
++<param name="pluginspage" value="http://www.apple.com/quicktime/download/indext.html">                
++<embed name = "qt_object" width="640" height="496" controller="true" loop="true" autoplay="true" src="http://portfolio.quilime.com/2008/synonymovement/synonymovement.mov.mov" kioskmode="true" nocache="true" type="video/quicktime" bgcolor="#000000" border="0" pluginspage="http://www.apple.com/quicktime/download/indext.html" enablejavascript="true">
++</embed>
++</object>
++
++
++<p>
++synonymovement
++<br/>
++<em>video installation<em>
++</p>
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..70c36d8cf1b6be795f3faf1c39085ada7485523b
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,12 @@@
++title = tessellated
++date = 2006
++thumb = http://portfolio.quilime.com/2008/tessellated/thumb.png
++
++--
++<img src="http://portfolio.quilime.com/2008/tessellated/tessellated_booth_comp.jpg" />
++
++<p>
++tessellated group
++<br/>
++<em>identity design, installation design</em>
++</p>
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..777f5493003c82f376d8a3ee8cddbe7bb8ccfc78
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,34 @@@
++title = Web
++date = 2007
++--
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/01_Dots/images/out.0033.png">
++
++
++A network of dots and lines interacts with itself in a single mesh. Depth determines audio volume. Intersections, connections and line-length determine tones. Similar tones and chord groups are designated with additional web lines and connections. You are able to interact with each web line as the strings of an instrument, each tone resonating through its connections.
++
++*medium: software*
++
++<!--more-->
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/06_Web/images/web.0645.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/06_Web/images/web.1336.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/06_Web/images/web.2533.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/06_Web/images/zforest.0105.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/06_Web/images/zforest.0327.png">
++
++<br />
++
++<img style="width:100%;" src="http://portfolio.quilime.com/new/content/06_Web/images/zforest.0619.png">
diff --cc css/style.css
index a6c520c8fa68f807f9b00c185b6af99fe3f7df18,f10980ac64bab19195209b8b3a8ef95dbebf335b..415effba87c20ed843cb92542ac64df8a871e16a
-     margin: 20px 100px 50px 30px;
-     background:#eee;
 +body {
- html,
- body,
- table {
++    background:#f4f4f4;
++}
++body, table {
++    font-size: 12px;
++    font-family: sans-serif;
++    line-height:1.5em;
 +}
 +
 -    font-size: 0.8em;
 -    font-family: sans-serif;
 -    line-height:1.5em;
 -    color: rgb(83, 104, 112);
+ body { 
+     padding:0;
+     margin:0;
++    color: #555;
+ }
  
-   font-family: arial;
-   color: #000;
-     line-height:1.3em;
+ a { 
 -    color:rgb(198, 28, 111);
 -    text-decoration:none;
++    font-weight:bold;
++    color:#000;
++/*    color: #22f;*/
+ }
+ a img { 
+     border:0; 
+ }
+ a.visited {
+     
  }
- ::-moz-selection,
- ::selection {
-   background: #08f !important;
-   color: #ff0;
+ a.mute { 
+     font-weight:normal;
+     color:rgb(129, 144, 144);
+ }
+ a:hover, a.mute:hover { 
+     color:rgb(209, 28, 36);
  }
  
 -    font-size:1em; 
++h1 {
++    padding-top:0;
++    margin-top:0;
++    margin-bottom:30px;
++}
+ h1, h2, h3, h4, h5, h6 { 
++    
+ }
+ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { 
++text-decoration:none;
+ }
  
- a {
-   color: #22f;
+ ul, li { 
+     margin:0; padding:0; list-style-type:none; 
+ }
+ ol { 
+     margin:0;
+ }
+ ol li { 
+     list-style-type:decimal; 
+ }
+ blockquote { 
+     font-family:serif;
+     font-style:italic;
+     font-size:1.2em;  
+     line-height:1.3em;
+     margin:0;
+     padding:0;
+ }
 -pre {
++pre, code {
++    color:#f08;
 +    font-weight:bold;
-     text-decoration:none;
-   border: 0;
-   padding: 0.2em 0.1em 0 0;
- }
- a img {  border: 0 }
- a.mute {
-   text-decoration: none !important;
-   font-weight: normal;
- }
- a:hover,
- a.mute:hover {
-   color: #d15;
-   text-decoration: none;
- }
- h1,
- h2,
- h3,
- h4,
- h5,
- h6 {
-   color:#338;
- }
- h1 a,
- h2 a,
- h3 a,
- h4 a,
- h5 a,
- h6 a { }
- h1 {  margin: 0 0 1em 0; }
- h2 {  margin: 2em 0 1em 0; }
- h3 {  margin: 0 0 0 0 }
- h4 {  margin-top: 0 }
- ul, li { }
- ol {  margin: 0 }
- ol li {  }
- blockquote {
-   font-family: times;
-   background: #000;
-   color: #aaa;
-   margin: 0;
-   line-height: 1.4em;
-   padding: 2em 4em;
-   font-style: italic;
-   line-height: 1.45em;
-   max-width: 600px;
- }
- code {  }
+     line-height:1.3em;
++    font-size:12px;
+ }
  #content {
-   padding-left: 100px;
-   min-width: 500px;
 -    padding:50px;
 -    background:#fff;
++  padding-left: 150px;
++  padding-top:30px;
++  padding-right:10px;
 +  padding-bottom: 200px;
-   z-index: 10;
+ }
 +
+ #nextprev {
 -    padding:0 50px 10px 50px;
++    padding:0 50px 10px 150px;
  }
- #content p:first-child {  margin-top: 0 }
- p {   }
 +
 +
- .nav {
-   top: 25px;
-   left: 20px;
++
+ #nav {
 -    padding:30px 50px;
 -    border-top:1px dotted #aaa;
 +  position:absolute;
++  top: 30px;
++  left: 20px;
 +}
- .nav a {
-   text-decoration: none;
-   font-weight: bold;
++#nav a {
  }
- .nav a.mute {  font-weight: normal }
- .nav li, ul.nav {
 -.archive li {
 -    font-weight:bold; 
++#nav a.mute {  font-weight: normal }
++#nav li, ul.nav {
 +  list-style-type:none;
 +  padding:0 !important;
 +  margin:0 !important ;
  }
  
  
- .index {
-   padding: 0;
-   margin: 0;
++
++
++
++
+ .entry {
++  width:auto;
++  padding-bottom:20px;
++  border-radius:3px;
++  margin-bottom:70px;
++  background:#fff;
++  padding:20px;
  }
- .index li {
-   line-height: 1.1em;
-   margin-bottom: 0.4em;
+ .entry h2 {
+     margin-bottom:20px;
  }
- .index li a {
-   font-weight: normal;
+ .entry .metadata { 
+     margin-top:30px;
+     font-style:italic; color:#777; font-size:12px;
  }
- .entry, .entry_b, .column {
-   margin-bottom: 50px;
-   background:#fff;
-   padding:30px;
-   border-radius:5px;
-   box-shadow:inset 1px 1px 1px #ddd;
-   max-width:720px;
+ .entry .metadata .tags li { 
+     display:inline-block; 
+     margin-right:0.3em; 
 -}
 +}
- .entry_b {
-   background:#eee;
-   box-shadow:none;
- }
- .entry .metadata {
-     margin-top:3em;
-   font-style: italic;
-   color: #999;
- }
- .entry .metadata a {  color: #999 }
- .entry .metadata a:hover {  color: #000 }
- .tags {
- margin:0;
- padding:0;
- }
- .entry .metadata .tags li {
-   display: inline-block;
-   margin-right: 0.3em;
- }
- .more,
- .home {
-   text-decoration: none;
-   color: #000;
-   font-weight: bold;
- }
- table {
-   margin: 0;
-   padding: 0;
-   border: 0;
- }
- table .column {
-   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 }
- #footer {  margin-top: 120px }
- #footer .copy a {  text-decoration: none }
- a.rss {
- /*  background: url("/img/rss-icon.png") no-repeat scroll right center transparent;
-   padding: 0 1.3em 0 0;  
- */
- }
- a.external {
-   background: url("/img/external-icon.png") no-repeat scroll right center transparent;
-   padding: 0 1.3em 0 0;
- }
- .thumb_elem {
++.entry p {
++     max-width:720px;   
++}
++
++
++
++.project {
 +    display:inline-block;
++    margin-right:10px;
++    margin-bottom:40px;
 +}
 +.thumb {
 +  width:100px;
 +  height:100px;
 +  border:1px dotted #000;
++  overflow:hidden;
++  background:#eee;
++}
++
++
++
++.column {
++  padding-right:100px;
++}
++
++.image li, .bookmarks li {
++    margin-bottom:40px;
++}
++
++ul.image {
++    background:#fff;
++    padding:20px;
 +}
diff --cc index.php
index 6791652fdb90d2710a1f3402fd30b83293314929,62b7c6d0dfe3cc36cb03ddd5fd10ecd8a3ccaa68..b16eaa32a9e03ce31c3710784d201b02f34611ff
+++ b/index.php
@@@ -1,60 -1,21 +1,44 @@@
  <?php
  
-     require_once 'lib/init.php';
-     $url = get_url();
-     list($response_format, $response_mime_type) = parse_format($url['extension'], 'html');
-     # setup template
-     $t = get_template_instance();
-     $t->response_format = $response_format;
-     $t->assign('view', isset($_GET['v']) ? $_GET['v'] : null);
-     $content_request = LOCAL_ROOT . CONTENT_DIR . $url['dirname'] . '/' . $url['filename'];
-     $page_request =  LOCAL_ROOT . PAGE_DIR . DIRECTORY_SEPARATOR . $url['filename'];
-     $total = 0;
-     # content exists, and is a folder
-     if (is_dir($content_request)) {
-         # get config in folder, if exists
-         if (is_file($content_request . '/' . CONFIG_FILE )) {
-             $config = parse_entry(new SplFileInfo($content_request . '/' . CONFIG_FILE));
-             $template = $config['config']['template'] . '.' . $response_format . '.tpl' ;
-         }
-         list($data, $total) = get_entries($url['dirname'] . '/' . $url['filename']);
-         if ($url['filename'] == '') {
-             $template = 'index.html.tpl';
-         }
-             
-         $t->assign('data', $data);
-         $t->assign('page_title', preg_replace('{^/|/$}', '', $url['url']));
-     }
-     # content exists, and is a single entry
-     else if (is_file($content_request)) {
-         $t->assign('data', parse_entry(new SplFileInfo($content_request)));
-         $t->assign('single', true);
-         $template = 'single.'.$response_format.'.tpl';
-     }
-     # content exists, and is a page
-     else if (is_file($page_request)) {
-         $page = parse_entry(new SplFileInfo($page_request), 1);
-         $t->assign('data', $page);
-         $template = $page['config']['template'] ? $page['config']['template'] . '.' . $response_format . '.tpl' : 'page.' . $response_format . '.tpl';
-     }
-     # 404
-     else {
-         $template = '404.html.tpl';
-     }
-     # render
-     $t->assign('total', $total);
-     header("Content-Type: {$response_mime_type}; charset=UTF-8");
-     $t->render($template);
- ?>
+ require 'lib/init.php';
++
++
++
++
+ $request = get_request();
+ $v = new View  ($request);
+ $m = new Model ($request);
++
++
++
++
+ if ($m->is_single())
+       $v->assign('entry', $m->entry);
+ else if ($m->is_page())
+       $v->assign('page', $m->page);
+ else if ($m->is_multiple())
+       $v->assign('entries', $m->entries);
++
++
++
++
++
+ header("Content-Type: {$m->response_mime_type}; charset=UTF-8"); 
+ $v->render( $m->template );
++
++
++
++
++
++
++
++
++
++exit;
diff --cc lib/init.php
index b340c1f0a1743551ba60e61661670f4c213478ad,8c030ebdaacbaecf3e4cddf5eb69d542b9776b8b..c0d38495ca2087acfef3a1632554db6caea04680
@@@ -1,28 -1,43 +1,82 @@@
  <?php
++/*
++<<<<<<< HEAD
 +    putenv("TZ=America/Los_Angeles");
  
- ?>
 +      ini_set('include_path', ini_get('include_path') . PATH_SEPARATOR . dirname(realpath(__FILE__)));
 +
 +      define ('SITE_TITLE', 'quilime');
 +      define ('LOCAL_ROOT', '/home/quilime/quilime.com/');
 +      define ('WEB_ROOT', 'http://quilime.com/');
 +
 +      define ('CONTENT_DIR', 'content');
 +      define ('TEMPLATE_DIR', 'templates');
 +      define ('PAGE_DIR', 'pages');
 +      define ('CONFIG_DELIMITER', '--');
 +    define ('MORE_DELIM', '<!--more-->');
 +      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);
 +
 -# error reporting
++?>
++=======
++*/
+ /**
+  *            SETUP
+  *
+  *            update variables specific to your server
+  *
+  *            note: PHP short tags must be enabled
+  */
 -define ('CLEAN_URLS',                  false);
 -define ('SITE_TITLE',                  'india 2011');
 -define ('LOCAL_ROOT',                  '/Users/gdunne/Sites/india/');
 -define ('WEB_ROOT',            '/~gdunne/india/');
++# error reporting (turn this off for production)
+ error_reporting(E_ALL);
+ ini_set("display_errors", 1);
+ # timezone
+ putenv('TZ=Asia/Calcutta');
+ # include path
+ ini_set('include_path', ini_get('include_path') . PATH_SEPARATOR . dirname(realpath(__FILE__)));
++
++
++
++
++
+ # settings
 -require_once 'view.php';
++define ('CLEAN_URLS',                  true);
++define ('SITE_TITLE',                  'quilime');
++define ('LOCAL_ROOT',                  '/home/quilime/quilime.com/');
++define ('WEB_ROOT',            '/');
+ define ('CONTENT_DIR',                 'content/');
+ define ('TEMPLATE_DIR',        'templates/');
+ define ('PAGE_DIR',            'pages/');
+ define ('CONFIG_DELIMITER',  '--');
+ define ('CONFIG_FILE',                 'config');
+ define ('MORE_DELIM',                  '<!--more-->');
+ define ('TITLE_DELIMITER',     ' &mdash; ');
+ define ('ENTRY_DATE_FORMAT', 'M d Y, h:i:s A T');
+ $_FILE_IGNORES = array(CONFIG_FILE, '.DS_Store');
++
++
++
++
++
+ # includes
+ require_once 'data.php';
+ require_once 'output.php';
+ require_once 'markdown.php';
+ require_once 'model.php';
++require_once 'view.php';
diff --cc lib/output.php
index ec4818695998b7b8968dce699d815fd0c674da6a,6afa47705bdc65522ef2352483cf43bd349bb534..efac82e04912cb31ae995bf17695c2df95ede1ea
@@@ -1,18 -1,5 +1,6 @@@
  <?php
  
- /**
-  *    return new template instance
-  */
- function get_template_instance()
- {
-     $t = new Template();
-     $t->template_dir = join(DIRECTORY_SEPARATOR, array(dirname(__FILE__), '..', TEMPLATE_DIR));
-       $t->template_cache_dir = join(DIRECTORY_SEPARATOR, array(dirname(__FILE__), '..', TEMPLATE_DIR, 'cache'));
-     return $t;
- }
 +
  /**
   *    @param format
   *  @param default format
@@@ -175,12 -148,25 +149,25 @@@ function get_url_parts(
  }
  
  
- function get_url()
- {
-     $path_info = pathinfo($_SERVER['SCRIPT_URL']);
-     $path_info['url'] = preg_match("/\.\.\//", $_SERVER['SCRIPT_URL']) ? '/' : $_SERVER['SCRIPT_URL'];
-     //$path_info['extension'] = null;
-     return $path_info; //substr($_SERVER['SCRIPT_URL'], strlen(get_base_dir() . '/'));
+ function get_request()
+ {   
 -    if (!CLEAN_URLS && isset($_GET['p'])) {
++    if (isset($_GET['p'])) {
+         $path = $_GET['p'];
+     } else {
+         // TODO
+         // this is fudged
+         if ($_SERVER['REQUEST_URI'] == WEB_ROOT) {
+             $path = '/';
+         }
+     }
+     $path_info = pathinfo( $path );
+     $path_info['path'] = preg_match("/\.\.\//", $path) ? '/' : $path;
+     $path_info['extension'] = null;
+     if ($path_info['dirname'] == '.')
+         $path_info['dirname'] = '';
+     return $path_info;
  }
  
  
diff --cc pages/about
index e5e9e72111bfbd8df2386a7d1caafce2ae83ba8a,483451b5f922a49b9fa883c191bc70fdded5c2c8..903998bc1484a7a3354d50b0fe6be8b5dcb4970f
@@@ -1,20 -1,7 +1,17 @@@
  title = about
  --
- ###about
++#about
  
- quilime is a codification of process, resource, and code by **gabriel dunne** ([www](http://gabrieldunne.com), [email](&#x6d;&#x61;&#x69;&#108;&#x74;&#111;&#x3a;&#x67;&#x64;&#x75;&#x6e;&#110;&#x65;&#x40;&#x71;&#117;&#105;&#x6c;&#x69;&#x6d;&#101;&#x2e;&#x63;&#111;&#x6d;))
++quilime is a codification of projects, process and resources by **gabriel dunne** ([www](http://gabrieldunne.com), [email](&#x6d;&#x61;&#x69;&#108;&#x74;&#111;&#x3a;&#x67;&#x64;&#x75;&#x6e;&#110;&#x65;&#x40;&#x71;&#117;&#105;&#x6c;&#x69;&#x6d;&#101;&#x2e;&#x63;&#111;&#x6d;))
 +<br />elsewhere:
 +[github](http://github.com/quilime/),
 +[vimeo](http://vimeo.com/quilime/),
 +[clmpr](http://clmpr.com/quilime/),
 +[flickr](http://flickr.com/photos/quilime/),
 +[delicious](http://delicious.com/quilime/),
 +[ffffound](http://ffffound.com/home/quilime/found/),
 +[@quilime](http://twitter.com/quilime/)
  
- quilime.com has taken many forms: <a href="/projects/">archive</a>
- site update <a href="http://quilime.com/.rss" class="rss">rss</a>
- quilime is powered by <a href="http://git.quilime.com/?p=plog.git;a=summary">plog</a> (project+log), a static-file CMS.
 -INDIA 2011 is a journal by Gabriel L Dunne, documenting a self-initiated 3mo residiency in Delhi, India with fellow artist Vishal K Dar.
++<!-- add <a href="http://quilime.com/.rss" class="rss">.rss</a> to the end of any url for an xml feed -->
  
 -all content &copy; 2011
++quilime is powered by <a href="http://git.quilime.com/?p=plog.git;a=summary">plog</a> (project+log) engine.
diff --cc pages/links
index 8039284d0461156c502512aa353fa4cb876ccf73,8a3369ed3224966724a2e7dff1ca50d0ab3fbab7..bdf2e9c298d199ea7af1ab05c7bcd50057adc95d
@@@ -2,29 -2,33 +2,31 @@@ title = link
  type = page
  markdown = true
  --
 -people
 -------
 -+ gabriel dunne [gabrieldunne.com](http://gabrieldunne.com)
 -+ stephanie sherriff [ssherriff.com](http://ssherriff.com)
 -+ ryan alexander [onecm.com](http://onecm.com)
 -+ joshua nimoy [jtnimoy.net](http://jtnimoy.net)
 -+ daniel massey [oddsympathy.com](http://oddsympathy.com)
 -+ keith pasko [keithpasko.com](http://keithpasko.com)
 -+ jeff lubow [dabkitsch.com/jml/](http://dabkitsch.com/jml/)
 -+ michael chang [ghost-hack.com](http://ghost-hack.com)  
 -+ carbon workshop [carbonworkshop.com](http://carbonworkshop.com)
 -+ sascha pohflep [pohflepp.com](http://pohflepp.com)
 -+ mylinh trieu [mylinhtrieu.com](http://mylinhtrieu.com)
 -+ aaron meyers [universaloscillation.com](http://universaloscillation.com)
 -+ tom carden [tom-carden.co.uk](http://tom-carden.co.uk)
 -+ michal migurski [mike.teczno.co](http://mike.teczno.com)
 -+ adam roth [ripevessel.com](http://ripevessel.com)
 -+ david rager [davidrager.org](http://davidrager.org)
 -+ marc nimoy [digitanalog.net](http://digitanalog.net)
 -+ matthew gale [makaga.com](http://makaga.com)
 -+ frédéric eyl [fredericeyl.de](http://fredericeyl.de)
 -+ the green eyl [thegreeneyl.com](http://thegreeneyl.com)
  
- ###links
 -<br />
 -<br />
++###people
 ++ [gabrieldunne.com](http://gabrieldunne.com) gabriel dunne 
 ++ [ssherriff.com](http://ssherriff.com) stephanie sherriff
 ++ [onecm.com](http://onecm.com) ryan alexander
 ++ [jtnimoy.net](http://jtnimoy.net) joshua nimoy 
 ++ [oddsympathy.com](http://oddsympathy.com) daniel massey
 ++ [keithpasko.com](http://keithpasko.com) keith pasko
 ++ [dabkitsch.com/jml/](http://dabkitsch.com/jml/) jeff lubow
 ++ [carbonworkshop.com](http://carbonworkshop.com) gustavo huber, shelly brown
 ++ [ghost-hack.com](http://ghost-hack.com) michael chang
 ++ [pohflepp.com](http://pohflepp.com) sascha pohflep
 ++ [mylinhtrieu.com](http://mylinhtrieu.com) mylinh trieu
 ++ [universaloscillation.com](http://universaloscillation.com) aaron meyers
 ++ [tom-carden.co.uk](http://tom-carden.co.uk) tom carden
 ++ [mike.teczno.co](http://mike.teczno.com) michal migurski
 ++ [ripevessel.com](http://ripevessel.com) adam roth
 ++ [davidrager.org](http://davidrager.org) david rager
 ++ [digitanalog.net](http://digitanalog.net) marc nimoy
 ++ [makaga.com](http://makaga.com) matthew gale
 ++ [fredericeyl.de](http://fredericeyl.de) frédéric eyl
 ++ [thegreeneyl.com](http://thegreeneyl.com) the green eyl
  
- ####places
 -places
 -------
 -+ gray area foundation for the arts [gaffta.org](http://gaffta.org)
 -+ bay area video coalition [bavc.org](http://bavc.org)
++<br /><br />
++
++###places
 ++ [gaffta.org](http://gaffta.org) gray area foundation for the arts
 ++ [bavc.org](http://bavc.org) bay area video coalition
index a0ed8af6204d142771072cfa877a82a532addddc,3cdbab2d21e6654e18115dcd15be6394de969e76..3447b6c88c478c6599ceca72553d86d38a4c6f13
@@@ -17,6 -14,9 +14,8 @@@
        
  </div>
  
 -
+     <? $this->include_template('nav.html.tpl') ?>
        <? $this->include_template('footer.html.tpl') ?>
  
  </body>
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..6ba5573269504ac8e449f901ed80e6f782d589bf
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,28 @@@
++<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">
++      <? foreach($entries as $entry): ?>
++    <li>
++        &mdash; <a class="more" href="<?= $entry['url']; ?>"><?= $entry['title']; ?></a>
++    </li>
++      <? endforeach; ?>       
++    </ul>
++      
++</div>
++
++      <? $this->include_template('footer.html.tpl') ?>
++    <? $this->include_template('nav.html.tpl') ?>
++
++</body>
++</html>
index b903d38fe466baf0deb71360d1da8d3614fb14ae,58c3f1744a798dbe4aa4e36b422a8b2271524d5c..2314da24ea50a928ee6e7452d394411d40124861
@@@ -1,17 -1,21 +1,18 @@@
  <div class="entry">
  
 -      <div class="content">
 +      <h1>
-               <a title="posted on <?=$data['date']?>" href="<?=$data['url']?>"><?=$data['title']?></a>
++              <a title="posted on <?=$entry['date']?>" href="<?=$entry['url']?>"><?=$entry['title']?></a>
 +      </h1>
 +
 +      <div class="content">   
-               <?=$data['content']?>
+               <?=$entry['content']?>
        </div>
  
        <div class="metadata">
-               <abbr title="<?=get_relative_time($data['timestamp']);?>"><?=date("F d, Y", $data['timestamp'])?></abbr> 
-               in <a href="<?=$data['cat']['url'];?>"><?=$data['cat']['name'];?></a><? if ($data['tags']) echo ' filed as ' . implode(', ', $data['tags']); ?>
-               
 -              <a href="<?=$entry['url']?>"><?=$entry['title']?></a>,
 -              <span title="<?=get_relative_time($entry['timestamp']);?>"><?=date(ENTRY_DATE_FORMAT, $entry['timestamp'])?></span> 
 -              <? if (!empty($entry['cat']['name'])): ?>
 -              in <a href="<?=$entry['cat']['url'];?>"><?=$entry['cat']['name'];?></a>
 -              <br/>
 -              <? endif; ?>
 -              <ul class="tags">
 -              <? if ($entry['tags']) foreach($entry['tags'] as $tag) : ?>
 -              <li>#<?=$tag?></li>
 -              <? endforeach; ?>
 -              </ul>
 -      </div>  
++              <abbr title="<?=get_relative_time($entry['timestamp']);?>"><?=date("F d, Y", $entry['timestamp'])?></abbr> 
++              in <a href="/<?=$entry['cat']['url'];?>"><?=$entry['cat']['name'];?></a><? if ($entry['tags']) echo ' filed as ' . implode(', ', $entry['tags']); ?>
 +      </div>
 +
++
  </div>
index 9bc47f6767e17420963101e9b3bf1bc5b74c2754,ae6fd8ff3050a1b89254f2c19fc1a697ebf99edd..ed48403054a9a2cfcb329eb6f5ac84020edfc6d4
@@@ -1,31 -1,6 +1,39 @@@
  
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  
++<? /*
++<!-- <<<<<<< HEAD
 +<link rel="alternate" type="application/rss+xml" title="RSS" href="<?= get_base_dir(); ?>/.rss" />
 +
 +<link rel="stylesheet" href="<?= get_base_dir(); ?>/css/style.css" type="text/css">
 +
 +<link href="<?= get_base_dir(); ?>/js/prettify/prettify.css" type="text/css" rel="stylesheet" />
 +<script type="text/javascript" src="<?= get_base_dir(); ?>/js/jquery-1.3.2.min.js"></script>
 +<script type="text/javascript" src="<?= get_base_dir(); ?>/js/prettify/prettify.js"></script>
 +<script>
 +
 +$(document).ready(function() {
 +      prettyPrint();
 +});
 +
 +</script>
 +
 +<script type="text/javascript">
 +
 +  var _gaq = _gaq || [];
 +  _gaq.push(['_setAccount', 'UA-351774-1']);
 +  _gaq.push(['_trackPageview']);
 +
 +  (function() {
 +    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
 +    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
 +    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
 +  })();
 +
 +</script>
++======= -->
++*/ ?>
+ <link rel="alternate" type="application/rss+xml" title="RSS" href="<?=get_base_dir();?>/.rss" />
+ <link rel="stylesheet" href="<?=get_base_dir();?>/css/style.css" type="text/css">
++<? /* <!-- >>>>>>> 2ae0cd949c331f83dcb05116cffdca21b2ecb871 --> */ ?> 
index c0b2cd438f87d238b47c2d1cc9518c6f54584493,b4fce1beb2d417d4f61ee0b19ba4ac9f0ef9a2e0..c960310716fff275dc656ec0de1c7656be1efe09
  <html>
  <head>
+     
      <? $this->include_template('head-inc.html.tpl') ?>
-     <title><?=SITE_TITLE?></title>
+     
+     <title><?=SITE_TITLE?><?=$this->page_title(TITLE_DELIMITER);?></title>
+     
  </head>
  <body>
-     <? $this->include_template('nav.html.tpl') ?>
+     
 +<div id="content">
 +
 +      <table>
 +      <tr>
 +      <td style="padding-right:100px;" valign="top">
-       <h3>code</h3>
-       <? foreach($data as $entry): 
-               if ($entry['cat']['name'] == 'code') : ?>
-               <div>&bull; <a href="<?=$entry['url'];?>"><?=$entry['title'];?></a></div>
-       <?      endif;
-       endforeach; ?>
-       <p><small>
-       <a class="rss" href="/code/.rss">rss</a>, <a class="more" href="/code/">more &rarr;</a>
-       </small>
-       </p>
++              <h3><a class="more" href="/code/">code</a></h3>
++              <ul class="archive">
++              <? $c=15; foreach(get_entries('code/') as $entry): if ($c--==0) break; ?>
++              <li>
++              <a href="<?=$entry['url']?>" title="<?=date("m d Y", $entry['timestamp'])?>"><?=$entry['title']?></a>
++              </li>
++              <? endforeach; ?>       
++              </ul>
++              <p><a class="more" href="/code/">more &rarr;</a></p>
 +      </td>
 +
 +      <td  valign="top">
-       <h3>(b)log</h3>
-       <? foreach($data as $entry): 
-               if ($entry['cat']['name'] == 'log') : ?>
-               <div>&bull; <a href="<?=$entry['url'];?>"><?=date('Y m d', $entry['timestamp']);?> &mdash; <?=$entry['title'];?></a></div>
-       <?      endif;
-       endforeach; ?>
-       <p><small>
-       <a class="rss" href="/log/.rss">rss</a>, <a class="more" href="/log/">more &rarr;</a>
-       </small>
-       </p>
++              <h3><a href="/journal/">log</a></h3>
++              <ul class="archive">
++              <? $c=15; foreach(get_entries('journal/') as $entry): if ($c--==0) break; ?>
++              <li>
++              <a href="<?=$entry['url']?>" title="<?=date("m d Y", $entry['timestamp'])?>"><?=date('Y m d', $entry['timestamp']);?> &mdash; <?=$entry['title']?></a>
++              </li>
++              <? endforeach; ?>       
++              </ul>   
++              <p><a class="more" href="/log/">more &rarr;</a></p>
 +      </td>
 +
 +      </tr>
 +      </table>        
 +
 +      <br />
 +      <br />
 +      <br />
 +      <br />                  
 +
 +      <div>
-       <h3>projects</h3>
++      <h3><a href="/projects/">projects</a></h3>
++              
++      <ul class="projects">
++      <? foreach(get_entries('projects/') as $entry): ?>
++      <li class="project">
++              <a href="<?=$entry['url']?>">
++            <div class="thumb">
++            <? if (isset($entry['config']['thumb'])): ?>
++            <img src="<?= $entry['config']['thumb']?>">
++            <? endif; ?>
++            </div>
++              <?=$entry['title']?></a>
++      </li>
++      <? endforeach; ?>       
++      </ul>   
++
++              &bull; <a href="http://content.stamen.com/som_transbay_tower">Bay Area Transit</a> - data visualization<br />           
++              &bull; <a href="http://portfolio.quilime.com/content/daschtein/index.html">Dachstein</a> - installation<br />
++              &bull; <a href="http://portfolio.quilime.com/content/cm/index.html">Celestial Mechanics</a> - dome-based animation<br />
++              &bull; <a href="http://portfolio.quilime.com/content/valentine/index.html">Valentine</a><br />  
 +
 +      <br />
 +      <br />
++      <br />
 +
-       <? foreach($data as $entry): 
-               if ($entry['cat']['name'] == 'projects') : ?>
-               <div class="thumb_elem">
-                       <a href="<?=$entry['url'];?>">
-                       <div class="thumb"></div>
-                       <?=$entry['title'];?>
-                       </a>
-               </div>
-       <?      endif;
-       endforeach; ?>
-               <!--
++      <h3><a href="/software/">software</a></h3>
++              
 +              &bull; <a href="http://git.quilime.com/?p=plog.git">plog</a> - project+log CMS<br />
 +              &bull; <a href="https://github.com/quilime/clmpr">clmpr</a> - minimal bookmarking site<br />
-                       
-               <br />
 +
-               &bull; <a href="http://portfolio.quilime.com/2008/?p=rattle">Rattles</a> - software<br />
-               &bull; <a href="http://portfolio.quilime.com/2008/?p=sempernull">Sempernull</a> - projection<br />
-               &bull; <a href="http://portfolio.quilime.com/2008/?p=synonymovement">Synonymovement</a> - projection<br />
-               &bull; <a href="http://portfolio.quilime.com/2008/?p=cabspotting">Cabspotting</a> - data visualization<br />
-               &bull; <a href="http://content.stamen.com/som_transbay_tower">Bay Area Transit</a> - data visualization<br />           
-               &bull; <a href="http://portfolio.quilime.com/2008/?p=mask">Mask</a> - painting<br />
-               &bull; <a href="http://portfolio.quilime.com/2008/?p=prism">Prism</a> - painting<br />
-               &bull; <a href="http://portfolio.quilime.com/new/port.php?p=01_Dots">Dots</a> - software<br />
-               &bull; <a href="http://portfolio.quilime.com/new/port.php?p=02_Jellyfish">Jelly</a> - software<br />
-               &bull; <a href="http://portfolio.quilime.com/new/port.php?p=05_Swim_Tank">Swim Tank</a> - software<br />
-               &bull; <a href="http://portfolio.quilime.com/new/port.php?p=06_Web">Web</a> - software<br />
-               &bull; <a href="http://portfolio.quilime.com/content/daschtein/index.html">Dachstein</a> - installation<br />
-               &bull; <a href="http://portfolio.quilime.com/content/cm/index.html">Celestial Mechanics</a> - dome-based animation<br />
-               &bull; <a href="http://portfolio.quilime.com/content/valentine/index.html">Valentine</a> - software<br />       
-               -->
 +
 +      </div>
 +
 +</div>
 +
++
+     <? $this->include_template('nav.html.tpl') ?>
        <? $this->include_template('footer.html.tpl') ?>
  
  </body>
  </html>
++      
index 5212d2d85ba824dc5964ae3d8458d8611bb9faec,12526134ead8ea73ea44f265e6547b293acc4e19..622fb628d86f080de323fbdf3efec503785c5353
@@@ -1,41 -1,15 +1,66 @@@
 -<div id="nav">           
++<!-- <<<<<<< HEAD
 +<ul class="nav">
  
 -      <ul class="archive">
 -      <? foreach(get_entries() as $entry): ?>
 -      <li>
 -      <a href="<?=$entry['url']?>" title="<?=date("m d Y", $entry['timestamp'])?>"><?=$entry['title']?></a>
 -      </li>
 -      <? endforeach; ?>       
 -      </ul>
 -      
 -      <br />  
  
-     <li><a href="/">quilime</a></li>
-       <li><a href="/about/">about</a></li>
 -      <a class="mute" href="<?=WEB_ROOT?>?p=about">about</a>
  
 -</div>
 +    <br />
 +
 +      <small>categories</small>
 +      <? $dirs = get_dirs("", array('recursive' => 0)); ?>
 +      <? foreach($dirs as $dir) : ?>
 +      <li><a href="<?=$dir['url']?>"><?=$dir['name']?></a></li>
 +      <? endforeach; ?> 
 +
 +      <br />
 +
 +      <small>pages</small>
 +    <li><a href="/projects/">projects</a></li>
 +      <li><a href="/photo/">photo</a></li>
 +      <li><a href="/agg/">aggregate</a></li>
 +      <li><a href="/links/">links</a></li>
 +
 +    <br />
 +
 +    <li><a class="rss" href="/.rss">rss</a></li>
 +
 +
 +
 +<br />
 +
 +<? /*
 +<ul class="index">
 +    <li><h3>index</h3></li>
 +      <? list($dirs, $total) = get_entries(""); ?>
 +      <?php foreach($dirs as $entry): ?>
 +    <li><a href="<?php echo $entry['url']; ?>"><?php echo $entry['title']; ?></a></li>
 +    <?php endforeach; ?>
 +</ul>
 +*/ ?>
 +
 +</ul>
++======= -->
++<ul id="nav">   
++
++    <li><a href="/">quilime</a></li>
++      <li><a href="/about/">about</a></li>
++
++      <br />
++      <br />
++
++      <small>category</small>
++      <? $dirs = get_dirs("", array('recursive' => 0)); ?>
++      <? foreach($dirs as $dir) : ?>
++      <li><a href="/<?=$dir['url']?>"><?=$dir['name']?></a></li>
++      <? endforeach; ?>  
++
++      <br />
++      <br />
++
++      <small>pages</small>
++    <li><a href="/projects">projects</a></li>
++      <li><a href="/photo">photo</a></li>
++      <li><a href="/agg">aggregate</a></li>
++      <li><a href="/links">links</a></li>     
++
++</ul>
++
index 0000000000000000000000000000000000000000,ea2b6529379c2905f563267e336e50e8df5a9ce2..a5be0371806f3ea3c857c6640474fc2bd795c9c2
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,10 +1,10 @@@
 -      <a href="<?=$entry['prev_entry']['url']?>">prev</a>
+ <? if (isset($entry['prev_entry'])) : ?> 
 -      <a href="<?=$entry['next_entry']['url']?>">next</a>
++      <a href="/<?=$entry['prev_entry']['url']?>">prev</a>
+       <script>var PREV_ENTRY = '<?=$entry['prev_entry']['url']?>'</script>
+ <? endif; ?>
+ <? if (isset($entry['next_entry'])) : ?> 
++      <a href="/<?=$entry['next_entry']['url']?>">next</a>
+       <script>var NEXT_ENTRY = '<?=$entry['next_entry']['url']?>'</script>
+ <? endif; ?>
index f43e3d88e2246fc4b29bf1cbd0aa53951ca63e03,8d6d1ab8c3359b194e5a5107c894f4935f5667fb..d26a1786f531afaf28bde4cfbbaf90b62510ada3
      
  <div id="content">
  
++<!-- <<<<<<< HEAD
 +      <div class="page">
 +      <?=$data['content'];?>
 +      </div>
++======= -->
+       <?=$page['content'];?>
++<!-- >>>>>>> 2ae0cd949c331f83dcb05116cffdca21b2ecb871 -->
        
  </div>
  
index ef9e4d0caa6f46d94dc467d1aa74f46d5f1ff7ae,0000000000000000000000000000000000000000..2b75673e47a352f84b145c2847bb350f1cacebea
mode 100644,000000..100644
--- /dev/null
@@@ -1,91 -1,0 +1,91 @@@
-       <a class="rss" href="http://api.flickr.com/services/feeds/photos_public.gne?id=28394478@N00&lang=en-us&format=rss_200">rss</a>, <a class="more" href="http://flickr.com/photos/quilime/" title="via flickr">more &rarr;</a>            
 +<html>
 +<head>
 +    
 +    <?php $this->include_template('head-inc.html.tpl'); ?>
 +    
 +    <title><?=SITE_TITLE?>: photo</title>
 +    <style>
 +      ul, li {
 +              list-style-type:none;
 +
 +      }
 +      ul {
 +              margin:0;
 +              padding:0;
 +      }
 +    </style>
 +</head>
 +<body>
 +    
 +    <? $this->include_template('nav.html.tpl') ?>
 +    
 +<div id="content">
 +      
 +
 +
 +<? /*
 +              <td valign="top" class="column">
 +              <?php $tube = get_rss_feed('http://gdata.youtube.com/feeds/base/users/quilime/favorites?alt=rss&v=2&orderby=published&client=ytapi-youtube-profile'); ?>
 +              <h2><a href="http://www.youtube.com/profile?user=kabr&view=favorites">video </a></h2>
 +              <ul class="video">
 +              <?php 
 +              $count = 11;
 +              foreach($tube->channel->item as $tube) :  
 +              if ($count-- == 0) break;
 +              ?>    
 +              <li title="<?php echo str_replace('"', '\'', $tube->title); ?>">
 +                  <? 
 +                  $url = $tube->link;
 +                  $pattern = '/v=(.+?)&/';
 +                  preg_match($pattern, $url, $matches);
 +                  $id = $matches[1];
 +                  ?>
 +                  <a href="<?php echo $tube->link; ?>">
 +
 +                  <img src="http://i3.ytimg.com/vi/<?=$id?>/default.jpg" />
 +                  </a>
 +              </li>
 +              <? endforeach; ?>  
 +              </ul>
 +              <p>
 +                  <a class="more" href="http://www.youtube.com/profile?user=quilime&view=favorites" title="via youtube">more &rarr;</a>            
 +              </p>
 +              </td>
 +*/ ?>
 +
 +      <!-- quilime:flickr -->
 +              <ul>
 +              <?      $count = 16; $img = get_rss_feed('http://api.flickr.com/services/feeds/photos_public.gne?id=28394478@N00&lang=en-us&format=rss_200');  ?>
 +        <?php foreach($img->channel->item as $item) : if (!$count--) break; ?>
 +        <li style="float:left; height:280px;margin-right:20px;">
 +            <?
 +                $subject = $item->description;
 +               $pattern = '/<a href="http:\/\/www\.flickr\.com\/photos\/quilime\/(.*) \/><\/a><\/p>/';
 +                preg_match($pattern, substr($subject, 3), $matches, PREG_OFFSET_CAPTURE);
 +                echo $matches[0][0];
 +            ?>
 +        </li>
 +<?endforeach;?>
 +      </ul>
 +      <p>
++      <a class="more" href="http://flickr.com/photos/quilime/" title="via flickr">more &rarr;</a>            
 +      </p>
 +
 +
 +
 +
 +      
 +      
 +      
 +
 +      
 +      
 +      
 +
 +      </div>
 +
 +      <? $this->include_template('footer.html.tpl'); ?>
 +
 +</body>
 +</html>
 +
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..14021ca1ea3a90b7a3b6381252448e22931a39f9
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,36 @@@
++<html>
++<head>
++    
++    <? $this->include_template('head-inc.html.tpl') ?>
++    
++    <title><?=SITE_TITLE?><?=$this->page_title(TITLE_DELIMITER);?></title>
++    
++</head>
++<body>
++    
++    
++<div id="content">
++
++    <? foreach($entries as $entry): ?>
++    <?  if (isset($entry['content_short'])) ?>
++            
++            <div class="project">
++            <a href="<?= $entry['url']?>">
++            <div class="thumb">
++            <? if (isset($entry['config']['thumb'])): ?>
++            <img src="<?= $entry['config']['thumb']?>">
++            <? endif; ?>
++            </div>
++            <?= $entry['title']; ?>
++            </a>
++            </div>
++
++    <? endforeach; ?>   
++    
++</div>
++
++    <? $this->include_template('footer.html.tpl') ?>
++    <? $this->include_template('nav.html.tpl') ?>
++
++</body>
++</html>
index 79d12ea5de396d7b6c85452c983de763276b2513,cae3f0234eddb2c62a96abede5a6c77d8fa83144..f8f5c3662e300723bad4c980ed832a26e71bd7c3
@@@ -3,39 -3,20 +3,49 @@@
      
      <? $this->include_template('head-inc.html.tpl') ?>
      
++<!-- <<<<<<< HEAD
 +    <title><?=SITE_TITLE?><?=TITLE_DELIMITER?> <?=$data['title'];?></title>
++======= -->
+     <title><?=$entry['title'];?></title>
++<!-- >>>>>>> 2ae0cd949c331f83dcb05116cffdca21b2ecb871 -->
      
  </head>
  <body>
      
-     <? $this->include_template('nav.html.tpl') ?>
-     
        <div id="content">
-               <? $this->include_template('entry.html.tpl', array('data' => $data)); ?>        
+               <? $this->include_template('entry.html.tpl'); ?>
+       </div>
+       <div id="nextprev">
+               <? $this->include_template('nextprev.html.tpl'); ?>
        </div>
  
++<!-- <<<<<<< HEAD -->
 +<!-- 
 +
 +<div id="disqus_thread"></div>
 +<script type="text/javascript">
 +    /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
 +    var disqus_shortname = 'quilime'; // required: replace example with your forum shortname
 +
 +    // The following are highly recommended additional parameters. Remove the slashes in front to use.
 +    // var disqus_identifier = 'unique_dynamic_id_1234';
 +    // var disqus_url = 'http://example.com/permalink-to-page.html';
 +
 +    /* * * DON'T EDIT BELOW THIS LINE * * */
 +    (function() {
 +        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
 +        dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
 +        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
 +    })();
 +</script>
 +<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
 +<a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
 + -->
 +
++<!-- ======= -->
+       <? $this->include_template('nav.html.tpl') ?>   
++<!-- >>>>>>> 2ae0cd949c331f83dcb05116cffdca21b2ecb871 -->
        <? $this->include_template('footer.html.tpl') ?>
  
  </body>