jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes website page titles.

Browse source
This commit is contained in:
Dominik Picheta 2016-06-04 22:30:59 +01:00
commit e0f6d0cd10
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tools/nimweb.nim
View file

@ -436,7 +436,7 @@ proc buildSponsors(c: var TConfigData, sponsorsFile: string, outputDir: string)
let outFile = outputDir / "sponsors.html" let outFile = outputDir / "sponsors.html"
var f: File var f: File
if open(f, outFile, fmWrite): if open(f, outFile, fmWrite):
writeLine(f, generateHtmlPage(c, "Our Sponsors", sponsors, "")) writeLine(f, generateHtmlPage(c, "", "Our Sponsors", sponsors, ""))
close(f) close(f)
else: else:
quit("[Error] Cannot write file: " & outFile) quit("[Error] Cannot write file: " & outFile)
@ -444,7 +444,7 @@ proc buildSponsors(c: var TConfigData, sponsorsFile: string, outputDir: string)
const const
cmdRst2Html = "nim rst2html --compileonly $1 -o:web/$2.temp web/$2.rst" 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]) exec(cmdRst2Html % [c.nimArgs, file])
var temp = "web" / changeFileExt(file, "temp") var temp = "web" / changeFileExt(file, "temp")
var content: string var content: string
@ -457,7 +457,7 @@ proc buildPage(c: var TConfigData, file, rss: string, assetDir = "") =
if not existsDir(outfile.splitFile.dir): if not existsDir(outfile.splitFile.dir):
createDir(outfile.splitFile.dir) createDir(outfile.splitFile.dir)
if open(f, outfile, fmWrite): if open(f, outfile, fmWrite):
writeLine(f, generateHTMLPage(c, file, content, rss, assetDir)) writeLine(f, generateHTMLPage(c, file, title, content, rss, assetDir))
close(f) close(f)
else: else:
quit("[Error] cannot write file: " & outfile) 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): for kind, path in walkDir(newsDir):
let (dir, name, ext) = path.splitFile let (dir, name, ext) = path.splitFile
if ext == ".rst": if ext == ".rst":
buildPage(c, tailDir(dir) / name, "", "../") let title = readFile(path).splitLines()[0]
buildPage(c, tailDir(dir) / name, title, "", "../")
else: else:
echo("Skipping file in news directory: ", path) echo("Skipping file in news directory: ", path)
@ -482,7 +483,7 @@ proc buildWebsite(c: var TConfigData) =
var file = c.tabs[i].val var file = c.tabs[i].val
let rss = if file in ["news", "index"]: extractFilename(rssUrl) else: "" let rss = if file in ["news", "index"]: extractFilename(rssUrl) else: ""
if '.' in file: continue if '.' in file: continue
buildPage(c, file, rss) buildPage(c, file, if file == "question": "FAQ" else: file, rss)
copyDir("web/assets", "web/upload/assets") copyDir("web/assets", "web/upload/assets")
buildNewsRss(c, "web/upload") buildNewsRss(c, "web/upload")
buildSponsors(c, sponsors, "web/upload") buildSponsors(c, sponsors, "web/upload")

4
tools/website.tmpl
View file

@ -1,12 +1,12 @@
#? stdtmpl | standard #? stdtmpl | standard
#proc generateHTMLPage(c: var TConfigData, currentTab, content, rss, #proc generateHTMLPage(c: var TConfigData, currentTab, title, content, rss,
# rootDir = ""): string = # rootDir = ""): string =
# result = "" # result = ""
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <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="stylesheet" type="text/css" href="${rootDir}assets/style.css?t=2221" />
<link rel="shortcut icon" href="${rootDir}assets/images/favicon.ico"> <link rel="shortcut icon" href="${rootDir}assets/images/favicon.ico">
#if len(rss) > 0: #if len(rss) > 0: