Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/devmanual:master commit in: bin/, /
Date: Mon, 03 Feb 2020 00:07:47
Message-Id: 1580687993.d09825a450135cfef920f6e9a426ff4d2c7a4fe1.ulm@gentoo
1 commit: d09825a450135cfef920f6e9a426ff4d2c7a4fe1
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 28 19:39:18 2020 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 2 23:59:53 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=d09825a4
7
8 devbook.xsl: Move all header parts into the header element. Add main.
9
10 This applies to bin/gen-eclass-html.sh as well.
11
12 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
13
14 bin/gen-eclass-html.sh | 7 +++---
15 devbook.xsl | 64 ++++++++++++++++++++++++++------------------------
16 2 files changed, 37 insertions(+), 34 deletions(-)
17
18 diff --git a/bin/gen-eclass-html.sh b/bin/gen-eclass-html.sh
19 index 84a46fc..883c787 100755
20 --- a/bin/gen-eclass-html.sh
21 +++ b/bin/gen-eclass-html.sh
22 @@ -47,12 +47,13 @@ IFS='' read -r -d '' HEADER << 'EOF'
23 <li><a href="/index.html"><i class="fa fa-home"></i> Home</a></li>
24 <li><a href="../index.html"><i class="fa fa-arrow-up"></i> Eclass Reference</a></li>
25 </ul></div>
26 -</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>
27 - <div class="container">
28 +</div></div></nav>
29 +<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>
30 +<main><div class="container">
31 EOF
32
33 IFS='' read -r -d '' FOOTER << 'EOF'
34 -</div>
35 +</div></main>
36 <footer><div class="container">
37 <div class="row">
38 <div class="col-xs-12 col-md-offset-2 col-md-7"></div>
39
40 diff --git a/devbook.xsl b/devbook.xsl
41 index 50315d1..be30022 100644
42 --- a/devbook.xsl
43 +++ b/devbook.xsl
44 @@ -542,48 +542,50 @@
45 </button>
46 </div>
47 <div class="collapse navbar-collapse" id="gw-toolbar">
48 - <div class="input-group">
49 - <input type="search" name="search" placeholder="Search" title="Search Gentoo Developer Manual [f]" accesskey="f" id="searchInput" class="form-control" onclick="fetchDocuments()"/>
50 - <div class="input-group-btn">
51 - <input type="submit" name="fulltext" value="Search" title="Search the pages for this text" id="mw-searchButton" class="searchButton btn btn-default" onclick="search()"/>
52 + <div class="input-group">
53 + <input type="search" name="search" placeholder="Search" title="Search Gentoo Developer Manual [f]" accesskey="f" id="searchInput" class="form-control" onclick="fetchDocuments()"/>
54 + <div class="input-group-btn">
55 + <input type="submit" name="fulltext" value="Search" title="Search the pages for this text" id="mw-searchButton" class="searchButton btn btn-default" onclick="search()"/>
56 + </div>
57 </div>
58 </div>
59 </div>
60 </div>
61 - </div>
62 - </nav>
63 - </header>
64 - <div id="searchResults" class="modal fade" role="dialog">
65 - <div class="modal-dialog">
66 - <div class="modal-content">
67 - <div class="modal-header">
68 + </nav>
69 + <div id="searchResults" class="modal fade" role="dialog">
70 + <div class="modal-dialog">
71 + <div class="modal-content">
72 + <div class="modal-header">
73 <button type="button" class="close" data-dismiss="modal">x</button>
74 <h4 class="modal-title">Search Results</h4>
75 - </div>
76 - <div class="modal-body">
77 - <p>No results found.</p>
78 - </div>
79 - <div class="modal-footer">
80 - <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
81 + </div>
82 + <div class="modal-body">
83 + <p>No results found.</p>
84 + </div>
85 + <div class="modal-footer">
86 + <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
87 + </div>
88 </div>
89 </div>
90 </div>
91 - </div>
92 - <div class="container">
93 - <div class="row">
94 - <div class="col-md010">
95 - <ol class="breadcrumb">
96 - <xsl:call-template name="printParentDocs">
97 - <xsl:with-param name="path" select="/guide/@self"/>
98 - <xsl:with-param name="depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
99 - </xsl:call-template>
100 - </ol>
101 + <div class="container">
102 + <div class="row">
103 + <div class="col-md010">
104 + <ol class="breadcrumb">
105 + <xsl:call-template name="printParentDocs">
106 + <xsl:with-param name="path" select="/guide/@self"/>
107 + <xsl:with-param name="depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
108 + </xsl:call-template>
109 + </ol>
110 + </div>
111 </div>
112 </div>
113 - </div>
114 - <div class="container">
115 - <xsl:apply-templates/>
116 - </div>
117 + </header>
118 + <main>
119 + <div class="container">
120 + <xsl:apply-templates/>
121 + </div>
122 + </main>
123 <footer>
124 <div class="container">
125 <div class="row">