git.iko.soy/webring
on master help sign in
Merge pull request #266 from ckipp01/master

add in nav, fix opml console err

commit3eb6872696a7b96cade9b2e464478a646d1ff298 authorЛu Лinveгa <aliceffekt@gmail.com> dateMon 12 Aug 2019, 09:10 (7 years ago) parente0fd21b6df64df
4 files changed+17−11
compare with master
unifiedsplit
links/main.css+6−5 scripts/hallway.js+3−1 scripts/opml.js+7−5 wiki.html+1
links/main.css+6−5
@@ -29,7 +29,6 @@ body aside span.right { color: #555; float: right; }
2929body aside li { text-transform: lowercase; cursor: pointer; }
3030
3131/* hallway */
32−
3332body #hallway #entries { display: flex; margin-top: 35px; }
3433body #hallway #entries > div { flex-grow: 1; }
3534body #hallway #showbar { position: absolute;top: 0px;width: 92%;height: 50px; background-image: url("data:image/svg+xml; utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='22'><path d='M11,4 L11,18 M4,4 L 4,18 M18,4 L18,18' stroke='%23555' fill='none' stroke-width='2' stroke-linecap='round'/></svg>");background-repeat: no-repeat;background-position: right;background-size: 25px; }
@@ -48,7 +47,7 @@ body #hallway .entry.highlight .author { color:#555; }
4847body #hallway .entry:hover .author { color:#ccc; }
4948body #hallway .entry:hover .date { color:#ccc; }
5049body #hallway .entry:hover .body { color:#ccc; border-bottom-color: #555 }
51−body #hallway #footer { padding-left: 60px; background-image: url(../icon.white.svg); background-size: 40px; background-repeat: no-repeat; background-position: 0px 10px; border-top: 2px solid white; padding-top: 20px; margin-top: 15px; max-width: calc(100% - 300px); min-height: 45px; line-height: 15px;}
50+body #hallway #footer { padding-left: 60px; background-image: url(../icon.white.svg); background-size: 40px; background-repeat: no-repeat; background-position: 0px 20px; border-top: 2px solid white; padding-top: 20px; margin-top: 15px; min-height: 45px; line-height: 15px;}
5251
5352body #hallway #pagination { margin: 10px; text-align: center; }
5453body #hallway #pagination span { padding: 3px; margin: 2px; cursor: pointer; }
@@ -57,10 +56,10 @@ body #hallway #pagination span { padding: 3px; margin: 2px; cursor: pointer; }
5756body #wiki { background: #ccc; color:#333; }
5857body #wiki main { display: flex; }
5958body #wiki main { flex: 1; }
60−body #wiki main { max-width: calc(100% - 230px); }
6159body #wiki main h1 { font-size: 1.3em; margin: 5px 0; font-weight: bold; }
6260body #wiki main div.related { border-bottom: 1px solid white; margin-bottom: 10px; }
6361body #wiki #main { width: 100%; }
62+body #wiki #main > a { text-decoration: underline; }
6463body #wiki #main a:hover { text-decoration: underline; }
6564body #wiki #main ul li { line-height: 15px; }
6665body #wiki aside { min-width: 220px; }
@@ -72,7 +71,7 @@ body #wiki aside a:before { content: '/'; }
7271body #wiki aside a:after { content: attr(data-msgs) " msgs"; position: absolute; right: 20px; color:#555; }
7372body #wiki ul.term { margin-bottom: 15px; }
7473body #wiki ul.term li.name { margin-bottom: 5px; }
75−body #wiki #footer { padding-left: 60px; background-image: url(../icon.white.svg); background-size: 40px; background-repeat: no-repeat; background-position: 0px 10px; border-top: 2px solid white; padding-top: 12px; margin-top: 15px; max-width: calc(100% - 300px); min-height: 45px; line-height: 15px;}
74+body #wiki #footer { padding-left: 60px; background-image: url(../icon.white.svg); background-size: 40px; background-repeat: no-repeat; background-position: 0px 18px; border-top: 2px solid white; padding-top: 12px; margin-top: 15px; min-height: 45px; line-height: 15px;}
7675
7776/* progress indicator */
7877body #progress { color: #777; }
@@ -88,6 +87,8 @@ body #progress progress::-moz-progress-bar { background: #777; }
8887 body #hallway #entries { margin-top: 0; }
8988 body #hallway #showbar { display: none; }
9089 body #hallway #hidebar { display: none; }
91− body #wiki footer { margin-right: 225px; }
90+ body #hallway #footer { max-width: calc(100% - 300px); }
91+ body #wiki main { max-width: calc(100% - 230px); }
92+ body #wiki footer { margin-right: 225px; max-width: calc(100% - 300px); }
9293}
9394
scripts/hallway.js+3−1
@@ -18,7 +18,9 @@ function Hallway (sites) {
1818 this._main.id = 'entries'
1919 this._footer = document.createElement('footer')
2020 this._footer.id = 'footer'
21− this._footer.innerHTML = `<p>The <strong>Hallway</strong> is a decentralized forum, to join the conversation, add a <a href="https://github.com/XXIIVV/webring#joining-the-hallway">feed:</a> field to your entry in the <a href="https://github.com/XXIIVV/Webring/">webring</a>.</p>`
21+ this.readme = `<p>The <strong>Hallway</strong> is a decentralized forum, to join the conversation, add a <a href="https://github.com/XXIIVV/webring#joining-the-hallway">feed:</a> field to your entry in the <a href="https://github.com/XXIIVV/Webring/">webring</a>.</p>`
22+ this.nav = `<p class='buttons'><a href='https://github.com/XXIIVV/webring'>Information</a> | <a href="index.html">The Portal</a> | <a href="wiki.html">The Wiki</a> | <a id="opml">OPML</a></p>`
23+ this._footer.innerHTML = `${this.readme}${this.nav}`
2224
2325 this.install = function (host) {
2426 this._el.appendChild(this._main)
scripts/opml.js+7−5
@@ -1,11 +1,13 @@
1−let outlines = sites.filter((site) => !!site.rss).map((site) => {
1+const outlines = sites.filter(site => site.rss).map(site => {
22 return `<outline type="rss" xmlUrl="${site.rss}" title="${site.title}"/>`
33})
44
5−let template = `<?xml version="1.0" encoding="UTF-8"?><opml version="1.1"><head></head><body>${outlines.join('')}</body></opml>`
5+const template = `<?xml version="1.0" encoding="UTF-8"?><opml version="1.1"><head></head><body>${outlines.join('')}</body></opml>`
66
77window.onload = function () {
8− let a = document.getElementById('opml')
9− a.setAttribute('href', 'data:text/plain;charset=utf-8,' + window.encodeURIComponent(template))
10− a.setAttribute('download', 'webring.opml')
8+ const a = document.getElementById('opml')
9+ if (a) {
10+ a.setAttribute('href', 'data:text/plain;charset=utf-8,' + window.encodeURIComponent(template))
11+ a.setAttribute('download', 'webring.opml')
12+ }
1113}
wiki.html+1
@@ -19,6 +19,7 @@
1919 </main>
2020 <footer id="footer">
2121 <p>The <strong>Wiki</strong> is a decentralized encyclopedia, to join the conversation, add a <a href="https://github.com/XXIIVV/webring#joining-the-wiki">wiki:</a> field to your entry in the <a href="https://github.com/XXIIVV/Webring/">webring</a>.</p>
22+ <p class='buttons'><a href='https://github.com/XXIIVV/webring'>Information</a> | <a href="hallway.html">The Hallway</a> | <a href="index.html">The Portal</a> | <a id="opml">OPML</a></p>
2223 <div id="progress"></div>
2324 </footer>
2425 </div>