applied more recent changes - swerc - anselm's simpler werc fork
(HTM) git clone git://git.suckless.org/swerc
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
---
(DIR) commit bbcc3e900761d7f15170e25b03136e18b4bbc506
(DIR) parent d9c0ed83c46ae15c475eef99217c03280eeb2bd3
(HTM) Author: anselm@garbe.us <unknown>
Date: Sat, 17 Mar 2012 19:11:17 +0100
applied more recent changes
Diffstat:
M bin/handlers.rc | 6 +++---
M bin/werc.rc | 2 +-
M etc/initrc | 4 ++--
M pub/style.css | 10 +++++-----
M tpl/master.tpl | 22 +++++++++-------------
5 files changed, 20 insertions(+), 24 deletions(-)
---
(DIR) diff --git a/bin/handlers.rc b/bin/handlers.rc
@@ -2,11 +2,11 @@
fn nav_tree {
echo '<ul>'
- if(! ~ $#sideBarNavTitle 0) {
+ if(! ~ $#menuTitle 0) {
if(~ $"req_paths_list /)
- echo '<li><a href="/" class="thisPage">'$"sideBarNavTitle'</a></li>'
+ echo '<li><a href="/" class="thisPage">'$"menuTitle'</a></li>'
if not
- echo '<li><a href="/">'$"sideBarNavTitle'</a></li>'
+ echo '<li><a href="/">'$"menuTitle'</a></li>'
}
# Ignore stderr, last path element might be a file that doesn't exist (eg., foo for foo.md)
# /./ to deal with p9p's ls failure to follow dir symlinks otherwise
(DIR) diff --git a/bin/werc.rc b/bin/werc.rc
@@ -120,4 +120,4 @@ fn werc_exec_request {
template $master_template | awk_buffer
}
-werc_exec_request # >[2]/tmp/wercdebug.log
+werc_exec_request >[2]/tmp/wercdebug.log
(DIR) diff --git a/etc/initrc b/etc/initrc
@@ -1,7 +1,7 @@
# General options
plan9port=$PLAN9
-path=($plan9port/bin . ./bin ./bin/contrib /bin /usr/bin)
+path=($plan9port/bin . ./bin ./bin/contrib /bin /usr/bin /usr/local/bin)
formatter=(fltr_cache markdown)
man_formatter=(troff -N -man)
-debug=()
+debug=1
sitesdir='/var/www/sites'
(DIR) diff --git a/pub/style.css b/pub/style.css
@@ -18,18 +18,18 @@ a:hover {
#menu {
clear: both;
color: #ccc;
- background-color: #058;
+ background-color: #ddd;
padding: 0.7ex;
- font-size: 84%;
+ font-size: 94%;
}
#menu a {
padding: 0.5ex 1ex 0.5ex 1ex;
- color: #fff;
+ color: #069;
}
#menu a:hover {
- background-color: #069;
+ background-color: #eee;
}
#header {
@@ -38,7 +38,7 @@ a:hover {
text-shadow: 1px 1px #fff;
font-size: 1.7em;
padding: 0.7ex 0.7ex 0.7ex 0.7em;
- border-top: 1px solid #ccc;
+ border-bottom: 1px solid #ccc;
}
#header a {
(DIR) diff --git a/tpl/master.tpl b/tpl/master.tpl
@@ -6,26 +6,22 @@
<meta charset="utf-8">
</head>
<body>
+ <div id="header">
+ <a href="http://suckless.org/">suckless.org</a> <span id="headerSubTitle">%($"siteTitle%)</span>
+ </div>
+
<div id="menu">
<a href="http://suckless.org">home</a> |
- <a href="http://hg.suckless.org">code</a> |
- <a href="http://dl.suckless.org">download</a> |
- <a href="http://man.suckless.org">man</a> |
<a href="http://dwm.suckless.org">dwm</a> |
- <a href="http://libs.suckless.org">libs</a> |
<a href="http://st.suckless.org">st</a> |
<a href="http://sta.li">stali</a> |
<a href="http://surf.suckless.org">surf</a> |
<a href="http://tools.suckless.org">tools</a> |
- <a href="http://wmi.suckless.org">wmi</a>
- </div>
- <div id="header">
-% if(! ~ $#siteImage 0) {
- <a href="/"><img src="%($"siteImage%)" alt="%($"siteTitle%)"/> <span id="headerSubTitle">%($"siteSubTitle%)</span></a>
-% }
-% if not {
- <a href="/">%($"siteTitle%) <span id="headerSubTitle">%($"siteSubTitle%)</span></a>
-% }
+ <a href="http://man.suckless.org">man</a>
+ <div class="right">
+ <a href="http://dl.suckless.org">download</a> |
+ <a href="http://hg.suckless.org">code</a>
+ </div>
</div>
<div id="content">