From 0a286773059f6c1f1bd3d2001f76b33dc29cee5a Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 14 Nov 2011 05:04:59 +0000 Subject: Simplify footer (remove images). --- doc/style.css | 18 ++++++++---------- gendoc.py | 8 ++------ lv2specgen/footer.html | 22 ---------------------- lv2specgen/lv2specgen.py | 10 +--------- lv2specgen/template.html | 21 +++++++++++++++++++-- 5 files changed, 30 insertions(+), 49 deletions(-) delete mode 100644 lv2specgen/footer.html 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%; diff --git a/gendoc.py b/gendoc.py index a7d24b3..16ba199 100755 --- a/gendoc.py +++ b/gendoc.py @@ -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 += '\n\n' index_html += '' index_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 @@ - - - Valid XHTML + RDFa - - - - - Valid CSS - - - - Creative Commons Attribution 3.0 Unported License - - 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 @@ -- cgit v1.2.1 a> 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168