diff options
| author | Dominik Picheta <dominikpicheta@gmail.com> | 2016-06-04 22:30:59 +0100 |
|---|---|---|
| committer | Dominik Picheta <dominikpicheta@gmail.com> | 2016-06-04 22:30:59 +0100 |
| commit | e0f6d0cd10e7bd174b9b8a2132a6bcdc9c19bd50 (patch) | |
| tree | 3012ba42cfe5213108191f89f85e9d76ba83815d /tools | |
| parent | e62b55054aff7e708416d075aade371233f39136 (diff) | |
| download | Nim-e0f6d0cd10e7bd174b9b8a2132a6bcdc9c19bd50.tar.gz | |
Fixes website page titles.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/nimweb.nim | 11 | ||||
| -rw-r--r-- | tools/website.tmpl | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/tools/nimweb.nim b/tools/nimweb.nim index 8da58ff4d..82bb88e5f 100644 --- a/tools/nimweb.nim +++ b/tools/nimweb.nim @@ -436,7 +436,7 @@ proc buildSponsors(c: var TConfigData, sponsorsFile: string, outputDir: string) let outFile = outputDir / "sponsors.html" var f: File if open(f, outFile, fmWrite): - writeLine(f, generateHtmlPage(c, "Our Sponsors", sponsors, "")) + writeLine(f, generateHtmlPage(c, "", "Our Sponsors", sponsors, "")) close(f) else: quit("[Error] Cannot write file: " & outFile) @@ -444,7 +444,7 @@ proc buildSponsors(c: var TConfigData, sponsorsFile: string, outputDir: string) const cmdRst2Html = "nim rst2html --compileonly $1 -o:web/$2.temp web/$2.rst" -proc buildPage(c: var TConfigData, file, rss: string, assetDir = "") = +proc buildPage(c: var TConfigData, file, title, rss: string, assetDir = "") = exec(cmdRst2Html % [c.nimArgs, file]) var temp = "web" / changeFileExt(file, "temp") var content: string @@ -457,7 +457,7 @@ proc buildPage(c: var TConfigData, file, rss: string, assetDir = "") = if not existsDir(outfile.splitFile.dir): createDir(outfile.splitFile.dir) if open(f, outfile, fmWrite): - writeLine(f, generateHTMLPage(c, file, content, rss, assetDir)) + writeLine(f, generateHTMLPage(c, file, title, content, rss, assetDir)) close(f) else: quit("[Error] cannot write file: " & outfile) @@ -467,7 +467,8 @@ proc buildNews(c: var TConfigData, newsDir: string, outputDir: string) = for kind, path in walkDir(newsDir): let (dir, name, ext) = path.splitFile if ext == ".rst": - buildPage(c, tailDir(dir) / name, "", "../") + let title = readFile(path).splitLines()[0] + buildPage(c, tailDir(dir) / name, title, "", "../") else: echo("Skipping file in news directory: ", path) @@ -482,7 +483,7 @@ proc buildWebsite(c: var TConfigData) = var file = c.tabs[i].val let rss = if file in ["news", "index"]: extractFilename(rssUrl) else: "" if '.' in file: continue - buildPage(c, file, rss) + buildPage(c, file, if file == "question": "FAQ" else: file, rss) copyDir("web/assets", "web/upload/assets") buildNewsRss(c, "web/upload") buildSponsors(c, sponsors, "web/upload") diff --git a/tools/website.tmpl b/tools/website.tmpl index 0657c275b..7585e544e 100644 --- a/tools/website.tmpl +++ b/tools/website.tmpl @@ -1,12 +1,12 @@ #? stdtmpl | standard -#proc generateHTMLPage(c: var TConfigData, currentTab, content, rss, +#proc generateHTMLPage(c: var TConfigData, currentTab, title, content, rss, # rootDir = ""): string = # result = "" <!DOCTYPE html> <html> <head> <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>${currentTab} - $c.projectTitle</title> + <title>${title} - $c.projectTitle</title> <link rel="stylesheet" type="text/css" href="${rootDir}assets/style.css?t=2221" /> <link rel="shortcut icon" href="${rootDir}assets/images/favicon.ico"> #if len(rss) > 0: |