From 4b3e4f49805f2d45e1ef53392424e978057bc189 Mon Sep 17 00:00:00 2001 From: Gabriel Dunne Date: Wed, 4 Jan 2012 17:18:36 -0800 Subject: [PATCH] added index page and some styling --- ...-02_arch_install_1 => archlinux_install_1} | 19 +++--- content/{log => code}/filebrowser | 0 css/style.css | 14 ++--- index.php | 16 +++-- js/prettify/prettify.css | 4 +- pages/about | 8 +-- templates/entry.html.tpl | 15 ++--- templates/head-inc.html.tpl | 7 +-- templates/index.html.tpl | 60 ++++++++++++++++++- templates/nav.html.tpl | 10 ++-- 10 files changed, 97 insertions(+), 56 deletions(-) rename content/code/{2012-01-02_arch_install_1 => archlinux_install_1} (97%) rename content/{log => code}/filebrowser (100%) 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 ea07c28..c71e819 100644 --- 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. -
-## 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 -
## 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. -
+ ## 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. -
+ ## 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*. -
+ ## 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. -
+ ## 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. -
+ ## 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`. -
+ ## 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 c4b82c4..87d806b 100644 --- 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 924aa4a..6791652 100644 --- 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 8e332a8..24cce10 100644 --- 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 d5d6efe..3d8ce42 100644 --- 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))
elsewhere: [github](http://github.com/quilime/), [vimeo](http://vimeo.com/quilime/), @@ -11,10 +10,9 @@ by **gabriel dunne** ([www](http://gabrieldunne.com), [email](mai [ffffound](http://ffffound.com/home/quilime/found/), [@quilime](http://twitter.com/quilime/) -quilime.com has taken many forms -View an archive of all projects. +quilime.com has taken many forms: archive site update rss -built with plog, an minimal, opensource cms. +quilime is built on plog (project+log), a minimal CMS. diff --git a/templates/entry.html.tpl b/templates/entry.html.tpl index cd68910..8443723 100644 --- a/templates/entry.html.tpl +++ b/templates/entry.html.tpl @@ -1,22 +1,17 @@
-

+

-

+ -
+
posted - in -
-
    - -
  • #
    • - -
+ in filed as +
diff --git a/templates/head-inc.html.tpl b/templates/head-inc.html.tpl index ecafdab..9bc47f6 100644 --- a/templates/head-inc.html.tpl +++ b/templates/head-inc.html.tpl @@ -3,11 +3,6 @@ - - - - - @@ -33,4 +28,4 @@ $(document).ready(function() { var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); - \ No newline at end of file + diff --git a/templates/index.html.tpl b/templates/index.html.tpl index 8e288fa..11fd84e 100644 --- a/templates/index.html.tpl +++ b/templates/index.html.tpl @@ -12,7 +12,65 @@
-this website is a codification of creative process, resources, and inspiration
by gabriel dunne (www, email) + + + + + + + + + +
+

code

+ +
•
+ +

+ rss, more → + +

+ 		+

'blog

+ + + +
+

+ rss, more → + +

+ 		+

projects

+ • plog - project+log CMS
+ • clmpr - minimal bookmarking site
+ +
+ + • Rattles
+ • Sempernull
+ • Synonymovement
+ • Cabspotting
+ • Bay Area Transit
+ • Mask
+ • Prism
+ • Dots
+ • Jelly
+ • Swim Tank
+ • Web
+ • Sempernull
+ • Rattles
+ • Dachstein
+ • Celestial Mechanics
+ • Valentine
+ + + +
diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl index b0cd97d..5212d2d 100644 --- a/templates/nav.html.tpl +++ b/templates/nav.html.tpl @@ -1,7 +1,8 @@