added index page and some styling

diff --git a/content/code/2012-01-02_arch_install_1 b/content/code/archlinux_install_1
similarity index 97%
rename from content/code/2012-01-02_arch_install_1
rename to content/code/archlinux_install_1
index ea07c28e26b8b6b531ea424707aae143fc85334a..c71e819497dc6a668537635801ab463d51005baf 100644 (file)
--- a/content/code/2012-01-02_arch_install_1
+++ b/content/code/archlinux_install_1
@@ -6,10 +6,10 @@ tags = arch linux windows installation tutorial
 
 Behold, a blog to document the process of installing [archlinux](http://www.archlinux.org/). Arch will be sharing the drive with Windows 7, so for the sake of completion, I'll make a note of how to set up a dual boot with the GRUB bootloader. I'll be installing both OS's from scratch, starting with Windows.
 
-<br />
-## System Setup
 
-- AMD X2 dual-core processor, running at 2.8 ghz
+## System Specs
+
+- AMD X2 dual-core processor, running at 2.8 ghz, circa 2002
 - ASUS ATX motherboard
 - 2 gigs of ram
 - 100gb drive
@@ -18,14 +18,13 @@ Behold, a blog to document the process of installing [archlinux](http://www.arch
 - 550w power supply
 
 
-<br />
 ## Installing Windows
 I installed Windows 7 from a USB stick using Microsoft's [Windows 7 USB/DVD tool](http://www.microsoftstore.com/store/msstore/html/pbPage.Help_Win7_usbdvd_dwnTool). You'll need a computer running Windows 7 already to do this. I booted with the USB drive, and installed Windows on the entire 100GB drive with a single partition. 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, and that's fine. 
 
 Note about this install. I have an old Linksys (Cysco) WMP54G Wireless PCI Card. Strangely, all the 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.
 
 
-<br />
+
 ## Installing Archlinux
 
 I downloading the Core Image via [torrent](http://www.archlinux.org/iso/2011.08.19/archlinux-2011.08.19-core-dual.iso.torrent) from [http://www.archlinux.org/download/](http://www.archlinux.org/download/).
@@ -40,7 +39,7 @@ The [installation](https://wiki.archlinux.org/index.php/Official_Arch_Linux_Inst
 You'll be prompted to chose your editor. If you don't know vi, then stick with nano. You can skip this, because you'll be asked again when it's needed.
 
 
-<br />
+
 ## Disk Partitions
 
 It's pretty straight forward until the drive partitions. My 100GB drive can only support 4 logical partitions, so the rest have to be Logical. Note: The numbers are out of order, because I used Logical partitions for everything except for the Windows partitions and /home. Logical partitions end up being counted last in the partition table, but I made my /home folder LAST so I could use the up the remaining space on the drive. You'll also need to set the       /boot partition's 'bootable' flag to `true`.
@@ -63,13 +62,13 @@ It's pretty straight forward until the drive partitions. My 100GB drive can only
 Some of these, namely **boot**, **swap**, and **home**, are *optional*.
 
 
-<br />
+
 ## Select Packages
 
 At minimum, you'll need the core packages that are already selected. I also included certain key packages such as OpenSSH. Basically, include any packages you need for internet connectivity, as everything else will be updated from the net. I use GRUB as the bootloader.
 
 
-<br />
+
 ## Configure System
 
 Configure system does multiple things, including setting the root password, network settings, and some other configuration tools. Here's a reference of where Arch installs all the base config files for the system.
@@ -91,13 +90,13 @@ You should edit any of these files that are specific to your system. At minimum
 You'll also need to enable at least one mirror in pacman.d/mirrorlist if you plan to update the system or download new packages.
 
 
-<br />
+
 ## Bootloader
 
 Install Bootloader will install and help you configure the bootloader you selected in the Select Packages stage (GRUB, in my case). After double-checking your bootloader configuration, you'll be prompted for a disk to install the loader to. You should install GRUB to the MBR of the installation disk, in this case `sda1`.
 
 
-<br />
+
 ## Finalizing Installation
 
 Once installed, exit the installer, remove the USB, type `reboot` in the command line, and the system will reboot. If all went well, you should be dropped into a login screen where you can log in with root and the password you chose during install. 

diff --git a/content/log/filebrowser b/content/code/filebrowser
similarity index 100%
rename from content/log/filebrowser
rename to content/code/filebrowser

diff --git a/css/style.css b/css/style.css
index c4b82c4c7777edb3b09dc594d97784ea89a5a2f5..87d806bb6f6113817e45d2707306035d6265fcd2 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -40,10 +40,7 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: 'Droid Serif';
-  font-size: 1em;
-
-color:#004;
+  color:#338;
 }
 h1 a,
 h2 a,
@@ -51,8 +48,8 @@ h3 a,
 h4 a,
 h5 a,
 h6 a { }
-h1 {  margin: 0 0 3em 0 }
-h2 {  margin: 0 0 0.5em 0; }
+h1 {  margin: 0 0 1em 0; font-size:1.8em; }
+h2 {  margin: 2em 0 0.5em 0; font-size:1.3em }
 h3 {  margin: 0 0 0 0 }
 h4 {  margin-top: 0 }
 ul, li { }
@@ -83,7 +80,7 @@ p {   }
 
 
 .nav {
-  top: 20px;
+  top: 25px;
   left: 20px;
   position:absolute;
 }
@@ -108,7 +105,6 @@ p {   }
   margin-bottom: 0.4em;
 }
 .index li a {
-  text-decoration: underline;
   font-weight: normal;
 }
 .entry, table .column {
@@ -176,7 +172,7 @@ table .bookmarks li {
 #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;
+  padding: 0 1.3em 0 0;  
 }
 a.external {
   background: url("/img/external-icon.png") no-repeat scroll right center transparent;

diff --git a/index.php b/index.php
index 924aa4ae54c93def028318fcce009381b7926144..6791652fdb90d2710a1f3402fd30b83293314929 100644 (file)
--- a/index.php
+++ b/index.php
@@ -16,21 +16,19 @@
     $total = 0;
 
     # content exists, and is a folder
-/*
-    if ($url['filename'] == '')
-    {
-        //$page = parse_entry(new SplFileInfo('/home/quilime/quilime.com/pages/about'), 1);
-        //$t->assign('data', $page);
-        //$template = $page['config']['template'] ? $page['config']['template'] . '.' . $response_format . '.tpl' : 'page.' . $response_format . '.tpl';
-                $template = 'index.html.tpl';
-    }
-    else */if (is_dir($content_request)) {
+
+    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']));
     }

diff --git a/js/prettify/prettify.css b/js/prettify/prettify.css
index 8e332a83d34fa446bfd1142702b0c3b843cc21fe..24cce10bf81232dee24769a7af8a454c73b13f04 100644 (file)
--- a/js/prettify/prettify.css
+++ b/js/prettify/prettify.css
@@ -12,8 +12,8 @@
 .atv { color: #080; }
 .dec { color: #606; }
 pre.prettyprint, code.prettyprint {
-  font-family:monaco, "Lucida Console", monospace; font-size:12px; line-height:1.5em; padding:0.5em 0.6em; background:#181818;
-  border-radius: 8px;
+  font-family:monaco, "Lucida Console", monospace; font-size:12px; line-height:1.5em; padding:0.2em 0.6em; background:#181818;
+  border-radius: 6px;
 }
 pre.prettyprint { padding:20px; }
 

diff --git a/pages/about b/pages/about
index d5d6efe89deecbd7e49fa6e1d3636bfc7aae96c2..3d8ce425dd6ffb45f9584b46de591ee881855ff5 100644 (file)
--- a/pages/about
+++ b/pages/about
@@ -1,7 +1,6 @@
 title = about
 --
-a codification of creative process and resources  
-by **gabriel dunne** ([www](http://gabrieldunne.com), [email](mailto:gdunne@quilime.com))
+quilime is a codification of process, resource, and code by **gabriel dunne** ([www](http://gabrieldunne.com), [email](mailto:gdunne@quilime.com))
 <br />elsewhere:
 [github](http://github.com/quilime/),
 [vimeo](http://vimeo.com/quilime/),
@@ -11,10 +10,9 @@ by **gabriel dunne** ([www](http://gabrieldunne.com), [email](&#x6d;&#x61;&#x69;
 [ffffound](http://ffffound.com/home/quilime/found/),
 [@quilime](http://twitter.com/quilime/)
 
-quilime.com has taken many forms  
-<a href="/projects/">View an archive</a> of all projects.
+quilime.com has taken many forms: <a href="/projects/">archive</a>
 
 site update <a href="http://quilime.com/.rss" class="rss">rss</a>
 
-built with <a href="http://git.quilime.com/?p=plog.git;a=summary">plog</a>, an minimal, opensource cms.
+quilime is built on <a href="http://git.quilime.com/?p=plog.git;a=summary">plog</a> (project+log), a minimal CMS. 
 

diff --git a/templates/entry.html.tpl b/templates/entry.html.tpl
index cd68910536f0576362329eede767826fe0613762..84437237c4d4bb718d4edf0d67b7d5dc2a26e1ca 100644 (file)
--- a/templates/entry.html.tpl
+++ b/templates/entry.html.tpl
@@ -1,22 +1,17 @@
 <div class="entry">
 
-       <h2>
+       <h1>
                <a title="posted on <?=$data['date']?>" href="<?=$data['url']?>"><?=$data['title']?></a>
-       </h2>
+       </h1>
 
-       <div class="content">
+       <div class="content">   
                <?=$data['content']?>
        </div>
 
        <div class="metadata">
                posted <abbr title="<?=get_relative_time($data['timestamp']);?>"><?=date("F d, Y", $data['timestamp'])?></abbr> 
-               in <a href="<?=$data['cat']['url'];?>"><?=$data['cat']['name'];?></a>
-               <br/>
-               <ul class="tags">
-               <? if ($data['tags']) foreach($data['tags'] as $tag) : ?>
-               <li>#<?=$tag?></li>
-               <? endforeach; ?>
-               </ul>
+               in <a href="<?=$data['cat']['url'];?>"><?=$data['cat']['name'];?></a> filed as <? if ($data['tags']) echo implode(', ', $data['tags']); ?>
+               
        </div>
 
 </div>

diff --git a/templates/head-inc.html.tpl b/templates/head-inc.html.tpl
index ecafdabff30cd18b2f2cfb8ff3dae31692dc29e9..9bc47f6767e17420963101e9b3bf1bc5b74c2754 100644 (file)
--- a/templates/head-inc.html.tpl
+++ b/templates/head-inc.html.tpl
@@ -3,11 +3,6 @@
 
 <link rel="alternate" type="application/rss+xml" title="RSS" href="<?= get_base_dir(); ?>/.rss" />
 
-
-<link href="http://fonts.googleapis.com/css?family=Droid+Serif:regular,italic&subset=latin" rel="stylesheet" type="text/css">
-<link href="http://fonts.googleapis.com/css?family=Droid+Sans+Mono:regular,italic&subset=latin" rel="stylesheet" type="text/css">
-<link href='http://fonts.googleapis.com/css?family=Droid+Sans' rel='stylesheet' type='text/css'>
-
 <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" />
@@ -33,4 +28,4 @@ $(document).ready(function() {
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
   })();
 
-</script>
\ No newline at end of file
+</script>

diff --git a/templates/index.html.tpl b/templates/index.html.tpl
index 8e288fa3a0dd8b0fc04f24ea7ea67bbb09047dae..11fd84e6107f0d8aa2e2ee751d3c531183268b84 100644 (file)
--- a/templates/index.html.tpl
+++ b/templates/index.html.tpl
@@ -12,7 +12,65 @@
 
 <div id="content">
 
-this website is a codification of creative process, resources, and inspiration <br/>by gabriel dunne (<a href="http://gabrieldunne.com">www</a>, <a href="mailto:gdunne@quilime.com">email</a>)
+       <table>
+       <tr>
+       <td class="column" valign="top">
+       <h3><a href="/code/">code</a></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>
+       </td>
+
+       <td class="column" valign="top">
+       <h3><a href="/log/">'blog</a></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; ?>
+       <br />
+       <p><small>
+       <a class="rss" href="/log/.rss">rss</a>, <a class="more" href="/log/">more &rarr;</a>
+       </small>
+       </p>
+       </td>
+
+
+       <td class="column" valign="top">
+       <h3><a href="/projects/">projects</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><br />
+               &bull; <a href="http://portfolio.quilime.com/2008/?p=sempernull">Sempernull</a><br />
+               &bull; <a href="http://portfolio.quilime.com/2008/?p=synonymovement">Synonymovement</a><br />
+               &bull; <a href="http://portfolio.quilime.com/2008/?p=cabspotting">Cabspotting</a><br />
+               &bull; <a href="http://content.stamen.com/som_transbay_tower">Bay Area Transit</a><br />                
+               &bull; <a href="http://portfolio.quilime.com/2008/?p=mask">Mask</a><br />
+               &bull; <a href="http://portfolio.quilime.com/2008/?p=prism">Prism</a><br />
+               &bull; <a href="http://portfolio.quilime.com/new/port.php?p=01_Dots">Dots</a><br />
+               &bull; <a href="http://portfolio.quilime.com/new/port.php?p=02_Jellyfish">Jelly</a><br />
+               &bull; <a href="http://portfolio.quilime.com/new/port.php?p=05_Swim_Tank">Swim Tank</a><br />
+               &bull; <a href="http://portfolio.quilime.com/new/port.php?p=06_Web">Web</a><br />
+               &bull; <a href="http://portfolio.quilime.com/new/port.php?p=04_Stars">Sempernull</a><br />
+               &bull; <a href="http://portfolio.quilime.com/new/port.php?p=03_Rattles">Rattles</a><br />
+               &bull; <a href="http://portfolio.quilime.com/content/daschtein/index.html">Dachstein</a><br />
+               &bull; <a href="http://portfolio.quilime.com/content/cm/index.html">Celestial Mechanics</a><br />
+               &bull; <a href="http://portfolio.quilime.com/content/valentine/index.html">Valentine</a><br />
+
+
+
+       </td>
+       </tr>
+       </table>        
 
 </div>
 

diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl
index b0cd97d8bb340b1e7bdd0f0407381fad57de0f2e..5212d2d85ba824dc5964ae3d8458d8611bb9faec 100644 (file)
--- a/templates/nav.html.tpl
+++ b/templates/nav.html.tpl
@@ -1,7 +1,8 @@
 <ul class="nav">
 
 
-    <li><a href="/"><?=SITE_TITLE?></a></li>
+    <li><a href="/">quilime</a></li>
+       <li><a href="/about/">about</a></li>
 
     <br />
 
@@ -9,14 +10,15 @@
        <? $dirs = get_dirs("", array('recursive' => 0)); ?>
        <? foreach($dirs as $dir) : ?>
        <li><a href="<?=$dir['url']?>"><?=$dir['name']?></a></li>
-       <? endforeach; ?>
+       <? endforeach; ?> 
 
-       <small><br /></small>
+       <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>
-    <li><a href="/about/">about</a></li>
 
     <br />