From d3772ef233e2ea1ba766f83c5c788fbdbb3b2d99 Mon Sep 17 00:00:00 2001 From: Maximilien Rigaut Date: Sat, 26 Aug 2017 13:32:21 +0200 Subject: [PATCH] Most minor bugs are gone, still a HUGE design flaw to correct --- generator/model.py | 2 +- generator/models/dual.py | 15 ++++++++------- .../Poetry/subarticle1/_config.txt | 3 +++ .../Poetry/subarticle1/index_en.txt | 2 +- .../Poetry/subarticle1/index_fr.txt | 2 +- .../Poetry/subarticle2_en/_config.txt | 2 ++ .../Poetry/subarticle2_fr/_config.txt | 2 ++ sites/generated_website/Poetry/index_en.html | 7 ++++--- sites/generated_website/Poetry/index_fr.html | 7 ++++--- sites/generated_website/Poetry/poetry1_en.html | 7 ++++--- sites/generated_website/Poetry/poetry1_fr.html | 7 ++++--- .../Poetry/subarticle1/index_en_en.html | 4 +--- .../Poetry/subarticle1/index_fr_fr.html | 4 +--- .../Poetry/subarticle2_en/index_en.html | 4 +--- .../Poetry/subarticle2_fr/index_fr.html | 4 +--- sites/generated_website/article1_en.html | 2 +- sites/generated_website/article1_fr.html | 2 +- sites/generated_website/index_en.html | 2 +- sites/generated_website/index_fr.html | 2 +- 19 files changed, 42 insertions(+), 38 deletions(-) create mode 100644 sites/example_website/Poetry/subarticle1/_config.txt create mode 100644 sites/example_website/Poetry/subarticle2_en/_config.txt create mode 100644 sites/example_website/Poetry/subarticle2_fr/_config.txt diff --git a/generator/model.py b/generator/model.py index 0343efd..ee46448 100644 --- a/generator/model.py +++ b/generator/model.py @@ -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: diff --git a/generator/models/dual.py b/generator/models/dual.py index 4b265cd..95f8302 100644 --- a/generator/models/dual.py +++ b/generator/models/dual.py @@ -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 diff --git a/sites/example_website/Poetry/subarticle1/_config.txt b/sites/example_website/Poetry/subarticle1/_config.txt new file mode 100644 index 0000000..eb62a82 --- /dev/null +++ b/sites/example_website/Poetry/subarticle1/_config.txt @@ -0,0 +1,3 @@ +title_en: Another subfolder +title_fr: Encore un autre sous dossier +---- diff --git a/sites/example_website/Poetry/subarticle1/index_en.txt b/sites/example_website/Poetry/subarticle1/index_en.txt index ae371bb..d0580a8 100644 --- a/sites/example_website/Poetry/subarticle1/index_en.txt +++ b/sites/example_website/Poetry/subarticle1/index_en.txt @@ -1,4 +1,4 @@ -title_en: Poetry +title_en: Subarticlulation category_en: Subology author_*: Max diff --git a/sites/example_website/Poetry/subarticle1/index_fr.txt b/sites/example_website/Poetry/subarticle1/index_fr.txt index 6dfbf61..255a7bb 100644 --- a/sites/example_website/Poetry/subarticle1/index_fr.txt +++ b/sites/example_website/Poetry/subarticle1/index_fr.txt @@ -1,4 +1,4 @@ -title_fr: Poésie +title_fr: Sous articulation category_fr: Subologie author_: Max diff --git a/sites/example_website/Poetry/subarticle2_en/_config.txt b/sites/example_website/Poetry/subarticle2_en/_config.txt new file mode 100644 index 0000000..bd20c6d --- /dev/null +++ b/sites/example_website/Poetry/subarticle2_en/_config.txt @@ -0,0 +1,2 @@ +title_en: The big subfoldery +---- diff --git a/sites/example_website/Poetry/subarticle2_fr/_config.txt b/sites/example_website/Poetry/subarticle2_fr/_config.txt new file mode 100644 index 0000000..079faf9 --- /dev/null +++ b/sites/example_website/Poetry/subarticle2_fr/_config.txt @@ -0,0 +1,2 @@ +title_fr: Sousdossier le dossier +---- diff --git a/sites/generated_website/Poetry/index_en.html b/sites/generated_website/Poetry/index_en.html index 52508f2..f3e2f46 100644 --- a/sites/generated_website/Poetry/index_en.html +++ b/sites/generated_website/Poetry/index_en.html @@ -43,9 +43,10 @@
  • Articles diff --git a/sites/generated_website/Poetry/index_fr.html b/sites/generated_website/Poetry/index_fr.html index e085a7b..8c6ca96 100644 --- a/sites/generated_website/Poetry/index_fr.html +++ b/sites/generated_website/Poetry/index_fr.html @@ -43,9 +43,10 @@
  • Articles diff --git a/sites/generated_website/Poetry/poetry1_en.html b/sites/generated_website/Poetry/poetry1_en.html index 3e7e8ba..159d34f 100644 --- a/sites/generated_website/Poetry/poetry1_en.html +++ b/sites/generated_website/Poetry/poetry1_en.html @@ -43,9 +43,10 @@
  • Articles diff --git a/sites/generated_website/Poetry/poetry1_fr.html b/sites/generated_website/Poetry/poetry1_fr.html index 6f2dd02..f8c9726 100644 --- a/sites/generated_website/Poetry/poetry1_fr.html +++ b/sites/generated_website/Poetry/poetry1_fr.html @@ -43,9 +43,10 @@
  • Articles diff --git a/sites/generated_website/Poetry/subarticle1/index_en_en.html b/sites/generated_website/Poetry/subarticle1/index_en_en.html index accc50e..039eab7 100644 --- a/sites/generated_website/Poetry/subarticle1/index_en_en.html +++ b/sites/generated_website/Poetry/subarticle1/index_en_en.html @@ -43,9 +43,7 @@
  • Articles diff --git a/sites/generated_website/Poetry/subarticle1/index_fr_fr.html b/sites/generated_website/Poetry/subarticle1/index_fr_fr.html index 86e70f0..5081c9f 100644 --- a/sites/generated_website/Poetry/subarticle1/index_fr_fr.html +++ b/sites/generated_website/Poetry/subarticle1/index_fr_fr.html @@ -43,9 +43,7 @@
  • Articles diff --git a/sites/generated_website/Poetry/subarticle2_en/index_en.html b/sites/generated_website/Poetry/subarticle2_en/index_en.html index cdcca20..ce8c255 100644 --- a/sites/generated_website/Poetry/subarticle2_en/index_en.html +++ b/sites/generated_website/Poetry/subarticle2_en/index_en.html @@ -43,9 +43,7 @@
  • Articles diff --git a/sites/generated_website/Poetry/subarticle2_fr/index_fr.html b/sites/generated_website/Poetry/subarticle2_fr/index_fr.html index ee4f76b..43eedee 100644 --- a/sites/generated_website/Poetry/subarticle2_fr/index_fr.html +++ b/sites/generated_website/Poetry/subarticle2_fr/index_fr.html @@ -43,9 +43,7 @@
  • Articles diff --git a/sites/generated_website/article1_en.html b/sites/generated_website/article1_en.html index f64d67d..3b50478 100644 --- a/sites/generated_website/article1_en.html +++ b/sites/generated_website/article1_en.html @@ -45,7 +45,7 @@ diff --git a/sites/generated_website/article1_fr.html b/sites/generated_website/article1_fr.html index b205067..944c831 100644 --- a/sites/generated_website/article1_fr.html +++ b/sites/generated_website/article1_fr.html @@ -45,7 +45,7 @@ diff --git a/sites/generated_website/index_en.html b/sites/generated_website/index_en.html index 0a68988..4c5c10b 100644 --- a/sites/generated_website/index_en.html +++ b/sites/generated_website/index_en.html @@ -45,7 +45,7 @@ diff --git a/sites/generated_website/index_fr.html b/sites/generated_website/index_fr.html index 870945a..12f3e4c 100644 --- a/sites/generated_website/index_fr.html +++ b/sites/generated_website/index_fr.html @@ -45,7 +45,7 @@