diff --git a/generator/model.py b/generator/model.py
index b5a102c..194a0a3 100644
--- a/generator/model.py
+++ b/generator/model.py
@@ -29,15 +29,15 @@ def makeHTMLName(node):
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),depth=depth)
+ menu=module.menu(previous="../",menulist="\n".join(article_list),articles=site.get_variable("articles",lang),depth=depth)
return menu
def makeAllData(module,list_of_data):
"Obsolete, use makeiFrame instead"
return module.mix_data(list_of_data)
-def makeiFrame(node):
- return ""
+def makeiFrame(module,list_of_nodes):
+ return module.iframe(list_of_nodes)
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))
diff --git a/generator/models/dual.py b/generator/models/dual.py
index 4fc897b..a34e438 100644
--- a/generator/models/dual.py
+++ b/generator/models/dual.py
@@ -91,7 +91,7 @@ def content(content="\{content\}",title="\{title\}"):
def iframe(list_of_pages):
iframes=""
for page in list_of_pages:
- iframes+="".format(page)
+ iframes+="".format(page)
return iframes
def mix_data(list_of_data):
diff --git a/sites/generated_website/Poetry/index_en.html b/sites/generated_website/Poetry/index_en.html
index a2d6833..0014bda 100644
--- a/sites/generated_website/Poetry/index_en.html
+++ b/sites/generated_website/Poetry/index_en.html
@@ -53,7 +53,7 @@
-
+
diff --git a/sites/generated_website/Poetry/index_fr.html b/sites/generated_website/Poetry/index_fr.html
index 82e61d7..dbc22f1 100644
--- a/sites/generated_website/Poetry/index_fr.html
+++ b/sites/generated_website/Poetry/index_fr.html
@@ -53,7 +53,7 @@
-
+
diff --git a/sites/generated_website/Poetry/poetry1_en.html b/sites/generated_website/Poetry/poetry1_en.html
index a2d6833..1a3fb22 100644
--- a/sites/generated_website/Poetry/poetry1_en.html
+++ b/sites/generated_website/Poetry/poetry1_en.html
@@ -53,7 +53,7 @@
-
+
diff --git a/sites/generated_website/Poetry/poetry1_fr.html b/sites/generated_website/Poetry/poetry1_fr.html
index 82e61d7..ead90d8 100644
--- a/sites/generated_website/Poetry/poetry1_fr.html
+++ b/sites/generated_website/Poetry/poetry1_fr.html
@@ -53,7 +53,7 @@
-
+
diff --git a/sites/generated_website/Poetry/subarticle1/index_en_en.html b/sites/generated_website/Poetry/subarticle1/index_en_en.html
index 4ca1ecd..da300b7 100644
--- a/sites/generated_website/Poetry/subarticle1/index_en_en.html
+++ b/sites/generated_website/Poetry/subarticle1/index_en_en.html
@@ -53,7 +53,7 @@
-
+
diff --git a/sites/generated_website/Poetry/subarticle1/index_fr_fr.html b/sites/generated_website/Poetry/subarticle1/index_fr_fr.html
index 9efdb64..b763057 100644
--- a/sites/generated_website/Poetry/subarticle1/index_fr_fr.html
+++ b/sites/generated_website/Poetry/subarticle1/index_fr_fr.html
@@ -53,7 +53,7 @@
-
+
diff --git a/sites/generated_website/Poetry/subarticle2_en/index_en.html b/sites/generated_website/Poetry/subarticle2_en/index_en.html
index 7f0f913..2b60de8 100644
--- a/sites/generated_website/Poetry/subarticle2_en/index_en.html
+++ b/sites/generated_website/Poetry/subarticle2_en/index_en.html
@@ -53,7 +53,7 @@
-
+
diff --git a/sites/generated_website/Poetry/subarticle2_fr/index_fr.html b/sites/generated_website/Poetry/subarticle2_fr/index_fr.html
index 5b782ee..b5fef61 100644
--- a/sites/generated_website/Poetry/subarticle2_fr/index_fr.html
+++ b/sites/generated_website/Poetry/subarticle2_fr/index_fr.html
@@ -53,7 +53,7 @@
-
+
diff --git a/sites/generated_website/article1_en.html b/sites/generated_website/article1_en.html
index 11b00ce..e6cfcca 100644
--- a/sites/generated_website/article1_en.html
+++ b/sites/generated_website/article1_en.html
@@ -53,7 +53,7 @@
-
+
diff --git a/sites/generated_website/article1_fr.html b/sites/generated_website/article1_fr.html
index c9d4377..25daaae 100644
--- a/sites/generated_website/article1_fr.html
+++ b/sites/generated_website/article1_fr.html
@@ -53,7 +53,7 @@
-
+
diff --git a/sites/generated_website/index_en.html b/sites/generated_website/index_en.html
index 11b00ce..4a0ba49 100644
--- a/sites/generated_website/index_en.html
+++ b/sites/generated_website/index_en.html
@@ -53,7 +53,7 @@
-
+
diff --git a/sites/generated_website/index_fr.html b/sites/generated_website/index_fr.html
index c9d4377..708d15d 100644
--- a/sites/generated_website/index_fr.html
+++ b/sites/generated_website/index_fr.html
@@ -53,7 +53,7 @@
-
+
diff --git a/vkyweb.py b/vkyweb.py
index e755bcf..7ceba18 100644
--- a/vkyweb.py
+++ b/vkyweb.py
@@ -22,18 +22,27 @@ def HTMLNameCreator(lang,ext="html"):
return "{}_{}.{}".format(node.name,lang,ext)
return makeHTMLName
+def iFrameFromNode(node):
+ "Return the list of pages that should be in the frames"
+ names=[]
+ for l in args.l:
+ names.append(os.path.basename(HTMLNameCreator("content_"+l,ext=args.extension)(node)))
+ return names
+
def gen_all_nodes_menu(tree,lang,depth):
previous_node=tree #maybe need to be sent via parameter, nonetheless very secondary
# TODO: look for index in all nodes, create it if needed
for current_node in tree.get_next_nodes(lang):
if (os.path.basename(current_node.name)[0]!="_"): #Likely add a visible: true/false tag in the future
filename=htmlNamer(current_node)
+ if args.verbose:
+ print "Generating {} menus".format(filename)
save=savePath(filename)
menu=model.makeContainer(choosen_model,website,current_node,previous_node,lang,htmlNamer,depth)
- frames=model.makeiFrame(current_node)
+ frames=model.makeiFrame(choosen_model,iFrameFromNode(current_node))
page=model.makePage(choosen_model,website,lang,menu,frames,depth)
- #print page
+
saveData(save,page)
depth="../"+depth
for new in tree.get_next_subtree(lang):
@@ -45,18 +54,21 @@ def gen_all_nodes_menu(tree,lang,depth):
pass
gen_all_nodes_menu(new,lang,depth)
-def gen_node(node,menu_lang,langs,choosen_model):
- #menu=makeContainer(model,site,current_node,previous_node,menu_lang,makeHTMLName)
- data=[]
- for lang in langs:
- data.append(model.makeData(choosen_model,current_node,lang))
- print data
- #model.makeMulticontent()
- #page=makePage(model,site,menu_lang,menu,data)
+def gen_all_nodes_content(tree,lang):
+ for current_node in tree.get_next_nodes(lang):
+ file_name=htmlContentNamer(current_node)
+ if args.verbose:
+ print "Generating {} content".format(file_name)
+ save=savePath(file_name)
+ content=model.makeData(choosen_model,current_node,lang)
+
+ saveData(save,content)
+
+ for t in tree.get_next_subtree(lang):
+ gen_all_nodes_content(t,lang)
parser = argparse.ArgumentParser(description='Website on-the-fly & static generator')
-#subparsers = parser.add_subparsers(help='Commands')
# The argparse should look like this:
# vkyweb.py PATH_TO_WEBSITE --update(only update) --verbose(show as much as possible) --dry(don't actually write anything) -d(destination if not current folder) -m(custom model) -l(only use theese languages)
@@ -66,7 +78,7 @@ parser.add_argument('--update',action="store_true",help="Only update, don't rewr
parser.add_argument("--dry",action="store_true",help="Dry run, don't write anything")
parser.add_argument("-d",metavar="destination",type=str,default=".",help="Destination to write to")
parser.add_argument("-l",metavar="langs",type=str,nargs="+",help="List of langs to generate the site to")
-parser.add_argument('--extention',type=str,default="html", help="The extention to give to all generated files")
+parser.add_argument('--extension',type=str,default="html", help="The extension to give to all generated files")
#parser.add_argument("--model",metavar="model",type=str,help="model to use")
#parser.add_argument("--merge",metavar="merge",type=str,help="don't use iframes, merge all content")
@@ -95,9 +107,12 @@ if args.verbose:
print("Website will be generated in {} at {}".format(args.l,args.d))
for lang in args.l: #Generate every page in .lang.html (with both contents)
- htmlNamer=HTMLNameCreator(lang,args.extention)
+ htmlNamer=HTMLNameCreator(lang,args.extension)
+ htmlContentNamer=HTMLNameCreator("content_"+lang,args.extension)
previous_node=website.tree.get_node("index",lang)
gen_all_nodes_menu(website.tree,lang,depth="")
+ gen_all_nodes_content(website.tree,lang)
+
#for tree in website.tree.get_next_subtree():
# previous_node=tree # For now, you can't get higher than index
#for every lang, do a mix of print_webtree and makeContainer