projects
/
treecutter.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added subdir argument, cleaned up arg handling
[treecutter.git]
/
treecutter
/
trie.py
diff --git
a/treecutter/trie.py
b/treecutter/trie.py
index b7a1c3d63228a126aa7a0479e803679760395b4c..ccbcada6af16f329e9a5b8bcfda9e9d763b391c7 100644
(file)
--- a/
treecutter/trie.py
+++ b/
treecutter/trie.py
@@
-60,7
+60,7
@@
class Trie():
# G.draw('g.png')
# print G.string()
# G.draw('g.png')
# print G.string()
- def _menu(self, trie, lang, page, css):
+ def _menu(self, trie, lang, page, css
, subdir
):
html = "<ul%s>\n" % css
for l in trie:
sel = ''
html = "<ul%s>\n" % css
for l in trie:
sel = ''
@@
-68,18
+68,18
@@
class Trie():
if p == page:
sel = ' class="selected"'
if p != None:
if p == page:
sel = ' class="selected"'
if p != None:
- html += '<li%s><a href="%s">%s</a>\n' \
- % (sel,l.value().link(),p.menu())
+ html += '<li%s><a href="%s
%s
">%s</a>\n' \
+ % (sel,
subdir,
l.value().link(),p.menu())
else:
else:
- html += '<li%s><a href="%s.en" hreflang="en">%s</a>*\n' \
- % (sel,l.value().link(), l.value().page('en').menu())
+ html += '<li%s><a href="%s
%s
.en" hreflang="en">%s</a>*\n' \
+ % (sel,
subdir,
l.value().link(), l.value().page('en').menu())
if l.children():
if l.children():
- html += self._menu(l.children(), lang, page, "")
+ html += self._menu(l.children(), lang, page, ""
, subdir
)
html += "</ul>\n"
return html
html += "</ul>\n"
return html
- def menu(self,lang,page,cssclass):
+ def menu(self,lang,page,cssclass
,subdir
):
css = ''
if cssclass:
css = ' class="'+cssclass+'"'
css = ''
if cssclass:
css = ' class="'+cssclass+'"'
- return self._menu(self._root, lang, page, css)
+ return self._menu(self._root, lang, page, css
, subdir
)