diff --git a/doc/user/CMakeLists.txt b/doc/user/CMakeLists.txt index 06f51579a788447991f1a04c6d83987ce915566a..b90ef770d2ca605670c43a3d40a847b312cb8b89 100644 --- a/doc/user/CMakeLists.txt +++ b/doc/user/CMakeLists.txt @@ -1,17 +1,5 @@ - -execute_process( - COMMAND git rev-parse --abbrev-ref HEAD - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - OUTPUT_VARIABLE GIT_BRANCH - OUTPUT_STRIP_TRAILING_WHITESPACE -) - -if (NOT GIT_BRANCH STREQUAL "") - set (GIT_BRANCH "${GIT_BRANCH}/") -endif (NOT GIT_BRANCH STREQUAL "") - -set(PATH_USERGUIDE_HTML "${PROJECT_BINARY_DIR}/doc/www-data.in/doc/${GIT_BRANCH}user_guide.html") -set(PATH_USERGUIDE_HTML_CHUNK "${PROJECT_BINARY_DIR}/doc/www-data.in/doc/${GIT_BRANCH}mpage/") +set(PATH_USERGUIDE_HTML "${PROJECT_BINARY_DIR}/doc/www-data.in/doc/user_guide.html") +set(PATH_USERGUIDE_HTML_CHUNK "${PROJECT_BINARY_DIR}/doc/www-data.in/doc/mpage/") set(PATH_USERGUIDE_TXT "${PROJECT_BINARY_DIR}/doc/user/tarantool_user_guide.txt") if (XMLLINT STREQUAL "XMLLINT-NOTFOUND") diff --git a/doc/www-data.in/_layout/base b/doc/www-data.in/_layout/base index 7271eed61a049113a868a2bce912a5ad3848dfc7..fad14650ea3ab2f49b26f467746930a390b44be6 100644 --- a/doc/www-data.in/_layout/base +++ b/doc/www-data.in/_layout/base @@ -17,7 +17,7 @@ <h2>An in-memory NoSQL database</h2> <h3> <a href="intro.html" class="intro">Overview</a> - <a href="doc/stable/mpage/index.html" class="documentation">Documentation</a> + <a href="doc/mpage/index.html" class="documentation">Documentation</a> <a href="download.html" class="download">Download</a> <a href="support.html" class="support">Support</a> </h3> diff --git a/extra/static.py b/extra/static.py index f1c4ee8808acbec079132e9f2ccc6d289187898b..d98caf33ef5f62685278c171bc2563dcee5319f4 100755 --- a/extra/static.py +++ b/extra/static.py @@ -23,11 +23,11 @@ class MockConfig(object): self.output_path = '../www-data/' self.layout_dir = '_layout/' self.text_dir = '_text/' - self.doc = 'doc/{branch}' + self.doc = 'doc/' self.doc_mpage = 'mpage/' self.doc_opage = 'user_guide.html' self.doc_css = '../user/tnt.css' - self.target = '' + self.target = '' class Loader(object): @@ -84,27 +84,23 @@ class Loader(object): <div id="headr" class="column">{1}</div> </div> """ + lheader = """ -### [Home](/) -> [Documentation][{co}] +### [Home](/) -> [Documentation][{ot}] -[opa]: /doc/{branch1}/user_guide.html -[mpa]: /doc/{branch1}/mpage/index.html """ - rheader = """ -### [{bn}][{o}1] / [{bno}][mpa2] +[one_page]: /doc/user_guide.html +[mul_page]: /doc/mpage/index.html """ -[opa1]: /doc/{branch1}/user_guide.html -[mpa1]: /doc/{branch1}/mpage/index.html + rheader = """ +### [{type}][{t}] -[opa2]: /doc/{branch2}/user_guide.html -[mpa2]: /doc/{branch2}/mpage/index.html """ +[one_page]: /doc/user_guide.html +[mul_page]: /doc/mpage/index.html """ env = { - 'bn' : branch.capitalize(), - 'bno' : ('master' if branch != 'master' else 'stable').capitalize(), - 'branch1' : branch, - 'branch2' : ('master' if branch != 'master' else 'stable'), - 'o' : 'mpa' if one_page else 'opa', - 'co' : 'opa' if one_page else 'mpa', + 'type' : 'Switch to ' + ('One-page' if not one_page else 'Multi-page') + ' version', + 'ot' : 'one_page' if one_page else 'mul_page', + 't' : 'mul_page' if one_page else 'one_page', } lheader = markdown(lheader.format(**env), extensions=mdext) rheader = markdown(rheader.format(**env), extensions=mdext) @@ -116,7 +112,7 @@ class Loader(object): branch = proc.communicate()[0].strip() docs_template = self.environ.get_template('documentation') # ========================================== - doc_mpath = os.path.join(self.config.doc, self.config.doc_mpage).format(branch=branch) + doc_mpath = os.path.join(self.config.doc, self.config.doc_mpage) doc_mpage_out = doc_mpath doc_mpath_out = os.path.join(self.config.output_path, doc_mpath) doc_mpath = os.path.join(self.config.input, doc_mpath) @@ -133,7 +129,7 @@ class Loader(object): self.write(os.path.join(doc_mpage_out, i), data) shutil.copy(self.config.doc_css, doc_mpath_out) # =========================================== - doc_opath = self.config.doc.format(branch=branch) + doc_opath = self.config.doc doc_opath_out = os.path.join(self.config.output_path, doc_opath) doc_opage_out = os.path.join(doc_opath, self.config.doc_opage) doc_opath = os.path.join(self.config.input, doc_opath)