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 2017/11/08 06:30:39 UTC
[10/15] isis-site git commit: ISIS-1766: updates docs for menubars
ISIS-1766: updates docs for menubars
Project: http://git-wip-us.apache.org/repos/asf/isis-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis-site/commit/20d819b0
Tree: http://git-wip-us.apache.org/repos/asf/isis-site/tree/20d819b0
Diff: http://git-wip-us.apache.org/repos/asf/isis-site/diff/20d819b0
Branch: refs/heads/asf-site
Commit: 20d819b02e06da7d370b20db58e088b358656e4f
Parents: a73614c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Nov 6 12:24:42 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Nov 6 12:24:42 2017 +0000
----------------------------------------------------------------------
content/applib/layout/component/component.xsd | 17 ++
.../layout/menubars/bootstrap3/menubars.xsd | 50 ++++++
content/applib/layout/menus/menubars.xsd | 65 --------
content/elasticlunr/index.json | 2 +-
content/guides/rgsvc/rgsvc.html | 166 ++++++++-----------
content/guides/ugvro/ugvro.html | 80 +++++----
6 files changed, 186 insertions(+), 194 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis-site/blob/20d819b0/content/applib/layout/component/component.xsd
----------------------------------------------------------------------
diff --git a/content/applib/layout/component/component.xsd b/content/applib/layout/component/component.xsd
index f780c27..7eca3ef 100644
--- a/content/applib/layout/component/component.xsd
+++ b/content/applib/layout/component/component.xsd
@@ -18,6 +18,8 @@
<xs:element name="fieldSet" type="tns:fieldSet"/>
+ <xs:element name="serviceAction" type="tns:serviceAction"/>
+
<xs:element name="property" type="tns:property"/>
<xs:complexType name="domainObject">
@@ -53,6 +55,21 @@
<xs:attribute name="promptStyle" type="tns:promptStyle"/>
</xs:complexType>
+ <xs:complexType name="serviceAction">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="named" type="xs:string"/>
+ <xs:element minOccurs="0" name="describedAs" type="xs:string"/>
+ <xs:element minOccurs="0" name="metadataError" type="xs:string"/>
+ <xs:element minOccurs="0" name="link" type="lnk:link"/>
+ </xs:sequence>
+ <xs:attribute name="objectType" type="xs:string" use="required"/>
+ <xs:attribute name="id" type="xs:string" use="required"/>
+ <xs:attribute name="namedEscaped" type="xs:boolean"/>
+ <xs:attribute name="bookmarking" type="tns:bookmarkPolicy"/>
+ <xs:attribute name="cssClass" type="xs:string"/>
+ <xs:attribute name="cssClassFa" type="xs:string"/>
+ </xs:complexType>
+
<xs:complexType name="fieldSet">
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0" ref="tns:action"/>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/20d819b0/content/applib/layout/menubars/bootstrap3/menubars.xsd
----------------------------------------------------------------------
diff --git a/content/applib/layout/menubars/bootstrap3/menubars.xsd b/content/applib/layout/menubars/bootstrap3/menubars.xsd
new file mode 100644
index 0000000..e4ad296
--- /dev/null
+++ b/content/applib/layout/menubars/bootstrap3/menubars.xsd
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:mb3="http://isis.apache.org/applib/layout/menubars/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:lnk="http://isis.apache.org/applib/layout/links"
+ xmlns:tns="http://isis.apache.org/applib/layout/menubars/bootstrap3"
+ elementFormDefault="qualified"
+ targetNamespace="http://isis.apache.org/applib/layout/menubars/bootstrap3" version="1.0">
+
+ <xs:import
+ namespace="http://isis.apache.org/applib/layout/component"
+ schemaLocation="../../component/component.xsd"/>
+
+ <xs:import
+ namespace="http://isis.apache.org/applib/layout/links"
+ schemaLocation="../../links/links.xsd"/>
+
+ <xs:element name="menuBars" type="tns:menuBars"/>
+
+ <xs:complexType name="menuBars">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="primary" type="tns:menuBar"/>
+ <xs:element minOccurs="0" name="secondary" type="tns:menuBar"/>
+ <xs:element minOccurs="0" name="tertiary" type="tns:menuBar"/>
+ <xs:element minOccurs="0" name="metadataError" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="menuBar">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" name="menu" type="tns:menu"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="menu">
+ <xs:sequence>
+ <xs:element name="named" type="xs:string"/>
+ <xs:element minOccurs="0" maxOccurs="unbounded" name="section" type="tns:section"/>
+ </xs:sequence>
+ <xs:attribute name="cssClassFa" type="xs:string"/>
+ <xs:attribute name="unreferencedActions" type="xs:boolean"/>
+ </xs:complexType>
+
+ <xs:complexType name="section">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" name="serviceAction" type="cpt:serviceAction"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/20d819b0/content/applib/layout/menus/menubars.xsd
----------------------------------------------------------------------
diff --git a/content/applib/layout/menus/menubars.xsd b/content/applib/layout/menus/menubars.xsd
deleted file mode 100644
index 15f440b..0000000
--- a/content/applib/layout/menus/menubars.xsd
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
- xmlns:lnk="http://isis.apache.org/applib/layout/links"
- xmlns:tns="http://isis.apache.org/applib/layout/menus"
- elementFormDefault="qualified"
- targetNamespace="http://isis.apache.org/applib/layout/menus" version="1.0">
-
- <xs:import
- namespace="http://isis.apache.org/applib/layout/component"
- schemaLocation="../component/component.xsd"/>
-
- <xs:import
- namespace="http://isis.apache.org/applib/layout/links"
- schemaLocation="../links/links.xsd"/>
-
- <xs:element name="action" type="tns:action"/>
-
- <xs:element name="menuBars" type="tns:menuBars"/>
-
- <xs:complexType name="menuBars">
- <xs:sequence>
- <xs:element minOccurs="0" name="primary" type="tns:menuBar"/>
- <xs:element minOccurs="0" name="secondary" type="tns:menuBar"/>
- <xs:element minOccurs="0" name="tertiary" type="tns:menuBar"/>
- <xs:element minOccurs="0" name="metadataError" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="menuBar">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="1" name="menu" type="tns:menu"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="menu">
- <xs:sequence>
- <xs:element name="named" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="1" name="section" type="tns:section"/>
- </xs:sequence>
- <xs:attribute name="cssClassFa" type="xs:string"/>
- </xs:complexType>
-
- <xs:complexType name="section">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="1" ref="tns:action"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="action">
- <xs:sequence>
- <xs:element minOccurs="0" name="named" type="xs:string"/>
- <xs:element minOccurs="0" name="describedAs" type="xs:string"/>
- <xs:element minOccurs="0" name="metadataError" type="xs:string"/>
- <xs:element minOccurs="0" name="link" type="lnk:link"/>
- </xs:sequence>
- <xs:attribute name="oid" type="xs:string" use="required"/>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="namedEscaped" type="xs:boolean"/>
- <xs:attribute name="bookmarking" type="cpt:bookmarkPolicy"/>
- <xs:attribute name="cssClass" type="xs:string"/>
- <xs:attribute name="cssClassFa" type="xs:string"/>
- </xs:complexType>
-</xs:schema>