Merge branch 'master' into website

* master: (30 commits)
  6.1.2
  bugfixes
  6.1.1
  critical change one of the hacks I had done for python3 turns out to severely break dealing with binary files revert that change for now; it's probably safer to use py2 only with this version, and a deeper fix will be needed later on
  nothing wrong with a stderr being not empty
  various cosmetic
  miscell cleanup and prettyfication in collector and application
  cosmetic
  6.1.0
  linux application receives a new attribute splitStderr defaults to False stdout and stderr are now merged by default in a single trace previous behaviour can be achieved by setting this new attribute to True
  cosmetic
  prettyfied execfuncs : mostly format vs %
  nicer output for the ssh command: show quotes only when needed
  prettyfied sshfuncs - no change
  6.0.9
  typo
  add a ${CODE} shorthand for linux applications, that refer to the full path of the (uploaded) code that was specified with code=
  linux/{node,application} only cosmetic and formatting use .format() instead of % should be harmless
  node.upload knows how to optionnally create executable files application.upload_code takes advantage of that -- this way we can upload a shell script usable as ${APP_HOME}/code
  revisited declaration of attributes for node and application
  ...

# Conflicts:
#	CHANGELOG.md
#	VERSION

diff --git a/website/Makefile b/website/Makefile
new file mode 100644 (file)
index 0000000..4ce410a
--- /dev/null
+++ b/website/Makefile
@@ -0,0 +1,63 @@
+########## contents
+ALL_MDS = $(shell git ls-files | grep '\.md$$')
+# a first, quick and dirty approach is to publish right
+# in /var/www/html so there's no impact on the httpd config
+# of course we might have to isolate this underneath at some point
+PUBLISH_PATH = /var/www/html
+
+#ALL_PLUGINS = plugins/*.{js,css,html}
+
+########## default target
+all: preview
+
+preview: prepare index meta convert 
+# this is what is invoked by restart-website.sh that is crontab'ed
+install: preview publish
+
+.PHONY: all preview publish install prepare index meta convert 
+preview_and_nepiall: prepare index meta nepi_all convert 
+install_and_nepiall: preview_and_nepiall publish
+
+.PHONY: preview_and_nepiall install_and_nepiall
+
+########## global vars
+# I am using the custom-made 'nepi' layout
+# which was 'exported' (copied) from markdown-styles' 'bootstrap3' 
+
+LAYOUT = ./nepi-layout
+
+##########
+prepare:
+       @[ -d markdown ] || mkdir markdown
+       rsync -av --delete --relative $(ALL_MDS) markdown
+
+# index.py is hard-wired to output in markdown/
+index:
+       @[ -d markdown ] || mkdir markdown
+       export LC_ALL=en_US.UTF-8; ./index.py $(ALL_MDS)
+
+# likewise
+meta:
+       @[ -d markdown ] || mkdir markdown
+       ./meta.py
+
+################################
+
+# compile status informations  by Nepi check
+status:
+       @[ -d markdown ] || mkdir markdown
+       ./status.py
+
+convert: 
+       generate-md --layout $(LAYOUT) --input markdown --output html
+
+# default is to publish locally as this runs right from nepi-newpl.sophia.inria.fr
+publish:
+       rsync -av --delete html/ $(PUBLISH_PATH)/
+
+debug:
+       echo ALL_MDS=$(ALL_MDS)
+
+clean:
+       rm -rf markdown html
+

diff --git a/website/README.md b/website/README.md
new file mode 100644 (file)
index 0000000..d5b92f4
--- /dev/null
+++ b/website/README.md
@@ -0,0 +1,5 @@
+This is an extremely rough draft of what could become the next iteration of the NEPI website. 
+
+No wiki (use markdown+git), no nonsense, no builtin code browsing or issue tracking either though.
+
+Inspired from the r2lab website.
\ No newline at end of file

diff --git a/website/crontab.sh b/website/crontab.sh
new file mode 100755 (executable)
index 0000000..c734b3f
--- /dev/null
+++ b/website/crontab.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cd $(dirname $0)
+./auto-update.sh
+make preview publish >& publish.log

diff --git a/website/index.md b/website/index.md
new file mode 100644 (file)
index 0000000..c82c18e
--- /dev/null
+++ b/website/index.md
@@ -0,0 +1,35 @@
+# NEPI
+
+
+## What is NEPI ?
+
+NEPI stands for *Network Experiment Programming Interface*
+
+NEPI is a Python-based library to model and run network experiments on a variety of network evaluation platforms, including PlanetLab, OMF wireless testbeds, ns-3 simulators, and others. It allows to specify resources to use in an experiment, to define experiment workflow constraints and to automate deployment, resource control and result collection.
+
+## Features
+
+ * Automatic experiment deployment
+ * Automatic result collection
+ * Interactive experimentation
+ * Hybrid experiments with multiple platforms
+ * Free open source license (GPLv2)
+ * Support for python2 and python3 (since NEPI 6.0)
+
+***
+
+## News - November 2015
+
+* NEPI is now numbered version 6, and can run under either python2 or python3.
+
+## News - June 2015
+
+* The reference for the NEPI codebase is no longer managed under mercurial, but under *git* together with other experimentation tools; for this reason it has been [moved to another location](http://git.onelab.eu/?p=nepi.git;a=summary) . Please [see this link](http://git.onelab.eu/?p=nepi.git;a=summary) if you need to browse history of changes made to the code.
+
+* Similarly, the [recommended way to install and upgrade nepi](https://pypi.python.org/pypi/nepi) is from now on based on `pypi` and `pip`.
+
+* Finally, all tarballs starting with release 3.2 have moved, and [can now be found here](http://build.onelab.eu/nepi).
+
+|[*Download*](http://build.onelab.eu/nepi/) | [*User Manual*](http://nepi.inria.fr/code/nepi/raw-file/43ae08ad10a3/doc/user_manual/user_manual.pdf) |[*Code Reference*](http://nepi.inria.fr/sphinx) |[*Bug Reporting*](http://nepi.inria.fr/bugzilla/) |
+|---|---|---|---|
+| Latest tarballs | NEPI explained | Classes & Methods | Found a bug ? |

diff --git a/website/index.py b/website/index.py
new file mode 100755 (executable)
index 0000000..fe137e5
--- /dev/null
+++ b/website/index.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# computes an index file in markdown/index.md from ./index.md with all the other md files referenced
+
+import sys
+import os
+from glob import glob
+
+source = "index.md"
+output_dir = "markdown"
+
+index_line_format = " * [{title}]({base}.html)\n"
+
+TITLE="title:"
+
+def get_title(filename):
+    with open(filename) as input:
+        for line in input:
+            if line.startswith(TITLE):
+                return line[len(TITLE):].strip()
+    return filename
+
+def main():
+    if not os.path.isfile(source):
+        print("Source not found {}".format(source))
+        sys.exit(1)
+
+    output = os.path.join(output_dir, source)
+    with open(output, 'w') as result:
+        # copy index.md
+        with open(source) as input:
+            result.write(input.read())
+        for other in sys.argv[1:]:
+            dir = os.path.dirname(other) or "."
+            base = os.path.basename(other).replace(".md", "")
+            title = get_title(other)
+            # skip index from the index...
+            if base == "index":
+                continue
+            # menu generated
+            #result.write(index_line_format.format(**locals()))
+    print("(Over)wrote {}".format(output))
+
+main()

diff --git a/website/install.md b/website/install.md
new file mode 100644 (file)
index 0000000..6b9076a
--- /dev/null
+++ b/website/install.md
@@ -0,0 +1,65 @@
+# How to install NEPI
+
+## Quick install
+
+The recommended way is to pull NEPI from the [python package index archive](pypi.python.org) using `pip`.
+
+    sudo pip install nepi
+    
+Most likely this is all you need to do to run simple scripts from the tutorials.
+
+Alternatively, you may specify a specific version number, e.g.:
+
+    sudo pip install nepi==6.0.4
+
+
+## Getting `pip`
+
+If you receive `command not found` when invoking `pip`, you will need to install this utility. Depending on your linux distribution, you can use
+
+* Fedora / RedHat / CentOS
+
+    `sudo yum install python-pip`
+    
+* Debian - ubuntu
+
+    `sudo apt-get install python-pip`
+
+## python2 *vs* python3
+
+If you want to use python3, depending on how your system is configured, you might need to invoke
+
+    sudo pip3 install nepi
+    
+and to `yum` or `apt-get` the `python3-pip` package instead.
+
+## More dependencies
+
+The following optional packages can be useful in some setups, but are not automatically pulled by `pip` because of their size and/or because they require additional binary tools in turn:
+
+* `sudo pip install matplotlib`
+* `sudo pip install pygraphviz`
+
+Of course, here again you might wish to use `pip3` instead.
+
+# Installing from sources
+
+*Alternative* approaches, more suitable to developers, are as follows. This is **not the recommended approach** though:
+
+## Install for all users
+
+    git clone git://git.onelab.eu/nepi.git
+    cd nepi
+    sudo make install
+    
+## Use NEPI without installing:
+
+    git clone git://git.onelab.eu/nepi.git
+    cd nepi
+    export PYTHONPATH=$(pwd) 
+    cd somewhere_else
+    python3 your-script.nepi 
+    
+
+# Older sheet
+You can also see the [original installation sheet for NEPI 3](http://nepi.inria.fr/Install/WebHome)
\ No newline at end of file

diff --git a/website/meta.py b/website/meta.py
new file mode 100755 (executable)
index 0000000..321b3c0
--- /dev/null
+++ b/website/meta.py
@@ -0,0 +1,51 @@
+#!/usr/bin/env python3
+
+import json
+import glob
+
+
+# I prefer writing python code rather than JSON natively
+# plus, this might be the place to inject subindexes for the tutorials page some day
+
+hard_wired_meta = {
+   # '*' means this is visible to all input files unless overridden
+   # in a more specific location
+   '*' : { 'logos_height': '18px'}
+   }
+
+title_header = 'title:'
+
+def tuto_contents(md):
+   """
+   input is a markdown filename
+   which is expected to define title:
+   output is a tuple (name, title)
+   with name having its '.md' removed
+   and title being said title
+   """
+   basename = md.replace('.md', '')
+   title = 'No title set'
+   with open(md) as input:
+      for line in input.readlines():
+         if line.startswith(title_header):
+            title = line[len(title_header):].strip()
+   return (basename, title)
+
+def main():
+
+   meta = hard_wired_meta
+   
+   # enrich it
+   # get the list of tutorials
+   tuto_files = glob.glob("tuto*.md")
+   # make sure the '*' key is present
+   wildcard = meta.setdefault('*', None)
+   wildcard['tutos'] = [ tuto_contents(tf) for tf in tuto_files]
+
+   # save
+   with open('markdown/meta.json', 'w') as output:
+      json.dump(meta, output)
+
+   
+if __name__ == '__main__':
+   main()

diff --git a/website/nepi-layout/assets/css/github-markdown.css b/website/nepi-layout/assets/css/github-markdown.css
new file mode 100644 (file)
index 0000000..447d396
--- /dev/null
+++ b/website/nepi-layout/assets/css/github-markdown.css
@@ -0,0 +1,700 @@
+@font-face {
+  font-family: octicons-anchor;
+  src: url(data:font/woff;charset=utf-8;base64,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) format('woff');
+}
+
+body {
+  background-color: white;
+}
+
+.markdown-body {
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+  color: #333;
+  overflow: hidden;
+  font-family: "Helvetica Neue", Helvetica, "Segoe UI", Arial, freesans, sans-serif;
+  font-size: 16px;
+  line-height: 1.6;
+  word-wrap: break-word;
+}
+
+.markdown-body a {
+  background: transparent;
+}
+
+.markdown-body a:active,
+.markdown-body a:hover {
+  outline: 0;
+}
+
+.markdown-body strong {
+  font-weight: bold;
+}
+
+.markdown-body h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+.markdown-body img {
+  border: 0;
+}
+
+.markdown-body hr {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  height: 0;
+}
+
+.markdown-body pre {
+  overflow: auto;
+}
+
+.markdown-body code,
+.markdown-body kbd,
+.markdown-body pre {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+
+.markdown-body input {
+  color: inherit;
+  font: inherit;
+  margin: 0;
+}
+
+.markdown-body html input[disabled] {
+  cursor: default;
+}
+
+.markdown-body input {
+  line-height: normal;
+}
+
+.markdown-body input[type="checkbox"] {
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  padding: 0;
+}
+
+.markdown-body table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+.markdown-body td,
+.markdown-body th {
+  padding: 0;
+}
+
+.markdown-body * {
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
+
+.markdown-body input {
+  font: 13px/1.4 Helvetica, arial, freesans, clean, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol";
+}
+
+.markdown-body a {
+  color: #4183c4;
+  text-decoration: none;
+}
+
+.markdown-body a:hover,
+.markdown-body a:focus,
+.markdown-body a:active {
+  text-decoration: underline;
+}
+
+.markdown-body hr {
+  height: 0;
+  margin: 15px 0;
+  overflow: hidden;
+  background: transparent;
+  border: 0;
+  border-bottom: 1px solid #ddd;
+}
+
+.markdown-body hr:before {
+  display: table;
+  content: "";
+}
+
+.markdown-body hr:after {
+  display: table;
+  clear: both;
+  content: "";
+}
+
+.markdown-body h1,
+.markdown-body h2,
+.markdown-body h3,
+.markdown-body h4,
+.markdown-body h5,
+.markdown-body h6 {
+  margin-top: 15px;
+  margin-bottom: 15px;
+  line-height: 1.1;
+}
+
+.markdown-body h1 {
+  font-size: 30px;
+}
+
+.markdown-body h2 {
+  font-size: 21px;
+}
+
+.markdown-body h3 {
+  font-size: 16px;
+}
+
+.markdown-body h4 {
+  font-size: 14px;
+}
+
+.markdown-body h5 {
+  font-size: 12px;
+}
+
+.markdown-body h6 {
+  font-size: 11px;
+}
+
+.markdown-body blockquote {
+  margin: 0;
+}
+
+.markdown-body ul,
+.markdown-body ol {
+  padding: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+.markdown-body ol ol,
+.markdown-body ul ol {
+  list-style-type: lower-roman;
+}
+
+.markdown-body ul ul ol,
+.markdown-body ul ol ol,
+.markdown-body ol ul ol,
+.markdown-body ol ol ol {
+  list-style-type: lower-alpha;
+}
+
+.markdown-body dd {
+  margin-left: 0;
+}
+
+.markdown-body code {
+  font: 12px Consolas, "Liberation Mono", Menlo, Courier, monospace;
+}
+
+.markdown-body pre {
+  margin-top: 0;
+  margin-bottom: 0;
+  font: 12px Consolas, "Liberation Mono", Menlo, Courier, monospace;
+}
+
+.markdown-body kbd {
+  background-color: #e7e7e7;
+  background-image: -webkit-linear-gradient(#fefefe, #e7e7e7);
+  background-image: linear-gradient(#fefefe, #e7e7e7);
+  background-repeat: repeat-x;
+  border-radius: 2px;
+  border: 1px solid #cfcfcf;
+  color: #000;
+  padding: 3px 5px;
+  line-height: 10px;
+  font: 11px Consolas, "Liberation Mono", Menlo, Courier, monospace;
+  display: inline-block;
+}
+
+.markdown-body>*:first-child {
+  margin-top: 0 !important;
+}
+
+.markdown-body>*:last-child {
+  margin-bottom: 0 !important;
+}
+
+.markdown-body .anchor {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  display: block;
+  padding-right: 6px;
+  padding-left: 30px;
+  margin-left: -30px;
+}
+
+.markdown-body .anchor:focus {
+  outline: none;
+}
+
+.markdown-body h1,
+.markdown-body h2,
+.markdown-body h3,
+.markdown-body h4,
+.markdown-body h5,
+.markdown-body h6 {
+  position: relative;
+  margin-top: 1em;
+  margin-bottom: 16px;
+  font-weight: bold;
+  line-height: 1.4;
+}
+
+.markdown-body h1 .octicon-link,
+.markdown-body h2 .octicon-link,
+.markdown-body h3 .octicon-link,
+.markdown-body h4 .octicon-link,
+.markdown-body h5 .octicon-link,
+.markdown-body h6 .octicon-link {
+  display: none;
+  color: #000;
+  vertical-align: middle;
+}
+
+.markdown-body h1:hover .anchor,
+.markdown-body h2:hover .anchor,
+.markdown-body h3:hover .anchor,
+.markdown-body h4:hover .anchor,
+.markdown-body h5:hover .anchor,
+.markdown-body h6:hover .anchor {
+  height: 1em;
+  padding-left: 8px;
+  margin-left: -30px;
+  line-height: 1;
+  text-decoration: none;
+}
+
+.markdown-body h1:hover .anchor .octicon-link,
+.markdown-body h2:hover .anchor .octicon-link,
+.markdown-body h3:hover .anchor .octicon-link,
+.markdown-body h4:hover .anchor .octicon-link,
+.markdown-body h5:hover .anchor .octicon-link,
+.markdown-body h6:hover .anchor .octicon-link {
+  display: inline-block;
+}
+
+.markdown-body h1 {
+  padding-bottom: 0.3em;
+  font-size: 2.25em;
+  line-height: 1.2;
+  border-bottom: 1px solid #eee;
+}
+
+.markdown-body h2 {
+  padding-bottom: 0.3em;
+  font-size: 1.75em;
+  line-height: 1.225;
+  border-bottom: 1px solid #eee;
+}
+
+.markdown-body h3 {
+  font-size: 1.5em;
+  line-height: 1.43;
+}
+
+.markdown-body h4 {
+  font-size: 1.25em;
+}
+
+.markdown-body h5 {
+  font-size: 1em;
+}
+
+.markdown-body h6 {
+  font-size: 1em;
+  color: #777;
+}
+
+.markdown-body p,
+.markdown-body blockquote,
+.markdown-body ul,
+.markdown-body ol,
+.markdown-body dl,
+.markdown-body table,
+.markdown-body pre {
+  margin-top: 0;
+  margin-bottom: 16px;
+}
+
+.markdown-body hr {
+  height: 4px;
+  padding: 0;
+  margin: 16px 0;
+  background-color: #e7e7e7;
+  border: 0 none;
+}
+
+.markdown-body ul,
+.markdown-body ol {
+  padding-left: 2em;
+}
+
+.markdown-body ul ul,
+.markdown-body ul ol,
+.markdown-body ol ol,
+.markdown-body ol ul {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+.markdown-body li>p {
+  margin-top: 16px;
+}
+
+.markdown-body dl {
+  padding: 0;
+}
+
+.markdown-body dl dt {
+  padding: 0;
+  margin-top: 16px;
+  font-size: 1em;
+  font-style: italic;
+  font-weight: bold;
+}
+
+.markdown-body dl dd {
+  padding: 0 16px;
+  margin-bottom: 16px;
+}
+
+.markdown-body blockquote {
+  padding: 0 15px;
+  color: #777;
+  border-left: 4px solid #ddd;
+}
+
+.markdown-body blockquote>:first-child {
+  margin-top: 0;
+}
+
+.markdown-body blockquote>:last-child {
+  margin-bottom: 0;
+}
+
+.markdown-body table {
+  display: block;
+  width: 100%;
+  overflow: auto;
+  word-break: normal;
+  word-break: keep-all;
+}
+
+.markdown-body table th {
+  font-weight: bold;
+}
+
+.markdown-body table th,
+.markdown-body table td {
+  padding: 6px 13px;
+  border: 1px solid #ddd;
+}
+
+.markdown-body table tr {
+  background-color: #fff;
+  border-top: 1px solid #ccc;
+}
+
+.markdown-body table tr:nth-child(2n) {
+  background-color: #f8f8f8;
+}
+
+.markdown-body img {
+  max-width: 100%;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
+
+.markdown-body code {
+  padding: 0;
+  padding-top: 0.2em;
+  padding-bottom: 0.2em;
+  margin: 0;
+  font-size: 85%;
+  background-color: rgba(0,0,0,0.04);
+  border-radius: 3px;
+}
+
+.markdown-body code:before,
+.markdown-body code:after {
+  letter-spacing: -0.2em;
+  content: "\00a0";
+}
+
+.markdown-body pre>code {
+  padding: 0;
+  margin: 0;
+  font-size: 100%;
+  word-break: normal;
+  white-space: pre;
+  background: transparent;
+  border: 0;
+}
+
+.markdown-body .highlight {
+  margin-bottom: 16px;
+}
+
+.markdown-body .highlight pre,
+.markdown-body pre {
+  padding: 16px;
+  overflow: auto;
+  font-size: 85%;
+  line-height: 1.45;
+  background-color: #f7f7f7;
+  border-radius: 3px;
+}
+
+.markdown-body .highlight pre {
+  margin-bottom: 0;
+  word-break: normal;
+}
+
+.markdown-body pre {
+  word-wrap: normal;
+}
+
+.markdown-body pre code {
+  display: inline;
+  max-width: initial;
+  padding: 0;
+  margin: 0;
+  overflow: initial;
+  line-height: inherit;
+  word-wrap: normal;
+  background-color: transparent;
+  border: 0;
+}
+
+.markdown-body pre code:before,
+.markdown-body pre code:after {
+  content: normal;
+}
+
+.markdown-body .highlight {
+  background: #fff;
+}
+
+.markdown-body .highlight .mf,
+.markdown-body .highlight .mh,
+.markdown-body .highlight .mi,
+.markdown-body .highlight .mo,
+.markdown-body .highlight .il,
+.markdown-body .highlight .m {
+  color: #945277;
+}
+
+.markdown-body .highlight .s,
+.markdown-body .highlight .sb,
+.markdown-body .highlight .sc,
+.markdown-body .highlight .sd,
+.markdown-body .highlight .s2,
+.markdown-body .highlight .se,
+.markdown-body .highlight .sh,
+.markdown-body .highlight .si,
+.markdown-body .highlight .sx,
+.markdown-body .highlight .s1 {
+  color: #df5000;
+}
+
+.markdown-body .highlight .kc,
+.markdown-body .highlight .kd,
+.markdown-body .highlight .kn,
+.markdown-body .highlight .kp,
+.markdown-body .highlight .kr,
+.markdown-body .highlight .kt,
+.markdown-body .highlight .k,
+.markdown-body .highlight .o {
+  font-weight: bold;
+}
+
+.markdown-body .highlight .kt {
+  color: #458;
+}
+
+.markdown-body .highlight .c,
+.markdown-body .highlight .cm,
+.markdown-body .highlight .c1 {
+  color: #998;
+  font-style: italic;
+}
+
+.markdown-body .highlight .cp,
+.markdown-body .highlight .cs {
+  color: #999;
+  font-weight: bold;
+}
+
+.markdown-body .highlight .cs {
+  font-style: italic;
+}
+
+.markdown-body .highlight .n {
+  color: #333;
+}
+
+.markdown-body .highlight .na,
+.markdown-body .highlight .nv,
+.markdown-body .highlight .vc,
+.markdown-body .highlight .vg,
+.markdown-body .highlight .vi {
+  color: #008080;
+}
+
+.markdown-body .highlight .nb {
+  color: #0086B3;
+}
+
+.markdown-body .highlight .nc {
+  color: #458;
+  font-weight: bold;
+}
+
+.markdown-body .highlight .no {
+  color: #094e99;
+}
+
+.markdown-body .highlight .ni {
+  color: #800080;
+}
+
+.markdown-body .highlight .ne {
+  color: #990000;
+  font-weight: bold;
+}
+
+.markdown-body .highlight .nf {
+  color: #945277;
+  font-weight: bold;
+}
+
+.markdown-body .highlight .nn {
+  color: #555;
+}
+
+.markdown-body .highlight .nt {
+  color: #000080;
+}
+
+.markdown-body .highlight .err {
+  color: #a61717;
+  background-color: #e3d2d2;
+}
+
+.markdown-body .highlight .gd {
+  color: #000;
+  background-color: #fdd;
+}
+
+.markdown-body .highlight .gd .x {
+  color: #000;
+  background-color: #faa;
+}
+
+.markdown-body .highlight .ge {
+  font-style: italic;
+}
+
+.markdown-body .highlight .gr {
+  color: #aa0000;
+}
+
+.markdown-body .highlight .gh {
+  color: #999;
+}
+
+.markdown-body .highlight .gi {
+  color: #000;
+  background-color: #dfd;
+}
+
+.markdown-body .highlight .gi .x {
+  color: #000;
+  background-color: #afa;
+}
+
+.markdown-body .highlight .go {
+  color: #888;
+}
+
+.markdown-body .highlight .gp {
+  color: #555;
+}
+
+.markdown-body .highlight .gs {
+  font-weight: bold;
+}
+
+.markdown-body .highlight .gu {
+  color: #800080;
+  font-weight: bold;
+}
+
+.markdown-body .highlight .gt {
+  color: #aa0000;
+}
+
+.markdown-body .highlight .ow {
+  font-weight: bold;
+}
+
+.markdown-body .highlight .w {
+  color: #bbb;
+}
+
+.markdown-body .highlight .sr {
+  color: #017936;
+}
+
+.markdown-body .highlight .ss {
+  color: #8b467f;
+}
+
+.markdown-body .highlight .bp {
+  color: #999;
+}
+
+.markdown-body .highlight .gc {
+  color: #999;
+  background-color: #EAF2F5;
+}
+
+.markdown-body .octicon {
+  font: normal normal 16px octicons-anchor;
+  line-height: 1;
+  display: inline-block;
+  text-decoration: none;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+.markdown-body .octicon-link:before {
+  content: '\f05c';
+}
+
+.markdown-body .task-list-item {
+  list-style-type: none;
+}
+
+.markdown-body .task-list-item+.task-list-item {
+  margin-top: 3px;
+}
+
+.markdown-body .task-list-item input {
+  float: left;
+  margin: 0.3em 0 0.25em -1.6em;
+  vertical-align: middle;
+}

diff --git a/website/nepi-layout/assets/css/hljs-github.min.css b/website/nepi-layout/assets/css/hljs-github.min.css
new file mode 100644 (file)
index 0000000..9b4f3aa
--- /dev/null
+++ b/website/nepi-layout/assets/css/hljs-github.min.css
@@ -0,0 +1,124 @@
+/*
+
+github.com style (c) Vasily Polovnyov <vast@whiteants.net>
+
+*/
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  color: #333;
+  background: #f8f8f8;
+  -webkit-text-size-adjust: none;
+}
+
+.hljs-comment,
+.diff .hljs-header,
+.hljs-javadoc {
+  color: #998;
+  font-style: italic;
+}
+
+.hljs-keyword,
+.css .rule .hljs-keyword,
+.hljs-winutils,
+.nginx .hljs-title,
+.hljs-subst,
+.hljs-request,
+.hljs-status {
+  color: #333;
+  font-weight: bold;
+}
+
+.hljs-number,
+.hljs-hexcolor,
+.ruby .hljs-constant {
+  color: #008080;
+}
+
+.hljs-string,
+.hljs-tag .hljs-value,
+.hljs-phpdoc,
+.hljs-dartdoc,
+.tex .hljs-formula {
+  color: #d14;
+}
+
+.hljs-title,
+.hljs-id,
+.scss .hljs-preprocessor {
+  color: #900;
+  font-weight: bold;
+}
+
+.hljs-list .hljs-keyword,
+.hljs-subst {
+  font-weight: normal;
+}
+
+.hljs-class .hljs-title,
+.hljs-type,
+.vhdl .hljs-literal,
+.tex .hljs-command {
+  color: #458;
+  font-weight: bold;
+}
+
+.hljs-tag,
+.hljs-tag .hljs-title,
+.hljs-rules .hljs-property,
+.django .hljs-tag .hljs-keyword {
+  color: #000080;
+  font-weight: normal;
+}
+
+.hljs-attribute,
+.hljs-variable,
+.lisp .hljs-body {
+  color: #008080;
+}
+
+.hljs-regexp {
+  color: #009926;
+}
+
+.hljs-symbol,
+.ruby .hljs-symbol .hljs-string,
+.lisp .hljs-keyword,
+.clojure .hljs-keyword,
+.scheme .hljs-keyword,
+.tex .hljs-special,
+.hljs-prompt {
+  color: #990073;
+}
+
+.hljs-built_in {
+  color: #0086b3;
+}
+
+.hljs-preprocessor,
+.hljs-pragma,
+.hljs-pi,
+.hljs-doctype,
+.hljs-shebang,
+.hljs-cdata {
+  color: #999;
+  font-weight: bold;
+}
+
+.hljs-deletion {
+  background: #fdd;
+}
+
+.hljs-addition {
+  background: #dfd;
+}
+
+.diff .hljs-change {
+  background: #0086b3;
+}
+
+.hljs-chunk {
+  color: #aaa;
+}

diff --git a/website/nepi-layout/assets/css/pilcrow.css b/website/nepi-layout/assets/css/pilcrow.css
new file mode 100644 (file)
index 0000000..347bef3
--- /dev/null
+++ b/website/nepi-layout/assets/css/pilcrow.css
@@ -0,0 +1,47 @@
+/* needed because the container has overflow: hidden, but the pilcrows overflow */
+.markdown-body {
+  padding-left: 30px;
+}
+
+.markdown-body h1,
+.markdown-body h2,
+.markdown-body h3,
+.markdown-body h4,
+.markdown-body h5,
+.markdown-body h6 {
+  position: relative;
+}
+
+.markdown-body h1:hover .header-link:before,
+.markdown-body h2:hover .header-link:before,
+.markdown-body h3:hover .header-link:before,
+.markdown-body h4:hover .header-link:before,
+.markdown-body h5:hover .header-link:before,
+.markdown-body h6:hover .header-link:before {
+    content: "\00B6";/* pilcrow */
+    color: #888;
+    font-size: smaller;
+}
+
+.markdown-body .header-link {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+
+  position: absolute;
+  top: 0;
+  left: -0.7em;
+  display: block;
+  padding-right: 1em;
+}
+
+.markdown-body h1:hover .header-link,
+.markdown-body h2:hover .header-link,
+.markdown-body h3:hover .header-link,
+.markdown-body h4:hover .header-link,
+.markdown-body h5:hover .header-link,
+.markdown-body h6:hover .header-link {
+  display: inline-block;
+  text-decoration: none;
+}

diff --git a/website/nepi-layout/page.html b/website/nepi-layout/page.html
new file mode 100644 (file)
index 0000000..0c3db4a
--- /dev/null
+++ b/website/nepi-layout/page.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, minimal-ui">
+    <title>{{title}}</title>
+    <link type="text/css" rel="stylesheet" href="{{asset 'css/github-markdown.css'}}">
+    <link type="text/css" rel="stylesheet" href="{{asset 'css/pilcrow.css'}}">
+    <link type="text/css" rel="stylesheet" href="{{asset 'css/hljs-github.min.css'}}"/>
+    <style>
+      body {
+        min-width: 200px;
+        max-width: 790px;
+        margin: 0 auto;
+        padding: 30px;
+      }
+    </style>
+  </head>
+  <body>
+    <article class="markdown-body">
+      {{~> content}}
+    </article>
+  </body>
+</html>