Most minor bugs are gone, still a HUGE design flaw to correct

This commit is contained in:
Maximilien Rigaut 2017-08-26 13:32:21 +02:00
parent c92cd8220f
commit d3772ef233
19 changed files with 42 additions and 38 deletions

View File

@ -27,7 +27,7 @@ def makeHTMLName(text):
return os.path.splitext(text)[0]+".html"#splitext(node.name)[0:-1].join(os.filesep)
def makeContainer(module,site,current_node,previous_node,lang,makeHTMLName=makeHTMLName,depth=""):
article_list=module.makeSubNodelist(site.tree,lang,getDataType,makeHTMLName)
article_list=module.makeSubNodelist(current_node.parent_node,lang,getDataType,makeHTMLName)
if previous_node==None:
previous=""
else:

View File

@ -117,11 +117,12 @@ def menuitem(text,link,datatype):
def makeSubNodelist(subnode,lang,getdatatype,makeHTMLName):
items=[]
for node in subnode.get_next_nodes():
if node.name[0]!="_":
items.append(menuitem(node.get_title(lang),makeHTMLName(node.name),getdatatype(node.path)))
for node in subnode.get_next_subtree():
#print(node,node.name)
if node.name[0]!="_":
items.append(menuitem(node.get_title(lang),node.path,"folder"))
for node in subnode.get_next_nodes(lang):
name=os.path.basename(node.name)
if name[0]!="_":
items.append(menuitem(node.get_title(lang),makeHTMLName(name),getdatatype(node.path)))
for node in subnode.get_next_subtree(lang):
name=os.path.basename(node.name)
if name[0]!="_":
items.append(menuitem(node.get_title(lang),name+"/"+makeHTMLName("index"),"folder"))
return items

View File

@ -0,0 +1,3 @@
title_en: Another subfolder
title_fr: Encore un autre sous dossier
----

View File

@ -1,4 +1,4 @@
title_en: Poetry
title_en: Subarticlulation
category_en: Subology
author_*: Max

View File

@ -1,4 +1,4 @@
title_fr: Poésie
title_fr: Sous articulation
category_fr: Subologie
author_: Max

View File

@ -0,0 +1,2 @@
title_en: The big subfoldery
----

View File

@ -0,0 +1,2 @@
title_fr: Sousdossier le dossier
----

View File

@ -43,9 +43,10 @@
<li class="active">
<a href="#"><i class="fa fa-folder"></i>Articles<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li><a href="index_en.html"><i class="fa fa-book "></i>Transaltionus</a></li>
<li><a href="article1_en.html"><i class="fa fa-book "></i>First article</a></li>
<li><a href="Poetry"><i class="fa fa-folder "></i>Poetry</a></li>
<li><a href="index_en.html"><i class="fa fa-book "></i>Poetry</a></li>
<li><a href="poetry1_en.html"><i class="fa fa-book "></i>Rose</a></li>
<li><a href="subarticle2_en/index_en.html"><i class="fa fa-folder "></i>The big subfoldery</a></li>
<li><a href="subarticle1/index_en.html"><i class="fa fa-folder "></i>Another subfolder</a></li>
</ul>
</ul>

View File

@ -43,9 +43,10 @@
<li class="active">
<a href="#"><i class="fa fa-folder"></i>Articles<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li><a href="index_fr.html"><i class="fa fa-book "></i>Traductionnator</a></li>
<li><a href="article1_fr.html"><i class="fa fa-book "></i>Premier article</a></li>
<li><a href="Poetry"><i class="fa fa-folder "></i>Poesie</a></li>
<li><a href="index_fr.html"><i class="fa fa-book "></i>Poésie</a></li>
<li><a href="poetry1_fr.html"><i class="fa fa-book "></i>Rose</a></li>
<li><a href="subarticle2_fr/index_fr.html"><i class="fa fa-folder "></i>Sousdossier le dossier</a></li>
<li><a href="subarticle1/index_fr.html"><i class="fa fa-folder "></i>Encore un autre sous dossier</a></li>
</ul>
</ul>

View File

@ -43,9 +43,10 @@
<li class="active">
<a href="#"><i class="fa fa-folder"></i>Articles<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li><a href="index_en.html"><i class="fa fa-book "></i>Transaltionus</a></li>
<li><a href="article1_en.html"><i class="fa fa-book "></i>First article</a></li>
<li><a href="Poetry"><i class="fa fa-folder "></i>Poetry</a></li>
<li><a href="index_en.html"><i class="fa fa-book "></i>Poetry</a></li>
<li><a href="poetry1_en.html"><i class="fa fa-book "></i>Rose</a></li>
<li><a href="subarticle2_en/index_en.html"><i class="fa fa-folder "></i>The big subfoldery</a></li>
<li><a href="subarticle1/index_en.html"><i class="fa fa-folder "></i>Another subfolder</a></li>
</ul>
</ul>

View File

@ -43,9 +43,10 @@
<li class="active">
<a href="#"><i class="fa fa-folder"></i>Articles<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li><a href="index_fr.html"><i class="fa fa-book "></i>Traductionnator</a></li>
<li><a href="article1_fr.html"><i class="fa fa-book "></i>Premier article</a></li>
<li><a href="Poetry"><i class="fa fa-folder "></i>Poesie</a></li>
<li><a href="index_fr.html"><i class="fa fa-book "></i>Poésie</a></li>
<li><a href="poetry1_fr.html"><i class="fa fa-book "></i>Rose</a></li>
<li><a href="subarticle2_fr/index_fr.html"><i class="fa fa-folder "></i>Sousdossier le dossier</a></li>
<li><a href="subarticle1/index_fr.html"><i class="fa fa-folder "></i>Encore un autre sous dossier</a></li>
</ul>
</ul>

View File

@ -43,9 +43,7 @@
<li class="active">
<a href="#"><i class="fa fa-folder"></i>Articles<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li><a href="index_en.html"><i class="fa fa-book "></i>Transaltionus</a></li>
<li><a href="article1_en.html"><i class="fa fa-book "></i>First article</a></li>
<li><a href="Poetry"><i class="fa fa-folder "></i>Poetry</a></li>
<li><a href="index_en_en.html"><i class="fa fa-book "></i>Subarticlulation</a></li>
</ul>
</ul>

View File

@ -43,9 +43,7 @@
<li class="active">
<a href="#"><i class="fa fa-folder"></i>Articles<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li><a href="index_fr.html"><i class="fa fa-book "></i>Traductionnator</a></li>
<li><a href="article1_fr.html"><i class="fa fa-book "></i>Premier article</a></li>
<li><a href="Poetry"><i class="fa fa-folder "></i>Poesie</a></li>
<li><a href="index_fr_fr.html"><i class="fa fa-book "></i>Sous articulation</a></li>
</ul>
</ul>

View File

@ -43,9 +43,7 @@
<li class="active">
<a href="#"><i class="fa fa-folder"></i>Articles<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li><a href="index_en.html"><i class="fa fa-book "></i>Transaltionus</a></li>
<li><a href="article1_en.html"><i class="fa fa-book "></i>First article</a></li>
<li><a href="Poetry"><i class="fa fa-folder "></i>Poetry</a></li>
<li><a href="index_en.html"><i class="fa fa-book "></i>Ferogo</a></li>
</ul>
</ul>

View File

@ -43,9 +43,7 @@
<li class="active">
<a href="#"><i class="fa fa-folder"></i>Articles<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li><a href="index_fr.html"><i class="fa fa-book "></i>Traductionnator</a></li>
<li><a href="article1_fr.html"><i class="fa fa-book "></i>Premier article</a></li>
<li><a href="Poetry"><i class="fa fa-folder "></i>Poesie</a></li>
<li><a href="index_fr.html"><i class="fa fa-book "></i>Ferugination</a></li>
</ul>
</ul>

View File

@ -45,7 +45,7 @@
<ul class="nav nav-second-level">
<li><a href="index_en.html"><i class="fa fa-book "></i>Transaltionus</a></li>
<li><a href="article1_en.html"><i class="fa fa-book "></i>First article</a></li>
<li><a href="Poetry"><i class="fa fa-folder "></i>Poetry</a></li>
<li><a href="Poetry/index_en.html"><i class="fa fa-folder "></i>Poetry</a></li>
</ul>
</ul>

View File

@ -45,7 +45,7 @@
<ul class="nav nav-second-level">
<li><a href="index_fr.html"><i class="fa fa-book "></i>Traductionnator</a></li>
<li><a href="article1_fr.html"><i class="fa fa-book "></i>Premier article</a></li>
<li><a href="Poetry"><i class="fa fa-folder "></i>Poesie</a></li>
<li><a href="Poetry/index_fr.html"><i class="fa fa-folder "></i>Poesie</a></li>
</ul>
</ul>

View File

@ -45,7 +45,7 @@
<ul class="nav nav-second-level">
<li><a href="index_en.html"><i class="fa fa-book "></i>Transaltionus</a></li>
<li><a href="article1_en.html"><i class="fa fa-book "></i>First article</a></li>
<li><a href="Poetry"><i class="fa fa-folder "></i>Poetry</a></li>
<li><a href="Poetry/index_en.html"><i class="fa fa-folder "></i>Poetry</a></li>
</ul>
</ul>

View File

@ -45,7 +45,7 @@
<ul class="nav nav-second-level">
<li><a href="index_fr.html"><i class="fa fa-book "></i>Traductionnator</a></li>
<li><a href="article1_fr.html"><i class="fa fa-book "></i>Premier article</a></li>
<li><a href="Poetry"><i class="fa fa-folder "></i>Poesie</a></li>
<li><a href="Poetry/index_fr.html"><i class="fa fa-folder "></i>Poesie</a></li>
</ul>
</ul>