Repository: incubator-edgent-website Updated Branches: refs/heads/master 0fbd28090 -> e9dfca502
[EDGENT-327] Use local Javadoc URLs Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/commit/7080f26d Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/tree/7080f26d Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/diff/7080f26d Branch: refs/heads/master Commit: 7080f26d0ba23b5de8ee933f5a37bb88e1123ac3 Parents: 0fbd280 Author: Queenie Ma <queeniema.apa...@gmail.com> Authored: Thu Jan 5 11:10:51 2017 -0800 Committer: Queenie Ma <queeniema.apa...@gmail.com> Committed: Mon Jan 9 09:19:29 2017 -0800 ---------------------------------------------------------------------- build.sh | 1 + site/_config.yml | 4 ++-- site/_data/mydoc/mydoc_topnav.yml | 8 ++++---- site/favicon.ico | Bin 0 -> 1150 bytes 4 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/blob/7080f26d/build.sh ---------------------------------------------------------------------- diff --git a/build.sh b/build.sh index 5ef9992..9cabe81 100644 --- a/build.sh +++ b/build.sh @@ -1,6 +1,7 @@ set -e cd site jekyll build -d ../content_tmp +sed -i "" "/^@import/d; s/'DejaVu Sans',//g; s/'DejaVu Sans Mono',//g; s/'DejaVu Serif',//g" ../content_tmp/javadoc/*/stylesheet.css COMMIT_HASH=`git rev-parse HEAD` cd .. git checkout asf-site http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/blob/7080f26d/site/_config.yml ---------------------------------------------------------------------- diff --git a/site/_config.yml b/site/_config.yml index 0fa3656..e51c4d1 100755 --- a/site/_config.yml +++ b/site/_config.yml @@ -126,9 +126,9 @@ host: 127.0.0.1 sourcerepourl: https://github.com/apache/incubator-edgent downloadsurl: /docs/downloads projurl: / -#docsurl: /javadoc/latest +docsurl: /javadoc/latest # above yields things like the following when running on a "jekyll serve" test server # [2016-12-22 15:23:31] ERROR `/favicon.ico' not found. # [2016-12-22 15:33:17] ERROR `/javadoc/latest/resources/fonts/dejavu.css' not found. # the following is undesirable as it doesn't link to the "jekyll serve" test server -docsurl: https://edgent.incubator.apache.org/javadoc/latest +# docsurl: https://edgent.incubator.apache.org/javadoc/latest http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/blob/7080f26d/site/_data/mydoc/mydoc_topnav.yml ---------------------------------------------------------------------- diff --git a/site/_data/mydoc/mydoc_topnav.yml b/site/_data/mydoc/mydoc_topnav.yml index 8fb9c7a..38141ab 100644 --- a/site/_data/mydoc/mydoc_topnav.yml +++ b/site/_data/mydoc/mydoc_topnav.yml @@ -60,8 +60,8 @@ javadoc_dropdowns: version: all output: web items: - - title: lastest - external_url: http://edgent.incubator.apache.org/javadoc/latest/index.html + - title: latest + url: /..\/javadoc\/latest audience: writers, designers platform: all product: all @@ -69,7 +69,7 @@ javadoc_dropdowns: output: web - title: 1.0.0 - external_url: http://edgent.incubator.apache.org/javadoc/r1.0.0/index.html + url: /..\/javadoc\/r1.0.0 audience: writers, designers platform: all product: all @@ -77,7 +77,7 @@ javadoc_dropdowns: output: web - title: 0.4.0 - external_url: http://edgent.incubator.apache.org/javadoc/r0.4.0/index.html + url: /..\/javadoc\/r0.4.0 audience: writers, designers platform: all product: all http://git-wip-us.apache.org/repos/asf/incubator-edgent-website/blob/7080f26d/site/favicon.ico ---------------------------------------------------------------------- diff --git a/site/favicon.ico b/site/favicon.ico new file mode 100644 index 0000000..7a1f9ac Binary files /dev/null and b/site/favicon.ico differ
