You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/10/23 23:41:04 UTC
[isis] branch ISIS-2062 updated: ISIS-2062: more messing with toc
and menus
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-2062 by this push:
new 911e751 ISIS-2062: more messing with toc and menus
911e751 is described below
commit 911e75149b42c541dc2595492c9fba65204123d8
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Oct 24 00:40:49 2019 +0100
ISIS-2062: more messing with toc and menus
---
antora/components/toc/modules/ROOT/nav.adoc | 110 ++++++----------
.../components/toc/modules/ROOT/pages/about.adoc | 139 ++++++++-------------
.../_adoc/modules/schema/partials/module-nav.adoc | 2 +-
.../modules/ext-asciidoc/partials/module-nav.adoc | 2 +-
.../modules/ext-markdown/partials/module-nav.adoc | 2 +-
.../partials/module-nav.adoc | 2 +-
site.yml | 3 +-
7 files changed, 100 insertions(+), 160 deletions(-)
diff --git a/antora/components/toc/modules/ROOT/nav.adoc b/antora/components/toc/modules/ROOT/nav.adoc
index 365096b..6c796c6 100644
--- a/antora/components/toc/modules/ROOT/nav.adoc
+++ b/antora/components/toc/modules/ROOT/nav.adoc
@@ -1,105 +1,73 @@
* What is Apache Isis?
** *xref:what-is-apache-isis/isis-in-pictures.adoc[Apache Isis in pictures]*
** xref:what-is-apache-isis/common-use-cases.adoc[Common Use Cases]
+** xref:what-is-apache-isis/screencasts.adoc[Screencasts]
+** xref:what-is-apache-isis/powered-by.adoc[Powered By]
-//* Examples
-//** xref:what-is-apache-isis/screencasts.adoc[Screencasts]
-//** xref:what-is-apache-isis/powered-by.adoc[Powered By]
+* Quick Start
-* Starter Apps
+** Starter Apps
-** xref:helloworld:ROOT:about.adoc[HelloWorld archetype]
-** xref:simpleapp:ROOT:about.adoc[SimpleApp archetype]
+*** xref:helloworld:ROOT:about.adoc[HelloWorld archetype]
+*** xref:simpleapp:ROOT:about.adoc[SimpleApp archetype]
+** Demos & Tutorials
-* User Guides
+*** xref:demoapp:ROOT:about.adoc[Demo App]
+*** link:https://danhaywood.gitlab.io/isis-petclinic-tutorial-docs/petclinic/1.16.2/intro.html[Petclinic (tutorial)]
-** *xref:ug:ROOT:about.adoc[Fundamentals & Beyond]*
-** *xref:demoapp:ROOT:about.adoc[Demo App]*
-** link:https://danhaywood.gitlab.io/isis-petclinic-tutorial-docs/petclinic/1.16.2/intro.html[Petclinic (tutorial)]
-* xref:rg:ROOT:about.adoc[Reference Guide]
-
-** *xref:rg:ant:about.adoc[Annotations]*
-** *xref:rg:svc:about.adoc[Domain Services]*
-** xref:rg:cms:about.adoc[Classes & Methods]
-** xref:rg:schema:about.adoc[Schemas]
-** xref:rg:cfg:about.adoc[Configuration]
-
-* Testing & Prototyping
+* Guides
+** *xref:ug:ROOT:about.adoc[User Guide]*
+** xref:rg:ROOT:about.adoc[Reference Guide]
** *xref:testing:ROOT:about.adoc[Testing]*
-* Wicket Viewer
-
-** xref:vw:ROOT:about.adoc[User Guide]
-** xref:vw:ext-viewer-wicket-excel:about.adoc[Excel Download (extension)]
-** xref:vw:ext-asciidoc:about.adoc[Asciidoc value type (extension)]
-** xref:vw:ext-markdown:about.adoc[Markdown value type (extension)]
-** xref:ext-sse:ROOT:about.adoc[Server Sent Events (extension)]
-
-* Restful Objects Viewer
-
-** xref:vro:ROOT:about.adoc[User Guide]
-** link:https://github/TODO/TODO[Seb's viewer (3rd party)]
-** link:https://github/TODO/TODO[Joerg's viewer (3rd party)]
-
-* Incubator
+* Components
-** xref:ext-incubator:ROOT:about.adoc[Experimental framework extensions]
+** xref:vw:ROOT:about.adoc[Wicket Viewer]
+** xref:vro:ROOT:about.adoc[Restful Objects]
+** xref:odn:ROOT:about.adoc[DataNucleus Object Store]
+** xref:security:ROOT:about.adoc[Security Guide]
+*** xref:ext-secman:ROOT:about.adoc[SecMan (extension)]
-* DataNucleus Object Store
-** xref:odn:ROOT:about.adoc[User Guide]
+* Support
+** Resources
-* Security
+*** xref:toc:devguide:about.adoc[Developers' Guide]
+*** xref:mavendeps:ROOT:about.adoc[Maven mixins]
-** xref:security:ROOT:about.adoc[User Guide]
-** xref:ext-secman:ROOT:about.adoc[Security Manager (extension)]
+** Mailing Lists
+*** xref:toc:ROOT:mailing-list/how-to-subscribe.adoc[How to subscribe]
+** Releases
-* Support Resources
+*** xref:toc:ROOT:downloads/how-to.adoc[Downloads]
+*** xref:relnotes:ROOT:about.adoc[Release Notes]
+*** xref:mignotes:ROOT:about.adoc[Migration Notes]
-** xref:toc:devguide:about.adoc[Developers' Guide]
-*** xref:toc:devguide:about.adoc#intellij[IntelliJ]
-*** xref:toc:devguide:about.adoc#eclipse[EclipseJ]
-*** xref:toc:devguide:about.adoc#contributing[Pull requests]p
-** xref:mavendeps:ROOT:about.adoc[Maven mixins]
-
-* Help
-
-** xref:toc:ROOT:mailing-list/how-to-subscribe.adoc[How to subscribe]
-** link:https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=87[JIRA] +
+** Other Resources
+*** link:https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=87[JIRA] +
_for bug reports & feature requests_
-* Releases
-
-** xref:toc:ROOT:downloads/how-to.adoc[Downloads]
-[external]
-** xref:relnotes:ROOT:about.adoc[Release Notes]
-[external]
-** xref:mignotes:ROOT:about.adoc[Migration Notes]
-
-
+* Internal
-* Committers
+** Committers
-** xref:toc:comguide:about.adoc[Committers' Guide]
-*** xref:toc:comguide:about.adoc#cutting-a-release[Cutting a Release]
-*** xref:toc:comguide:about.adoc#verifying-releases[Verifying a Release]
+*** xref:toc:comguide:about.adoc[Committers' Guide]
+**** xref:toc:comguide:about.adoc#cutting-a-release[Cutting a Release]
+**** xref:toc:comguide:about.adoc#verifying-releases[Verifying a Release]
-* Implementation
+** Implementation
-[external]
-** xref:archdesign:ROOT:about.adoc[Architecture & Design]
-[external]
-** xref:runtime-services:ROOT:about.adoc[Framework Internal Services]
-[external]
-** xref:smoketests:ROOT:about.adoc[SmokeTest App]
+*** xref:archdesign:ROOT:about.adoc[Architecture & Design]
+*** xref:runtime-services:ROOT:about.adoc[Framework Internal Services]
+*** xref:smoketests:ROOT:about.adoc[SmokeTest App]
diff --git a/antora/components/toc/modules/ROOT/pages/about.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
index ffa2c6b..5e4fc22 100644
--- a/antora/components/toc/modules/ROOT/pages/about.adoc
+++ b/antora/components/toc/modules/ROOT/pages/about.adoc
@@ -1,3 +1,4 @@
+= Menu
:notice: licensed to the apache software foundation (asf) under one or more contributor license agreements. see the notice file distributed with this work for additional information regarding copyright ownership. the asf licenses this file to you under the apache license, version 2.0 (the "license"); you may not use this file except in compliance with the license. you may obtain a copy of the license at. http://www.apache.org/licenses/license-2.0 . unless required by applicable law or ag [...]
include::_attributes.adoc[]
@@ -12,108 +13,95 @@ include::_attributes.adoc[]
* *xref:what-is-apache-isis/isis-in-pictures.adoc[Apache Isis in pictures]*
* xref:what-is-apache-isis/common-use-cases.adoc[Common Use Cases]
-| *Examples*
-
* xref:what-is-apache-isis/screencasts.adoc[Screencasts]
* xref:what-is-apache-isis/powered-by.adoc[Powered By]
-| *xref:toc:ROOT:quick-start.adoc#starter-apps[Starter Apps]*
+| *Quick Start*
-* xref:helloworld:ROOT:about.adoc[HelloWorld]
+* xref:helloworld:ROOT:about.adoc[Hello World]
* xref:simpleapp:ROOT:about.adoc[SimpleApp]
-| *xref:toc:ROOT:guides.adoc#user-guides[User Guides]*
-
-* *xref:ug:ROOT:about.adoc[Fundamentals & Beyond]*
-* *xref:demoapp:ROOT:about.adoc[Demo App]*
-
-_Tutorials:_
+_Demos & Tutorials:_
+* xref:demoapp:ROOT:about.adoc[Demo App]
* link:https://danhaywood.gitlab.io/isis-petclinic-tutorial-docs/petclinic/1.16.2/intro.html[Petclinic]
-| *xref:rg:ROOT:about.adoc[Reference Guide]*
-
-* xref:rg:ant:about.adoc[Annotations]
-* xref:rg:svc:about.adoc[Domain Services]
-* xref:rg:cms:about.adoc[Classes & Methods]
-* xref:rg:schema:about.adoc[Schemas]
-* xref:rg:cfg:about.adoc[Configuration]
-
-
-| *xref:toc:ROOT:guides.adoc#testing-prototyping[Testing & Prototyping]*
+| *Guides*
+* *xref:ug:ROOT:about.adoc[User Guide]*
+* *xref:rg:ROOT:about.adoc[Reference Guide]*
* *xref:testing:ROOT:about.adoc[Testing]*
+| *Components*
+* xref:vw:ROOT:about.adoc[Wicket Viewer] +
+ + extensions
+* xref:vro:ROOT:about.adoc[Restful Objects Viewer]
+* xref:odn:ROOT:about.adoc[DataNucleus Object Store]
+* xref:security:ROOT:about.adoc[Security Guide]
+** xref:ext-secman:ROOT:about.adoc[SecMan (extension)]
-| *xref:toc:ROOT:components.adoc#wicket-viewer[Wicket Viewer]*
-* xref:vw:ROOT:about.adoc[User Guide]
+| *Support*
-_Extensions:_
-
-* xref:vw:ext-viewer-wicket-excel:about.adoc[Excel Download]
-* xref:vw:ext-asciidoc:about.adoc[Asciidoc value type ]
-* xref:vw:ext-markdown:about.adoc[Markdown value type]
-* xref:ext-sse:ROOT:about.adoc[Server Sent Events]
-* xref:ext-incubator:ROOT:about.adoc[Experimental framework extensions]
-
-| *xref:toc:ROOT:components.adoc#restful-objects-viewer[Restful Objects Viewer]*
-
-* xref:vro:ROOT:about.adoc[User Guide]
+* xref:toc:devguide:about.adoc[Developers' Guide]
+* xref:mavendeps:ROOT:about.adoc[Maven mixins]
-_3rd Party (not ASF):_
+_Mailing Lists_
-** link:https://github/TODO/TODO[Seb's viewer]
-** link:https://github/TODO/TODO[Joerg's viewer]
+* xref:toc:ROOT:mailing-list/how-to-subscribe.adoc[How to subscribe]
+* link:https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=87[JIRA] +
-*xref:toc:ROOT:components.adoc#datanucleus-object-store[DataNucleus Object Store]*
-* xref:odn:ROOT:about.adoc[User Guide]
+| *Releases*
-| *xref:toc:ROOT:components.adoc#security[Security]*
+* xref:toc:ROOT:downloads/how-to.adoc[Downloads]
+* xref:relnotes:ROOT:about.adoc[Release Notes]
+* xref:mignotes:ROOT:about.adoc[Migration Notes]
-* xref:security:ROOT:about.adoc[User Guide]
+_Other Resources_
-_Extensions:_
+* link:https://cwiki.apache.org/confluence/display/ISIS/Index[ASF Wiki]
+* link:https://fisheye.apache.org/browse/~br=master/isis-git/[ASF Fisheye]
+* link:http://stackoverflow.com/questions/tagged/isis[Stack Overflow]
-* xref:ext-secman:ROOT:about.adoc[Security Manager]
-| *xref:toc:ROOT:support.adoc#resources[Support Resources]*
+| *Other Extensions*
-* xref:toc:devguide:about.adoc[Developers' Guide]
-** xref:toc:devguide:about.adoc#intellij[IntelliJ] & xref:toc:devguide:about.adoc#eclipse[Eclipse]
-** xref:toc:devguide:contributing.adoc[Pull requests]
-//** xref:toc:devguide:asciidoc-syntax.adoc[Asciidoc syntax]
+* xref:ext-restclient:ROOT:about.adoc[REST Client]
+* xref:ext-incubator:ROOT:about.adoc[Incubator]
-* xref:mavendeps:ROOT:about.adoc[Maven mixins]
-| xref:toc:ROOT:support.adoc#help[*Help]*
+|*3rd party*
-* xref:toc:ROOT:mailing-list/how-to-subscribe.adoc[How to subscribe]
+* link:https://github.com/sebastianslutzky/AngularViewerCLI[AngularViewer]
+* link:https://github.com/joerg-rade/kroviz[Kroviz]
+* link:https://platform.incode.org[Incode Platform]
-* link:https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=87[JIRA] +
-_for bug reports & feature requests_
+_nb: not ASF_
-|*xref:toc:ROOT:support.adoc#releases[Releases]*
+| *Real-world Apps*
- * xref:toc:ROOT:downloads/how-to.adoc[Downloads]
- * xref:relnotes:ROOT:about.adoc[Release Notes]
- * xref:mignotes:ROOT:about.adoc[Migration Notes]
+* https://github.com/estatio/estatio[Estatio]
+* https://github.com/incodehq/contactapp[ContactApp]
+* https://github.com/incodehq/ecpcrm[ECP CRM]
+*Example Apps*
+* https://github.com/isisaddons/isis-app-todoapp[TodoApp]
+* https://github.com/isisaddons/isis-app-kitchensink[Kitchensink]
+* https://github.com/isisaddons/isis-app-quickstart[Quickstart]
-|*xref:toc:ROOT:internal.adoc#committers[Committers]*
+|*Internal*
* xref:toc:comguide:about.adoc[Committers' Guide]
** xref:toc:comguide:about.adoc#cutting-a-release[Cutting a Release]
** xref:toc:comguide:about.adoc#verifying-releases[Verifying a Release]
-
-|*xref:toc:ROOT:internal.adoc#implementation[Implementation]*
+_Implementation_
* xref:archdesign:ROOT:about.adoc[Architecture & Design]
* xref:runtime-services:ROOT:about.adoc[Framework Internal Services]
@@ -121,47 +109,30 @@ _for bug reports & feature requests_
-|*Going Deeper*
-
-* xref:going-deeper/articles-and-presentations.adoc[Articles, Conferences, Podcasts]
-* xref:going-deeper/books.adoc[Books]
-* link:../ug/fun/_attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf[Naked Objects PhD thesis] (Pawson)
-|*3rd party*
-* https://platform.incode.org[Incode Platform]
-* https://github.com/incodehq/incode-examples[Incode Domain Examples]
-* https://github.com/incodehq/incode-camel[Incode Camel App]
+| *Further reading:*
-_nb: not ASF_
+* xref:going-deeper/articles-and-presentations.adoc[Articles & Presentations]
+* xref:going-deeper/books.adoc[Books]
-| *Real-world Apps*
-* https://github.com/estatio/estatio[Estatio]
-* https://github.com/incodehq/contactapp[ContactApp]
-* https://github.com/incodehq/ecpcrm[ECP CRM]
-*Example Apps*
+| *Academia*
-* https://github.com/isisaddons/isis-app-todoapp[TodoApp]
-* https://github.com/isisaddons/isis-app-kitchensink[Kitchensink]
-* https://github.com/isisaddons/isis-app-quickstart[Quickstart]
+* link:../ug/fun/_attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf[Naked Objects PhD] (Pawson)
+* https://esc.fnwi.uva.nl/thesis/centraal/files/f270412620.pdf[CLIsis: An interface for Visually Impaired Users] (Bachelors dissertation, Ginn)
+* https://esc.fnwi.uva.nl/thesis/centraal/files/f1051832702.pdf[Using blockchain to validate audit trail data in private business applications] (Masters dissertation, Kalis)
-*Experiments*
+_Experiments_
* https://github.com/isisaddons/isis-app-neoapp[Neo4J Example]
* https://github.com/isisaddons/isis-app-simpledsl[Isis DSL Example]
-| *Other academia*
-
-* https://esc.fnwi.uva.nl/thesis/centraal/files/f270412620.pdf[CLIsis: An interface for Visually Impaired Users] (Bachelors dissertation, Ginn)
-* https://esc.fnwi.uva.nl/thesis/centraal/files/f1051832702.pdf[Using blockchain to validate audit trail data in private business applications] (Masters dissertation, Kalis)
-
-
|===
diff --git a/core/schema/_adoc/modules/schema/partials/module-nav.adoc b/core/schema/_adoc/modules/schema/partials/module-nav.adoc
index 6a00890..3452ee2 100644
--- a/core/schema/_adoc/modules/schema/partials/module-nav.adoc
+++ b/core/schema/_adoc/modules/schema/partials/module-nav.adoc
@@ -1,4 +1,4 @@
-* xref:rg:schema:aabout.adoc[Schema]
+* xref:rg:schema:about.adoc[Schema]
** xref:rg:schema:mml.adoc[MetaModel]
** xref:rg:schema:cmd.adoc[Command]
diff --git a/extensions/asciidoc/_adoc/modules/ext-asciidoc/partials/module-nav.adoc b/extensions/asciidoc/_adoc/modules/ext-asciidoc/partials/module-nav.adoc
index 2fbec5f..ec1801f 100644
--- a/extensions/asciidoc/_adoc/modules/ext-asciidoc/partials/module-nav.adoc
+++ b/extensions/asciidoc/_adoc/modules/ext-asciidoc/partials/module-nav.adoc
@@ -1,2 +1,2 @@
-* xref:vw:ext-asciidoc:about.adoc[About]
+* xref:vw:ext-asciidoc:about.adoc[Asciidoc value type (extension)]
diff --git a/extensions/markdown/_adoc/modules/ext-markdown/partials/module-nav.adoc b/extensions/markdown/_adoc/modules/ext-markdown/partials/module-nav.adoc
index 46d95a3..9cf596c 100644
--- a/extensions/markdown/_adoc/modules/ext-markdown/partials/module-nav.adoc
+++ b/extensions/markdown/_adoc/modules/ext-markdown/partials/module-nav.adoc
@@ -1,2 +1,2 @@
-* xref:vw:ext-markdown:about.adoc[About]
+* xref:vw:ext-markdown:about.adoc[Markdown value type (extension)]
diff --git a/extensions/viewer-wicket-excel/_adoc/modules/ext-viewer-wicket-excel/partials/module-nav.adoc b/extensions/viewer-wicket-excel/_adoc/modules/ext-viewer-wicket-excel/partials/module-nav.adoc
index b53450e..1b88c1d 100644
--- a/extensions/viewer-wicket-excel/_adoc/modules/ext-viewer-wicket-excel/partials/module-nav.adoc
+++ b/extensions/viewer-wicket-excel/_adoc/modules/ext-viewer-wicket-excel/partials/module-nav.adoc
@@ -1,2 +1,2 @@
-* xref:vw:ext-viewer-wicket-excel:about.adoc[About]
+* xref:vw:ext-viewer-wicket-excel:about.adoc[Excel Download (extension)]
diff --git a/site.yml b/site.yml
index 12ec137..a3a6851 100644
--- a/site.yml
+++ b/site.yml
@@ -132,7 +132,8 @@ content:
ui:
bundle:
- url: antora/theme/ui-bundle.zip
+ url: ../isis-antora/build/ui-bundle.zip
+ #url: antora/theme/ui-bundle.zip
snapshot: true
supplemental_files: antora/supplemental-ui