[ARVADOS] updated: 09f20203faabdd65367c7db1f84fd63527101903
git at public.curoverse.com
git at public.curoverse.com
Mon Dec 23 19:12:46 EST 2013
Summary of changes:
doc/_config.yml | 12 ++++++++----
doc/_includes/navbar_left.html | 6 +++---
doc/api/ApiClientAuthorization.textile | 1 +
doc/api/ApiClients.textile | 1 +
doc/api/AuthorizedKey.textile | 1 +
doc/api/Collections.textile | 1 +
doc/api/Commit.textile | 1 +
doc/api/CommitAncestor.textile | 1 +
doc/api/Group.textile | 1 +
doc/api/Human.textile | 1 +
doc/api/JobTasks.textile | 1 +
doc/api/Jobs.textile | 1 +
doc/api/KeepDisk.textile | 1 +
doc/api/Link.textile | 1 +
doc/api/Links.textile | 1 +
doc/api/Log.textile | 1 +
doc/api/Node.textile | 1 +
doc/api/PipelineInstance.textile | 1 +
doc/api/PipelineTemplate.textile | 1 +
doc/api/Repository.textile | 1 +
doc/api/Specimen.textile | 1 +
doc/api/Trait.textile | 1 +
doc/api/User.textile | 1 +
doc/api/VirtualMachine.textile | 1 +
doc/api/authentication.textile | 1 +
doc/api/crunch-scripts.textile | 1 +
doc/api/methods.textile | 1 +
doc/api/permission-model.textile | 1 +
doc/api/resources.textile | 1 +
.../controllers/arvados/v1/schema_controller.rb | 4 ++--
30 files changed, 40 insertions(+), 9 deletions(-)
via 09f20203faabdd65367c7db1f84fd63527101903 (commit)
via 8d149b6d680e124f4079dfd5788ead5dbbc34c41 (commit)
from 2d3d78091a2cc4a6e18b90b4112de69bf44ad04d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 09f20203faabdd65367c7db1f84fd63527101903
Author: Tim Pierce <twp at clinicalfuture.com>
Date: Mon Dec 23 15:51:54 2013 -0500
Fix bug in default argument types.
diff --git a/services/api/app/controllers/arvados/v1/schema_controller.rb b/services/api/app/controllers/arvados/v1/schema_controller.rb
index 80b2cb6..1d50daa 100644
--- a/services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/services/api/app/controllers/arvados/v1/schema_controller.rb
@@ -193,9 +193,9 @@ class Arvados::V1::SchemaController < ApplicationController
limit: {
type: "integer",
description: "Maximum number of #{k.to_s.underscore.pluralize} to return.",
- default: "100",
+ default: 100,
format: "int32",
- minimum: "0",
+ minimum: 0,
location: "query"
},
pageToken: {
commit 8d149b6d680e124f4079dfd5788ead5dbbc34c41
Author: Tim Pierce <twp at clinicalfuture.com>
Date: Mon Dec 23 15:13:19 2013 -0500
Reorganizing API documentation to support new navbar (refs #1651).
Add site.navbar.api to _config.yml, and add matching "navmenu" fields to API documentation pages.
diff --git a/doc/_config.yml b/doc/_config.yml
index d214f84..a4fed53 100644
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@ -2,7 +2,11 @@ baseurl: /doc
arvados_api_host: qr1hi.arvadosapi.com
navbar:
userguide:
- - Getting Started
- - Tutorials
- - Examples
- - Reference
+ - Getting Started
+ - Tutorials
+ - Examples
+ - Reference
+ api:
+ - Concepts
+ - API Methods
+ - Schema
diff --git a/doc/_includes/navbar_left.html b/doc/_includes/navbar_left.html
index 81e94b7..d593ff3 100644
--- a/doc/_includes/navbar_left.html
+++ b/doc/_includes/navbar_left.html
@@ -1,14 +1,14 @@
<div class="span3">
<div class="affix-top">
<div class="well sidebar-nav">
- {% if page.navsection == 'userguide' %}
+ {% if page.navsection == 'userguide' or page.navsection == 'api' %}
<ol class="nav nav-list">
- {% for menu_item in site.navbar.userguide %}
+ {% for menu_item in site.navbar[page.navsection] %}
<li>{{ menu_item }}
<ol class="nav nav-list">
{% for navorder in (0..99) %}
{% for p in site.pages %}
- {% if p.navmenu == menu_item and p.navorder == navorder %}
+ {% 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>
diff --git a/doc/api/ApiClientAuthorization.textile b/doc/api/ApiClientAuthorization.textile
index 133b9cb..cb8a8e6 100644
--- a/doc/api/ApiClientAuthorization.textile
+++ b/doc/api/ApiClientAuthorization.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: ApiClientAuthorization"
navorder: 101
---
diff --git a/doc/api/ApiClients.textile b/doc/api/ApiClients.textile
index b4bc5d1..7acfcf0 100644
--- a/doc/api/ApiClients.textile
+++ b/doc/api/ApiClients.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: ApiClient"
navorder: 101
---
diff --git a/doc/api/AuthorizedKey.textile b/doc/api/AuthorizedKey.textile
index 6450807..28b7769 100644
--- a/doc/api/AuthorizedKey.textile
+++ b/doc/api/AuthorizedKey.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: AuthorizedKey"
navorder: 101
---
diff --git a/doc/api/Collections.textile b/doc/api/Collections.textile
index 428cddd..90dcf2e 100644
--- a/doc/api/Collections.textile
+++ b/doc/api/Collections.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: Collections"
navorder: 13
---
diff --git a/doc/api/Commit.textile b/doc/api/Commit.textile
index 9bb8dbf..dddb61e 100644
--- a/doc/api/Commit.textile
+++ b/doc/api/Commit.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: Commit"
navorder: 101
---
diff --git a/doc/api/CommitAncestor.textile b/doc/api/CommitAncestor.textile
index d8921c3..ae444ea 100644
--- a/doc/api/CommitAncestor.textile
+++ b/doc/api/CommitAncestor.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: CommitAncestor"
navorder: 101
---
diff --git a/doc/api/Group.textile b/doc/api/Group.textile
index 5b4fae8..853d052 100644
--- a/doc/api/Group.textile
+++ b/doc/api/Group.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: Group"
navorder: 101
---
diff --git a/doc/api/Human.textile b/doc/api/Human.textile
index 15718f3..11a1dde 100644
--- a/doc/api/Human.textile
+++ b/doc/api/Human.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: Human"
navorder: 101
---
diff --git a/doc/api/JobTasks.textile b/doc/api/JobTasks.textile
index 7cb3ea3..656ca1d 100644
--- a/doc/api/JobTasks.textile
+++ b/doc/api/JobTasks.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: JobTasks"
navorder: 16
---
diff --git a/doc/api/Jobs.textile b/doc/api/Jobs.textile
index d238c13..b837b3e 100644
--- a/doc/api/Jobs.textile
+++ b/doc/api/Jobs.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: Jobs"
navorder: 15
---
diff --git a/doc/api/KeepDisk.textile b/doc/api/KeepDisk.textile
index 6873e8b..b013ede 100644
--- a/doc/api/KeepDisk.textile
+++ b/doc/api/KeepDisk.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: KeepDisk"
navorder: 101
---
diff --git a/doc/api/Link.textile b/doc/api/Link.textile
index 95ddeb5..1bffc1f 100644
--- a/doc/api/Link.textile
+++ b/doc/api/Link.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: Link"
navorder: 101
---
diff --git a/doc/api/Links.textile b/doc/api/Links.textile
index be3c089..5faa9b0 100644
--- a/doc/api/Links.textile
+++ b/doc/api/Links.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: Links"
navorder: 17
---
diff --git a/doc/api/Log.textile b/doc/api/Log.textile
index adeb166..34ec27f 100644
--- a/doc/api/Log.textile
+++ b/doc/api/Log.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: Log"
navorder: 101
---
diff --git a/doc/api/Node.textile b/doc/api/Node.textile
index 9c4c426..c2f0ee9 100644
--- a/doc/api/Node.textile
+++ b/doc/api/Node.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: Node"
navorder: 101
---
diff --git a/doc/api/PipelineInstance.textile b/doc/api/PipelineInstance.textile
index 9b4c9a3..2a646c9 100644
--- a/doc/api/PipelineInstance.textile
+++ b/doc/api/PipelineInstance.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: PipelineInstance"
navorder: 101
---
diff --git a/doc/api/PipelineTemplate.textile b/doc/api/PipelineTemplate.textile
index 84e0128..c316ac4 100644
--- a/doc/api/PipelineTemplate.textile
+++ b/doc/api/PipelineTemplate.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: PipelineTemplate"
navorder: 101
---
diff --git a/doc/api/Repository.textile b/doc/api/Repository.textile
index ad95479..f014b48 100644
--- a/doc/api/Repository.textile
+++ b/doc/api/Repository.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: Repository"
navorder: 101
---
diff --git a/doc/api/Specimen.textile b/doc/api/Specimen.textile
index 90216aa..dcb4326 100644
--- a/doc/api/Specimen.textile
+++ b/doc/api/Specimen.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: Specimen"
navorder: 101
---
diff --git a/doc/api/Trait.textile b/doc/api/Trait.textile
index d2e625d..49c444e 100644
--- a/doc/api/Trait.textile
+++ b/doc/api/Trait.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: Trait"
navorder: 101
---
diff --git a/doc/api/User.textile b/doc/api/User.textile
index d5fce1a..5d9d90d 100644
--- a/doc/api/User.textile
+++ b/doc/api/User.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: User"
navorder: 101
---
diff --git a/doc/api/VirtualMachine.textile b/doc/api/VirtualMachine.textile
index 964df01..241f4c7 100644
--- a/doc/api/VirtualMachine.textile
+++ b/doc/api/VirtualMachine.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Schema
title: "Resource: VirtualMachine"
navorder: 101
---
diff --git a/doc/api/authentication.textile b/doc/api/authentication.textile
index e48be7d..d02f834 100644
--- a/doc/api/authentication.textile
+++ b/doc/api/authentication.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Concepts
title: Authentication
navorder: 2
---
diff --git a/doc/api/crunch-scripts.textile b/doc/api/crunch-scripts.textile
index 859e5a7..10f0c65 100644
--- a/doc/api/crunch-scripts.textile
+++ b/doc/api/crunch-scripts.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Concepts
title: Crunch scripts
navorder: 5
---
diff --git a/doc/api/methods.textile b/doc/api/methods.textile
index 5b47d3f..fd11ddb 100644
--- a/doc/api/methods.textile
+++ b/doc/api/methods.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Concepts
title: REST methods
navorder: 3
---
diff --git a/doc/api/permission-model.textile b/doc/api/permission-model.textile
index 78b8384..843ab25 100644
--- a/doc/api/permission-model.textile
+++ b/doc/api/permission-model.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Concepts
title: "Permission model"
navorder: 6
---
diff --git a/doc/api/resources.textile b/doc/api/resources.textile
index e6ab62e..f7c1e69 100644
--- a/doc/api/resources.textile
+++ b/doc/api/resources.textile
@@ -1,6 +1,7 @@
---
layout: default
navsection: api
+navmenu: Concepts
title: Resources
navorder: 4
---
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list