Jekyll is dead, long live Zenweb!
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 10 Feb 2014 21:39:03 +0000 (16:39 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 10 Feb 2014 21:39:03 +0000 (16:39 -0500)
96 files changed:
.gitignore
doc/Gemfile
doc/Gemfile.lock
doc/Rakefile
doc/_config.yml
doc/_includes/_0-filter_py.liquid [moved from doc/_includes/0-filter.py with 100% similarity]
doc/_includes/_alert-incomplete.liquid [moved from doc/_includes/alert-incomplete.html with 100% similarity]
doc/_includes/_alert_stub.liquid [moved from doc/_includes/alert-stub.html with 100% similarity]
doc/_includes/_navbar_left.liquid [new file with mode: 0644]
doc/_includes/_navbar_top.liquid [moved from doc/_includes/navbar_top.html with 100% similarity]
doc/_includes/_notebox-begin.liquid [moved from doc/_includes/notebox-begin.html with 100% similarity]
doc/_includes/_notebox-end.liquid [moved from doc/_includes/notebox-end.html with 100% similarity]
doc/_includes/_parallel_hash_script_py.liquid [moved from doc/_includes/parallel_hash_script.py with 100% similarity]
doc/_includes/_run-md5sum_py.liquid [moved from doc/_includes/run-md5sum.py with 100% similarity]
doc/_includes/_tutorial_hash_script_py.liquid [moved from doc/_includes/tutorial_hash_script.py with 100% similarity]
doc/_includes/navbar_left.html [deleted file]
doc/_layouts/default.html.liquid [moved from doc/_layouts/default.html with 97% similarity]
doc/admin/cheat_sheet.html.textile.liquid [moved from doc/admin/cheat_sheet.textile with 97% similarity]
doc/admin/index.html.md.liquid [moved from doc/admin/index.md with 79% similarity]
doc/api/authentication.html.textile.liquid [moved from doc/api/authentication.textile with 99% similarity]
doc/api/crunch-scripts.html.textile.liquid [moved from doc/api/crunch-scripts.textile with 99% similarity]
doc/api/index.html.textile.liquid [moved from doc/api/index.textile with 99% similarity]
doc/api/methods.html.textile.liquid [moved from doc/api/methods.textile with 99% similarity]
doc/api/methods/api_client_authorizations.html.textile.liquid [moved from doc/api/methods/api_client_authorizations.textile with 99% similarity]
doc/api/methods/api_clients.html.textile.liquid [moved from doc/api/methods/api_clients.textile with 99% similarity]
doc/api/methods/authorized_keys.html.textile.liquid [moved from doc/api/methods/authorized_keys.textile with 99% similarity]
doc/api/methods/collections.html.textile.liquid [moved from doc/api/methods/collections.textile with 99% similarity]
doc/api/methods/groups.html.textile.liquid [moved from doc/api/methods/groups.textile with 99% similarity]
doc/api/methods/humans.html.textile.liquid [moved from doc/api/methods/humans.textile with 99% similarity]
doc/api/methods/job_tasks.html.textile.liquid [moved from doc/api/methods/job_tasks.textile with 99% similarity]
doc/api/methods/jobs.html.textile.liquid [moved from doc/api/methods/jobs.textile with 99% similarity]
doc/api/methods/keep_disks.html.textile.liquid [moved from doc/api/methods/keep_disks.textile with 99% similarity]
doc/api/methods/links.html.textile.liquid [moved from doc/api/methods/links.textile with 99% similarity]
doc/api/methods/logs.html.textile.liquid [moved from doc/api/methods/logs.textile with 99% similarity]
doc/api/methods/nodes.html.textile.liquid [moved from doc/api/methods/nodes.textile with 99% similarity]
doc/api/methods/pipeline_instances.html.textile.liquid [moved from doc/api/methods/pipeline_instances.textile with 99% similarity]
doc/api/methods/pipeline_templates.html.textile.liquid [moved from doc/api/methods/pipeline_templates.textile with 99% similarity]
doc/api/methods/repositories.html.textile.liquid [moved from doc/api/methods/repositories.textile with 99% similarity]
doc/api/methods/specimens.html.textile.liquid [moved from doc/api/methods/specimens.textile with 99% similarity]
doc/api/methods/traits.html.textile.liquid [moved from doc/api/methods/traits.textile with 99% similarity]
doc/api/methods/users.html.textile.liquid [moved from doc/api/methods/users.textile with 99% similarity]
doc/api/methods/virtual_machines.html.textile.liquid [moved from doc/api/methods/virtual_machines.textile with 99% similarity]
doc/api/permission-model.html.textile.liquid [moved from doc/api/permission-model.textile with 99% similarity]
doc/api/resources.html.textile.liquid [moved from doc/api/resources.textile with 99% similarity]
doc/api/schema/ApiClient.html.textile.liquid [moved from doc/api/schema/ApiClient.textile with 98% similarity]
doc/api/schema/ApiClientAuthorization.html.textile.liquid [moved from doc/api/schema/ApiClientAuthorization.textile with 98% similarity]
doc/api/schema/AuthorizedKey.html.textile.liquid [moved from doc/api/schema/AuthorizedKey.textile with 98% similarity]
doc/api/schema/Collection.html.textile.liquid [moved from doc/api/schema/Collection.textile with 99% similarity]
doc/api/schema/Commit.html.textile.liquid [moved from doc/api/schema/Commit.textile with 98% similarity]
doc/api/schema/CommitAncestor.html.textile.liquid [moved from doc/api/schema/CommitAncestor.textile with 98% similarity]
doc/api/schema/Group.html.textile.liquid [moved from doc/api/schema/Group.textile with 98% similarity]
doc/api/schema/Human.html.textile.liquid [moved from doc/api/schema/Human.textile with 98% similarity]
doc/api/schema/Job.html.textile.liquid [moved from doc/api/schema/Job.textile with 99% similarity]
doc/api/schema/JobTask.html.textile.liquid [moved from doc/api/schema/JobTask.textile with 99% similarity]
doc/api/schema/KeepDisk.html.textile.liquid [moved from doc/api/schema/KeepDisk.textile with 98% similarity]
doc/api/schema/Link.html.textile.liquid [moved from doc/api/schema/Link.textile with 99% similarity]
doc/api/schema/Log.html.textile.liquid [moved from doc/api/schema/Log.textile with 98% similarity]
doc/api/schema/Node.html.textile.liquid [moved from doc/api/schema/Node.textile with 98% similarity]
doc/api/schema/PipelineInstance.html.textile.liquid [moved from doc/api/schema/PipelineInstance.textile with 98% similarity]
doc/api/schema/PipelineTemplate.html.textile.liquid [moved from doc/api/schema/PipelineTemplate.textile with 98% similarity]
doc/api/schema/Repository.html.textile.liquid [moved from doc/api/schema/Repository.textile with 98% similarity]
doc/api/schema/Specimen.html.textile.liquid [moved from doc/api/schema/Specimen.textile with 98% similarity]
doc/api/schema/Trait.html.textile.liquid [moved from doc/api/schema/Trait.textile with 98% similarity]
doc/api/schema/User.html.textile.liquid [moved from doc/api/schema/User.textile with 98% similarity]
doc/api/schema/VirtualMachine.html.textile.liquid [moved from doc/api/schema/VirtualMachine.textile with 98% similarity]
doc/gen_api_method_docs.py
doc/index.html.liquid [moved from doc/index.html with 99% similarity]
doc/install/client.html.textile.liquid [moved from doc/install/client.textile with 87% similarity]
doc/install/create-standard-objects.html.textile.liquid [moved from doc/install/create-standard-objects.textile with 99% similarity]
doc/install/index.html.md.liquid [moved from doc/install/index.md with 91% similarity]
doc/install/install-api-server.html.md [moved from doc/install/install-api-server.md with 99% similarity]
doc/install/install-crunch-dispatch.html.textile.liquid [moved from doc/install/install-crunch-dispatch.textile with 99% similarity]
doc/install/install-workbench-app.html.md [moved from doc/install/install-workbench-app.md with 98% similarity]
doc/sdk/index.html.textile.liquid [moved from doc/sdk/index.textile with 95% similarity]
doc/sdk/python/crunch-utility-libraries.html.textile.liquid [moved from doc/sdk/python/crunch-utility-libraries.textile with 99% similarity]
doc/sdk/python/python.html.textile.liquid [moved from doc/sdk/python/python.textile with 93% similarity]
doc/sdk/python/sdk-python.html.textile.liquid [moved from doc/sdk/python/sdk-python.textile with 99% similarity]
doc/user/examples/crunch-examples.html.textile.liquid [moved from doc/user/examples/crunch-examples.textile with 99% similarity]
doc/user/getting_started/check-environment.html.textile.liquid [moved from doc/user/getting_started/check-environment.textile with 99% similarity]
doc/user/getting_started/community.html.textile.liquid [moved from doc/user/getting_started/community.textile with 99% similarity]
doc/user/getting_started/ssh-access.html.textile.liquid [moved from doc/user/getting_started/ssh-access.textile with 99% similarity]
doc/user/getting_started/workbench.html.textile.liquid [moved from doc/user/getting_started/workbench.textile with 98% similarity]
doc/user/index.html.textile.liquid [moved from doc/user/index.textile with 99% similarity]
doc/user/reference/api-tokens.html.textile.liquid [moved from doc/user/reference/api-tokens.textile with 99% similarity]
doc/user/reference/sdk-cli.html.textile.liquid [moved from doc/user/reference/sdk-cli.textile with 99% similarity]
doc/user/tutorials/running-external-program.html.textile.liquid [moved from doc/user/tutorials/running-external-program.textile with 96% similarity]
doc/user/tutorials/tutorial-firstscript.html.textile.liquid [moved from doc/user/tutorials/tutorial-firstscript.textile with 96% similarity]
doc/user/tutorials/tutorial-gatk-variantfiltration.html.textile.liquid [moved from doc/user/tutorials/tutorial-gatk-variantfiltration.textile with 99% similarity]
doc/user/tutorials/tutorial-job-debug.html.textile.liquid [moved from doc/user/tutorials/tutorial-job-debug.textile with 99% similarity]
doc/user/tutorials/tutorial-job1.html.textile.liquid [moved from doc/user/tutorials/tutorial-job1.textile with 99% similarity]
doc/user/tutorials/tutorial-keep.html.textile.liquid [moved from doc/user/tutorials/tutorial-keep.textile with 99% similarity]
doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid [moved from doc/user/tutorials/tutorial-new-pipeline.textile with 98% similarity]
doc/user/tutorials/tutorial-parallel.html.textile.liquid [moved from doc/user/tutorials/tutorial-parallel.textile with 97% similarity]
doc/user/tutorials/tutorial-trait-search.html.textile.liquid [moved from doc/user/tutorials/tutorial-trait-search.textile with 99% similarity]
doc/zenweb-liquid.rb
doc/zenweb-textile.rb

index 471e7ccfcd7cc1d0ac80f5f6205238fff3816896..4d6cc39a237559d2d2530bef984194cb456ee1cf 100644 (file)
@@ -3,4 +3,5 @@
 docker/*/generated/*
 docker/config.yml
 doc/_site/*
-doc/.site/*
\ No newline at end of file
+doc/.site/*
+doc/sdk/python/arvados
\ No newline at end of file
index ad695f0859bcedf7b708f297ea0012933d666269..497682b1dd04ba6cecfe1694113cd808946c2d51 100644 (file)
@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 gem 'zenweb'
 gem 'liquid'
+gem 'RedCloth'
index 5de90b1c700c6fdcb0cce06473e81c9aba68f28e..048f27acfb7ee8c71ecafb255fd1cdcbdd6bf883 100644 (file)
@@ -1,6 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    RedCloth (4.2.9)
     coderay (1.1.0)
     kramdown (1.3.1)
     less (1.2.21)
@@ -26,5 +27,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  RedCloth
   liquid
   zenweb
index 65d285507786f9e20c0d95caf2b45cd6acdb5b35..2ebd27228f4337aec9d4eb9890693bb993557412 100644 (file)
@@ -1,7 +1,18 @@
 #!/usr/bin/env rake
 
 require "rubygems"
-require "zenweb/tasks"
+Rake.application.rake_require "zenweb/tasks"
 load "zenweb-textile.rb"
 load "zenweb-liquid.rb"
 
+file ".site/sdk/python/arvados/index.html" do |t|
+  sh "epydoc --html -o sdk/python/arvados arvados"
+  Dir["sdk/python/arvados/*"].each do |f|
+    puts f
+    $website.pages[f] = Zenweb::Page.new($website, f)
+  end
+end
+
+task :extra_wirings do
+  $website.pages["sdk/python/python.html.textile.liquid"].depends_on(".site/sdk/python/arvados/index.html")
+end
index cd13810e95da2f5438847560a2bf35ffdab6915d..c9dab0f7ca3cbe7e97182047cba9d40c2d14c41d 100644 (file)
@@ -1,16 +1,92 @@
 exclude: ["Rakefile", "tmp"]
 baseurl: /doc
 arvados_api_host: qr1hi.arvadosapi.com
-layout: default
+
 navbar:
   userguide:
-    - Getting Started
-    - Tutorials
-    - Examples
-    - Reference
-  api:
-    - Concepts
-    - API Methods
-    - Schema
+    - Getting Started:
+      - user/getting_started/workbench.html.textile.liquid
+      - user/getting_started/ssh-access.html.textile.liquid
+      - user/getting_started/check-environment.html.textile.liquid
+      - user/getting_started/community.html.textile.liquid
+    - Tutorials:
+      - user/tutorials/tutorial-keep.html.textile.liquid
+      - user/tutorials/tutorial-job1.html.textile.liquid
+      - user/tutorials/tutorial-firstscript.html.textile.liquid
+      - user/tutorials/tutorial-job-debug.html.textile.liquid
+      - user/tutorials/tutorial-new-pipeline.html.textile.liquid
+      - user/tutorials/tutorial-parallel.html.textile.liquid
+      - user/tutorials/tutorial-trait-search.html.textile.liquid
+      - user/tutorials/tutorial-gatk-variantfiltration.html.textile.liquid
+      - user/tutorials/running-external-program.html.textile.liquid
+    - Examples:
+      - user/examples/crunch-examples.html.textile.liquid
+    - Reference:
+      - user/reference/api-tokens.html.textile.liquid
+      - user/reference/sdk-cli.html.textile.liquid
   sdk:
-    - Python
+    - Python:
+      - sdk/python/sdk-python.html.textile.liquid
+      - sdk/python/python.html.textile.liquid
+      - sdk/python/crunch-utility-libraries.html.textile.liquid
+  api:
+    - Concepts:
+      - api/authentication.html.textile.liquid
+      - api/methods.html.textile.liquid
+      - api/resources.html.textile.liquid
+      - api/crunch-scripts.html.textile.liquid
+      - api/permission-model.html.textile.liquid
+    - API Methods:
+      - api/methods/api_client_authorizations.html.textile.liquid
+      - api/methods/api_clients.html.textile.liquid
+      - api/methods/authorized_keys.html.textile.liquid
+      - api/methods/collections.html.textile.liquid
+      - api/methods/groups.html.textile.liquid
+      - api/methods/humans.html.textile.liquid
+      - api/methods/jobs.html.textile.liquid
+      - api/methods/job_tasks.html.textile.liquid
+      - api/methods/keep_disks.html.textile.liquid
+      - api/methods/links.html.textile.liquid
+      - api/methods/logs.html.textile.liquid
+      - api/methods/nodes.html.textile.liquid
+      - api/methods/pipeline_instances.html.textile.liquid
+      - api/methods/pipeline_templates.html.textile.liquid
+      - api/methods/repositories.html.textile.liquid
+      - api/methods/specimens.html.textile.liquid
+      - api/methods/traits.html.textile.liquid
+      - api/methods/users.html.textile.liquid
+      - api/methods/virtual_machines.html.textile.liquid
+    - Schema:
+      - api/schema/ApiClientAuthorization.html.textile.liquid
+      - api/schema/ApiClient.html.textile.liquid
+      - api/schema/AuthorizedKey.html.textile.liquid
+      - api/schema/Collection.html.textile.liquid
+      - api/schema/CommitAncestor.html.textile.liquid
+      - api/schema/Commit.html.textile.liquid
+      - api/schema/Group.html.textile.liquid
+      - api/schema/Human.html.textile.liquid
+      - api/schema/Job.html.textile.liquid
+      - api/schema/JobTask.html.textile.liquid
+      - api/schema/KeepDisk.html.textile.liquid
+      - api/schema/Link.html.textile.liquid
+      - api/schema/Log.html.textile.liquid
+      - api/schema/Node.html.textile.liquid
+      - api/schema/PipelineInstance.html.textile.liquid
+      - api/schema/PipelineTemplate.html.textile.liquid
+      - api/schema/Repository.html.textile.liquid
+      - api/schema/Specimen.html.textile.liquid
+      - api/schema/Trait.html.textile.liquid
+      - api/schema/User.html.textile.liquid
+      - api/schema/VirtualMachine.html.textile.liquid
+  admin:
+    - Admin:
+      - admin/index.html.md.liquid
+      - admin/cheat_sheet.html.textile.liquid
+  installguide:
+    - Install:
+      - install/install-api-server.html.md.liquid
+      - install/index.html.md.liquid
+      - install/install-workbench-app.html.md.liquid
+      - install/client.html.textile.liquid
+      - install/create-standard-objects.html.textile.liquid
+      - install/install-crunch-dispatch.html.textile.liquid
diff --git a/doc/_includes/_navbar_left.liquid b/doc/_includes/_navbar_left.liquid
new file mode 100644 (file)
index 0000000..92d2082
--- /dev/null
@@ -0,0 +1,20 @@
+<div class="span3">
+  <div class="affix-top">
+    <div class="well sidebar-nav">
+      <ol class="nav nav-list">
+        {% for section in site.navbar[page.navsection] %}
+        {% for entry in section %}
+       <li><span class="nav-header">{{ entry[0] }}</span>
+         <ol class="nav nav-list">
+          {% for item in entry[1] %}        
+            {% assign p = site.pages[item] %}
+            <li {% if p.url == page.url %} class="active activesubnav" {% elsif p.title == page.subnavsection %} class="activesubnav" {% endif %}>
+              <a href="{{ site.baseurl }}{{ p.url }}">{{ p.title }}</a></li>
+          {% endfor %}
+          </ol>
+        {% endfor %}
+        {% endfor %}
+      </ol>
+    </div>
+  </div>
+</div>
diff --git a/doc/_includes/navbar_left.html b/doc/_includes/navbar_left.html
deleted file mode 100644 (file)
index ff5726f..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-        <div class="span3">
-          <div class="affix-top">
-            <div class="well sidebar-nav">
-             {% if page.navsection == 'userguide' or page.navsection == 'api' or page.navsection == 'sdk' %}
-             <ol class="nav nav-list">
-                {% for menu_item in site.navbar[page.navsection] %}
-               <li><span class="nav-header">{{ menu_item }}</span>
-                 <ol class="nav nav-list">
-                    {% for navorder in (0..99) %}
-                     {% for p in site.pages %}
-                      {% if p.navsection == page.navsection and p.navmenu == menu_item and p.navorder == navorder %}
-                       <li {% if p.url == page.url %} class="active activesubnav" {% elsif p.title == page.subnavsection %} class="activesubnav" {% endif %}><a href="{{ site.baseurl }}{{ p.url }}">{{ p.title }}</a></li>
-                      {% endif %}{% endfor %}{% endfor %}
-                 </ol>
-               </li>
-                {% endfor %}
-             </ol>
-             {% else %}
-             <ol class="nav nav-list">
-               {% for navorder in (0..99) %}{% for p in site.pages %}{% if p.navsection == page.navsection and p.navorder == navorder %}
-               <li {% if p.url == page.url %} class="active activesubnav" {% elsif p.title == page.subnavsection %} class="activesubnav" {% endif %}><a href="{{ site.baseurl }}{{ p.url }}">{{ p.title }}</a></li>
-               {% endif %}{% endfor %}{% endfor %}
-             </ol>         
-             {% endif %}
-            </div>
-          </div>
-        </div>
similarity index 97%
rename from doc/_layouts/default.html
rename to doc/_layouts/default.html.liquid
index 4e2f08a4518a5ba159103d3fa080e016835d620a..ba3ce3a5753133c81d63e91c614368f8461ba902 100644 (file)
@@ -76,7 +76,7 @@
         <![endif]-->
   </head>
   <body class="nopad">
-    {% include navbar_top.html %}
+    {% include 'navbar_top' %}
 
     {% if page.navsection == 'top' or page.no_nav_left %}
     {{ content }}
@@ -86,7 +86,7 @@
 
     <div class="container-fluid">
       <div class="row-fluid">
-        {% include navbar_left.html %}
+        {% include 'navbar_left' %}
         <div class="span9"><div style="padding-left: 2em;">
           {{ content }}
         </div></div>
similarity index 97%
rename from doc/admin/cheat_sheet.textile
rename to doc/admin/cheat_sheet.html.textile.liquid
index d817827693d30ddb699b4ef1c29612841c4c0717..f811755260d6bcd9c1bea1e2965c67aa92a1f076 100644 (file)
@@ -1,8 +1,7 @@
 ---
 layout: default
-navsection: adminguide
+navsection: admin
 title: Cheat Sheet
-navorder: 1
 ...
 
 h1. Cheat Sheet
similarity index 79%
rename from doc/admin/index.md
rename to doc/admin/index.html.md.liquid
index 53e4e429a215c7d8448ce2f233bf07dd4ea3809f..f0ed3ad4fcefd5382caf4f909e41809978dc158e 100644 (file)
@@ -1,11 +1,10 @@
 ---
 layout: default
-navsection: adminguide
+navsection: admin
 title: Overview
-navorder: 0
 ...
 
-{% include alert-stub.html %}
+{% include 'alert_stub' %}
 
 # Administration Overview
 
similarity index 99%
rename from doc/api/authentication.textile
rename to doc/api/authentication.html.textile.liquid
index 20dfcf7ddc919e0ad3e9a72e94165155ba7e5507..1b5e240de6f71cbf1657db1046f66b50a936950a 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Concepts
 title: Authentication
-navorder: 2
+
 ...
 
 h1. Authentication
similarity index 99%
rename from doc/api/crunch-scripts.textile
rename to doc/api/crunch-scripts.html.textile.liquid
index dcf004ee79eddb8255adfad3901fa03beffdeabf..98634cdd9ba11ba1f110eaadb8c9554c7b5d847a 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Concepts
 title: Crunch scripts
-navorder: 5
+
 ...
 
 h2. Crunch scripts
similarity index 99%
rename from doc/api/index.textile
rename to doc/api/index.html.textile.liquid
index 64fe57bee5290d54887cb5b95e6a70c8c37311f6..097216d3a0e5df1d049b1129337b49b68da0eed9 100644 (file)
@@ -2,7 +2,7 @@
 layout: default
 navsection: api
 title: API Reference
-navorder: 0
+
 ...
 
 h1. API Reference
similarity index 99%
rename from doc/api/methods.textile
rename to doc/api/methods.html.textile.liquid
index c7ddbc3588b2c7038a63460f9c42f8fd4eeb2d45..2bfb9c4bfb1e2f7b026fc642c2b69bfe011962c2 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Concepts
 title: REST methods
-navorder: 3
+
 ...
 
 h1. REST Methods
similarity index 99%
rename from doc/api/methods/api_client_authorizations.textile
rename to doc/api/methods/api_client_authorizations.html.textile.liquid
index c9f6d8294f1392d3e02b5112fe8e778ff3cb0fb5..74fd21e47d241fd8892cc55f13d0fbc850663c69 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: API Methods
 title: "api_client_authorizations"
-navorder: 1
+
 ...
 
 h1. api_client_authorizations
similarity index 99%
rename from doc/api/methods/api_clients.textile
rename to doc/api/methods/api_clients.html.textile.liquid
index 2b014ad8c2d39e47d10d9d4e193c878b8e69b555..37eaa0a64aad2ce52568f07f82db4386f350471b 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: API Methods
 title: "api_clients"
-navorder: 2
+
 ...
 
 h1. api_clients
similarity index 99%
rename from doc/api/methods/authorized_keys.textile
rename to doc/api/methods/authorized_keys.html.textile.liquid
index e1c5892e54dcebc50cd51dbaa25601212fc7c781..0c5b7eea5bfcc5c706a7a1ba118bb7881434d7f6 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: API Methods
 title: "authorized_keys"
-navorder: 3
+
 ...
 
 h1. authorized_keys
similarity index 99%
rename from doc/api/methods/collections.textile
rename to doc/api/methods/collections.html.textile.liquid
index 100f86e6a5a20bf5c893a762fdb3138d78e6546f..9c631c214057c4ae1a102051c27700422bd44d1f 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: API Methods
 title: "collections"
-navorder: 4
+
 ...
 
 h1. collections
similarity index 99%
rename from doc/api/methods/groups.textile
rename to doc/api/methods/groups.html.textile.liquid
index 8db062d8400ca08403cbcf347fad6693f90004c3..f897eab2b8127e73f6cc368b1e318d34d8b50fa8 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: API Methods
 title: "groups"
-navorder: 5
+
 ...
 
 h1. groups
similarity index 99%
rename from doc/api/methods/humans.textile
rename to doc/api/methods/humans.html.textile.liquid
index d395b14565b4ae2897eed1991ebfd6e4204da33a..a0e715b58e8b7fb2027187bcab251c34267e7f02 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: API Methods
 title: "humans"
-navorder: 6
+
 ...
 
 h1. humans
similarity index 99%
rename from doc/api/methods/job_tasks.textile
rename to doc/api/methods/job_tasks.html.textile.liquid
index 220cf26d0cfb2562ffc82ed828af678b42e4ad31..daf4aa28d69f51c7374c0c7e42807add8339bf60 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: API Methods
 title: "job_tasks"
-navorder: 7
+
 ...
 
 h1. job_tasks
similarity index 99%
rename from doc/api/methods/jobs.textile
rename to doc/api/methods/jobs.html.textile.liquid
index 81093873315b6ada363b9b640a7450b52f49f6e1..f3e51fcbd22d5906684ea6adf643de75094a97fb 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: API Methods
 title: "jobs"
-navorder: 8
+
 ...
 
 h1. jobs
similarity index 99%
rename from doc/api/methods/keep_disks.textile
rename to doc/api/methods/keep_disks.html.textile.liquid
index 94eb420d4d8a6eb4b3bb84f9ec8a5a865d6d0351..720130fa6fe61200c4f54a57f96c87640d54ee65 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: API Methods
 title: "keep_disks"
-navorder: 9
+
 ...
 
 h1. keep_disks
similarity index 99%
rename from doc/api/methods/links.textile
rename to doc/api/methods/links.html.textile.liquid
index f046783821fa5057d60b9fc37ae3da88ca17eb2e..0885f428e79c2697a596fabc251f520288749d20 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: API Methods
 title: "links"
-navorder: 10
+
 ...
 
 h1. links
similarity index 99%
rename from doc/api/methods/logs.textile
rename to doc/api/methods/logs.html.textile.liquid
index 600cc3ab3211f27b7993891e9b6ed6ed4f627ada..b7934e50db299b47c806bf14fb04bd1654ab89d8 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: API Methods
 title: "logs"
-navorder: 11
+
 ...
 
 h1. logs
similarity index 99%
rename from doc/api/methods/nodes.textile
rename to doc/api/methods/nodes.html.textile.liquid
index 9521d3f7383d6ebe3e4ea995796be8c29b1e1c63..081734dc0557810351cf02cd9bae37c5a8ea2af1 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: API Methods
 title: "nodes"
-navorder: 12
+
 ...
 
 h1. nodes
similarity index 99%
rename from doc/api/methods/pipeline_instances.textile
rename to doc/api/methods/pipeline_instances.html.textile.liquid
index f50fe859fbe4d26d35caab9c2024e673edaa2bc3..5e9cb30febd790e35273b4c07c18a666d32f585c 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: API Methods
 title: "pipeline_instances"
-navorder: 13
+
 ...
 
 h1. pipeline_instances
similarity index 99%
rename from doc/api/methods/pipeline_templates.textile
rename to doc/api/methods/pipeline_templates.html.textile.liquid
index fafd24071b90d6afdf8986fdd14ad8e66baa0bd6..d353c7c7b6f4332e78b7b95d3cb9bacd4eecdc33 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: API Methods
 title: "pipeline_templates"
-navorder: 14
+
 ...
 
 h1. pipeline_templates
similarity index 99%
rename from doc/api/methods/repositories.textile
rename to doc/api/methods/repositories.html.textile.liquid
index 3d4aedcf5c47af608302c7e0e16985a3d87d0a63..90dc0f5ace996e468534ec44bde4cfdf7ecc54d8 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: API Methods
 title: "repositories"
-navorder: 15
+
 ...
 
 h1. repositories
similarity index 99%
rename from doc/api/methods/specimens.textile
rename to doc/api/methods/specimens.html.textile.liquid
index 4fa095e4d17aecfd9b1f7279a8b9519b6b9b101e..f56542dc6b8c9356c8ef80e1307aa7b2709801c6 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: API Methods
 title: "specimens"
-navorder: 16
+
 ...
 
 h1. specimens
similarity index 99%
rename from doc/api/methods/traits.textile
rename to doc/api/methods/traits.html.textile.liquid
index 28d567867f8542a517bfb23b0f81e61ff2ef0c1b..b2548b95859c0824f363d8b281b0634ce0eccae4 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: API Methods
 title: "traits"
-navorder: 17
+
 ...
 
 h1. traits
similarity index 99%
rename from doc/api/methods/users.textile
rename to doc/api/methods/users.html.textile.liquid
index 2ae5eee4a9de9e7dcc7b3129e05f55a726bc4370..9fbbda54e6134e40f3010402c4cde88824048291 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: API Methods
 title: "users"
-navorder: 18
+
 ...
 
 h1. users
similarity index 99%
rename from doc/api/methods/virtual_machines.textile
rename to doc/api/methods/virtual_machines.html.textile.liquid
index a96fcb4becd5f5e8a7b844a09c407fed186b902e..e815232dc5212ef86e1f4f2cc728789401a81165 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: API Methods
 title: "virtual_machines"
-navorder: 19
+
 ...
 
 h1. virtual_machines
similarity index 99%
rename from doc/api/permission-model.textile
rename to doc/api/permission-model.html.textile.liquid
index cc4c0d8d7b47b84e5306efadd4ba861ada0646ff..73c99c1691d3d16b688df209aec2d41103a69be1 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Concepts
 title: "Permission model"
-navorder: 6
+
 ...
 
 h1. Permission model
similarity index 99%
rename from doc/api/resources.textile
rename to doc/api/resources.html.textile.liquid
index 8a54a142255a546160b9deaf1f2b9f7690be0454..05517fcccc4b7d6a13f4e9e3aa4038b3c6a6bc9c 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Concepts
 title: Resources
-navorder: 4
+
 ...
 
 h1. Resources
similarity index 98%
rename from doc/api/schema/ApiClient.textile
rename to doc/api/schema/ApiClient.html.textile.liquid
index 86f93450d63ea1ae288ccb5827bb412538b902d1..90f1eebc9e2a5459bb709a02452b0da671237652 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Schema
 title: ApiClient
-navorder: 2
+
 ...
 
 h1. ApiClient
similarity index 98%
rename from doc/api/schema/ApiClientAuthorization.textile
rename to doc/api/schema/ApiClientAuthorization.html.textile.liquid
index d9ee87dbcdc7d5e12221f4b666805675088b3051..1dec2bb454e8b0ce0778d0c50b668426bc5373f9 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Schema
 title: ApiClientAuthorization
-navorder: 1
+
 ...
 
 h1. ApiClientAuthorization
similarity index 98%
rename from doc/api/schema/AuthorizedKey.textile
rename to doc/api/schema/AuthorizedKey.html.textile.liquid
index c60ce7146ecf053da68dbe3ed103212902383b63..7d8bc20f4b534a2d72b08d374192a1ff832931b0 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Schema
 title: AuthorizedKey
-navorder: 3
+
 ...
 
 h1. AuthorizedKey
similarity index 99%
rename from doc/api/schema/Collection.textile
rename to doc/api/schema/Collection.html.textile.liquid
index fb39ff929d8ddd60224e365903e7f841af7df604..4704d6392a999d6d6f1521f48279b9b1f984c8a1 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Schema
 title: Collection
-navorder: 4
+
 ...
 
 h1. Collection
similarity index 98%
rename from doc/api/schema/Commit.textile
rename to doc/api/schema/Commit.html.textile.liquid
index 71791ebf1223e28ec208d9a4e0fdba29dbd9c617..403d8d5da033567d6d18c5505a0e68a238ecafa0 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Schema
 title: Commit
-navorder: 6
+
 ...
 
 h1. Commit
similarity index 98%
rename from doc/api/schema/CommitAncestor.textile
rename to doc/api/schema/CommitAncestor.html.textile.liquid
index e4788f8a68c71ff0f61993ed01511d59deb58541..ab4dd5b4a90a99cdbb9d6d5b50bac6802d22d749 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Schema
 title: CommitAncestor
-navorder: 5
+
 ...
 
 h1. CommitAncestor
similarity index 98%
rename from doc/api/schema/Group.textile
rename to doc/api/schema/Group.html.textile.liquid
index 4315d758f0fb5d03550d62c42689e094ceb6c073..71a006c1867c8a7a561d48b79665857bbffdeaff 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Schema
 title: Group
-navorder: 7
+
 ...
 
 h1. Group
similarity index 98%
rename from doc/api/schema/Human.textile
rename to doc/api/schema/Human.html.textile.liquid
index 31766c9b60fc9bbfa2a240cad86dd2a0901106ef..837fc4209f9c80a73440ab8df0efd417294ce016 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Schema
 title: Human
-navorder: 8
+
 ...
 
 h1. Human
similarity index 99%
rename from doc/api/schema/Job.textile
rename to doc/api/schema/Job.html.textile.liquid
index 631c54942ebd9d486f1ea4fef45baae0e8e14a84..3fe631f67b2d5008a18d67270303bc47302de918 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Schema
 title: Job
-navorder: 9
+
 ...
 
 h1. Job
similarity index 99%
rename from doc/api/schema/JobTask.textile
rename to doc/api/schema/JobTask.html.textile.liquid
index fbbc8efc84afdfc6199f9b4c9a76cb0cea106c0e..f6818f40c6dcd04c8f751932e5782bf903c5995c 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Schema
 title: JobTask
-navorder: 10
+
 ...
 
 h1. JobTask
similarity index 98%
rename from doc/api/schema/KeepDisk.textile
rename to doc/api/schema/KeepDisk.html.textile.liquid
index d9f36abd34e5ac6e9eb88940e62b2fe8371f964f..edac4d5e12625e2b39f119c09dd7b06ee349e117 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Schema
 title: KeepDisk
-navorder: 11
+
 ...
 
 h1. KeepDisk
similarity index 99%
rename from doc/api/schema/Link.textile
rename to doc/api/schema/Link.html.textile.liquid
index 952d6f04857ad2c58678771f8c32fffa173f0941..abad3838bf43e8bee971b7e155fe314c646a0d53 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Schema
 title: Link
-navorder: 12
+
 ...
 
 h1. Link
similarity index 98%
rename from doc/api/schema/Log.textile
rename to doc/api/schema/Log.html.textile.liquid
index 7c94d34a4b256c2422f17ea9ec383ce242858947..533ca5c2caeb1a9e3c0ba26248b2389cf8d22abd 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Schema
 title: Log
-navorder: 14
+
 ...
 
 h1. Log
similarity index 98%
rename from doc/api/schema/Node.textile
rename to doc/api/schema/Node.html.textile.liquid
index ccdd3e571ae94e82fc3a5823478579e0328eb0de..827ce18bf676cb9f3ac19d7083feee8f9174b474 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Schema
 title: Node
-navorder: 15
+
 ...
 
 h1. Node
similarity index 98%
rename from doc/api/schema/PipelineInstance.textile
rename to doc/api/schema/PipelineInstance.html.textile.liquid
index 4eeb98926e782e072f12425c6d16520c332b04b8..7fd62f06e09db7a533c2b18d51a2b691dca7f856 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Schema
 title: PipelineInstance
-navorder: 16
+
 ...
 
 h1. PipelineInstance
similarity index 98%
rename from doc/api/schema/PipelineTemplate.textile
rename to doc/api/schema/PipelineTemplate.html.textile.liquid
index c54ba5837cdc2800b072080f8fbde80feca05998..75b99815075c51f7b8f2c7cb7e433ba37f6876ac 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Schema
 title: PipelineTemplate
-navorder: 17
+
 ...
 
 h1. PipelineTemplate
similarity index 98%
rename from doc/api/schema/Repository.textile
rename to doc/api/schema/Repository.html.textile.liquid
index 4989c69cb47b8309c784ac6d5f56ebe0885f2b71..e21b7432cdc2d554f0869b559dcf9982739c36a6 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Schema
 title: Repository
-navorder: 18
+
 ...
 
 h1. Repository
similarity index 98%
rename from doc/api/schema/Specimen.textile
rename to doc/api/schema/Specimen.html.textile.liquid
index 04afddc681a2767801a4cea32e674a86e23992a5..7c0eff94fc56b146ffdc1389a0c84b8b36a68f91 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Schema
 title: Specimen
-navorder: 19
+
 ...
 
 h1. Specimen
similarity index 98%
rename from doc/api/schema/Trait.textile
rename to doc/api/schema/Trait.html.textile.liquid
index d6829d359d9f66f14ae8e24ad33b063c8fc9a116..8f077ef70ab15e34ccf383743f9228a2cb742142 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Schema
 title: Trait
-navorder: 20
+
 ...
 
 h1. Trait
similarity index 98%
rename from doc/api/schema/User.textile
rename to doc/api/schema/User.html.textile.liquid
index d141ec03b56c68c5843ae2be7721535033fae478..cd7e64b9721493658661cbca60f2e655c42b533e 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Schema
 title: User
-navorder: 21
+
 ...
 
 h1. User
similarity index 98%
rename from doc/api/schema/VirtualMachine.textile
rename to doc/api/schema/VirtualMachine.html.textile.liquid
index 0b5ccb80b5dd9280e19a395177c2245fe201a8fb..ba5b3a782428a2f18290316322ffd2a1e1df5854 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: api
 navmenu: Schema
 title: VirtualMachine
-navorder: 22
+
 ...
 
 h1. VirtualMachine
index ac8fe032ff9c962b4bb4a533b46f33a65b5dd546..afbe9e7dd9aa7ded4a08a4f50d15f17fdb694e0a 100755 (executable)
@@ -61,7 +61,6 @@ for resource in sorted(api[u'resources']):
     outf = open(out_fname, 'w')
     outf.write(
 """---
-layout: default
 navsection: api
 navmenu: API Methods
 title: "{resource}"
similarity index 99%
rename from doc/index.html
rename to doc/index.html.liquid
index 9d5fb799603b864c4e424f563f1e82f4106477e9..0fdc75763782cc0bb23bf2011c973b822bd0af91 100644 (file)
@@ -1,5 +1,6 @@
 ---
 layout: default
+no_nav_left: true
 navsection: top
 title: Arvados | Documentation
 ...
similarity index 87%
rename from doc/install/client.textile
rename to doc/install/client.html.textile.liquid
index 7827a139650ca6b875d96f3bf4e1d077b6628450..cc21938dcd1d412f173b012016ffe38765e84f6d 100644 (file)
@@ -2,16 +2,16 @@
 layout: default
 navsection: installguide
 title: Install client libraries
-navorder: 5
+
 ...
 
 h1. Install client libraries
 
 h3. Python
 
-{% include notebox-begin.html %}
+{% include 'notebox-begin' %}
 The Python package includes the Python API client library module and the CLI utilities @arv-get@ and @arv-put@.
-{% include notebox-end.html %}
+{% include 'notebox-end' %}
 
 Get the arvados source tree.
 
@@ -29,8 +29,8 @@ Alternatively, build the package (without sudo) using @python setup.py bdist_egg
 
 h3. Ruby
 
-{% include notebox-begin.html %}
+{% include 'notebox-begin' %}
 The arvados package includes the Ruby client library module. The arvados-cli package includes the CLI utilities @arv@, @arv-run-pipeline-instance@, and @crunch-job@.
-{% include notebox-end.html %}
+{% include 'notebox-end' %}
 
 notextile. <pre><code>$ <span class="userinput">sudo gem install arvados arvados-cli</span></code></pre>
similarity index 99%
rename from doc/install/create-standard-objects.textile
rename to doc/install/create-standard-objects.html.textile.liquid
index 857679ff64cc761153931c6e7bd39dfd04df4810..e8018b215df54a149caaf91cded8d1b574741618 100644 (file)
@@ -2,7 +2,7 @@
 layout: default
 navsection: installguide
 title: Create standard objects
-navorder: 4
+
 ...
 
 h1. Create standard objects
similarity index 91%
rename from doc/install/index.md
rename to doc/install/index.html.md.liquid
index 39b3d97c91411465e39f72a3d3fcc63bc5129ce0..f11cac9cea0373fc957d3f3d220284d697b249a8 100644 (file)
@@ -2,10 +2,9 @@
 layout: default
 navsection: installguide
 title: Overview
-navorder: 0
 ...
 
-{% include alert-stub.html %}
+{% include 'alert_stub' %}
 
 # Installation Overview
 
similarity index 99%
rename from doc/install/install-api-server.md
rename to doc/install/install-api-server.html.md
index c959e1bdcf5c30fa23385add06da79298556b00b..37bafcf7ac566d6b7217496deac0694b69ca4745 100644 (file)
@@ -5,7 +5,7 @@ title: Install the API server
 navorder: 1
 ...
 
-{% include alert-stub.html %}
+{% include 'alert-stub' %}
 
 # API server setup
 
similarity index 99%
rename from doc/install/install-crunch-dispatch.textile
rename to doc/install/install-crunch-dispatch.html.textile.liquid
index d6525aa2fa01872da391c60c0af878b6d44d7f87..893a8aad9a5279e991d046c0ec95642e03e02fa0 100644 (file)
@@ -2,7 +2,7 @@
 layout: default
 navsection: installguide
 title: Install the Crunch dispatcher
-navorder: 3
+
 ...
 
 h1. Crunch setup
similarity index 98%
rename from doc/install/install-workbench-app.md
rename to doc/install/install-workbench-app.html.md
index c598785379ffba05781373f6ec5f15c3ac57c80e..e9c2168c2524823e56c21b5124783d05ec7ee9e5 100644 (file)
@@ -5,7 +5,7 @@ title: Install the Arvados workbench application
 navorder: 2
 ...
 
-{% include alert-stub.html %}
+{% include 'alert-stub' %}
 
 # Workbench setup
 
similarity index 95%
rename from doc/sdk/index.textile
rename to doc/sdk/index.html.textile.liquid
index ee001d987ed0f4afed230ed60ceec1be432c51d5..e15eb1b64bd50874bf488d23a1bb04bffdc538dc 100644 (file)
@@ -2,7 +2,7 @@
 layout: default
 navsection: sdk
 title: "SDK Reference"
-navorder: 0
+
 ...
 
 h1. Arvados SDK Reference
similarity index 99%
rename from doc/sdk/python/crunch-utility-libraries.textile
rename to doc/sdk/python/crunch-utility-libraries.html.textile.liquid
index c0b54fa23cf55c0f034d0837ce6af62cab69d27a..a897e9487da05960d6af70fdb63a1ea06e7fc94f 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: sdk
 navmenu: Python
 title: "Crunch utility libraries"
-navorder: 20
+
 ...
 
 h1. Crunch utility libraries
similarity index 93%
rename from doc/sdk/python/python.textile
rename to doc/sdk/python/python.html.textile.liquid
index 4483cd9d726c406bb6d206c4fd1e725ce8544dda..26fbc88f34d84f9ca9bb199b0f78dacdcee775ee 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: sdk
 navmenu: Python
 title: "PyDoc Reference"
-navorder: 30
+
 no_nav_left: true
 ...
 
similarity index 99%
rename from doc/sdk/python/sdk-python.textile
rename to doc/sdk/python/sdk-python.html.textile.liquid
index 2e9660ef73d62426d70bf27484b90d7160407a89..22a21670bfec29cf6182af6497c3bff634150896 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: sdk
 navmenu: Python
 title: "Python SDK"
-navorder: 10
+
 ...
 
 h1. Python SDK
similarity index 99%
rename from doc/user/examples/crunch-examples.textile
rename to doc/user/examples/crunch-examples.html.textile.liquid
index b1ada1f548f9ba88fa262fe43a69603719cd76d1..65fd316c107d8f39cc5cf6191aedad7706c1f093 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: userguide
 navmenu: Examples
 title: "Crunch examples"
-navorder: 30
+
 ...
 
 h1. Crunch examples
similarity index 99%
rename from doc/user/getting_started/check-environment.textile
rename to doc/user/getting_started/check-environment.html.textile.liquid
index 1516c7f44891d952fbc4845c0e735bd0687e2160..ac3d90cbf8be43e9a4f0db5d6f3499a8b9a5678b 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: userguide
 navmenu: Getting Started
 title: "Checking your environment"
-navorder: 10
+
 ...
 
 h1. Checking your environment
similarity index 99%
rename from doc/user/getting_started/community.textile
rename to doc/user/getting_started/community.html.textile.liquid
index 7c630380ba5a1d38750d299c6c9dd596a7eb0d93..c910ac1f42b404fe09370f359c3bedf7f6be09c5 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: userguide
 navmenu: Getting Started
 title: Arvados Community and Getting Help
-navorder: 11
+
 ...
 h1. Arvados Community and Getting Help
 
similarity index 99%
rename from doc/user/getting_started/ssh-access.textile
rename to doc/user/getting_started/ssh-access.html.textile.liquid
index 7d1104002f6cb7dce29d0ccdc126c5865a2f490b..74ecde2b5e0856303756213e4008005d8acd6ad1 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: userguide
 navmenu: Getting Started
 title: Accessing an Arvados VM over ssh
-navorder: 2
+
 ...
 
 h1. Accessing an Arvados Virtual Machine over ssh
similarity index 98%
rename from doc/user/getting_started/workbench.textile
rename to doc/user/getting_started/workbench.html.textile.liquid
index 2b72cd3ee6bf4c08566c3bd367e08014ad7578af..71041b3ea2c7d46cf52d5bb6ce90ff74fb926ad9 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: userguide
 navmenu: Getting Started
 title: Accessing Arvados Workbench
-navorder: 1
+
 ...
 h1. Accessing Arvados Workbench
 
similarity index 99%
rename from doc/user/index.textile
rename to doc/user/index.html.textile.liquid
index cc723f66944e38999663cbd34abe639524201f4f..17c435ec35037dba7d11e2d769fc1b7d92e89aca 100644 (file)
@@ -2,7 +2,7 @@
 layout: default
 navsection: userguide
 title: Welcome to Arvados!
-navorder: 0
+
 ...
 
 h1. Welcome to Arvados!
similarity index 99%
rename from doc/user/reference/api-tokens.textile
rename to doc/user/reference/api-tokens.html.textile.liquid
index b3938f250490226cf047740dc2aaa418cd06b7cb..48fea0a828f90d25a89ef23b2806738a17e80f1e 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: userguide
 navmenu: Reference
 title: "Getting an API token"
-navorder: 01
+
 ...
 
 h1. Reference: Getting an API token
similarity index 99%
rename from doc/user/reference/sdk-cli.textile
rename to doc/user/reference/sdk-cli.html.textile.liquid
index 5a7753c24ee9710b04076b14d84b0ac5fc6efc2a..55e9c3c5c4d24388b5e20b496bc1c9ba0fb58765 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: userguide
 navmenu: Reference
 title: "Command line interface"
-navorder: 22
+
 ...
 
 h1. Reference: Command Line Interface
similarity index 96%
rename from doc/user/tutorials/running-external-program.textile
rename to doc/user/tutorials/running-external-program.html.textile.liquid
index 34cb71ab757b67ae3f639168c702b1135645703e..5a4320c3a71f269a47fa6236d6eb6dd24e1a2cc7 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: userguide
 navmenu: Tutorials
 title: "Running external programs"
-navorder: 18
+
 ...
 
 h1. Running external programs
@@ -23,7 +23,7 @@ Start by entering the @crunch_scripts@ directory of your git repository:
  
 Next, using your favorite text editor, create a new file called @run-md5sum.py@ in the @crunch_scripts@ directory.  Add the following code to use the @md5sum@ program to compute the hash of each file in a collection:
 
-<pre><code class="userinput">{% include run-md5sum.py %}</code></pre>
+<pre><code class="userinput">{% include 'run-md5sum_py' %}</code></pre>
 
 Make the file executable:
 
similarity index 96%
rename from doc/user/tutorials/tutorial-firstscript.textile
rename to doc/user/tutorials/tutorial-firstscript.html.textile.liquid
index 5cb8c26cb110207df65c1683a4451ba6bc803f3b..d0108eaaceb8357dab91f2c1c6ee8bec988d736f 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: userguide
 navmenu: Tutorials
 title: "Writing a Crunch script"
-navorder: 13
+
 ...
 
 h1. Writing a Crunch script
@@ -36,13 +36,13 @@ Cloning into 'you'...</code></pre>
 
 This will create an git checkout in the directory called @you@.
 
-{% include notebox-begin.html %}
+{% include 'notebox-begin' %}
 For more information about using @git@, try
 
 notextile. <pre><code>$ <span class="userinput">man gittutorial</span></code></pre>
 
 or <b>"click here to search Google for git tutorials":http://google.com/#q=git+tutorial</b>
-{% include notebox-end.html %}
+{% include 'notebox-end' %}
 
 h2. Creating a Crunch script
 
@@ -60,7 +60,7 @@ notextile. <pre>$ <code class="userinput">nano hash.py</code></pre>
 
 Add the following code to compute the md5 hash of each file in a collection:
 
-<pre><code class="userinput">{% include tutorial_hash_script.py %}</code></pre>
+<pre><code class="userinput">{% include 'tutorial_hash_script_py' %}</code></pre>
 
 Make the file executable:
 
similarity index 99%
rename from doc/user/tutorials/tutorial-gatk-variantfiltration.textile
rename to doc/user/tutorials/tutorial-gatk-variantfiltration.html.textile.liquid
index 17485653c77fb7691faad4f480ee1f6fb6672c62..04894fda2cd3bd1759d9dfb4bec3b38ffed2827d 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: userguide
 navmenu: Tutorials
 title: "Using GATK with Arvados"
-navorder: 16
+
 ...
 
 h1. Using GATK with Arvados
similarity index 99%
rename from doc/user/tutorials/tutorial-job-debug.textile
rename to doc/user/tutorials/tutorial-job-debug.html.textile.liquid
index 570713b5614753a0fa9c434a3900c73155acdfe6..063eb12f49c577394e57890643812c3009eb79ad 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: userguide
 navmenu: Tutorials
 title: "Debugging a Crunch script"
-navorder: 14
+
 ...
 
 h1. Debugging a Crunch script
similarity index 99%
rename from doc/user/tutorials/tutorial-job1.textile
rename to doc/user/tutorials/tutorial-job1.html.textile.liquid
index be159db85f473e62d4cd32a06121e68f96cc421d..b88ba6051691d55e2efe373a4adf75d94efa18b6 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: userguide
 navmenu: Tutorials
 title: "Running a Crunch job"
-navorder: 12
+
 ...
 
 h1. Running a crunch job
similarity index 99%
rename from doc/user/tutorials/tutorial-keep.textile
rename to doc/user/tutorials/tutorial-keep.html.textile.liquid
index eb0f9690f5f69e5e217c6b6369465a1e0b838c4c..01ef78ad12d5cb866fff54e3db5312629b567ae4 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: userguide
 navmenu: Tutorials
 title: "Storing and Retrieving data using Arvados Keep"
-navorder: 11
+
 ...
 
 h1. Storing and Retrieving data using Arvados Keep
similarity index 98%
rename from doc/user/tutorials/tutorial-new-pipeline.textile
rename to doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid
index ee92090de1e9be780262aee99190235219bf8716..83122377314acc5eeada54ab7182449f67fe42d1 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: userguide
 navmenu: Tutorials
 title: "Constructing a Crunch pipeline"
-navorder: 15
+
 ...
 
 h1. Constructing a Crunch pipeline
@@ -16,7 +16,7 @@ h2. Create a new script
 
 Our second script will filter the output of @parallel_hash.py@ and only include hashes that start with 0.  Create a new script in @crunch_scripts/@ called @0-filter.py@:
 
-<pre><code class="userinput">{% include 0-filter.py %}</code></pre>
+<pre><code class="userinput">{% include '0-filter_py' %}</code></pre>
 
 Now add it to git:
 
similarity index 97%
rename from doc/user/tutorials/tutorial-parallel.textile
rename to doc/user/tutorials/tutorial-parallel.html.textile.liquid
index 1cad88ce659e7a25e08fc5e91de0a609e64620fd..d8254a63e6e397fc960f50cf536642227314a9e2 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: userguide
 navmenu: Tutorials
 title: "Parallel Crunch tasks"
-navorder: 15
+
 ...
 
 h1. Parallel Crunch tasks
@@ -19,7 +19,7 @@ Start by entering the @crunch_scripts@ directory of your git repository:
 
 Next, using your favorite text editor, create a new file called @parallel-hash.py@ in the @crunch_scripts@ directory.  Add the following code to compute the md5 hash of each file in a collection:
 
-<pre><code class="userinput">{% include parallel_hash_script.py %}</code></pre>
+<pre><code class="userinput">{% include 'parallel_hash_script_py' %}</code></pre>
 
 Make the file executable:
 
similarity index 99%
rename from doc/user/tutorials/tutorial-trait-search.textile
rename to doc/user/tutorials/tutorial-trait-search.html.textile.liquid
index 1fcbbc3a9d4f5c462dbae7be99aaa53ba7bcd332..b6024119bb6e0e30818df99d9fed7da07df9ce67 100644 (file)
@@ -3,7 +3,7 @@ layout: default
 navsection: userguide
 navmenu: Tutorials
 title: "Querying the Metadata Database"
-navorder: 16
+
 ...
 
 h1. Querying the Metadata Database
index f301aa4ad9c6a7ec3fa9e15d0bc56236e2da6335..545a0d8f5a31f58421e263288540c8eff9f4ecc7 100644 (file)
@@ -5,18 +5,37 @@ module ZenwebLiquid
 end
 
 module Zenweb
+
   class Page
+
+    def render_liquid page, content
+      liquid self.body, content, page, binding
+    end
     
     ##
     # Render a page's liquid and return the intermediate result
-    def render_liquid page, content, binding = TOPLEVEL_BINDING
+    def liquid template, content, page, binding = TOPLEVEL_BINDING
       require 'liquid'
+      Liquid::Template.file_system = Liquid::LocalFileSystem.new(File.join(File.dirname(Rake.application().rakefile), "_includes"))
+      unless defined? @liquid_template
+        @liquid_template = Liquid::Template.parse(template)
+      end
       
-      unless defined? @liquid_template then
-        @liquid_template = Liquid::Template.parse(content).render()
+      vars = {}
+      vars["content"] = content
+
+      vars["site"] = site.config.h.clone
+      pages = {}
+      site.pages.each do |f, p|
+        pages[f] = p.config.h.clone
+        pages[f]["url"] = p.url
       end
+      vars["site"]["pages"] = pages
+
+      vars["page"] = page.config.h.clone
+      vars["page"]["url"] = page.url
       
-      @liquid_template.render(binding)
+      @liquid_template.render(vars)
     end
   end
 end
index bdd716267bc569b00a2d54ceb6c53fa83fa7b9e7..0a4bb6f8c73408a13c07c9d7f5b6036fd1b097a3 100644 (file)
@@ -10,14 +10,8 @@ module Zenweb
     ##
     # Render a page's textile and return the resulting html
     def render_textile page, content
-      textile body
-    end
-
-    ##
-    # Render textile in +content+ 
-    def textile content
       require 'RedCloth'
-      @textile = RedCloth.new(content).to_html
+      RedCloth.new(content ? content : self.body).to_html
     end
   end
 end