From 1df30c4fe4ba7103ff635294da8a7a9f08803e10 Mon Sep 17 00:00:00 2001 From: Maximilien Rigaut Date: Sat, 26 Aug 2017 10:13:23 +0200 Subject: [PATCH] Still bugfixing --- .gitignore | 2 ++ generator/model.py | 14 +++++------ generator/models/dual.py | 24 +++++++++--------- sites/generated_website/Poetry/index_en.html | 20 +++++++-------- sites/generated_website/Poetry/index_fr.html | 20 +++++++-------- .../generated_website/Poetry/poetry1_en.html | 20 +++++++-------- .../generated_website/Poetry/poetry1_fr.html | 20 +++++++-------- .../Poetry/subarticle1/index_en_en.html | 20 +++++++-------- .../Poetry/subarticle1/index_fr_fr.html | 20 +++++++-------- .../Poetry/subarticle2_en/index_en.html | 20 +++++++-------- .../Poetry/subarticle2_fr/index_fr.html | 20 +++++++-------- sites/generated_website/article1_en.html | 4 +-- sites/generated_website/article1_fr.html | 4 +-- sites/generated_website/index_en.html | 4 +-- sites/generated_website/index_fr.html | 4 +-- vkyweb.py | 25 ++++++++++++------- 16 files changed, 125 insertions(+), 116 deletions(-) diff --git a/.gitignore b/.gitignore index 72364f9..8dc8d5b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +generated_* + # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] diff --git a/generator/model.py b/generator/model.py index f0958e5..b5a102c 100644 --- a/generator/model.py +++ b/generator/model.py @@ -26,10 +26,10 @@ def makeHTMLName(node): "Get the link assotitated with the node (name.html)" return os.path.splitext(node.name)[0]+".html"#splitext(node.name)[0:-1].join(os.filesep) -def makeContainer(module,site,current_node,previous_node,lang): +def makeContainer(module,site,current_node,previous_node,lang,makeHTMLName=makeHTMLName,depth=""): article_list=module.makeSubNodelist(site.tree,lang,getDataType,makeHTMLName) previous=module.menuitem(site.get_variable("previous",lang),previous_node.path,"previous") - menu=module.menu(previous=previous,menulist="\n".join(article_list),articles=site.get_variable("articles",lang)) + menu=module.menu(previous=previous,menulist="\n".join(article_list),articles=site.get_variable("articles",lang),depth=depth) return menu def makeAllData(module,list_of_data): @@ -38,12 +38,12 @@ def makeAllData(module,list_of_data): def makeiFrame(node): return "" - + def makeData(module,current_node,lang): return module.content(content=current_node.get_content(lang),title=current_node.get_one(["article_title",'title',"article_name","name"],lang)) -def makePage(module,site,lang,menu,data): - return module.container(pagetitle=site.get_title(lang),websitename=site.get_one(['websitename',"webtitle","name","title"],lang),menu=menu,page=data) +def makePage(module,site,lang,menu,data,depth): + return module.container(pagetitle=site.get_title(lang),websitename=site.get_one(['websitename',"webtitle","name","title"],lang),menu=menu,page=data,depth=depth) if __name__ == '__main__': @@ -53,10 +53,10 @@ if __name__ == '__main__': current_node=site.tree.get_node("index",lang) previous_node=site.tree.get_node("index",lang) - menu=makeContainer(dual,site,current_node,previous_node,lang) + menu=makeContainer(dual,site,current_node,previous_node,lang,depth="") data=makeData(dual,current_node,lang) - page=makePage(dual,site,lang,menu,data) + page=makePage(dual,site,lang,menu,data,depth="") with open("site_base/dual/test.html","w+") as f: f.write(page) print(page) diff --git a/generator/models/dual.py b/generator/models/dual.py index b4e4c52..4fc897b 100644 --- a/generator/models/dual.py +++ b/generator/models/dual.py @@ -1,6 +1,6 @@ import os -def container(pagetitle="#_pagetitle_#",websitename="#_websitename_#",menu="\{menu\}",page="\{page\}"): +def container(pagetitle="#_pagetitle_#",websitename="#_websitename_#",menu="\{menu\}",page="\{page\}",depth=""): "Return the global appearance of the website" return """ @@ -9,11 +9,11 @@ def container(pagetitle="#_pagetitle_#",websitename="#_websitename_#",menu="\{me {pagetitle} - + - + - + @@ -53,21 +53,21 @@ def container(pagetitle="#_pagetitle_#",websitename="#_websitename_#",menu="\{me - + - + - + - + - """.format(MENU=menu,PAGE=page,websitename=websitename,pagetitle=pagetitle) + """.format(MENU=menu,PAGE=page,websitename=websitename,pagetitle=pagetitle,depth=depth) -def menu(previous="",menulist="\{menulist\}",articles="#_articles_#"): +def menu(previous="",menulist="\{menulist\}",articles="#_articles_#",depth=""): "Return the menu list" return """
  • - +
  • {previous}
  • @@ -75,7 +75,7 @@ def menu(previous="",menulist="\{menulist\}",articles="#_articles_#"): - """.format(previous=previous,menulist=menulist,articles=articles) + """.format(previous=previous,menulist=menulist,articles=articles,depth=depth) def content(content="\{content\}",title="\{title\}"): return """
    diff --git a/sites/generated_website/Poetry/index_en.html b/sites/generated_website/Poetry/index_en.html index 2c309eb..a2d6833 100644 --- a/sites/generated_website/Poetry/index_en.html +++ b/sites/generated_website/Poetry/index_en.html @@ -5,11 +5,11 @@ Mulloland - + - + - + @@ -37,14 +37,14 @@