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 2020/03/18 09:22:51 UTC
[isis] 01/07: ISIS-2062: updates docs
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M3-RC1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ad1c5b3a16168a2b9fdf0d7b713938b5387ad236
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Mar 17 22:11:05 2020 +0000
ISIS-2062: updates docs
---
antora/supplemental-ui/index.html | 47 ++++++++++++----------
.../modules/starters/pages/helloworld-script.adoc | 9 +----
.../modules/starters/pages/simpleapp-script.adoc | 9 +----
3 files changed, 29 insertions(+), 36 deletions(-)
diff --git a/antora/supplemental-ui/index.html b/antora/supplemental-ui/index.html
index f9d02f5..d0b090b 100644
--- a/antora/supplemental-ui/index.html
+++ b/antora/supplemental-ui/index.html
@@ -613,13 +613,11 @@ Examples
<div class="col-lg-6 text-left text-lg-left">
<p class="cta-text text-center" style="margin-block-end: 0; ">
Learn about Apache Isis™ by running the minimal <a href="docs/latest/starters/helloworld.html">helloworld</a> starter app.
- <span><img id="helloworld-copy" src="_/img/home/clipboard-copy.png" width="16" height="16"/></span>
</p>
</div>
<div class="col-lg-6 text-left text-lg-left">
<p class="cta-text text-center" style="margin-block-end: 0; ">
Develop your own Apache Isis™ app using the more structured <a href="docs/latest/starters/simpleapp.html">simpleapp</a> starter app.
- <span><img id="simpleapp-copy" src="_/img/home/clipboard-copy.png" width="16" height="16"/></span>
</p>
</div>
</div>
@@ -646,19 +644,29 @@ mvn -pl webapp spring-boot:run</pre>
</div>
</div>
<div class="row">
+ <div class="col-lg-6 text-left text-lg-left">
+ <p class="cta-text text-center" style="margin-block-end: 0; margin-top: -20px;">
+ <span id="helloworld-copy" style="cursor: pointer;"><img src="_/img/home/clipboard-copy.png" width="16" height="16"/> Copy text</span>
+ </p>
+ </div>
+ <div class="col-lg-6 text-left text-lg-left">
+ <p class="cta-text text-center" style="margin-block-end: 0; margin-top: -20px;">
+ <span id="simpleapp-copy" style="cursor: pointer;"><img src="_/img/home/clipboard-copy.png" width="16" height="16"/> Copy text</span>
+ </p>
+ </div>
+ </div>
+
+ <div class="row">
<p class="cta-text text-center" style="margin-block-end: 0; margin-left: 20px; margin-top: 20px;">
If you want to use the previous 1.x version, you can use these Maven archetypes.
</p>
<div class="col-lg-6 text-left text-lg-left">
<p>
<pre>
-APP=helloworld
-VERSION=1.17.0
-
mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
-D archetypeArtifactId=helloworld-archetype \
- -D archetypeVersion=$VERSION \
+ -D archetypeVersion=1.17.0 \
-D groupId=com.mycompany \
-D artifactId=myapp \
-D version=1.0-SNAPSHOT \
@@ -671,13 +679,10 @@ mvn jetty:run</pre>
<div class="col-lg-6 text-center text-lg-left">
<p>
<pre>
-APP=simpleapp
-VERSION=1.17.0
-
mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
-D archetypeArtifactId=$APP-archetype \
- -D archetypeVersion=$VERSION \
+ -D archetypeVersion=1.17.0 \
-D groupId=com.mycompany \
-D artifactId=myapp \
-D version=1.0-SNAPSHOT \
@@ -896,30 +901,28 @@ mvn -pl webapp jetty:run</pre>
<script src="_/js/home/lib/sticky/sticky.js"></script>
<script>
- document.querySelector('img#helloworld-copy').addEventListener('click', async event => {
+ document.querySelector('#helloworld-copy').addEventListener('click', async event => {
if (!navigator.clipboard) {
- document.querySelector('#helloworld-copy').remove()
+ document.querySelector('#helloworld-copy').remove();
return
}
- const text = document.querySelector('#helloworld-text').innerHTML
+ const text = document.querySelector('#helloworld-text').innerHTML;
try {
- await navigator.clipboard.writeText(text)
- event.target.textContent = 'Copied to clipboard'
- alert("text copied")
+ await navigator.clipboard.writeText(text);
+ event.target.textContent = 'Copied to clipboard';
} catch (err) {
alert("Failed to copy :-(", err)
}
});
- document.querySelector('img#simpleapp-copy').addEventListener('click', async event => {
+ document.querySelector('#simpleapp-copy').addEventListener('click', async event => {
if (!navigator.clipboard) {
- document.querySelector('#simpleapp-copy').remove()
+ document.querySelector('#simpleapp-copy').remove();
return
}
- const text = document.querySelector('#simpleapp-text').innerHTML
+ const text = document.querySelector('#simpleapp-text').innerHTML;
try {
- await navigator.clipboard.writeText(text)
- event.target.textContent = 'Copied to clipboard'
- alert("text copied")
+ await navigator.clipboard.writeText(text);
+ event.target.textContent = 'Copied to clipboard';
} catch (err) {
alert("Failed to copy :-(", err)
}
diff --git a/starters/adoc/modules/starters/pages/helloworld-script.adoc b/starters/adoc/modules/starters/pages/helloworld-script.adoc
index a7f250f..c16d626 100644
--- a/starters/adoc/modules/starters/pages/helloworld-script.adoc
+++ b/starters/adoc/modules/starters/pages/helloworld-script.adoc
@@ -3,13 +3,8 @@
[source,bash,subs="attributes+"]
----
-APP=helloworld
-BRANCH=master
-
-REPO=isis-app-$APP
-curl "https://codeload.github.com/apache/$REPO/zip/$BRANCH" | jar xv
-mv $REPO-$BRANCH $REPO
-cd $REPO
+curl https://codeload.github.com/apache/isis-app-helloworld/zip/master | jar xv
+cd isis-app-helloworld-master
mvn clean install
mvn spring-boot:run
diff --git a/starters/adoc/modules/starters/pages/simpleapp-script.adoc b/starters/adoc/modules/starters/pages/simpleapp-script.adoc
index c633db9..0d74951 100644
--- a/starters/adoc/modules/starters/pages/simpleapp-script.adoc
+++ b/starters/adoc/modules/starters/pages/simpleapp-script.adoc
@@ -4,13 +4,8 @@
[source,bash,subs="attributes+"]
----
-APP=simpleapp
-BRANCH=master
-
-REPO=isis-app-$APP
-curl "https://codeload.github.com/apache/$REPO/zip/$BRANCH" | jar xv
-mv $REPO-$BRANCH $REPO
-cd $REPO
+curl https://codeload.github.com/apache/isis-app-simpleapp/zip/master | jar xv
+cd isis-app-simpleapp-master
mvn clean install
mvn -pl webapp spring-boot:run