From 48e21a507e4f1a745575c5e242d0c1b110907810 Mon Sep 17 00:00:00 2001 From: Masakazu Kitajo Date: Sat, 21 May 2016 17:31:33 +0900 Subject: [PATCH 1/3] TS-4466: Add links to other versions of the documentation (cherry picked from commit 70a23a925be4800efbd24d82217e6d22084f2e14) --- doc/_templates/layout.html | 41 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 doc/_templates/layout.html diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html new file mode 100644 index 00000000000..b4afcb7ecb8 --- /dev/null +++ b/doc/_templates/layout.html @@ -0,0 +1,41 @@ +{# + 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 agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +#} +{% extends "!layout.html" %} +{% block footer %} +
+ + Apache Traffic Server + v: {{ version }} + + +
+
+
Languages
+
English
+
日本語
+
+
+
Versions
+
latest
+
6.2.x
+
5.3.x
+
+
+
+{{ super() }} +{% endblock %} From f85938fff0e4237a40a3f92e4409e32b99dfa855 Mon Sep 17 00:00:00 2001 From: Masakazu Kitajo Date: Sat, 21 May 2016 17:46:48 +0900 Subject: [PATCH 2/3] TS-4466: Specify language explicitly (cherry picked from commit 59fb3d33391bc4f9adc0417099ea96cddac88cba) Conflicts: ci/jenkins/bin/docs.sh --- ci/jenkins/bin/docs.sh | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 ci/jenkins/bin/docs.sh diff --git a/ci/jenkins/bin/docs.sh b/ci/jenkins/bin/docs.sh new file mode 100644 index 00000000000..6754040a8c8 --- /dev/null +++ b/ci/jenkins/bin/docs.sh @@ -0,0 +1,39 @@ +#!/bin/sh +# +# 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 agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# These shenanigans are here to allow it to run both manually, and via Jenkins +test -z "${ATS_MAKE}" && ATS_MAKE="make" +test ! -z "${WORKSPACE}" && cd "${WORKSPACE}/src" + +# This avoids redoing the configure on every doc build, which is somewhat annoying +[ ! -f configure ] && autoreconf -fi +[ ! -f config.nice ] && ./configure + +cd doc + +echo "Building English version" +rm -rf docbuild/html +${ATS_MAKE} -e SPHINXOPTS="-D language='en'" html +[ $? != 0 ] && exit 1 +/usr/bin/rsync --delete -av docbuild/html/ /home/docs/en/${ATS_BRANCH} + +echo "Building JA version" +rm -rf docbuild/html +${ATS_MAKE} -e SPHINXOPTS="-D language='ja'" html +[ $? != 0 ] && exit 1 +/usr/bin/rsync --delete -av docbuild/html/ /home/docs/ja/${ATS_BRANCH} From f8254e5ec09cbbf31fbc33c6454628a133232c97 Mon Sep 17 00:00:00 2001 From: Masakazu Kitajo Date: Tue, 24 May 2016 16:16:38 +0900 Subject: [PATCH 3/3] TS-4466: Improve a layout and behavior of the switcher (cherry picked from commit ca35a0528b83c74ed7aa2f05cb73041648505b86) --- doc/_templates/layout.html | 2 +- doc/static/override.css | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html index b4afcb7ecb8..3033ee8dcad 100644 --- a/doc/_templates/layout.html +++ b/doc/_templates/layout.html @@ -17,7 +17,7 @@ #} {% extends "!layout.html" %} {% block footer %} -
+
Apache Traffic Server v: {{ version }} diff --git a/doc/static/override.css b/doc/static/override.css index 1ab1e713768..b7940a31929 100644 --- a/doc/static/override.css +++ b/doc/static/override.css @@ -23,3 +23,8 @@ dd { span.pre { line-height: initial; } + +/* Fix for nav bottom padding with flyout */ +nav.wy-nav-side { + padding-bottom: 3em; +}