summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jeremiah Dow <jeremdow@gmail.com> 2012-05-11 21:16:28 -0400
committerGravatar Jeremiah Dow <jeremdow@gmail.com> 2012-05-11 21:16:28 -0400
commite6a307e8bfb22290239a0d672b369da9c923af45 (patch)
treea1552003bfb51242f598686eac40267696d120b5
parent093e336c982cb8d6d04061315694b8d112487523 (diff)
downloadjeremdow.us-e6a307e8bfb22290239a0d672b369da9c923af45.tar.gz
rearranging site
-rw-r--r--apps/blagh/app.rc19
-rw-r--r--sites/blog.jeremdow.com/_werc/config5
l---------sites/blog.jeremdow.com/_werc/lib/default_master.tpl1
-rw-r--r--sites/blog.jeremdow.com/_werc/lib/footer.inc21
-rw-r--r--sites/blog.jeremdow.com/_werc/lib/top_bar.inc17
l---------sites/blog.jeremdow.com/_werc/pub1
-rw-r--r--sites/jeremdow.com/_werc/lib/footer.inc15
-rw-r--r--sites/jeremdow.us/_werc/config (renamed from sites/jeremdow.com/_werc/config)2
-rw-r--r--sites/jeremdow.us/_werc/lib/404.tpl (renamed from sites/jeremdow.com/_werc/lib/404.tpl)0
-rw-r--r--sites/jeremdow.us/_werc/lib/default_master.tpl (renamed from sites/jeremdow.com/_werc/lib/default_master.tpl)2
-rw-r--r--sites/jeremdow.us/_werc/lib/footer.inc21
-rw-r--r--sites/jeremdow.us/_werc/lib/headers.inc (renamed from sites/jeremdow.com/_werc/lib/headers.inc)6
-rw-r--r--sites/jeremdow.us/_werc/lib/headers.tpl (renamed from sites/jeremdow.com/_werc/lib/headers.tpl)0
-rw-r--r--sites/jeremdow.us/_werc/lib/top_bar.inc (renamed from sites/jeremdow.com/_werc/lib/top_bar.inc)10
-rw-r--r--sites/jeremdow.us/_werc/pub/style.css (renamed from sites/jeremdow.com/_werc/pub/style.css)2
15 files changed, 44 insertions, 78 deletions
diff --git a/apps/blagh/app.rc b/apps/blagh/app.rc
index aa9b57a..c90dd60 100644
--- a/apps/blagh/app.rc
+++ b/apps/blagh/app.rc
@@ -32,7 +32,7 @@ fn blagh_init {
ll_add handlers_bar_left echo '<a href="'$blagh_uri'new_post">Make a new post</a>'
}
- if(~ $req_path $blagh_uri /[0-9][0-9][0-9][0-9]/ /*/[0-9][0-9]/ /*/*/[0-9][0-9]/) {
+ if(~ $req_path $blagh_uri */[0-9][0-9][0-9][0-9]/ */*/[0-9][0-9]/ */*/*/[0-9][0-9]/) {
handler_body_main=blagh_body
u=$blagh_uri'index'
extraHeaders=$"extraHeaders ^ \
@@ -90,13 +90,18 @@ fn get_post_list {
}
fn req_path_date {
+ if (! ~ $blagh_uri '/')
+ date_path=`{echo $req_path | sed 's/\'$blagh_uri'/'}
+ if not
+ date_path=$req_path
+
switch($req_path){
- case /[0-9][0-9][0-9][0-9]/
- echo $req_path[0-9][0-9]/[0-9][0-9]/
- case /[0-9][0-9][0-9][0-9]/[0-9][0-9]/
- echo $req_path[0-9][0-9]/
- case /[0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9]/
- echo $req_path
+ case */[0-9][0-9][0-9][0-9]/
+ echo $date_path[0-9][0-9]/[0-9][0-9]/
+ case */[0-9][0-9][0-9][0-9]/[0-9][0-9]/
+ echo $date_path[0-9][0-9]/
+ case */[0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9]/
+ echo $date_path
case *
echo /[0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9]/
}
diff --git a/sites/blog.jeremdow.com/_werc/config b/sites/blog.jeremdow.com/_werc/config
deleted file mode 100644
index 8b910ea..0000000
--- a/sites/blog.jeremdow.com/_werc/config
+++ /dev/null
@@ -1,5 +0,0 @@
-masterSite=rc.jeremdow.com
-siteTitle='Jere`s blog'
-siteSubTitle='drupal, google, linux, publishing'
-conf_enable_blog
-conf_enable_comments
diff --git a/sites/blog.jeremdow.com/_werc/lib/default_master.tpl b/sites/blog.jeremdow.com/_werc/lib/default_master.tpl
deleted file mode 120000
index 9aa7a2f..0000000
--- a/sites/blog.jeremdow.com/_werc/lib/default_master.tpl
+++ /dev/null
@@ -1 +0,0 @@
-../../../jeremdow.com/_werc/lib/default_master.tpl \ No newline at end of file
diff --git a/sites/blog.jeremdow.com/_werc/lib/footer.inc b/sites/blog.jeremdow.com/_werc/lib/footer.inc
deleted file mode 100644
index 17db840..0000000
--- a/sites/blog.jeremdow.com/_werc/lib/footer.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="feed">
- <p>
- <a href="http://fusion.google.com/add?source=atgs&feedurl=http%3A//blog.jeremdow.com/index.rss"><img src="http://buttons.googlesyndication.com/fusion/add.gif" border="0" alt="Add to Google"></a>
- <a class="feed" target="blank" href="http://blog.jeremdow.com/index.rss"><img alt="RSS" src="http://jeremdow.com/_images/feed-icon16x16.png" /></a>
- </p>
-</div>
-<div id="footer">
- <br class="doNotDisplay doNotPrint" />
-
- <div class="right">
- <p>
- &copy; 2006-2011 Jeremiah Dow | <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">CC BY-SA</a>
- </p>
- </div>
-
- <div class="left">
- <p>
- <a href="http://werc.cat-v.org/" target="blank">Powered by werc</a>
- </p>
- </div>
-</div>
diff --git a/sites/blog.jeremdow.com/_werc/lib/top_bar.inc b/sites/blog.jeremdow.com/_werc/lib/top_bar.inc
deleted file mode 100644
index ff09786..0000000
--- a/sites/blog.jeremdow.com/_werc/lib/top_bar.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-<nav class="superHeader">
- <div class="left">
- <a href="http://profiles.google.com/jeremdow">+Jeremiah</a>
- <a href="http://jeremdow.com">About</a>
- <a href="http://blog.jeremdow.com" class="thisPage">Blog</a>
- <a href="http://flickr.com/jeremdow" target="blank">Flickr</a>
- <a href="http://facebook.com/jeremdow" target="blank">Facebook</a>
- <a href="http://twitter.com/jeremdow" target="blank">Twitter</a>
- <a href="http://git.jeremdow.com">Git</a>
- </div>
-
- <div class="right">
- <span class="doNotDisplay">Related links:</span>
- <a href="http://git.jeremdow.com/?p=jeremdow.com.git;a=summary">site updates</a>
- | <a href="/sitemap">site map</a>
- </div>
-</nav>
diff --git a/sites/blog.jeremdow.com/_werc/pub b/sites/blog.jeremdow.com/_werc/pub
deleted file mode 120000
index 2f27bf3..0000000
--- a/sites/blog.jeremdow.com/_werc/pub
+++ /dev/null
@@ -1 +0,0 @@
-../../jeremdow.com/_werc/pub \ No newline at end of file
diff --git a/sites/jeremdow.com/_werc/lib/footer.inc b/sites/jeremdow.com/_werc/lib/footer.inc
deleted file mode 100644
index f742126..0000000
--- a/sites/jeremdow.com/_werc/lib/footer.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="footer">
- <br class="doNotDisplay doNotPrint" />
-
- <div class="right">
- <p>
- &copy; 2006-2011 Jeremiah Dow | <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">CC BY-SA</a>
- </p>
- </div>
-
- <div class="left">
- <p>
- <a href="http://werc.cat-v.org/" target="blank">Powered by werc</a>
- </p>
- </div>
-</div>
diff --git a/sites/jeremdow.com/_werc/config b/sites/jeremdow.us/_werc/config
index 4cdccda..64c5835 100644
--- a/sites/jeremdow.com/_werc/config
+++ b/sites/jeremdow.us/_werc/config
@@ -1,3 +1,3 @@
-masterSite=rc.jeremdow.com
+masterSite=jeremdow.us
siteTitle='Jeremiah Dow'
siteSubTitle='About me'
diff --git a/sites/jeremdow.com/_werc/lib/404.tpl b/sites/jeremdow.us/_werc/lib/404.tpl
index a1b6187..a1b6187 100644
--- a/sites/jeremdow.com/_werc/lib/404.tpl
+++ b/sites/jeremdow.us/_werc/lib/404.tpl
diff --git a/sites/jeremdow.com/_werc/lib/default_master.tpl b/sites/jeremdow.us/_werc/lib/default_master.tpl
index 89a77e7..595986e 100644
--- a/sites/jeremdow.com/_werc/lib/default_master.tpl
+++ b/sites/jeremdow.us/_werc/lib/default_master.tpl
@@ -5,7 +5,7 @@
<div id="search">
<form action='http://www.google.com/search'>
<div>
- <input name='q' type='hidden' value='site:jeremdow.com' />
+ <input name='q' type='hidden' value='site:jeremdow.us' />
<input name='q' size='40' type='text' />
<input name='sa' type='submit' value='Search' />
</div>
diff --git a/sites/jeremdow.us/_werc/lib/footer.inc b/sites/jeremdow.us/_werc/lib/footer.inc
new file mode 100644
index 0000000..a2588f9
--- /dev/null
+++ b/sites/jeremdow.us/_werc/lib/footer.inc
@@ -0,0 +1,21 @@
+<div id="feed">
+ <p>
+ <!-- <a href="http://fusion.google.com/add?source=atgs&feedurl=http%3A//jeremdow.com/blog/index.rss"><img src="http://buttons.googlesyndication.com/fusion/add.gif" border="0" alt="Add to Google"></a> -->
+ <a class="feed" target="blank" href="http://jeremdow.us/blog/index.rss"><img alt="RSS" src="http://jeremdow.us/_images/feed-icon16x16.png" /></a>
+ </p>
+</div>
+<div id="footer">
+ <br class="doNotDisplay doNotPrint" />
+
+ <div class="right">
+ <p xmlns:dct="http://purl.org/dc/terms/" xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#">
+ 2006-2012 <a rel="dct:publisher" href="http://jeremdow.us">Jeremiah Dow</a> | <a rel="license" href="http://creativecommons.org/publicdomain/zero/1.0/">CC0</a>
+ </p>
+ </div>
+
+ <div class="left">
+ <p>
+ <a href="http://werc.cat-v.org/" target="blank">Powered by werc</a>
+ </p>
+ </div>
+</div>
diff --git a/sites/jeremdow.com/_werc/lib/headers.inc b/sites/jeremdow.us/_werc/lib/headers.inc
index 86353b5..fb0ecec 100644
--- a/sites/jeremdow.com/_werc/lib/headers.inc
+++ b/sites/jeremdow.us/_werc/lib/headers.inc
@@ -1,11 +1,11 @@
-<link rel="alternate" type="application/atom+xml" title="ATOM" href="http://blog.jeremdow.com/index.atom">
-<link rel="alternate" type="application/rss+xml" title="RSS" href="http://blog.jeremdow.com/index.rss">
+<link rel="alternate" type="application/atom+xml" title="ATOM" href="http://jeremdow.us/blog/index.atom">
+<link rel="alternate" type="application/rss+xml" title="RSS" href="http://jeremdow.us/blog/index.rss">
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-22084762-1']);
- _gaq.push(['_setDomainName', '.jeremdow.com']);
+ _gaq.push(['_setDomainName', '.jeremdow.us']);
_gaq.push(['_trackPageview']);
(function() {
diff --git a/sites/jeremdow.com/_werc/lib/headers.tpl b/sites/jeremdow.us/_werc/lib/headers.tpl
index c5ec687..c5ec687 100644
--- a/sites/jeremdow.com/_werc/lib/headers.tpl
+++ b/sites/jeremdow.us/_werc/lib/headers.tpl
diff --git a/sites/jeremdow.com/_werc/lib/top_bar.inc b/sites/jeremdow.us/_werc/lib/top_bar.inc
index f51cb30..b589db8 100644
--- a/sites/jeremdow.com/_werc/lib/top_bar.inc
+++ b/sites/jeremdow.us/_werc/lib/top_bar.inc
@@ -1,17 +1,17 @@
<nav class="superHeader">
<div class="left">
<a href="http://profiles.google.com/jeremdow">+Jeremiah</a>
- <a href="http://jeremdow.com" class="thisPage">About</a>
- <a href="http://blog.jeremdow.com">Blog</a>
- <a href="http://flickr.com/jeremdow" target="blank">Flickr</a>
+ <a href="http://jeremdow.us" class="thisPage">About</a>
+ <a href="http://jeremdow.com/us">Blog</a>
+ <a href="http://profiles.google.com/jeremdow/photos" target="blank">Photos</a>
<a href="http://facebook.com/jeremdow" target="blank">Facebook</a>
<a href="http://twitter.com/jeremdow" target="blank">Twitter</a>
- <a href="http://git.jeremdow.com">Git</a>
+ <a href="http://git.jeremdow.us">Git</a>
</div>
<div class="right">
<span class="doNotDisplay">Related links:</span>
- <a href="http://git.jeremdow.com/?p=jeremdow.com.git;a=summary">site updates</a>
+ <a href="http://git.jeremdow.com/?p=jeremdow.us.git;a=summary">site updates</a>
| <a href="/sitemap">site map</a>
</div>
</nav>
diff --git a/sites/jeremdow.com/_werc/pub/style.css b/sites/jeremdow.us/_werc/pub/style.css
index 5ba1242..0c7ab3b 100644
--- a/sites/jeremdow.com/_werc/pub/style.css
+++ b/sites/jeremdow.us/_werc/pub/style.css
@@ -148,7 +148,7 @@ a:hover { text-decoration: underline; }
/* # Main Copy # */
#main-copy {
- max-width: 70em;
+ max-width: 100%;
color: black;
background-color: transparent;
text-align: justify;