Merge lp:~hrvojem/percona-toolkit/html-theme-update into lp:percona-toolkit/2.2

Proposed by Hrvoje Matijakovic
Status: Merged
Merged at revision: 568
Proposed branch: lp:~hrvojem/percona-toolkit/html-theme-update
Merge into: lp:percona-toolkit/2.2
Diff against target: 36 lines (+15/-1)
2 files modified
config/sphinx-build/Makefile (+7/-0)
config/sphinx-build/percona-theme/layout.html (+8/-1)
To merge this branch: bzr merge lp:~hrvojem/percona-toolkit/html-theme-update
Reviewer Review Type Date Requested Status
Daniel Nichter Approve
Review via email: mp+155260@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Nichter (daniel-nichter) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config/sphinx-build/Makefile'
2--- config/sphinx-build/Makefile 2011-12-29 17:51:55 +0000
3+++ config/sphinx-build/Makefile 2013-03-25 15:35:49 +0000
4@@ -38,6 +38,13 @@
5 -rm -rf $(BUILDDIR)/*
6
7 html:
8+ @echo "Downloading percona-theme ..."
9+ @wget -O percona-theme.tar.gz http://percona.com/docs/theme/percona-toolkit/2.2
10+ @rm -rf percona-theme
11+ @echo "Extracting theme."
12+ @tar -zxf percona-theme.tar.gz
13+ @rm percona-theme.tar.gz
14+ @echo "Building html doc"
15 $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
16 @echo
17 @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
18
19=== modified file 'config/sphinx-build/percona-theme/layout.html'
20--- config/sphinx-build/percona-theme/layout.html 2013-03-20 14:06:40 +0000
21+++ config/sphinx-build/percona-theme/layout.html 2013-03-25 15:35:49 +0000
22@@ -76,7 +76,14 @@
23 </div>
24 </div>
25
26-
27+ <div class="side-column-block">
28+ <div class="a-btn-container">
29+ <a title="Download PDF Manual for Percona Toolkit 2.2" href="http://form.percona.com/Percona_Toolkit_2_2_Operations_Manual.html" class="a-btn-new">
30+ <span class="a-btn-text">Download Manual</span>
31+ <span class="a-btn-fixed-slide-text">PDF for version 2.2</span>
32+ <span class="a-btn-icon-right"><span></span></span>
33+ </a>
34+ </div></div>
35
36 <div class="percona_com_ad" style="width:220px;"><script type="text/javascript" src="http://www.percona.com/ads.php?size=220x120"></script></div>
37

Subscribers

People subscribed via source and target branches