Style and content updates.

diff --git a/TODO b/TODO
index d3550fe6ae3ff0ad0b90e1f78c7d3d476841cd0c..a38a7866bd43d837e50f38f7ea293fa4afcfdea3 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,10 +1,10 @@
 TODO
-
 - pagination (View)
-
 - canvas icons for list/thumb/tile views (js)
-
 - static cache generation (wget? curl?)
+  static rss, json, html
+- commenting system from india branch
+
 
 - update content.sh to give back help if used incorrectly
 

diff --git a/content/code/.adva b/content/code/.adva
new file mode 100644 (file)
index 0000000..316cea3
--- /dev/null
+++ b/content/code/.adva
@@ -0,0 +1,53 @@
+title = advanced hard drive format
+date = feb 20 2012, 9:34pm PST
+
+--
+Newer hard drives (circa 2012) are building drives that use a 4KB sector size instead of the conventional 512B. This requires a specific type of formatting to make sure the alignment of the drive is correct, allowing the OS to take full advantage of the performance of the drive. If the drives partition table is not aligned to a single sector that is a multiple of 512, but at least 2x512B, then it will potentially allow gaps between each sector. Ubuntu will throw an error in the disk utilty saying the "Warning: The partition table is misaligned by n number of bytes", and the drive will not perform fully.
+
+For this article I am using a Seagate 2TB ATA ST2000DM001-9YN164 which I am formatting in a single partition as ext4.
+
+I reference this article heavily via linuxconfig.org: [Linux ED EARS Advanced Hard Drive Format](http://linuxconfig.org/linux-wd-ears-advanced-format)
+
+<!--more-->
+
+By default, linux partitioned my drive with the start of each partition on sector 63, which lead to warnings from Ubuntu because they are not aligned to 4K sector from the beginning of the track.
+
+The following assumes your disk is labled as <code>sda</code>.
+<pre class="prettyprint"># fdisk -u /dev/sda
+
+The number of cylinders for this disk is set to 121601.
+There is nothing wrong with that, but this is larger than 1024,
+and could in certain setups cause problems with:
+1) software that runs at boot time (e.g., old versions of LILO)
+2) booting and partitioning software from other OSs
+   (e.g., DOS FDISK, OS/2 FDISK)
+
+Command (m for help): p
+
+Disk /dev/sda: 2000.1 GB, 2000204886016 bytes
+255 heads, 63 sectors/track, 121601 cylinders, total 1953525168 sectors
+Units = sectors of 1 * 512 = 512 bytes
+Disk identifier: 0x10bd10bc
+
+   Device Boot      Start         End      Blocks   Id  System
+
+Command (m for help): n
+Command action
+   e   extended
+   p   primary partition (1-4)
+p
+Partition number (1-4): 1
+First sector (63-1953525167, default 63): 64
+Last sector, +sectors or +size{K,M,G} (64-1953525167, default 1953525167):
+Using default value 1953525167
+
+Command (m for help): w
+The partition table has been altered!
+
+Calling ioctl() to re-read partition table.
+
+WARNING: Re-reading the partition table failed with error 16: Device or resource busy.
+The kernel still uses the old table.
+The new table will be used at the next reboot.
+Syncing disks.
+</pre>
\ No newline at end of file

diff --git a/content/code/archlinux_install b/content/code/archlinux_install
index c34cb624e4e18c7954d4b52cd03f598536dd086d..36592e8eeb25bd0059bc3d8b1587334f2d433f9a 100644 (file)
--- a/content/code/archlinux_install
+++ b/content/code/archlinux_install
@@ -16,12 +16,13 @@ Documentation of the process of installing [archlinux](http://www.archlinux.org/
 - 550w power supply
 
 
+
 ## Installing Windows
 Windows was installed from a USB stick using Microsoft's [Windows 7 USB/DVD tool](http://www.microsoftstore.com/store/msstore/html/pbPage.Help_Win7_usbdvd_dwnTool). It's required to create this key from a Windows 7 system. Boot with the USB drive, then install Windows on the drive in a single partition. Windows also creates a System Reserved partition for itself. Once installed, via Start Menu > Administrative Tools > Computer Management > Disk Manamagent, select 'Shrink Partition' on the main Windows parition to create another partition for Arch. The default value for the shrink is 50%, so for my setup the value for the new disk size was ~50GB, which was ideal. 
 
 Note about this install. I have an old Linksys (Cysco) WMP54G Wireless PCI Card. Drivers from Linksys/Cysco's website didn't work, but following this [blog post](http://www.phishthis.com/2009/01/16/how-to-install-wmp54g-drivers-on-windows-7-beta-64-bit-or-vista-64-bit/), the generic RALink drivers worked great.
 
-
+<!--more-->
 
 ## Installing Archlinux
 

diff --git a/content/code/clmpr b/content/code/clmpr
deleted file mode 100644 (file)
index 76fbb1b..0000000
--- a/content/code/clmpr
+++ /dev/null
@@ -1,4 +0,0 @@
-title = clmpr
-tags = software web bookmarks
---
-<a href="https://github.com/quilime/clmpr">clmpr</a> - minimal bookmarking site<br />

diff --git a/content/code/mel/notepad b/content/code/mel/notepad
index f8a63dacd828c88e7427afec70d55a57f0b1305a..4a4b8c5e3c174cf0595d5d91ab64afaed04fbc8e 100644 (file)
--- a/content/code/mel/notepad
+++ b/content/code/mel/notepad
@@ -3,6 +3,10 @@ title = "MEL Notepad"
 tags = mel maya
 --
 
+mel notepad with various code snippets
+
+
+
 process selection list
 <pre class="prettyprint lang-mel">string $select[] = `ls -sl`;
 for ( $node in $select ) // process each
@@ -31,6 +35,8 @@ string $no_component = `match "^[^\.]*" $node`;
 // Result: "pCube1" //
 </pre>
 
+<!--more-->
+
 <br />
 Extract component or attribute, with '.'
 <pre class="prettyprint lang-mel">

diff --git a/content/code/mel/sphere_intersect b/content/code/mel/sphere_intersect
index 229977e19bdacbfac0dfd6b0814a70f92450d731..9ff0395c02543e046ecfbe9b53a26d2fadf52a12 100644 (file)
--- a/content/code/mel/sphere_intersect
+++ b/content/code/mel/sphere_intersect
@@ -1,5 +1,5 @@
 date = 2009-06-12
-title = "MEL Sphere Intersect"
+title = "Sphere Intersect in Maya/MEL"
 tags = maya mel sphere intersection
 lang = mel
 --
@@ -8,6 +8,8 @@ Function to return location of intersect with poly mesh and spherical object mov
 <br/>
 </p>
 
+<!--more-->
+
 <h2>
 mel source
 </h2>
@@ -63,4 +65,4 @@ intersectSphereY;</pre>
 
 
 
-<img src="http://media.quilime.com/files/img/sphere_intersect.png">
\ No newline at end of file
+<img src="http://media.quilime.com/files/img/sphere_intersect.png">

diff --git a/content/code/osx_command_line_audio b/content/code/osx_command_line_audio
index c74f46bf396a99fccdf2e96469d640f4f1bb4086..6733842f4c38869aa88e84706d9ccef27c956fac 100644 (file)
--- a/content/code/osx_command_line_audio
+++ b/content/code/osx_command_line_audio
@@ -31,7 +31,7 @@ gcc test.c -o test
 
 
 
-##resources
+## references
 
 - <a href="http://countercomplex.blogspot.com/2011/10/algorithmic-symphonies-from-one-line-of.html">http://countercomplex.blogspot.com/2011/10/algorithmic-symphonies-from-one-line-of.html</a>
 - <a href="http://www.bemmu.com/music/index.html">http://www.bemmu.com/music/index.html</a>
@@ -41,3 +41,5 @@ gcc test.c -o test
 - <a href="http://wurstcaptures.untergrund.net/music/?oneliner=-(M%3D127)%3E(s%3D(((y%3D%5B3%2C3%2C4.7%2C2%5D%5Bp%3Dt%3E%3E14%263%5D%2F5*t)*.96%2663)%2B(y%2663))*1.2%2B(t%3E%3E16%3F(((5*t%25(m%3D2048))*(a%3D1-t%25m%2Fm)%26128)*(0x53232323%3E%3E(z%3Dt%3E%3E11%26(k%3D31))%261)*a%2B((d%3D(14*t*t%5Et)%25m*a)%26M)*(0xa444c444%3E%3Ez%261)*a*1.5%2B((a*d*(t%3E%3E9%261)%26M)%2F7.5))%2B((((h%3D%22IQNNNN!!%5D%5D!Q!IW%5DWQNN%3F%3F!!W%5DWQNNN%3F%22.charCodeAt(t%3E%3E10%2615%7Cp%2F3%3C%3C4)%2F33*t-t)%26k)%2B(h*1.99%26k)%2B(h*.49%26k)%2B(h*.97%26k)-64))*a*(2-a)*2%3A0))%3F-M%3As%3EM%3FM%3As&oneliner2=&t0=0&tmod=0&duration=30&separation=100&rate=8000">one-liner</a> from <a href="http://www.iquilezles.org">inigo quilez</a>
 
 -->
+
+<br />

diff --git a/content/code/plog b/content/code/plog
deleted file mode 100644 (file)
index c6bd8c3..0000000
--- a/content/code/plog
+++ /dev/null
@@ -1,4 +0,0 @@
-title = plog
-tags = software web cms blog engine
---
-<a href="http://git.quilime.com/?p=plog.git">plog</a> - project+log CMS<br />

diff --git a/content/code/scripts/imageslice b/content/code/scripts/imageslice
index acd928b2b0c320e14bbd9b6cf0631fed8a36abd0..b4aab53c7abf0a52cfed8151fa7e84f7ee263a88 100644 (file)
--- a/content/code/scripts/imageslice
+++ b/content/code/scripts/imageslice
@@ -6,6 +6,8 @@ lang = bash
 
 Shell script that slices a single image into any number of vertical and horizontal sections.
 
+
+
 <pre class="prettyprint">#!/bin/bash
 #@author  gabriel dunne &lt;quilime.com&gt;
 
@@ -39,6 +41,8 @@ else
 fi
 </pre>
 
+<!--more-->
+
 ##To Use
 navigate to slice.sh in your terminal and do 
 <pre class="prettyprint">chmod +x slice.sh

diff --git a/content/code/terminal_emulator_on_win b/content/code/terminal_emulator_on_win
index 7e0bc70adb8ca13f785bca1332cf127da9fb2860..cd51b25f413a1675e6714ed951000656bdb27e9f 100644 (file)
--- a/content/code/terminal_emulator_on_win
+++ b/content/code/terminal_emulator_on_win
@@ -1,9 +1,7 @@
 title = Terminal Emulator on Windows via Cygwin
 date = august 11 2011
 --
-The default Cygwin install emulates a terminal in a command window similar to the DOS prompt with a limited feature set. 
-
-For a full featured x-term, you can install Cygwin-X along with Cygwin:
+How to install cygwin on windows:
 
 1. **Install <a href="http://cygwin.com">Cygwin</a> from <a href="http://cygwin.com/setup.exe">setup.exe</a>**
 
@@ -26,6 +24,9 @@ For a full featured x-term, you can install Cygwin-X along with Cygwin:
 
     <br />
 
+<!--more-->
+
+
 3. **~/.XDefaults**  
 dark theme:
 <pre class="prettyprint">
@@ -61,6 +62,8 @@ dark theme:
 Some more themes on the <a href="https://bbs.archlinux.org/viewtopic.php?pid=653473">Arch forums</a>.  
 <br />
 
+
+
 4. **~/.bashrc**  
 To enable color `ls` and human readable size format, add:
 <pre class="prettyprint">
@@ -76,6 +79,8 @@ Disable emacs temp (~) file pooping
 </pre>
 <br />
 
+
+
 Result:  
 <img src="http://media.quilime.com/files/img/cygwin.PNG" />
 

diff --git a/content/config b/content/config
index 94c78eabf63b98818719c7d01354c69457539788..090d7d2162d5e914ccc2410ca95debfa67b42453 100644 (file)
--- a/content/config
+++ b/content/config
@@ -1,3 +1,3 @@
 title = quilime
-template = index
+#template = index
 

diff --git a/content/log/2011-09-28_sriyantra b/content/log/2011-09-28_sriyantra
index 2fe3e17fae77e7e1203ebdbf474aa282a6811821..c0798a90f6a61093d82eb563ea82579a092f89f3 100644 (file)
--- a/content/log/2011-09-28_sriyantra
+++ b/content/log/2011-09-28_sriyantra
@@ -1,11 +1,16 @@
 date = 2011-09-28
-title = sri yantra
+title = sri
 --
 
+<img src="http://media.quilime.com/files/projects/india/sriyantra/kali-yantra.jpg" />    
+
+<!--more-->
+
 <!--<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="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.

diff --git a/content/log/2011-10 16 _beg b/content/log/2011-10 16 _beg
index 987e6187d136722ca8dcce4fda1c09e1cb50f002..15504d93781fe1fe97e428386f8dcf5d692ce232 100644 (file)
--- a/content/log/2011-10 16 _beg
+++ b/content/log/2011-10 16 _beg
@@ -2,10 +2,7 @@ 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. 

diff --git a/content/log/2011-10-06_alphabet b/content/log/2011-10-06_alphabet
index de750a9b232d566f6953b2d38ddf157d15f42198..de7beb8abb76fbf03432bb99a8f11d5883ecd0f6 100644 (file)
--- a/content/log/2011-10-06_alphabet
+++ b/content/log/2011-10-06_alphabet
@@ -5,8 +5,11 @@ title = alphabet
 consanants
 
 <img src="http://media.quilime.com/files/projects/india/lang/hindi_cons.gif">
+<!--more-->
+
 <br /><br /><br />
 
+
 vowels
 
 <img src="http://media.quilime.com/files/projects/india/lang/hindi_vwl.gif">

diff --git a/content/log/2012-02-20_temple b/content/log/2012-02-20_temple
new file mode 100644 (file)
index 0000000..915bef5
--- /dev/null
+++ b/content/log/2012-02-20_temple
@@ -0,0 +1,6 @@
+date = feb 20 2012
+title = temple
+--
+<a href="http://www.flickr.com/photos/quilime/6914577153/sizes/z/in/photostream/">
+       <img src="http://farm8.staticflickr.com/7053/6914577153_4c2b7d8a1a_z.jpg">
+</a>

diff --git a/content/log/2012-04-01_studiopano b/content/log/2012-04-01_studiopano
new file mode 100644 (file)
index 0000000..f9184b0
--- /dev/null
+++ b/content/log/2012-04-01_studiopano
@@ -0,0 +1,7 @@
+title = studio pano
+date = 2012-04-01
+--
+<a href="http://www.flickr.com/photos/quilime/7039418073/in/photostream/"><img src="http://farm8.staticflickr.com/7187/7039418073_33cb505a31_z.jpg"/></a>
+
+studio panorama taken by <a href="http://onecm.com">Ryan Alexander</a>  
+<a href="http://www.flickr.com/photos/quilime/7039418073/in/photostream/">flickr</a>
\ No newline at end of file

diff --git a/css/style.css b/css/style.css
index 8ec16810cd639d3087521abeb90e5265b896e700..ebdf7d249fdfeae42e9df7a6203f8163aefc664d 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -1,7 +1,7 @@
 body, table {
-    font-size:14px;
+    font-size:13px;
     font-family: arial, monaco, monospace;
-    line-height:1.6em;
+    line-height:1.4em;
 }
 
 body {
@@ -116,9 +116,16 @@ background:rgba(25,25,25,0.3);
 
 .entry {
   padding-bottom:20px;
-  margin-bottom:70px;
+  margin-bottom:100px;
+}
+.entry .metadata {
+  visibility:hidden;
+}
+.entry:hover .metadata{
+  visibility:visible;
 }
-.single .entry {
+.single .entry .metadata {
+  visibility:visible !important;
 }
 
 .singlebg {
@@ -156,7 +163,7 @@ background:rgba(25,25,25,0.3);
 .archive li {
     padding-bottom:5px;
     margin-bottom:5px;
-    border-bottom:1px dotted #555;
+    border-bottom:1px dotted #333;
 }
 
 .project {

diff --git a/lib/init.php b/lib/init.php
index e77e3a28b482a58fd17942120ee0940fcf4a3ae2..870319479996ae49135c0d7485645d5829663266 100644 (file)
--- a/lib/init.php
+++ b/lib/init.php
@@ -25,6 +25,7 @@ ini_set('include_path', ini_get('include_path') . PATH_SEPARATOR . dirname(realp
 
 # settings
 define ('CLEAN_URLS',           true);
+define ('LIMIT',             15);
 define ('SITE_TITLE',           'quilime');
 define ('LOCAL_ROOT',           '/home/quilime/quilime.com/');
 define ('WEB_ROOT',             '/');

diff --git a/pages/about b/pages/about
index c9a09deda567278fadd823add9fb1a5266e27065..6b4a8c8820d8d6cd392e53070669332da66ea68d 100644 (file)
--- a/pages/about
+++ b/pages/about
@@ -3,31 +3,24 @@ title = about
 
 quilime is a codification of projects, process and resources  
 
-all content © 1999—2012 **gabriel dunne** ([www](http://gabrieldunne.com), [email](mailto:gdunne@quilime.com))
+all content © 1999—2012 **gabriel dunne** ([www](http://gabrieldunne.com), [email](mailto:gdunne@quilime.com)) unless otherwise noted
 
 
-<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-sa/3.0/80x15.png" /></a>
-
-<br />
-
-related    
+elsewhere    
 [clmpr](http://clmpr.com/quilime/)  
 [aggregate](http://media.quilime.com/aggregate/)       
 [git.quilime.com](http://git.quilime.com)  
-
-
-elsewhere    
-[flickr](http://flickr.com/photos/quilime/)  
-[vimeo](http://vimeo.com/quilime/)    
-[github](http://github.com/quilime/)  
-[twitter](http://twitter.com/quilime/)  
+[github.com/quilime](http://github.com/quilime/)  
+[flickr.com/photos/quilime](http://flickr.com/photos/quilime/)  
+[vimeo/quilime](http://vimeo.com/quilime/)    
+[twitter/quilime](http://twitter.com/quilime/)  
 
 
 <!-- add <a href="http://quilime.com/.rss" class="rss">.rss</a> to the end of any url for an xml feed -->
 
 <br />
 
-running on <a href="http://git.quilime.com/?p=plog;a=summary">plog</a>, a custom static-file **p**roject+**log**ging engine.
+quilime runs on <a href="http://git.quilime.com/?p=plog;a=summary">plog</a>, a static-file **p**roject+**log**
 
 
 

diff --git a/pages/all b/pages/all
new file mode 100644 (file)
index 0000000..2740ac2
--- /dev/null
+++ b/pages/all
@@ -0,0 +1,3 @@
+title = all
+template = default
+--

diff --git a/pages/index b/pages/index
new file mode 100644 (file)
index 0000000..64a6599
--- /dev/null
+++ b/pages/index
@@ -0,0 +1,2 @@
+template = index
+--

diff --git a/pages/links b/pages/links
index bdf2e9c298d199ea7af1ab05c7bcd50057adc95d..624af374d8ee8e1240d854ef9fdf3baa6a31fbf8 100644 (file)
--- a/pages/links
+++ b/pages/links
@@ -7,6 +7,7 @@ markdown = true
 + [gabrieldunne.com](http://gabrieldunne.com) gabriel dunne 
 + [ssherriff.com](http://ssherriff.com) stephanie sherriff
 + [onecm.com](http://onecm.com) ryan alexander
++ [ripevessel.com](http://ripevessel.com) adam roth  
 + [jtnimoy.net](http://jtnimoy.net) joshua nimoy 
 + [oddsympathy.com](http://oddsympathy.com) daniel massey
 + [keithpasko.com](http://keithpasko.com) keith pasko
@@ -18,7 +19,6 @@ markdown = true
 + [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

diff --git a/pages/test b/pages/test
new file mode 100644 (file)
index 0000000..3823d61
--- /dev/null
+++ b/pages/test
@@ -0,0 +1 @@
+template = test

diff --git a/templates/default.html.tpl b/templates/default.html.tpl
index e2e3faec5d4c5181b87e03f5c613ead3b1a0c291..f68fa2c7795c2661b5b597e1258e95e06dca1059 100644 (file)
--- a/templates/default.html.tpl
+++ b/templates/default.html.tpl
@@ -1,3 +1,10 @@
+<?php
+
+    if (!isset($entries)) {
+        $entries = get_entries();
+    }
+
+?>
 <html>
 <head>
     <? $this->include_template('head-inc.html.tpl') ?>
@@ -8,7 +15,7 @@
 <div id="content">
 
     <div class="entries">
-       <? foreach($entries as $entry): ?>
+       <? $limit = LIMIT; foreach($entries as $entry): if ($limit-- == 0) break; ?>
         
         <? if (isset($entry['content_short'])): ?>
             <? $entry['content'] = $entry['content_short'] . '<br /><a class="more" href="'.$entry['url'].'">more &rarr;</a><br /><br />'; ?>
@@ -19,6 +26,11 @@
        <? endforeach; ?>
     </div>
 
+    <a href="/index">index &rarr;</a>
+    <br />
+    <br />
+    <br />
+
 </div>
 
 <? $this->include_template('nav.html.tpl') ?>

diff --git a/templates/entry.html.tpl b/templates/entry.html.tpl
index 0736718b6c29bbd2aed213d049d9cb3001b0649a..ae845d1655ca3357d80c11873a3c7a563d17ca03 100644 (file)
--- a/templates/entry.html.tpl
+++ b/templates/entry.html.tpl
@@ -4,13 +4,16 @@
                <a title="posted on <?=$entry['date']?>" href="/<?=$entry['url']?>">&mdash; <?=$entry['title']?></a>
        </h1>
 
+
        <div class="content">
                <?=$entry['content']?>
        </div>
 
        <div class="metadata">
-               <a title="permalink" href="/<?=$entry['url']?>">#</a><br />
-               <!-- <abbr title="<?=get_relative_time($entry['timestamp']);?>"><?=date("F d, Y", $entry['timestamp'])?></abbr>  -->
+               <a href="/<?=$entry['url']?>">#</a>
+               <br />
+               <span title="<?=get_relative_time($entry['timestamp']);?>"><?=date("F d, Y", $entry['timestamp'])?></span> in
+               <a href="/<?=$entry['cat']['url'];?>">/<?=$entry['cat']['url'];?></a><? if ($entry['tags']) echo '<br/>tags: ' . implode(', ', $entry['tags']); ?>
        </div>
 
 </div>

diff --git a/templates/index.html.tpl b/templates/index.html.tpl
index 1fbef0a926eb4fad74e65ef3fc55a9d607bcc020..ef600e34fea4d81ef010526fd587bdb8b35e6f38 100644 (file)
--- a/templates/index.html.tpl
+++ b/templates/index.html.tpl
@@ -27,7 +27,6 @@
                <p><a class="more" href="/log/">more &rarr;</a></p>
        </td>
        
-               
        <td  style="padding-right:100px;"  valign="top">
                <h1><a class="more" href="/code/">code</a></h1>
                <ul class="archive">
@@ -43,7 +42,6 @@
                <p><a class="more" href="/code/">more &rarr;</a></p>
        </td>
 
-
        <td valign="top">
                <h1><a href="/projects/">projects</a></h1>
                <ul class="projects">
@@ -77,7 +75,6 @@
                     }
                 </script>
 
-
             <? endif; ?>
                    </div>
                        <?=$entry['title']?></a>
@@ -89,21 +86,16 @@
        </tr>
        </table>        
 
-<!--           &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/>
 
+<a href="/all">all posts &rarr;</a>
 
 </div>
 
 <br />
 
-
     <? $this->include_template('nav.html.tpl') ?>
-
        <? $this->include_template('footer.html.tpl') ?>
 
 </body>

diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl
index 76cedc8e7b5b958fc94fb6bce27e05d4b7cb1074..6b0b116197181d7b31b7b0fa59e6e5f6f277bce7 100644 (file)
--- a/templates/nav.html.tpl
+++ b/templates/nav.html.tpl
@@ -1,64 +1,21 @@
-<!-- <<<<<<< HEAD
-<ul class="nav">
-
-
-
-    <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="/">home</a></li>
-    <!-- <li><a href="/contents">contents</a></li> -->
-       <li><a href="/about">about</a></li>
+    <li><a href="/index">index</a></li>  
 
-       <br />
-       <br />
+    <br />
 
        <? $dirs = get_dirs("", array('recursive' => 0)); ?>
        <? foreach($dirs as $dir) : ?>
        <li><a href="/<?=$dir['url']?>"><?=$dir['name']?></a></li>
        <? endforeach; ?>
 
-       <br />
-       <br />
+    <br />
 
-       <li><a href="/photo">photo</a></li>
        <li><a href="/agg">aggregate</a></li>
+       <li><a href="/photo">photo</a></li>
        <li><a href="/links">links</a></li>
+       <li><a href="/about">about</a></li>
 
        <br />
        <br />

diff --git a/templates/photo.html.tpl b/templates/photo.html.tpl
index 2b75673e47a352f84b145c2847bb350f1cacebea..83fde89851d5f1b479894e85fe3b836156ed0df2 100644 (file)
--- a/templates/photo.html.tpl
+++ b/templates/photo.html.tpl
@@ -67,6 +67,9 @@
         </li>
 <?endforeach;?>
        </ul>
+       <p style="clear:both;">
+
+       </p>
        <p>
        <a class="more" href="http://flickr.com/photos/quilime/" title="via flickr">more &rarr;</a>            
        </p>

diff --git a/templates/single.html.tpl b/templates/single.html.tpl
index d35a00b4b5184dc0917c031ad329a43b2f540c4e..e511b6cf14b45827cb48b3f474688877c478b5e6 100644 (file)
--- a/templates/single.html.tpl
+++ b/templates/single.html.tpl
@@ -14,30 +14,10 @@
                        $this->include_template($entry['config']['template'] . '.' . $this->response_format . '.tpl');
                }
                else {
+                       $this->include_template('entry.' . $this->response_format . '.tpl');
+                       } 
                ?>
 
-       <div class="entry">
-
-       <h1><?=$entry['title']?></h1>
-
-       <div class="content">
-               <?=$entry['content']?>
-       </div>
-
-       <div class="metadata">
-
-               <a href="/<?=$entry['url']?>">#</a>
-
-               <br />
-
-               created: <span title="<?=get_relative_time($entry['timestamp']);?>"><?=date("F d, Y", $entry['timestamp'])?></span> in
-               <a href="/<?=$entry['cat']['url'];?>">/<?=$entry['cat']['url'];?></a><? if ($entry['tags']) echo '<br/>tags: ' . implode(', ', $entry['tags']); ?>
-       </div>
-
-       </div>
-
-       <? } ?>
-
        </div>
 
        <? $this->include_template('nav.html.tpl') ?>

diff --git a/templates/viewtoggle.html.tpl b/templates/viewtoggle.html.tpl
new file mode 100644 (file)
index 0000000..dc88804
--- /dev/null
+++ b/templates/viewtoggle.html.tpl
@@ -0,0 +1,40 @@
+<a onClick="return toggleView();" title="toggle view" href="#">
+<canvas id="viewicon" width="25" height="25"></canvas>
+</a>
+<script>
+
+    function toggleView() {
+        console.log('toggle view');
+        return false;
+    }
+
+    var mode = 'list';
+    var canvas = document.getElementById('viewicon');
+    drawIcon(mode);
+
+    function drawIcon(mode) {
+        if(canvas && canvas.getContext) {
+            var ctx = canvas.getContext('2d');
+            ctx.clearRect ( 0 , 0 , 25 , 25 );
+
+            switch(mode) {
+                case 'list' :
+                    var lh = 4;
+                    var blh = 1;
+                    var toff = 4;
+                    var w = 20;
+                    ctx.beginPath();
+                    for(var i = 0; i < 4; i++ ) {
+                    ctx.moveTo(0, blh * i + lh * i + toff);
+                    ctx.lineTo(w, blh * i + lh * i + toff);
+                    }
+                    ctx.closePath();
+                    ctx.lineWidth = 3;
+                break;
+            }
+            ctx.strokeStyle = "#2A80EB";
+            ctx.stroke();
+            ctx.fill();        
+        }
+    }
+</script>