From 8ef8dcb5319cf6c642088ef45e6694637be478c9 Mon Sep 17 00:00:00 2001
From: Gabriel Dunne <gdunne@quilime.com>
Date: Sun, 16 Dec 2012 23:17:09 -0800
Subject: [PATCH] some updates and styles

---
 content/code/bash_profile_osx | 33 +++++++++++++++++++++++----------
 content/config                |  2 +-
 css/style.css                 |  8 +-------
 lib/config.ini                |  2 +-
 templates/default.html.tpl    |  2 +-
 templates/entry.html.tpl      |  4 +++-
 templates/nav.html.tpl        |  7 +------
 7 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/content/code/bash_profile_osx b/content/code/bash_profile_osx
index 9d58942..b635e88 100644
--- a/content/code/bash_profile_osx
+++ b/content/code/bash_profile_osx
@@ -9,19 +9,32 @@ export TERM=xterm-color
 export LSCOLORS=GxFxCxDxBxegedabagacad
 
 
-# minimal prompt
-# export PS1="
-# $PWD
-# : "
+function parse_git_branch {
+  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
+  echo "("${ref#refs/heads/}")"
+}
 
+#Black       0;30     Dark Gray     1;30
+#Blue        0;34     Light Blue    1;34
+#Green       0;32     Light Green   1;32
+#Cyan        0;36     Light Cyan    1;36
+#Red         0;31     Light Red     1;31
+#Purple      0;35     Light Purple  1;35
+#Brown       0;33     Yellow        1;33
+#Light Gray  0;37     White         1;37
 
-# current git branch
-export PS1="
-\[\033[38m\]\u@\h\[\033[01;34m\] \w \[\033[31m\]\`ruby -e \"
-print (%x{git branch 2> /dev/null}.grep(/^\*/).first || '').
-gsub(/^\* (.+)$/, '(\1) ')\"\`\[\033[37m\]
-$\[\033[00m\] "
+# colors
+RED="\[\033[31m\]"
+GREEN="\[\033[32m\]"
+YELLOW="\[\033[33m\]"
+BLUE="\[\033[0;34m\]"
+BLUE_B="\[\033[1;34m\]"
+WHITE_B="\[\033[1;37m\]"
+NO_COLOR="\[\033[0m\]"
 
+# prompt with git repo
+export PS1="$WHITE_B\u@\h $BLUE_B\w $RED\$(parse_git_branch) $NO_COLOR \n$BLUE_B\$ $NO_COLOR"
+export PS2="$BLUE_B> $NO_COLOR";
 
 # aliases
 alias ff="find . -type f -name "
diff --git a/content/config b/content/config
index a28a878..3a4c693 100644
--- a/content/config
+++ b/content/config
@@ -1,2 +1,2 @@
 title = quilime
-template = index
+template = home
diff --git a/css/style.css b/css/style.css
index 06e7ef6..8949d4c 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1,7 +1,6 @@
 body, table {
     font-family: arial, monaco, monospace;
     line-height:1.4em;
-    font-size:14px;
 }
 
 body {
@@ -33,13 +32,10 @@ h1 {
     padding-top:0;
     margin-top:0;
     margin-bottom:30px;
-    font-size
 }
 h1, h2, h3, h4, h5, h6 {
-    font-weight:normal;
     color:#666;
-    font-size:1em;
-    text-shadow:1px 1px 3px #000;
+    font-size:1.2em;
     letter-spacing:0.2em;
 }
 h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
@@ -47,10 +43,8 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
     color:#666;
 }
 h1 a {
-  color:#f0a;
 }
 h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover {
-  color:#fff;
 }
 
 
diff --git a/lib/config.ini b/lib/config.ini
index cc7d500..07337f0 100644
--- a/lib/config.ini
+++ b/lib/config.ini
@@ -2,7 +2,7 @@
 ; general settings
 site_title  = quilime
 clean_urls  = 1
-limit       = 15
+limit       = 100
 ; http://php.net/manual/en/function.date.php
 date_format = M d Y, h:i:s A T
 
diff --git a/templates/default.html.tpl b/templates/default.html.tpl
index 1bb277a..d9cd1e3 100644
--- a/templates/default.html.tpl
+++ b/templates/default.html.tpl
@@ -19,7 +19,7 @@
 	<? endforeach; ?>
     </div>
 
-    <a href="/index">index &rarr;</a>
+    <a href="/index">&uarr; index</a>
     <br />
     <br />
     <br />
diff --git a/templates/entry.html.tpl b/templates/entry.html.tpl
index 6e5fd00..ef64ba5 100644
--- a/templates/entry.html.tpl
+++ b/templates/entry.html.tpl
@@ -10,11 +10,13 @@
 	</div>
 
 	<div class="metadata">
+<?php if (isset($entry['is_single']) && $entry['is_single']) { ?>
 		<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/>' . implode(', ', $entry['tags']); ?>
-	</div>
+<?php } ?>	
+</div>
 
 	<? 
 	if (isset($entry['is_single']) && $entry['is_single'] && $entry['comments_enabled'])
diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl
index 59812dd..e893de0 100644
--- a/templates/nav.html.tpl
+++ b/templates/nav.html.tpl
@@ -1,6 +1,6 @@
 <ul id="nav">
 
-    <li><a href="/">home</a></li>
+    <li><a href="/"><?=SITE_TITLE?></a></li>
 
     <br />
 
@@ -9,15 +9,10 @@
 	<li><a href="/<?=$dir['url']?>"><?=$dir['name']?></a></li>
 	<? endforeach; ?>
 
-    <br />
-
 	<!-- <li><a href="/agg">aggregate</a></li> -->
 	<li><a href="/photo">photo</a></li>
 	<li><a href="/links">links</a></li>
 
-	<br />
-	<li><a href="/about">about</a></li>
-	<li><a href="/.rss">feed</a></li>
 	<br />
 	<br />
 
-- 
2.34.1