OpenLP

Merge lp:~raoul-snyman/openlp/user-guide into lp:~openlp-documentation/openlp/trunk

  1. user-guide
  2. Merge into trunk
Proposed by Raoul Snyman
Status: Merged
Merged at revision: 111
Proposed branch: lp:~raoul-snyman/openlp/user-guide
Merge into: lp:~openlp-documentation/openlp/trunk
Diff against target: 90 lines (+20/-9)
2 files modified
manual/source/conf.py (+3/-3)
user-guide/source/conf.py (+17/-6)
To merge this branch: bzr merge lp:~raoul-snyman/openlp/user-guide
Reviewer Review Type Date Requested Status
Wesley Stout Approve
Review via email: mp+129565@code.launchpad.net

Description of the change

Moved things around a bit, put shared stuff into common.

To post a comment you must log in.
Revision history for this message
Wesley Stout (wesleystout) :
review: Approve
lp:~raoul-snyman/openlp/user-guide updated
110. By Wesley Stout

added install instructions for osx and the app store

111. By OpenLP Core

moved shared files

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'common'
2=== added directory 'common/images'
3=== renamed file 'manual/source/pics/logo.png' => 'common/images/logo.png'
4=== renamed file 'manual/source/pics/openlp.ico' => 'common/images/openlp.ico'
5=== renamed directory 'manual/themes' => 'common/themes'
6=== modified file 'manual/source/conf.py'
7--- manual/source/conf.py 2012-06-11 19:29:12 +0000
8+++ manual/source/conf.py 2012-10-13 17:11:19 +0000
9@@ -111,7 +111,7 @@
10 }
11
12 # Add any paths that contain custom themes here, relative to this directory.
13-html_theme_path = [os.path.join(os.path.abspath('..'), 'themes')]
14+html_theme_path = [os.path.abspath(os.path.join('..', '..', 'common', 'themes'))]
15
16 # The name for this set of Sphinx documents. If None, it defaults to
17 # "<project> v<release> documentation".
18@@ -122,12 +122,12 @@
19
20 # The name of an image file (relative to this directory) to place at the top
21 # of the sidebar.
22-html_logo = 'pics/logo.png'
23+html_logo = '../../common/images/logo.png'
24
25 # The name of an image file (within the static path) to use as favicon of the
26 # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
27 # pixels large.
28-html_favicon = 'pics/openlp.ico'
29+html_favicon = '../../common/images/openlp.ico'
30
31 # Add any paths that contain custom static files (such as style sheets) here,
32 # relative to this directory. They are copied after the builtin static files,
33
34=== modified file 'user-guide/source/conf.py'
35--- user-guide/source/conf.py 2012-07-10 21:01:43 +0000
36+++ user-guide/source/conf.py 2012-10-13 17:11:19 +0000
37@@ -25,7 +25,7 @@
38
39 # Add any Sphinx extension module names here, as strings. They can be extensions
40 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
41-extensions = ['sphinx.ext.autodoc','rst2pdf.pdfbuilder']
42+extensions = ['rst2pdf.pdfbuilder']
43
44 # Add any paths that contain templates here, relative to this directory.
45 templates_path = ['_templates']
46@@ -91,15 +91,26 @@
47
48 # The theme to use for HTML and HTML Help pages. See the documentation for
49 # a list of builtin themes.
50-html_theme = 'default'
51+if sys.argv[2] == 'qthelp' or sys.argv[2] == 'htmlhelp':
52+ html_theme = 'openlp_qthelp'
53+else:
54+ html_theme = 'default'
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 # documentation.
59-#html_theme_options = {}
60+if sys.argv[2] == 'html':
61+ html_theme_options = {
62+ 'sidebarbgcolor': '#3a60a9',
63+ 'relbarbgcolor': '#203b6f',
64+ 'footerbgcolor': '#26437c',
65+ 'headtextcolor': '#203b6f',
66+ 'linkcolor': '#26437c',
67+ 'sidebarlinkcolor': '#ceceff'
68+ }
69
70 # Add any paths that contain custom themes here, relative to this directory.
71-#html_theme_path = []
72+html_theme_path = [os.path.abspath(os.path.join('..', '..', 'common', 'themes'))]
73
74 # The name for this set of Sphinx documents. If None, it defaults to
75 # "<project> v<release> documentation".
76@@ -110,12 +121,12 @@
77
78 # The name of an image file (relative to this directory) to place at the top
79 # of the sidebar.
80-#html_logo = None
81+html_logo = '../../common/images/logo.png'
82
83 # The name of an image file (within the static path) to use as favicon of the
84 # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
85 # pixels large.
86-#html_favicon = None
87+html_favicon = '../../common/images/openlp.ico'
88
89 # Add any paths that contain custom static files (such as style sheets) here,
90 # relative to this directory. They are copied after the builtin static files,

Subscribers

People subscribed via source and target branches