Permalink
Browse files

Updated the template for Markdoc 0.6.x.

  • Loading branch information...
1 parent 95e4940 commit 3a86cdee0063aaa4e4611cfd9d4b13b893ba568f @bendiken bendiken committed Dec 21, 2010
Showing with 58 additions and 11 deletions.
  1. +1 −1 .markdoc.yaml
  2. +53 −3 .templates/document.html
  3. +4 −7 wiki/index
View
@@ -2,5 +2,5 @@ wiki-name: Unlicense.org
wiki-dir: wiki
document-extensions: []
markdown:
- extensions: [extra, codehilite, toc]
+ extensions: [extra, toc]
google-analytics: UA-83574-16
View
@@ -1,14 +1,64 @@
{% extends 'base.html' %}
-{% block crumbs %}
+{% block js %}
+<style type="text/css">
+ body {
+ width: 730px;
+ font-family: "Helvetica Neue",Helvetica,Arial,Geneva,sans-serif;
+ font-size: 10pt;
+ }
+ body #breadcrumbs, body #content, body #footer {
+ width: 700px;
+ height: 100%;
+ margin: 0 auto;
+ padding: 0 1.2em 1.2em;
+ }
+ h1 {
+ font-size: 2em;
+ }
+ h2 {
+ font-size: 1.6em;
+ }
+ h1 {
+ margin-top: 0.6em;
+ }
+ h2, h3, h4, h5, h6 {
+ margin-bottom: 0.4em;
+ margin-top: 1em;
+ }
+ code {
+ font-family: inherit;
+ }
+ pre, blockquote, table.codehilitetable {
+ font-size: 10pt;
+ background-color: #F6F6F6;
+ border-color: #999999 -moz-use-text-color;
+ border-style: solid none;
+ border-width: 1px medium;
+ display: block;
+ line-height: 1.5em;
+ margin-left: 1.2em;
+ margin-right: 1em;
+ padding: 0.5em 0.5em 0.5em 1em !important;
+ }
+ body #footer {
+ background-color: #F6F6F6;
+ text-align: center;
+ }
+</style>
+{% endblock %}
+
+{% block crumbs %}{% endblock %}
+
+{% block content_header %}
<img alt="Say No to Copyright" title="Say No to Copyright" src="./pd-icon.png"
align="right" width="50" height="50" border="0" style="margin: 5px 0px 0px 10px;"/>
{% endblock %}
{% block content %}{{ content }}{% endblock %}
-{% block footer %}
- <p id="footer">
+{% block body_footer %}
+ <div id="footer">
<a href="http://creativecommons.org/publicdomain/zero/1.0/">No rights reserved</a>.
Powered by <a href="http://markdoc.org/">Markdoc</a>.
Hosted by <a href="http://www.dreamhost.com/r.cgi?181700">Dreamhost</a>.
View
@@ -16,7 +16,6 @@ The Unlicense
To opt out of the copyright game altogether and set your code free, put your next software project into the [public domain](http://me.stpeter.im/essays/publicdomain.html) using the following (un)licensing statement:
- :::text
This is free and unencumbered software released into the public domain.
Anyone is free to copy, modify, publish, use, compile, sell, or
@@ -55,7 +54,6 @@ In order to ensure your project remains completely free and unencumbered by copy
At minimum, you should ask them to accompany any [non-trivial](http://www.gnu.org/prep/maintain/maintain.html#Legally-Significant) patches with a simple statement like the following:
- :::text
I dedicate any and all copyright interest in this software to the
public domain. I make this dedication for the benefit of the public at
large and to the detriment of my heirs and successors. I intend this
@@ -64,7 +62,6 @@ At minimum, you should ask them to accompany any [non-trivial](http://www.gnu.or
Better yet is to ask the major contributors to [digitally sign](http://en.wikipedia.org/wiki/Digital_signature) a more explicit copyright release (see an example [`WAIVER`](./WAIVER) file), and then to keep a record of such signatures in an `AUTHORS` file accompanying your software. Using [GnuPG](http://www.gnupg.org/), contributors can sign a copyright waiver file as follows:
- :::bash
$ gpg --no-version --armor --sign WAIVER
Note that if a contributor makes significant changes or enhancements in his capacity as an employee of some organization, then the above may be insufficient and you would additionally need to ask for a copyright disclaimer signed by a company officer. For more information, have a look at [how the SQLite project handles this](http://www.sqlite.org/copyright.html). The Free Software Foundation also [provides an example](http://www.fsf.org/licensing/licenses/gpl-howto.html) of a simple copyright disclaimer to be signed by an employer.
@@ -76,13 +73,13 @@ Unlicensed Free Software
Here follows a sample of some of the software projects that have already adopted the Unlicense or a derivative thereof:
-* [Bitcoin.php](https://github.com/mikegogulski/bitcoin-php), a PHP library (and plugins for [WP e-Commerce](https://github.com/mikegogulski/bitcoin-wp-e-commerce), [UberCart](https://github.com/mikegogulski/uc_bitcoin), and [VirtueMart](https://github.com/mikegogulski/bitcoin-virtuemart)) for the [Bitcoin](http://bitcoin.org/) peer-to-peer digital currency system.
+* [Bitcoin.php](http://github.com/mikegogulski/bitcoin-php), a PHP library (and plugins for [WP e-Commerce](http://github.com/mikegogulski/bitcoin-wp-e-commerce), [UberCart](http://github.com/mikegogulski/uc_bitcoin), and [VirtueMart](http://github.com/mikegogulski/bitcoin-virtuemart)) for the [Bitcoin](http://bitcoin.org/) peer-to-peer digital currency system.
* [CRM114.rb](http://crm114.rubyforge.org/), a Ruby interface to the CRM114 Controllable Regex Mutilator.
* [Dagny](http://github.com/zacharyvoase/dagny), a Django adaptation of Ruby on Rails's Resource-Oriented Architecture.
* [EagleClaw](http://github.com/zacharyvoase/eagleclaw), a Ruby library for building screen scrapers.
* [Fancypants](http://github.com/simonwhitaker/fancypants), a JavaScript and Python library of data visualisation trinkets.
-* [fastFrag](https://github.com/gregory80/fastFrag), a simple JSON-based client-side JavaScript templating engine.
-* [ficly, writes like](https://chrome.google.com/extensions/detail/hmgkocbacnpdfoklnggcjjipnicfnklf/), a Google Chrome extension for analyzing ficly.com stories using the iwl.me service.
+* [fastFrag](http://github.com/gregory80/fastFrag), a simple JSON-based client-side JavaScript templating engine.
+* [ficly, writes like](http://chrome.google.com/extensions/detail/hmgkocbacnpdfoklnggcjjipnicfnklf/), a Google Chrome extension for analyzing ficly.com stories using the iwl.me service.
* [GrowlAMQP](http://gemcutter.org/gems/growl-amqp), a Ruby daemon that reports AMQP messages via Growl.
* [Habilis](http://github.com/simonwhitaker/habilis), an email-to-[Dropbox](http://www.dropbox.com/) gateway.
* [Have-a-Cookie](http://have-a-cookie.tumblr.com/), a Google Chrome extension for enhanced-privacy cookie management.
@@ -108,7 +105,7 @@ Here follows a sample of some of the software projects that have already adopted
* [RDFcache](http://rdfcache.rubyforge.org/), a content-addressable storage system for RDF data.
* [RDFgrid](http://rdfgrid.rubyforge.org/), a framework for map/reduce-based batch-processing of RDF data with Hadoop.
* [RSA.rb](http://rsa.rubyforge.org/), a Ruby implementation of the RSA encryption algorithm and the PKCS#1 cryptography standard.
-* [Tor.rb](http://cypherpunk.rubyforge.org/tor/), a Ruby library for interacting with the [Tor](https://www.torproject.org/) anonymity network.
+* [Tor.rb](http://cypherpunk.rubyforge.org/tor/), a Ruby library for interacting with the [Tor](http://www.torproject.org/) anonymity network.
* [Trith](http://trith.org/), an experimental concatenative programming language.
* [Trinity](http://trinity.datagraph.org/), a Ruby web framework for publishing Linked Data.
* [Tubras](http://code.google.com/p/tubras/), a C++/Lua game engine.

0 comments on commit 3a86cde

Please sign in to comment.