You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ns...@apache.org on 2012/12/01 23:04:32 UTC
git commit: Integration for Futon
Updated Branches:
refs/heads/docs c2569c639 -> 9c279a412
Integration for Futon
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/9c279a41
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9c279a41
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9c279a41
Branch: refs/heads/docs
Commit: 9c279a4129388d62ce6a66e5e545799e9a3e956c
Parents: c2569c6
Author: Noah Slater <ns...@apache.org>
Authored: Sat Dec 1 22:04:27 2012 +0000
Committer: Noah Slater <ns...@apache.org>
Committed: Sat Dec 1 22:04:27 2012 +0000
----------------------------------------------------------------------
share/doc/build/Makefile.am | 14 ++++++++++----
share/doc/src/conf.py | 7 +++++--
share/doc/templates/help.html | 9 +++++++++
share/doc/templates/searchbox.html | 16 ++++++++++++++++
share/doc/templates/sidebar.html | 24 ------------------------
share/doc/templates/utilities.html | 22 ++++++++++++++++++++++
share/www/_sidebar.html | 2 +-
7 files changed, 63 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9c279a41/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index 0ce4eb0..163653e 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -12,7 +12,8 @@
SPHINXOPTS = \
-d doctrees \
- -n -c $(srcdir)/../src \
+ -n -c $(srcdir)/../src \ \
+ -A local=1 \
$(srcdir)/../src
info_file_dist = texinfo/CouchDB.info
@@ -167,13 +168,18 @@ src_files = \
../src/pretty_urls.rst \
../src/release.rst \
../src/replication.rst \
- ../src/ssl.rst \
+ ../src/ssl.rst
+
+src_files_html = \
../static/rtd.css \
- ../templates/sidebar.html
+ ../templates/help.html \
+ ../templates/searchbox.html \
+ ../templates/utilities.html
EXTRA_DIST = \
$(image_files) \
$(src_files) \
+ $(src_files_html) \
$(info_file_build) \
$(pdf_file_build) \
$(html_files_build)
@@ -224,7 +230,7 @@ $(html_files): html.stamp
$(MAKE) $(AM_MAKEFLAGS) html.stamp; \
fi
-html.stamp: $(image_files) $(src_files)
+html.stamp: $(image_files) $(src_files) $(src_files_html)
@rm -f html.tmp
@touch html.tmp
$(top_srcdir)/build-aux/sphinx-build \
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9c279a41/share/doc/src/conf.py
----------------------------------------------------------------------
diff --git a/share/doc/src/conf.py b/share/doc/src/conf.py
index d06df28..de4cc01 100644
--- a/share/doc/src/conf.py
+++ b/share/doc/src/conf.py
@@ -38,6 +38,8 @@ templates_path = ["../templates"]
html_static_path = ["../static"]
+html_title = "Apache CouchDB " + version + " Manual"
+
html_style = "rtd.css"
html_logo = "../images/logo.png"
@@ -46,10 +48,11 @@ html_favicon = "../images/favicon.ico"
html_sidebars= {
"**": [
- 'searchbox.html',
+ "searchbox.html",
"localtoc.html",
"relations.html",
- "sidebar.html",
+ "utilities.html",
+ "help.html",
]
}
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9c279a41/share/doc/templates/help.html
----------------------------------------------------------------------
diff --git a/share/doc/templates/help.html b/share/doc/templates/help.html
new file mode 100644
index 0000000..4fdea02
--- /dev/null
+++ b/share/doc/templates/help.html
@@ -0,0 +1,9 @@
+<h3>More Help</h3>
+
+<ul>
+<li><a href="https://couchdb.apache.org/">Homepage</a></li>
+<li><a href="http://wiki.apache.org/couchdb/">Wiki</a></li>
+<li><a href="https://couchdb.apache.org/#mailing-list">Mailing Lists</a></li>
+<li><a href="http://webchat.freenode.net/?channels=couchdb">IRC</a></li>
+<li><a href="https://issues.apache.org/jira/browse/CouchDB">Issues</a></li>
+</ul>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9c279a41/share/doc/templates/searchbox.html
----------------------------------------------------------------------
diff --git a/share/doc/templates/searchbox.html b/share/doc/templates/searchbox.html
new file mode 100644
index 0000000..4c083f5
--- /dev/null
+++ b/share/doc/templates/searchbox.html
@@ -0,0 +1,16 @@
+<div id="searchbox" style="display: none">
+
+<h3>Quick Search</h3>
+
+<form class="search" action="search.html" method="get">
+<input type="text" name="q">
+<input type="submit" value="Go">
+<input type="hidden" name="check_keywords" value="yes">
+<input type="hidden" name="area" value="default">
+</form>
+
+<br>
+
+</div>
+
+<script type="text/javascript">$('#searchbox').show(0);</script>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9c279a41/share/doc/templates/sidebar.html
----------------------------------------------------------------------
diff --git a/share/doc/templates/sidebar.html b/share/doc/templates/sidebar.html
deleted file mode 100644
index 67b0e50..0000000
--- a/share/doc/templates/sidebar.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-
-Licensed 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.
-
--->
-
-<h3>More Help</h3>
-
-<ul>
-<li><a href="https://couchdb.apache.org/">Homepage</a></li>
-<li><a href="http://wiki.apache.org/couchdb/">Wiki</a></li>
-<li><a href="https://couchdb.apache.org/#mailing-list">Mailing Lists</a></li>
-<li><a href="http://webchat.freenode.net/?channels=couchdb">IRC</a></li>
-<li><a href="https://issues.apache.org/jira/browse/CouchDB">Issues</a></li>
-</ul>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9c279a41/share/doc/templates/utilities.html
----------------------------------------------------------------------
diff --git a/share/doc/templates/utilities.html b/share/doc/templates/utilities.html
new file mode 100644
index 0000000..22f4b8c
--- /dev/null
+++ b/share/doc/templates/utilities.html
@@ -0,0 +1,22 @@
+<!--
+
+Licensed 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.
+
+-->
+
+{% if local %}
+<h3>Utilities</h3>
+
+<ul>
+<li><a href="../">Futon</a></li>
+</ul>
+{% endif %}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9c279a41/share/www/_sidebar.html
----------------------------------------------------------------------
diff --git a/share/www/_sidebar.html b/share/www/_sidebar.html
index e3dc93c..271e906 100644
--- a/share/www/_sidebar.html
+++ b/share/www/_sidebar.html
@@ -25,7 +25,7 @@ specific language governing permissions and limitations under the License.
<li><a href="status.html">Status</a></li>
</ul></li>
<li><span>Documentation</span><ul>
- <li><a href="docs/index.html">Manual</a></li>
+ <li><a href="docs/">Manual</a></li>
</ul></li>
<li><span>Diagnostics</span><ul>
<li><a href="verify_install.html">Verify Installation</a></li>