commit: d09825a450135cfef920f6e9a426ff4d2c7a4fe1
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 19:39:18 2020 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 2 23:59:53 2020 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=d09825a4
devbook.xsl: Move all header parts into the header element. Add main.
This applies to bin/gen-eclass-html.sh as well.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
bin/gen-eclass-html.sh | 7 +++---
devbook.xsl | 64 ++++++++++++++++++++++++++------------------------
2 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/bin/gen-eclass-html.sh b/bin/gen-eclass-html.sh
index 84a46fc..883c787 100755
--- a/bin/gen-eclass-html.sh
+++ b/bin/gen-eclass-html.sh
@@ -47,12 +47,13 @@ IFS='' read -r -d '' HEADER << 'EOF'
<li><a href="/index.html"><i class="fa fa-home"></i> Home</a></li>
<li><a href="../index.html"><i class="fa fa-arrow-up"></i> Eclass
Reference</a></li>
</ul></div>
-</div></div></nav></header><div class="container"><div class="row"><div
class="col-md010"><ol class="breadcrumb"><li><a href="/index.html">Master
Index</a></li><li><a href="../index.html">Eclass
Reference</a></li></ol></div></div></div>
- <div class="container">
+</div></div></nav>
+<div class="container"><div class="row"><div class="col-md010"><ol
class="breadcrumb"><li><a href="/index.html">Master Index</a></li><li><a
href="../index.html">Eclass Reference</a></li></ol></div></div></div></header>
+<main><div class="container">
EOF
IFS='' read -r -d '' FOOTER << 'EOF'
-</div>
+</div></main>
<footer><div class="container">
<div class="row">
<div class="col-xs-12 col-md-offset-2 col-md-7"></div>
diff --git a/devbook.xsl b/devbook.xsl
index 50315d1..be30022 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -542,48 +542,50 @@
</button>
</div>
<div class="collapse navbar-collapse" id="gw-toolbar">
- <div class="input-group">
- <input type="search" name="search" placeholder="Search"
title="Search Gentoo Developer Manual [f]" accesskey="f" id="searchInput"
class="form-control" onclick="fetchDocuments()"/>
- <div class="input-group-btn">
- <input type="submit" name="fulltext" value="Search"
title="Search the pages for this text" id="mw-searchButton" class="searchButton
btn btn-default" onclick="search()"/>
+ <div class="input-group">
+ <input type="search" name="search" placeholder="Search"
title="Search Gentoo Developer Manual [f]" accesskey="f" id="searchInput"
class="form-control" onclick="fetchDocuments()"/>
+ <div class="input-group-btn">
+ <input type="submit" name="fulltext" value="Search"
title="Search the pages for this text" id="mw-searchButton" class="searchButton
btn btn-default" onclick="search()"/>
+ </div>
</div>
</div>
</div>
</div>
- </div>
- </nav>
- </header>
- <div id="searchResults" class="modal fade" role="dialog">
- <div class="modal-dialog">
- <div class="modal-content">
- <div class="modal-header">
+ </nav>
+ <div id="searchResults" class="modal fade" role="dialog">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
<button type="button" class="close"
data-dismiss="modal">x</button>
<h4 class="modal-title">Search Results</h4>
- </div>
- <div class="modal-body">
- <p>No results found.</p>
- </div>
- <div class="modal-footer">
- <button type="button" class="btn btn-default"
data-dismiss="modal">Close</button>
+ </div>
+ <div class="modal-body">
+ <p>No results found.</p>
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-default"
data-dismiss="modal">Close</button>
+ </div>
</div>
</div>
</div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-md010">
- <ol class="breadcrumb">
- <xsl:call-template name="printParentDocs">
- <xsl:with-param name="path" select="/guide/@self"/>
- <xsl:with-param name="depth"
select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' ,
''))"/>
- </xsl:call-template>
- </ol>
+ <div class="container">
+ <div class="row">
+ <div class="col-md010">
+ <ol class="breadcrumb">
+ <xsl:call-template name="printParentDocs">
+ <xsl:with-param name="path" select="/guide/@self"/>
+ <xsl:with-param name="depth"
select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' ,
''))"/>
+ </xsl:call-template>
+ </ol>
+ </div>
</div>
</div>
- </div>
- <div class="container">
- <xsl:apply-templates/>
- </div>
+ </header>
+ <main>
+ <div class="container">
+ <xsl:apply-templates/>
+ </div>
+ </main>
<footer>
<div class="container">
<div class="row">
