diff options
| -rw-r--r-- | doc/style.css | 18 | ||||
| -rwxr-xr-x | gendoc.py | 8 | ||||
| -rw-r--r-- | lv2specgen/footer.html | 22 | ||||
| -rwxr-xr-x | lv2specgen/lv2specgen.py | 10 | ||||
| -rw-r--r-- | lv2specgen/template.html | 21 |
5 files changed, 30 insertions, 49 deletions
diff --git a/doc/style.css b/doc/style.css index 9943318..3eb5e32 100644 --- a/doc/style.css +++ b/doc/style.css @@ -314,21 +314,19 @@ blockquote { margin: 0; } #footer { - border-top: 1px dashed #ccc; bottom: 0; clear: both; - font-size: 75%; - margin: 3em 0 0; - padding: 1em; - position: relative; - text-align: right; + font-size: x-small; + margin: 2em 0 0; + padding: 0 1em 1em 1em; vertical-align: top; + background-color: #F3F3F3; + border-top: 1px solid #DDD; } -.footer-text { - margin: 0 0 0 0; - vertical-align: top; - color: #444; +#footer div { + padding-top: 1em; } + #searchbox a.reference, #searchbox span.reference { color: #339; font-size: 85%; @@ -111,8 +111,6 @@ subst_file('doc/htaccess.in', '%s/lv2core/.htaccess' % out_base, { '@NAME@': 'lv2core', '@BASE@': '/ns/lv2core' }) -footer = open('./lv2specgen/footer.html', 'r') - # Generate main (ontology) documentation and indices for dir in ['ext', 'extensions']: print("** Generating %s%s documentation" % (URIPREFIX, dir)) @@ -242,10 +240,9 @@ for dir in ['ext', 'extensions']: index_html += '</table>\n</div>\n' index_html += '<div id="footer">' - index_html += '<span class="footer-text">Generated on ' + index_html += '<div>Generated on ' index_html += datetime.datetime.utcnow().strftime('%F %H:%M UTC') - index_html += ' by gendoc.py</span> ' - index_html += footer.read() + '</div>' + index_html += ' by gendoc.py</div></div>' index_html += '</body></html>\n' @@ -261,4 +258,3 @@ except: shutil.copy('lv2specgen/style.css', os.path.join('build', STYLEURI)) devnull.close() -footer.close() diff --git a/lv2specgen/footer.html b/lv2specgen/footer.html deleted file mode 100644 index 5259e4c..0000000 --- a/lv2specgen/footer.html +++ /dev/null @@ -1,22 +0,0 @@ - <span about="" resource="http://www.w3.org/TR/rdfa-syntax" - rel="dct:conformsTo"> - <a href="http://validator.w3.org/check?uri=referer"> - <img style="border:0;width:88px;height:31px" - src="http://www.w3.org/Icons/valid-xhtml-rdfa-blue" - alt="Valid XHTML + RDFa"/> - </a> - </span> - <span about="" resource="http://www.w3.org/TR/CSS2" - rel="dct:conformsTo"> - <a href="http://jigsaw.w3.org/css-validator/check/referer"> - <img style="border:0;width:88px;height:31px" - src="http://jigsaw.w3.org/css-validator/images/vcss-blue" - alt="Valid CSS"/></a> - </span> - <span about=""> - <a about="" rel="license" href="http://creativecommons.org/licenses/by/3.0/"> - <img alt="Creative Commons Attribution 3.0 Unported License" - style="border-width:0;width:88px;height:31px" - src="http://i.creativecommons.org/l/by/3.0/88x31.png" /> - </a> - </span> diff --git a/lv2specgen/lv2specgen.py b/lv2specgen/lv2specgen.py index 5c62701..c1c7741 100755 --- a/lv2specgen/lv2specgen.py +++ b/lv2specgen/lv2specgen.py @@ -934,14 +934,6 @@ def specgen(specloc, indir, docdir, style_uri, doc_base, doclinks, instances=Fal f = open(temploc, "r") template = f.read() - # Footer - footerloc = os.path.join(indir, "footer.html") - footer = '' - f = open(footerloc, "r") - footer = f.read() - - template = template.replace('@FOOTER@', footer) - # Build a symbol -> link mapping for external links dlfile = open(doclinks, 'r') for line in dlfile: @@ -1118,7 +1110,7 @@ def usage(): print("""Usage: %s ONTOLOGY INDIR STYLE OUTPUT [FLAGS] ONTOLOGY : Path to ontology file - INDIR : Input directory containing template.html footer.html style.css + INDIR : Input directory containing template.html and style.css STYLE : Stylesheet URI OUTPUT : HTML output path BASE : Documentation output base URI diff --git a/lv2specgen/template.html b/lv2specgen/template.html index e5399c8..8906e6f 100644 --- a/lv2specgen/template.html +++ b/lv2specgen/template.html @@ -50,8 +50,25 @@ <!-- FOOTER --> <div id="footer"> - <span class="footer-text">Generated on @TIME@ from <a href="./@FILENAME@" class="footer-text">@FILENAME@</a> by <a href="http://drobilla.net/software/lv2specgen" class="footer-text">lv2specgen</a></span> - @FOOTER@ + <div> + This document is available under the + <a about="" rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"> + Creative Commons Attribution-ShareAlike License + </a> + </div> + <div> + Valid + <a about="" rel="dct:conformsTo" resource="http://www.w3.org/TR/rdfa-syntax" + href="http://validator.w3.org/check?uri=referer"> + XHTML+RDFa + </a> + and + <a about="" rel="dct:conformsTo" resource="http://www.w3.org/TR/CSS2" + href="http://jigsaw.w3.org/css-validator/check/referer"> + CSS + </a> + generated on <span about="" rel="dc:created">@TIME@</span> from <a href="./@FILENAME@">@FILENAME@</a> by <a href="http://drobilla.net/software/lv2specgen">lv2specgen</a> + </div> </div> </body> |