Merge lp:~cjohnston/ubuntu-ci-services-itself/theme into lp:ubuntu-ci-services-itself

Proposed by Chris Johnston
Status: Merged
Approved by: Ursula Junque
Approved revision: 16
Merged at revision: 15
Proposed branch: lp:~cjohnston/ubuntu-ci-services-itself/theme
Merge into: lp:ubuntu-ci-services-itself
Diff against target: 64 lines (+26/-4)
3 files modified
docs/README_DOCS (+5/-0)
docs/conf.py (+19/-4)
docs/requirements.txt (+2/-0)
To merge this branch: bzr merge lp:~cjohnston/ubuntu-ci-services-itself/theme
Reviewer Review Type Date Requested Status
Vincent Ladeuil (community) Approve
Ursula Junque (community) Approve
Chris Johnston (community) Needs Resubmitting
Francis Ginther Approve
Review via email: mp+198143@code.launchpad.net

Commit message

Add an Ubuntu theme to the docs

Description of the change

To post a comment you must log in.
Revision history for this message
Francis Ginther (fginther) wrote :

I pip installed the bootstrap theme from https://pypi.python.org/pypi/sphinx-bootstrap-theme/ to use. You might want to post a link if you have one so others can review. Looks good so far and i'll tentatively approve. Would like to know if others have a strong objection before top approving.

review: Approve
Revision history for this message
Vincent Ladeuil (vila) wrote :

I went to the live version, I saw, I was convinced ;)

review: Approve
Revision history for this message
Vincent Ladeuil (vila) wrote :

Hmm, 'pip installed' is slightly worrying, can those instructions be added to the README ?

16. By Chris Johnston

Add a readme for the docs

Revision history for this message
Chris Johnston (cjohnston) wrote :

Added a REAME_DOCS file for the docs.

 review resubmit

review: Needs Resubmitting
Revision history for this message
Ursula Junque (ursinha) wrote :

Looks good.

review: Approve
Revision history for this message
Vincent Ladeuil (vila) wrote :

Thanks for the README_DOCS !

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'docs/README_DOCS'
2--- docs/README_DOCS 1970-01-01 00:00:00 +0000
3+++ docs/README_DOCS 2013-12-09 09:33:47 +0000
4@@ -0,0 +1,5 @@
5+These are the docs for the Ubuntu CI Engine
6+
7+To setup the docs with the 'United' bootstrap theme create a virtualenv and run:
8+
9+pip install -r requirements.txt
10
11=== modified file 'docs/conf.py'
12--- docs/conf.py 2013-11-16 10:12:08 +0000
13+++ docs/conf.py 2013-12-09 09:33:47 +0000
14@@ -41,16 +41,16 @@
15
16 # General information about the project.
17 project = u'Ubuntu CI Engine'
18-copyright = u'2013, Canonical CI Engineering Team'
19+copyright = u'2013, Canonical Ltd.'
20
21 # The version info for the project you're documenting, acts as replacement for
22 # |version| and |release|, also used in various other places throughout the
23 # built documents.
24 #
25 # The short X.Y version.
26-version = '0.0'
27+#version = '0.0'
28 # The full version, including alpha/beta/rc tags.
29-release = '0.0'
30+#release = '0.0'
31
32 # The language for content autogenerated by Sphinx. Refer to documentation
33 # for a list of supported languages.
34@@ -91,7 +91,22 @@
35
36 # The theme to use for HTML and HTML Help pages. See the documentation for
37 # a list of builtin themes.
38-html_theme = 'default'
39+try:
40+ import sphinx_bootstrap_theme
41+except ImportError:
42+ html_theme = 'default'
43+ html_theme_options = {}
44+else:
45+ html_theme = 'bootstrap'
46+ html_theme_path = sphinx_bootstrap_theme.get_html_theme_path()
47+ html_theme_options = {
48+ 'bootswatch_theme': "united",
49+ 'navbar_site_name': "Documentation",
50+ 'navbar_pagenav': False,
51+ 'navbar_sidebarrel': False,
52+ 'source_link_position': "off",
53+ 'globaltoc_depth': -1,
54+ }
55
56 # Theme options are theme-specific and customize the look and feel of a theme
57 # further. For a list of options available for each theme, see the
58
59=== added file 'docs/requirements.txt'
60--- docs/requirements.txt 1970-01-01 00:00:00 +0000
61+++ docs/requirements.txt 2013-12-09 09:33:47 +0000
62@@ -0,0 +1,2 @@
63+Sphinx==1.1.3
64+sphinx-bootstrap-theme==0.3.3

Subscribers

People subscribed via source and target branches