changelog shortlog tags branches files raw gz bz2 help

Mercurial > hg > werc / changeset: Merge updates from 'stable'.

changeset 599: 2cf868d144f3
parent 598: 4418faa290f4
parent 594: a150ab6df4e2
child 600: 4539504f023c
author: uriel@vm41.cat-v.org
date: Tue, 20 Oct 2009 02:09:21 +0200
files: .hgtags
description: Merge updates from 'stable'.
     2.1--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2+++ b/apps/wman/search.tpl	Tue Oct 20 02:09:21 2009 +0200
     2.3@@ -0,0 +1,20 @@
     2.4+<form action="" method="POST">
     2.5+<fieldset>
     2.6+    <input type="text" name="wman_search" value="%($"s%)" />
     2.7+    <input type="submit" name="go" value="Feel Lucky" />
     2.8+    <input type="submit" value="Search" />
     2.9+
    2.10+% if(! ~ $"post_arg_wman_search '') {
    2.11+%   if(~ $"wman_search_results '') {
    2.12+        No matches found for <i>'%($post_arg_wman_search%)'</i>.
    2.13+%   }
    2.14+%   if not {
    2.15+        <ul>
    2.16+%       echo $wman_search_results|awk -F/ '$(NF-1) ~ "^[0-9]+$" {printf "<li><a href=\"'$wman_base_uri'%s/%s\" />%s(%s)</a></li>", $(NF-1),$NF, $NF, $(NF-1)}'
    2.17+        </ul>
    2.18+%   }
    2.19+% }
    2.20+
    2.21+</fieldset>
    2.22+</form>
    2.23+
     3.1--- a/sites/default.cat-v.org/_werc/lib/footer.inc	Wed Sep 23 12:55:27 2009 +0200
     3.2+++ b/sites/default.cat-v.org/_werc/lib/footer.inc	Tue Oct 20 02:09:21 2009 +0200
     3.3@@ -19,8 +19,11 @@
     3.4 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
     3.5 </script>
     3.6 <script type="text/javascript">
     3.7+try {
     3.8 var pageTracker = _gat._getTracker("UA-1220719-1");
     3.9 pageTracker._setDomainName("cat-v.org");
    3.10-pageTracker._initData();
    3.11 pageTracker._trackPageview();
    3.12-</script>
    3.13+
    3.14+var pageTracker2 = _gat._getTracker("UA-1220719-12");
    3.15+pageTracker2._trackPageview();
    3.16+} catch(err) {}</script>
     4.1--- a/sites/default.cat-v.org/_werc/lib/headers.inc	Wed Sep 23 12:55:27 2009 +0200
     4.2+++ b/sites/default.cat-v.org/_werc/lib/headers.inc	Tue Oct 20 02:09:21 2009 +0200
     4.3@@ -1,3 +1,7 @@
     4.4 <meta name="verify-v1" content="6zEoK0WMlnLmIS/w7Pnh6+srZECHsvnMGN0kQmowSGk=" />
     4.5+<meta name="google-site-verification" content="z5zCyEitNLNZmhVblsogrEiy6Acf0UZROsFMtLjioN4" />
     4.6 <META name="y_key" content="49dff3fad5352458"><META name="y_key" content="5dc40bfee9494e98"><META name="y_key" content="b60a53d1fa98f4c8">
     4.7 <meta name="msvalidate.01" content="5008C6E6B172BEB1F43E770296C3D560" />
     4.8+<style>
     4.9+a { text-decoration: none!important; }
    4.10+</style>
     5.1--- a/sites/default.cat-v.org/_werc/lib/top_bar.inc	Wed Sep 23 12:55:27 2009 +0200
     5.2+++ b/sites/default.cat-v.org/_werc/lib/top_bar.inc	Tue Oct 20 02:09:21 2009 +0200
     5.3@@ -1,7 +1,11 @@
     5.4     <div class="left">
     5.5-      <a href="http://gsoc.cat-v.org">gsoc</a> |
     5.6-      <a href="http://doc.cat-v.org">doc archive</a> |
     5.7-      <a href="http://repo.cat-v.org">software repo</a> |
     5.8+      <a href="http://quotes.cat-v.org">quotes</a> |
     5.9+      <a href="http://doc.cat-v.org">docs</a> |
    5.10+      <a href="http://repo.cat-v.org">repo</a> |
    5.11+      <a href="http://sam.cat-v.org">sam</a> |
    5.12+      <a href="http://man.cat-v.org">man</a> |
    5.13+      <a href="http://acme.cat-v.org">acme</a> |
    5.14+      <a href="http://glenda.cat-v.org">Glenda</a> |
    5.15       <a href="http://ninetimes.cat-v.org">9times</a> |
    5.16       <a href="http://harmful.cat-v.org">harmful</a> |
    5.17       <a href="http://9p.cat-v.org/">9P</a> |
     6.1--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2+++ b/sites/werc.cat-v.org/apps/_footer.md	Tue Oct 20 02:09:21 2009 +0200
     6.3@@ -0,0 +1,10 @@
     6.4+External Apps
     6.5+=============
     6.6+
     6.7+This are some apps developed by werc users, to install them put them in your werc's `apps/` dir and enable them from any config file as usual.
     6.8+
     6.9+* [Xibit](http://xibit.soul9.org/): an image gallery app by written by soul9.
    6.10+* [SMAK](http://www.anarchyinthetubes.com/hg/smak/): a "very simple" image gallery by yiyus.
    6.11+* [hgwerc](http://www.anarchyinthetubes.com/hg/hgwebdir.cgi/hgwerc/): a wrapper around the mercurial web interface to integrate it into werc sites, also by yiyus.
    6.12+* [scrappydog](http://code.google.com/p/scrappydog/): A werc based online scrapbook by maht.
    6.13+* [flip](http://www.anarchyinthetubes.com/hg/flip/): A web interface to view PDFs, by yiyus.
     7.1--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2+++ b/sites/werc.cat-v.org/apps/_header.md	Tue Oct 20 02:09:21 2009 +0200
     7.3@@ -0,0 +1,5 @@
     7.4+Werc Apps
     7.5+=========
     7.6+
     7.7+Werc includes the following 'apps' by default that any site can enable usually by executing a function of the form `conf_enable_myapp` in any given `_werc/config` file.
     7.8+
     8.1--- a/sites/werc.cat-v.org/apps/dirdir/index.md	Wed Sep 23 12:55:27 2009 +0200
     8.2+++ b/sites/werc.cat-v.org/apps/dirdir/index.md	Tue Oct 20 02:09:21 2009 +0200
     8.3@@ -6,7 +6,7 @@
     8.4 infrastructure.  
     8.5 
     8.6 Features
     8.7-========
     8.8+--------
     8.9 
    8.10 DirDir is still somewhat experimental, but already all features diri had, plus some extras thanks to werc's power:
    8.11 
    8.12@@ -20,14 +20,22 @@
    8.13     * Implemented in about two dozen lines of rc scripts.
    8.14 
    8.15 
    8.16+Documentation
    8.17+-------------
    8.18+
    8.19+Just login, go to any page, and click the `Edit` button.
    8.20+
    8.21+To create a new page, go to the address where you want to create the new page, click `Edit`, enter the initial contents, `Save`, and you are done.
    8.22+
    8.23+
    8.24 Status
    8.25-======
    8.26+------
    8.27 
    8.28 Mostly usable, all basic features already implemented in the latest werc source
    8.29 tree. 
    8.30 
    8.31 About the name
    8.32-==============
    8.33+--------------
    8.34 
    8.35 DirDir is a pun on its predecessor diri and WikiWiki, and [Dirdir is also the title of a novel](http://www.amazon.com/gp/product/0879974788?ie=UTF8&tag=catv-20&linkCode=as2&camp=1789&creative=390957&creativeASIN=0879974788) by science fiction and literature grand master [Jack Vance](http://www.amazon.com/gp/redirect.html?ie=UTF8&location=http%3A%2F%2Fwww.amazon.com%2Fs%3Fie%3DUTF8%26redirect%3Dtrue%26search-type%3Dss%26index%3Dbooks%26ref%3Dntt%255Fathr%255Fdp%255Fsr%255F1%26field-author%3DJack%2520Vance&tag=catv-20&linkCode=ur2&camp=1789&creative=39095).
    8.36 
     9.1--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2+++ b/sites/werc.cat-v.org/docs/dir_listings.md	Tue Oct 20 02:09:21 2009 +0200
     9.3@@ -0,0 +1,29 @@
     9.4+Autogenerated Directory Listings
     9.5+================================
     9.6+
     9.7+If a directory has no `index.md`, `index.html` or `index.txt` and has no other
     9.8+*main handler* set up by a [werc app](/apps/), the default directory listing
     9.9+handler is used.
    9.10+
    9.11+The default directory handler simply displays the path to the directory, and a
    9.12+list of links to all files and dirs located at this path.
    9.13+
    9.14+
    9.15+Header and footer
    9.16+-----------------
    9.17+
    9.18+If a `_header.md` or `_footer.md` files are found in the directory, their
    9.19+contents will be displayed in the corresponding sections before and after
    9.20+the directory contents.
    9.21+
    9.22+
    9.23+Tuning the item's order
    9.24+------------------------
    9.25+
    9.26+You can set the `dir_listing_ls_opts` config variable in the dir's corresponding _werc/config to change the way items will be ordered.
    9.27+
    9.28+For example to list items in reverse chronological order simply add:
    9.29+
    9.30+    dir_listing_ls_opts=( -t )
    9.31+
    9.32+The options taken are [the standard Plan 9 ls(1) flags](http://man.cat-v.org/plan_9/1/ls).
    10.1--- a/sites/werc.cat-v.org/docs/rc_template_lang.md	Wed Sep 23 12:55:27 2009 +0200
    10.2+++ b/sites/werc.cat-v.org/docs/rc_template_lang.md	Tue Oct 20 02:09:21 2009 +0200
    10.3@@ -11,6 +11,11 @@
    10.4 
    10.5 That is basically it!
    10.6 
    10.7+For further documentation on rc see:
    10.8+
    10.9+* [The rc(1) man page for Plan 9](http://man.cat-v.org/plan_9/1/rc).
   10.10+* [The rc shell paper by Tom Duff](http://rc.cat-v.org).
   10.11+
   10.12 
   10.13 Examples
   10.14 --------
    11.1--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2+++ b/sites/werc.cat-v.org/docs/web_server_setup/_header.md	Tue Oct 20 02:09:21 2009 +0200
    11.3@@ -0,0 +1,16 @@
    11.4+Setting Up Your HTTP Server to Run Werc
    11.5+=======================================
    11.6+
    11.7+
    11.8+Werc should work with any web server that supports the CGI interface, and a few
    11.9+that don't. Here are collected instructions and sample configurations for some
   11.10+of the most popular HTTP servers that people has used with werc.
   11.11+
   11.12+In general setup consists of mapping all paths for a virtual host to the
   11.13+werc.rc script, usually in practice this means that the `document root` (or
   11.14+similar concept) for a virtual host is mapped to
   11.15+`/path/to/werc/sites/domain.name.com/`, and if no static file matches the
   11.16+request, control is handed to werc.rc, this allows the HTTP server to handle
   11.17+static files and werc to handle everything else (note that such a setup will
   11.18+expose your `_werc/config` files, which usually should not be a security
   11.19+issue).
    12.1--- a/sites/werc.cat-v.org/index.md	Wed Sep 23 12:55:27 2009 +0200
    12.2+++ b/sites/werc.cat-v.org/index.md	Tue Oct 20 02:09:21 2009 +0200
    12.3@@ -37,6 +37,10 @@
    12.4 Werc runs on any Unix-like system where [Plan 9 from User Space](http://plan9.us)
    12.5 is available (this includes Linux, *BSD, OS X and Solaris), and on Plan 9.
    12.6 
    12.7+If you use Debian you can install the `9base` package that will provide all the
    12.8+required commands (but at the moment you need to install the version in *sid*,
    12.9+older versions in stable lack some of the required programs)
   12.10+
   12.11 Werc can use any HTTP server that can handle CGI, and has been tested with at
   12.12 least Apache, Lighttpd, Cherokee, nhttpd, Hiawatha, and others.
   12.13 
   12.14@@ -72,13 +76,17 @@
   12.15 * [werc project at freshmeat](http://freshmeat.net/projects/werc/) - You can get new release notifications there.
   12.16 * [werc project at ohloh](https://www.ohloh.net/p/werc/)
   12.17 
   12.18+
   12.19 License
   12.20 -------
   12.21 
   12.22-Public domain, [because so called 'intellectual property' is an oxymoron](http://harmful.cat-v.org/economics/intellectual_property/).
   12.23+Public domain, [because so called 'intellectual property' is an
   12.24+oxymoron](http://harmful.cat-v.org/economics/intellectual_property/).
   12.25 
   12.26-(By default includes markdown.pl which has a different license, but this can be
   12.27-replaced).
   12.28+Alternatively if your prefer it or your country's brain dead copyright law
   12.29+doesn't recognize the public domain werc is made available under the terms of
   12.30+the MIT and ISC licenses.
   12.31+
   12.32 
   12.33 Credits
   12.34 -------
    13.1--- a/sites/werc.cat-v.org/wiki/_werc/config	Wed Sep 23 12:55:27 2009 +0200
    13.2+++ b/sites/werc.cat-v.org/wiki/_werc/config	Tue Oct 20 02:09:21 2009 +0200
    13.3@@ -1,1 +1,1 @@
    13.4-enable_wiki=yes
    13.5+conf_enable_wiki