Updates ikiwiki

5 files changed, 46 insertions, 125 deletions

diff --git a/ikiwiki/ikiwiki.setup b/ikiwiki/ikiwiki.setup
index d349203..4cb2ad3 100644
--- a/ikiwiki/ikiwiki.setup
+++ b/ikiwiki/ikiwiki.setup
@@ -6,140 +6,87 @@
 # Remember to re-run ikiwiki --setup any time you edit this file.
 
 use IkiWiki::Setup::Standard {
-  wikiname => "Templates",
+  wikiname       => "Templates",
   admintemplates => ["templates", ],
-  adminemail => 'templates@fluxo.info',
+  adminemail     => 'templates@fluxo.info',
 
   # Be sure to customise these..
-  srcdir => ".",
+  srcdir  => ".",
   destdir => "www",
 
-  url => "https://templates.fluxo.info",
-  cgiurl => "https://templates.fluxo.info/ikiwiki.cgi",
+  url          => "https://templates.fluxo.info",
   #templatedir => "/usr/share/ikiwiki/templates",
   #underlaydir => "/usr/share/ikiwiki/basewiki",
 
-  # Subversion stuff.
-  #rcs => "svn",
-  #historyurl => "http://svn.fluxo.info/trunk/[[file]]",
-  #diffurl => "http://svn.fluxo.info/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]",
-  #svnrepo => "/svn/wiki",
-  #svnpath => "trunk",
-
   # Git stuff.
-  rcs => "git",
+  rcs        => "git",
   historyurl => "https://git.fluxo.info/?p=templates.git;a=history;f=[[file]]",
-  diffurl => "https://git.fluxo.info/?p=templates.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
+  diffurl    => "https://git.fluxo.info/?p=templates.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
   #gitorigin_branch => "origin",
   #gitmaster_branch => "master",
   # See https://ikiwiki.info/tips/laptop_wiki_with_git/
   gitorigin_branch => '',
 
-  # Tla stuff.
-  #rcs => "tla"
-  #historyurl => ??,
-  #diffurl => ??,
-
-  # Mercurial stuff.
-  #rcs => "mercurial",
-  #historyurl => "http://localhost:8000/log/tip/[[file]]", # hg serve'd local repository
-  #diffurl => "http://localhost:8000/?fd=[[r2]];file=[[file]]",
-
-  # Bazaar stuff.
-  #rcs => "bzr",
-  #historyurl => "",
-  #diffurl => "http://example.com/revision?start_revid=[[r2]]#[[file]]-s", # using loggerhead
-
-  # Monotone stuff
-  #rcs => "monotone",
-  #mtnkey => "web\@machine.company.com",
-  #historyurl => "http://viewmtn.example.com/branch/head/filechanges/com.example.branch/[[file]]",
-  #diffurl => "http://viewmtn.example.com/revision/diff/[[r1]]/with/[[r2]]/[[file]]",
-  # Set if you want the wiki to sync on update and commit.
-  #mtnsync => 0,
-  # The path to your workspace (defaults to the srcdir itself)
-  # e.g. use if your srcdir is a subdirectory of the workspace.
-  #mtnrootdir => "path/to/root/of/workspace",
-
   wrappers => [
     #{
-    #  # The cgi wrapper.
-    #  cgi => 0,
-    #  wrapper => "/var/sites/rhatto/ikiwiki/ikiwiki.cgi",
-    #  wrappermode => "06550",
-    #  wrappergroup => "www-data",
-    #},
-    #{
-    #  # The svn post-commit wrapper.
-    #  # Note that this will overwrite any existing
-    #  # post-commit hook script, which may not be
-    #  # what you want.
-    #  wrapper => "/svn/wikirepo/hooks/post-commit",
-    #  wrappermode => "04755",
-    #  # Log to syslog since svn post-commit hooks
-    #  # hide output and errors.
-    #  syslog => 1,
-    #},
-    #{
     #  # The git post-update wrapper.
     #  # Note that this will overwrite any existing
     #  # post-update hook script, which may not be
     #  # what you want.
-    #  wrapper => "/var/git/repositories/rhatto.git/hooks/post-update",
-    #  wrappermode => "06550",
+    #  wrapper      => "/var/git/repositories/rhatto.git/hooks/post-update",
+    #  wrappermode  => "06550",
     #  wrappergroup => "git",
     #},
-    #{
-    #  # The monotone netsync hook.
-    #  wrapper => "path/to/root/of/workspace/_MTN/ikiwiki-netsync-hook",
-    #  wrappermode => "06755",
-    #},
   ],
 
-  # Default to generating rss feeds for pages with feeds?
-  rss => 1,
-  # Default to generating atom feeds for pages with feeds?
+  # Default to generating rss and atom feeds for pages with feeds?
+  rss   => 1,
   #atom => 1,
+
   # Allow generating feeds even if not generated by default?
-  #allowrss => 1,
+  #allowrss  => 1,
   #allowatom => 1,
+
   # Urls to ping with XML-RPC when feeds are updated
   #pingurl => [qw{http://rpc.technorati.com/rpc/ping}],
   # Include discussion links on all pages?
   discussion => 0,
+
   # To exclude files matching a regexp from processing. This adds to
   # the default exclude list.
   #exclude => qr/\.wav$/,
   exclude => qr/www/,
+
   # To change the extension used for generated html files.
   #htmlext => 'htm',
+
   # Time format (for strftime)
   #timeformat => '%c',
+
   # Locale to use. Must be a UTF-8 locale.
   #locale => 'en_US.UTF-8',
-  # Only send cookies over SSL connections.
-  #sslcookie => 1,
+
   # Logging settings:
   #verbose => 1,
   syslog => 0,
+
   # To link to templates pages in a subdirectory of the wiki.
-  #templatesdir => "templatess",
-  # To create output files named page.html rather than page/index.html.
-  #usedirs => 0,
-  # Simple spam prevention: require an account-creation password.
-  #account_creation_password => "guesswhat",
-  # Cost of generating a password using Authen::Passphrase::BlowfishCrypt
-  #password_cost => 8,
+  #templatesdir => "templates",
+
   # Uncomment to force ikiwiki to run with a particular umask.
   umask => 002,
+
   # Default settings for the recentchanges page.
   #recentchangespage => "recentchanges",
-  #recentchangesnum => 100,
+  #recentchangesnum  => 100,
+
   # Use new '!'-prefixed preprocessor directive syntax
   #prefix_directives => 0,
+
   # Attempt to make hardlinks to source files instead of copying them.
   # Useful if the wiki contains large media files.
-  #hardlink => 1,
+  hardlink => 1,
+
   # Enable use of multimarkdown features in .mdwn files.
   #multimarkdown => 1,
 
@@ -147,9 +94,11 @@ use IkiWiki::Setup::Standard {
   #add_plugins => [qw{goodstuff search wikitext camelcase
   #                   htmltidy fortune sidebar map rst anonok}],
   add_plugins => [qw{goodstuff sidebar}],
+
   # If you want to disable any of the default plugins, list them here.
   #disable_plugins => [qw{inline htmlscrubber passwordauth openid}],
   disable_plugins => [qw{openid editpage}],
+
   # To add a directory to the perl search path, use this.
   #libdir => "/home/me/.ikiwiki/",
 
@@ -163,50 +112,6 @@ use IkiWiki::Setup::Standard {
   # base page.
   #tagbase => "tag",
 
-  # For use with the search plugin if the omega cgi is located
-  # somewhere else.
-  #omega_cgi => "/usr/lib/cgi-bin/omega/omega",
-
-  # For use with the openid plugin, to give an url to a page templatess
-  # can use to signup for an OpenID.
-  #openidsignup => "http://myopenid.com/",
-
-  # For use with the mirrorlist plugin, a list of mirrors.
-  #mirrorlist => {
-  #  mirror1 => "http://hostname1",
-  #  mirror2 => "http://hostname2/mirror",
-  #},
-
-  # For use with the anonok plugin, a PageSpec specifying what
-  # pages anonymous templatess can edit
-  #anonok_pagespec => "*",
-
-  # For use with the aggregate plugin, to allow aggregation to be
-  # triggered via the web.
-  #aggregate_webtrigger => 1,
-
-  # For use with the pinger plugin, how many seconds to wait before
-  # timing out.
-  #pinger_timeout => 15.
-
-  # For use with the amazon S3 plugin, your public access key id.
-  #amazon_s3_key_id => 'XXXXXXXXXXXXXXXXXXXX',
-  # And a file holding your secret key. This file *must* not be
-  # readable by others!
-  #amazon_s3_key_file => "/home/me/.hide/.s3_key
-  # The globally unique name of the bucket to use to store the wiki.
-  #amazon_s3_bucket => "mywiki",
-  # A prefix to prepend to each page name.
-  #amazon_s3_prefix => "wiki/",
-  # Uncomment to use the S3 European datacenter.
-  #amazon_s3_location => "EU",
-  # Uncomment if you need to store each index file twice.
-  #amazon_s3_dupindex => 1,
-
-  # For use with the attachment plugin, a program that returns
-  # nonzero if its standard input contains an virus.
-  #virus_checker => "clamdscan -",
-
   # See https://ikiwiki.info/plugins/po/
   #po_master_language => 'en|English',
   #po_slave_languages => [ 'pt|Portuguese' ],
diff --git a/ikiwiki/local.css b/ikiwiki/local.css
new file mode 100644
index 0000000..2669089
--- /dev/null
+++ b/ikiwiki/local.css
@@ -0,0 +1,9 @@
+/**
+ * Local CSS customizations.
+ */
+
+/*
+body {
+  font-family: monospace;
+}
+*/
diff --git a/ikiwiki/sitemap.mdwn b/ikiwiki/sitemap.mdwn
new file mode 100644
index 0000000..6586976
--- /dev/null
+++ b/ikiwiki/sitemap.mdwn
@@ -0,0 +1,3 @@
+[[!meta title="Sitemap"]]
+
+[[!map pages="page(*) and !ikiwiki/* and !index and !sandbox and !templates* and !smileys and !shortcuts and !ikiwiki and !RecentChanges and !*/Discussion" show="title"]]
diff --git a/ikiwiki/templates/page.tmpl b/ikiwiki/templates/page.tmpl
index b525d22..6a3b146 100644
--- a/ikiwiki/templates/page.tmpl
+++ b/ikiwiki/templates/page.tmpl
@@ -51,7 +51,8 @@
           <li><a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a> <span class="divider">/</span> </li>
       </TMPL_LOOP>
       <li><TMPL_VAR TITLE></li>
-      <li><span class="divider">|</span> <a href="/meta">Meta</a></li>
+      <li><span class="divider">|</span> <a href="/timeline">Timeline</a></li>
+      <li><span class="divider">|</span> <a href="/timeline">Sitemap</a></li>
       <li><span class="divider">|</span> <a href="<TMPL_VAR HISTORYURL>">History</a></li>
       <li><span class="divider">|</span> <a href="/index.rss">Feed</a></li>
       </ul>
diff --git a/ikiwiki/timeline.mdwn b/ikiwiki/timeline.mdwn
new file mode 100644
index 0000000..4a683f7
--- /dev/null
+++ b/ikiwiki/timeline.mdwn
@@ -0,0 +1,3 @@
+[[!meta title="Timeline"]]
+   
+[[!inline  pages="page(*) and !ikiwiki/* and !index and !sandbox and !templates* and !smileys and !shortcuts and !ikiwiki and !RecentChanges and !*/Discussion" archive="yes"]]