From c92cd8220f08366fc9509586ad7b1d53708f9912 Mon Sep 17 00:00:00 2001 From: Maximilien Rigaut Date: Sat, 26 Aug 2017 12:47:01 +0200 Subject: [PATCH] Some issues fixed, still a long way to go before alpha --- generator/model.py | 13 +++-- generator/models/dual.py | 5 +- sites/generated_website/Poetry/index_en.html | 2 +- sites/generated_website/Poetry/index_fr.html | 2 +- .../generated_website/Poetry/poetry1_en.html | 2 +- .../generated_website/Poetry/poetry1_fr.html | 2 +- .../Poetry/subarticle1/index_en_en.html | 2 +- .../Poetry/subarticle1/index_fr_fr.html | 2 +- .../Poetry/subarticle2_en/index_en.html | 2 +- .../Poetry/subarticle2_fr/index_fr.html | 2 +- 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 +- vkyweb.py | 55 ++++++++++++------- 15 files changed, 59 insertions(+), 38 deletions(-) diff --git a/generator/model.py b/generator/model.py index 194a0a3..0343efd 100644 --- a/generator/model.py +++ b/generator/model.py @@ -22,14 +22,17 @@ def getDataType(name): return typename return "other" -def makeHTMLName(node): +def makeHTMLName(text): "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) + 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) - previous=module.menuitem(site.get_variable("previous",lang),previous_node.path,"previous") - menu=module.menu(previous="../",menulist="\n".join(article_list),articles=site.get_variable("articles",lang),depth=depth) + if previous_node==None: + previous="" + else: + previous=module.menuitem(site.get_variable("previous",lang),"../"+makeHTMLName("index"),"previous") + 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): @@ -45,6 +48,8 @@ def makeData(module,current_node,lang): 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) +def pathAssets(module): + return module.assets() if __name__ == '__main__': site=makeWebsite("sites/example_website") diff --git a/generator/models/dual.py b/generator/models/dual.py index a34e438..4b265cd 100644 --- a/generator/models/dual.py +++ b/generator/models/dual.py @@ -94,6 +94,9 @@ def iframe(list_of_pages): iframes+="".format(page) return iframes +def assets(): + return "site_base/dual/assets" + def mix_data(list_of_data): return "
"+"".join(list_of_data)+"
" @@ -116,7 +119,7 @@ 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),getdatatype(node.path))) + 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]!="_": diff --git a/sites/generated_website/Poetry/index_en.html b/sites/generated_website/Poetry/index_en.html index 0014bda..52508f2 100644 --- a/sites/generated_website/Poetry/index_en.html +++ b/sites/generated_website/Poetry/index_en.html @@ -39,7 +39,7 @@
  • -
  • Previous articles
  • +
  • Previous articles
  • Articles