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

further website improvements

Browse source
This commit is contained in:
Araq 2014-12-10 02:29:31 +01:00
commit 0cb3d31617
4 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/jsgen.nim
View file

@ -954,7 +954,9 @@ proc genAddr(p: PProc, n: PNode, r: var TCompRes) =
r.address = s.loc.r r.address = s.loc.r
r.res = toRope("0") r.res = toRope("0")
else: else:
internalError(n.info, "genAddr: 4") # 'var openArray' for instance produces an 'addr' but this is harmless:
gen(p, n.sons[0], r)
#internalError(n.info, "genAddr: 4 " & renderTree(n))
else: internalError(n.info, "genAddr: 2") else: internalError(n.info, "genAddr: 2")
of nkCheckedFieldExpr: of nkCheckedFieldExpr:
genCheckedFieldAddr(p, n, r) genCheckedFieldAddr(p, n, r)

1
tools/nimweb.nim
View file

@ -400,6 +400,7 @@ proc main(c: var TConfigData) =
for i in 0..c.tabs.len-1: for i in 0..c.tabs.len-1:
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
exec(cmd % [c.nimArgs, file]) exec(cmd % [c.nimArgs, file])
var temp = "web" / changeFileExt(file, "temp") var temp = "web" / changeFileExt(file, "temp")
var content: string var content: string

8
tools/website.tmpl
View file

@ -24,10 +24,16 @@
# var t = c.tabs[i].val # var t = c.tabs[i].val
#if currentTab == t: #if currentTab == t:
<a class="active" <a class="active"
#elif t == "community" or t == "news":
# continue
#else: #else:
<a <a
#end if #end if
href="${t}.html" title = "$c.projectName - $name">$name</a> #if t.contains('.'):
href="${t}" title = "$c.projectName - $name">$name</a>
#else:
href="${t}.html" title = "$c.projectName - $name">$name</a>
#end if
#end for #end for
</nav> </nav>
</div> </div>

8
web/nim.ini
View file

@ -7,7 +7,7 @@ Authors: "Andreas Rumpf and contributors"
[Links] [Links]
# Underscores are replaced with a space. # Underscores are replaced with a space.
# Everything after ; is the ID # Everything after ; is the ID
User_Forum: "http://forum.nim-lang.org;link_forum" Community: "community.html;link_forum"
Aporia_IDE: "https://github.com/nimrod-code/Aporia;link_aporia" Aporia_IDE: "https://github.com/nimrod-code/Aporia;link_aporia"
Github_Repo: "http://github.com/Araq/Nimrod;link_github" Github_Repo: "http://github.com/Araq/Nimrod;link_github"
@ -15,12 +15,14 @@ Github_Repo: "http://github.com/Araq/Nimrod;link_github"
[Tabs] [Tabs]
# Menu entry: filename # Menu entry: filename
home: index home: index
news: news
docs: documentation docs: documentation
learn: learn learn: learn
download: download download: download
community: community forum: "http://forum.nim-lang.org"
FAQ: question FAQ: question
# these two are not in the list of "tabs", but do exist:
community: community
news: news
[Ticker] [Ticker]
file: ticker.txt file: ticker.txt