# HG changeset patch # User Steve Losh # Date 1260927747 18000 # Node ID 187b25ff6e1afad6494923d14c3d9b44a219ba8d # Parent 037b7d29d984db5d832dbb7fbc9b27f0520cf5e0 Update the docs to work with the new version of Markdoc. diff -r 037b7d29d984 -r 187b25ff6e1a docs/.templates/404.html --- a/docs/.templates/404.html Wed Dec 02 02:13:03 2009 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -{% extends 'markdoc-default/404.html' %} diff -r 037b7d29d984 -r 187b25ff6e1a docs/.templates/base.html --- a/docs/.templates/base.html Wed Dec 02 02:13:03 2009 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -{% extends 'markdoc-default/base.html' %} diff -r 037b7d29d984 -r 187b25ff6e1a docs/.templates/document.html --- a/docs/.templates/document.html Wed Dec 02 02:13:03 2009 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -{% extends 'markdoc-default/document.html' %} diff -r 037b7d29d984 -r 187b25ff6e1a docs/.templates/listing.html --- a/docs/.templates/listing.html Wed Dec 02 02:13:03 2009 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -{% extends 'markdoc-default/listing.html' %} diff -r 037b7d29d984 -r 187b25ff6e1a docs/.templates/macros/html --- a/docs/.templates/macros/html Wed Dec 02 02:13:03 2009 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -{% macro cssimport(css_href, document_root="", media="screen, projection") -%} - -{%- endmacro %} - -{% macro css() -%} - -{%- endmacro %} - -{% macro jsimport(js_href, document_root="") -%} - -{%- endmacro %} - -{% macro js() -%} - -{%- endmacro %} diff -r 037b7d29d984 -r 187b25ff6e1a docs/.templates/markdoc-default/404.html --- a/docs/.templates/markdoc-default/404.html Wed Dec 02 02:13:03 2009 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -{% extends 'base.html' %} - -{% block body %} -

Not Found: {{ request.path_info|e }}

-

- We couldn’t find what you were looking for. - {% if not is_index %}You could try going home.{% endif %} -

-{% endblock %} diff -r 037b7d29d984 -r 187b25ff6e1a docs/.templates/markdoc-default/base.html --- a/docs/.templates/markdoc-default/base.html Wed Dec 02 02:13:03 2009 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ - - - - - - - - {% if 'wiki-name' in config %}{{ config['wiki-name']|e }} ยป {% endif -%} - {% block title %}{{ title }}{% endblock %} - - - {% import "macros/html" as html -%} - - {{ html.cssimport("/media/css/reset.css", document_root) }} - {{ html.cssimport("/media/css/layout.css", document_root) }} - {{ html.cssimport("/media/css/typography.css", document_root) }} - {{ html.cssimport("/media/css/pygments.css", document_root) }} - - - - {% if crumbs %} - - {% endif %} - -
- - {% block body %} - {% endblock %} - -
- - - - diff -r 037b7d29d984 -r 187b25ff6e1a docs/.templates/markdoc-default/document.html --- a/docs/.templates/markdoc-default/document.html Wed Dec 02 02:13:03 2009 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -{% extends 'base.html' %} - -{% block body %} - {{ content }} -{% endblock %} diff -r 037b7d29d984 -r 187b25ff6e1a docs/.templates/markdoc-default/listing.html --- a/docs/.templates/markdoc-default/listing.html Wed Dec 02 02:13:03 2009 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -{% extends 'base.html' %} - -{% block title %}ls /{{ directory|e }}{% endblock %} - -{% block body %} -

ls /{{ directory|e }}

- - {% if sub_directories %} -

Directories

- - - {% for subdir in sub_directories %} - - - - {% endfor %} -
- - {{ subdir.basename|e }}/ - -
- {% endif %} - - {% if pages %} -

Pages

- - - {% for page in pages %} - - - - - {% endfor %} -
{{ page.humansize }} - - {{ page.title|e }} - -
- {% endif %} - - {% if files %} -

Files

- - - {% for file in files %} - - - - - {% endfor %} -
{{ file.humansize }} - - {{ file.basename|e }} - -
- {% endif %} -{% endblock %} diff -r 037b7d29d984 -r 187b25ff6e1a docs/markdoc.yaml --- a/docs/markdoc.yaml Wed Dec 02 02:13:03 2009 -0500 +++ b/docs/markdoc.yaml Tue Dec 15 20:42:27 2009 -0500 @@ -1,7 +1,6 @@ wiki-name: "hg-prompt" -template-dir: ".templates" static-dir: "static" hide-prefix: "." @@ -10,7 +9,6 @@ listing-filename: "list.html" use-default-static: false -use-default-templates: false markdown: safe_mode: false diff -r 037b7d29d984 -r 187b25ff6e1a docs/publish.sh --- a/docs/publish.sh Wed Dec 02 02:13:03 2009 -0500 +++ b/docs/publish.sh Tue Dec 15 20:42:27 2009 -0500 @@ -1,6 +1,6 @@ #!/usr/bin/env bash -markdoc build --document-root '/hg-prompt/' +markdoc build rsync --delete -az .html/ ~/src/sjl.bitbucket.org/hg-prompt hg -R ~/src/sjl.bitbucket.org commit -Am 'hg-prompt: Update documentation.' hg -R ~/src/sjl.bitbucket.org push diff -r 037b7d29d984 -r 187b25ff6e1a docs/static/media/css/layout.css --- a/docs/static/media/css/layout.css Wed Dec 02 02:13:03 2009 -0500 +++ b/docs/static/media/css/layout.css Tue Dec 15 20:42:27 2009 -0500 @@ -1,3 +1,4 @@ +/* @override http://localhost:8008/media/css/layout.css */ body, html { background-color: #226F89; margin: 0; @@ -6,22 +7,21 @@ div#breadcrumbs { border-bottom: 4px dashed #265565; - border-left: 1px solid #265565; border-right: 1px solid #265565; - margin: 0 auto; - padding: 0.5em 1.5em; + padding: 0em 1.5em; background-color: #fff; width: 55em; + margin: 0em 0em 0em -1.5em; } div#breadcrumbs p { - margin-bottom: 0.2em; + margin: 0.5em auto; } div#content { background-color: #fff; height: 100%; - margin: 0 auto; + margin: 0 auto 3em; overflow: hidden; - padding: 1em 1.5em 1.5em 1.5em; + padding: 0em 1.5em 0em 1.5em; width: 55em; border-left: 1px solid #265565; border-right: 1px solid #265565; @@ -47,20 +47,15 @@ color: #F14800; } -div#footer { +p#footer { background-color: #fff; - border: 1px solid #265565; border-top: 4px dashed #265565; width: 55em; - padding: 1em 1.5em; - margin: 0 auto; - margin-bottom: 3em; + padding: 0.75em 1.5em; text-align: center; color: #666; -} -div#footer p { - margin: 0; - padding: 0; + margin-left: -1.5em; + margin-bottom: 0em; } ul { diff -r 037b7d29d984 -r 187b25ff6e1a docs/wiki/documentation/index.mdown --- a/docs/wiki/documentation/index.mdown Wed Dec 02 02:13:03 2009 -0500 +++ b/docs/wiki/documentation/index.mdown Tue Dec 15 20:42:27 2009 -0500 @@ -1,14 +1,14 @@ Documentation ============= -##[Usage](/hg-prompt/documentation/usage/)## +##[Usage](/documentation/usage/)## How the `hg prompt` command can be used. -##[Keywords](/hg-prompt/documentation/keywords/)## +##[Keywords](/documentation/keywords/)## Keywords available to use with the command. -##[Sample Prompts](/hg-prompt/documentation/samples/)## +##[Sample Prompts](/documentation/samples/)## Some sample prompts to get you started. \ No newline at end of file diff -r 037b7d29d984 -r 187b25ff6e1a docs/wiki/documentation/keywords/index.mdown --- a/docs/wiki/documentation/keywords/index.mdown Wed Dec 02 02:13:03 2009 -0500 +++ b/docs/wiki/documentation/keywords/index.mdown Tue Dec 15 20:42:27 2009 -0500 @@ -3,7 +3,7 @@ There a number of keywords available. If you have any suggestions for more please [let me know][issues]. -[issues]: http://bitbucket.org/sjl/hg-prompt/issues +[issues]: http://bitbucket.org/sjl/issues Some of the keywords support filters. These filters can be combined when it makes sense. If in doubt, try it! diff -r 037b7d29d984 -r 187b25ff6e1a docs/wiki/documentation/usage/index.mdown --- a/docs/wiki/documentation/usage/index.mdown Wed Dec 02 02:13:03 2009 -0500 +++ b/docs/wiki/documentation/usage/index.mdown Tue Dec 15 20:42:27 2009 -0500 @@ -34,4 +34,4 @@ Take a look at the [keywords][] documentation to see all the keywords `hg-prompt` supports. -[keywords]: /hg-prompt/documentation/keywords/ \ No newline at end of file +[keywords]: /documentation/keywords/ \ No newline at end of file diff -r 037b7d29d984 -r 187b25ff6e1a docs/wiki/index.mdown --- a/docs/wiki/index.mdown Wed Dec 02 02:13:03 2009 -0500 +++ b/docs/wiki/index.mdown Tue Dec 15 20:42:27 2009 -0500 @@ -15,10 +15,10 @@ [Code][] -------- -[Installation]: /hg-prompt/installation/ -[Quick Start]: /hg-prompt/quickstart/ -[Full Documentation]: /hg-prompt/documentation/ -[Code]: http://bitbucket.org/sjl/hg-prompt/ +[Installation]: /installation/ +[Quick Start]: /quickstart/ +[Full Documentation]: /documentation/ +[Code]: http://bitbucket.org/sjl Screenshot ---------- diff -r 037b7d29d984 -r 187b25ff6e1a docs/wiki/installation/index.mdown --- a/docs/wiki/installation/index.mdown Wed Dec 02 02:13:03 2009 -0500 +++ b/docs/wiki/installation/index.mdown Tue Dec 15 20:42:27 2009 -0500 @@ -8,13 +8,13 @@ First, clone the repository: :::console - $ hg clone http://bitbucket.org/sjl/hg-prompt/ + $ hg clone http://bitbucket.org/sjl/ Edit the `[extensions]` section in your `~/.hgrc` file: :::cfg [extensions] - prompt = (path to)/hg-prompt/prompt.py + prompt = (path to)/prompt.py Make sure everything is working: @@ -24,4 +24,4 @@ Take a look at the [Quick Start][] guide to learn how to put some useful information into your shell prompt. -[Quick Start]: /hg-prompt/quickstart/ \ No newline at end of file +[Quick Start]: /quickstart/ \ No newline at end of file diff -r 037b7d29d984 -r 187b25ff6e1a docs/wiki/quickstart/index.mdown --- a/docs/wiki/quickstart/index.mdown Wed Dec 02 02:13:03 2009 -0500 +++ b/docs/wiki/quickstart/index.mdown Tue Dec 15 20:42:27 2009 -0500 @@ -5,7 +5,7 @@ If you haven't already [installed][install] it, do that now. -[install]: /hg-prompt/installation/ +[install]: /installation/ A Simple (But Useful) Prompt ---------------------------- @@ -49,4 +49,4 @@ From here you can take a look at the [full documentation][] to see all the interesting things `hg-prompt` can do. -[full documentation]: /hg-prompt/documentation/ \ No newline at end of file +[full documentation]: /documentation/ \ No newline at end of file