mirror of https://github.com/Malphaet/vkyweb.git
Most bugs corrected, still much to do but working nonetheless
This commit is contained in:
parent
3eb149abcb
commit
fbd4cb7dd8
|
|
@ -133,7 +133,7 @@ def parse_file(file_name):
|
|||
beg_lang,end_lang,text=match.groups()
|
||||
page_text=[]
|
||||
|
||||
if beg_lang: #Will now add a lang to witch the programe should write
|
||||
if beg_lang: #Will now add a lang to witch the program should write
|
||||
if beg_lang in used_langs:
|
||||
used_langs[beg_lang]+=1
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ def makeHTMLName(text):
|
|||
"Get the link assotitated with the node (name.html)"
|
||||
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=""):
|
||||
def makeContainer(module,site,current_node,previous_node,lang,makeHTMLName=makeHTMLName,depth="",langswitch=""):
|
||||
article_list=module.makeSubNodelist(current_node.parent_node,lang,getDataType,makeHTMLName)
|
||||
if previous_node==None:
|
||||
previous=""
|
||||
|
|
@ -45,8 +45,11 @@ def makeiFrame(module,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))
|
||||
|
||||
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 makePage(module,site,lang,menu,data,depth,langswitch):
|
||||
return module.container(pagetitle=site.get_title(lang),websitename=site.get_one(['websitename',"webtitle","name","title"],lang),menu=menu,page=data,depth=depth,langswitch=langswitch)
|
||||
|
||||
def makeLangSwitch(module,list_of_lang,selected_lang):
|
||||
return module.langselect(list_of_lang,selected_lang)
|
||||
|
||||
def pathAssets(module):
|
||||
return module.assets()
|
||||
|
|
@ -58,7 +61,7 @@ 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,depth="")
|
||||
menu=makeContainer(dual,site,current_node,previous_node,lang,depth="",langswitch="")
|
||||
data=makeData(dual,current_node,lang)
|
||||
|
||||
page=makePage(dual,site,lang,menu,data,depth="")
|
||||
|
|
|
|||
|
|
@ -1,113 +0,0 @@
|
|||
# Copyleft (c) 2016 Cocobug All Rights Reserved.
|
||||
# coding=utf-8
|
||||
|
||||
import re,traceback
|
||||
|
||||
try:
|
||||
from tree_parser import *
|
||||
except:
|
||||
from generator.tree_parser import *
|
||||
|
||||
re_vars=re.compile(".*\#_(?P<variable>.*)_\#")
|
||||
|
||||
class HTMLPage(object):
|
||||
"Basic HTML object"
|
||||
def __init__(self,name,node):
|
||||
self.html=""
|
||||
self.name=name
|
||||
self.node=node
|
||||
self.path=""
|
||||
|
||||
def load(self,path):
|
||||
self.path=path
|
||||
try:
|
||||
with open(path) as a:
|
||||
self.model=a.read()
|
||||
except:
|
||||
print( "Error loading model")
|
||||
|
||||
def replace(self,lang):
|
||||
self.html=""
|
||||
for line in self.model.splitlines():
|
||||
#print (line)
|
||||
try:
|
||||
variable=re_vars.match(line).groups()[0]
|
||||
if variable!=None:
|
||||
line=line.replace("#_"+variable+"_#",self.node.get_variable(variable,lang))
|
||||
except AttributeError:
|
||||
pass
|
||||
except:
|
||||
print( traceback.print_exc())
|
||||
self.html+=line
|
||||
self.html+=os.linesep
|
||||
#print( self.html)
|
||||
|
||||
def export(self):
|
||||
"Generate the HTML code and output it"
|
||||
return self.html
|
||||
|
||||
class Container(HTMLPage):
|
||||
"Side menus and title, acess to all special pages"
|
||||
def __init__(self,name,node):
|
||||
super(Container,self).__init__(name,node)
|
||||
|
||||
class Data(HTMLPage):
|
||||
"Webpage itself"
|
||||
def __init__(self,name,node):
|
||||
super(Data,self).__init__(name,node)
|
||||
|
||||
class DualContainer(Container):
|
||||
"Dual view"
|
||||
def __init__(self,name,node):
|
||||
super(DualContainer,self).__init__(name,node)
|
||||
|
||||
|
||||
class DualData(Data):
|
||||
"Dual view"
|
||||
def __init__(self,name,node):
|
||||
super(DualData,self).__init__(name,node)
|
||||
|
||||
def replace(self,lang):
|
||||
self.html=self.model
|
||||
self.html=self.html.replace("#_content_#",self.node.get_content("fr"))
|
||||
self.html=self.html.replace("#_name_#",self.node.get_variable("title","fr"))
|
||||
|
||||
def DataType(ext):
|
||||
"Return some kind of general types depending on the extention"
|
||||
data={"image":[".jpg",".png",".svg",".tiff",".jpeg"],
|
||||
"audio":[".ogg",".aiff",".mp3"],
|
||||
"text":[".txt",".md"],
|
||||
"video":[".mov",".mp4"]}
|
||||
for typename,extension in data.iteritems():
|
||||
print typename,extension
|
||||
if ext in extension:
|
||||
return typename
|
||||
return None
|
||||
|
||||
def makeContainer(node):
|
||||
c=DualContainer(node.name,node)
|
||||
#print (node.variables)
|
||||
#print( node.config_file)
|
||||
c.load("generator/model/dual_menu.html")
|
||||
c.replace("fr")
|
||||
return c
|
||||
|
||||
def makeData(node):
|
||||
c=DualData(node.name,node)
|
||||
c.load("generator/model/dual_page.html")
|
||||
c.replace("fr")
|
||||
return c
|
||||
|
||||
def makePage(node,cont,data):
|
||||
c=DualContainer(node.name,node)
|
||||
c.load("generator/model/dual_container.html")
|
||||
c.replace('fr')
|
||||
cont_t=cont.export()
|
||||
data_t=data.export()
|
||||
print( c.export().replace("##PAGE##",data_t).replace("##MENU##",cont_t))
|
||||
|
||||
if __name__ == '__main__':
|
||||
site=makeWebsite("sites/example_website")
|
||||
cont=makeContainer(site)
|
||||
data=makeData(site.tree.get_node("index","fr"))
|
||||
makePage(site,cont,data)
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
import os
|
||||
|
||||
def container(pagetitle="#_pagetitle_#",websitename="#_websitename_#",menu="\{menu\}",page="\{page\}",depth=""):
|
||||
def container(pagetitle="#_pagetitle_#",websitename="#_websitename_#",menu="\{menu\}",page="\{page\}",langswitch="\{langswitch\}",depth=""):
|
||||
"Return the global appearance of the website"
|
||||
return """<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
|
|
@ -29,11 +29,9 @@ def container(pagetitle="#_pagetitle_#",websitename="#_websitename_#",menu="\{me
|
|||
</button>
|
||||
<a class="navbar-brand" href="#"><i class="fa fa-square-o "></i> {websitename}</a>
|
||||
</div>
|
||||
<!-- <div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li><a href="#">Login</a></li>
|
||||
</ul>
|
||||
</div> -->
|
||||
<div class="navbar-collapse collapse">
|
||||
{langswitch}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /. NAV TOP -->
|
||||
|
|
@ -61,7 +59,7 @@ def container(pagetitle="#_pagetitle_#",websitename="#_websitename_#",menu="\{me
|
|||
<!-- CUSTOM SCRIPTS -->
|
||||
<script src="{depth}assets/js/custom.js"></script>
|
||||
</body>
|
||||
</html>""".format(MENU=menu,PAGE=page,websitename=websitename,pagetitle=pagetitle,depth=depth)
|
||||
</html>""".format(MENU=menu,PAGE=page,websitename=websitename,pagetitle=pagetitle,depth=depth,langs="",langswitch=langswitch)
|
||||
|
||||
|
||||
def menu(previous="",menulist="\{menulist\}",articles="#_articles_#",depth=""):
|
||||
|
|
@ -122,6 +120,16 @@ def menuitem(text,link,datatype):
|
|||
#print (datatype)
|
||||
return """<li><a href="{link}"><i class="fa fa-{datatype} "></i>{text}</a></li>""".format(text=text,link=link,datatype=geticon(datatype))
|
||||
|
||||
def langselect(list_of_links,selected_lang):
|
||||
links=""
|
||||
for l,pagelink,lang_name in list_of_links:
|
||||
if l==selected_lang:
|
||||
style="class=\"btn btn-default\""
|
||||
else:
|
||||
style=""#"class=\"btn btn-default\""
|
||||
links+="""<li><a {style} href="{pagelink}">{lang_name}</a></li>""".format(pagelink=pagelink,lang_name=lang_name,style=style)
|
||||
return """<ul class="nav navbar-nav navbar-right">{}</ul>""".format(links)
|
||||
|
||||
def makeSubNodelist(subnode,lang,getdatatype,makeHTMLName):
|
||||
items=[]
|
||||
for node in subnode.get_next_nodes(lang):
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ class WebTree(object):
|
|||
self.config_path=os.path.join(self.website_path,self.path,"_config.txt")
|
||||
self.config_file=file_parser.parse_file(self.config_path)
|
||||
self.variables=self.config_file.variables
|
||||
self.name=self.config_file.name #Should actually, rename the file to allow customs names in _config
|
||||
self.name=self.path.split("_")[0]#self.config_file.name #Should actually, rename the file to allow customs names in _config
|
||||
|
||||
def get_variable(self,varname,filter_lang="*"):
|
||||
"Get the corresponding variable"
|
||||
|
|
@ -76,7 +76,7 @@ class WebSubTree(WebTree):
|
|||
self.subtree={}
|
||||
self.nodes={}
|
||||
WebTree.__init__(self,website_path,path)
|
||||
self.name=os.path.split(path)[-1]
|
||||
#self.name=os.path.split(path)[-1]
|
||||
|
||||
def get_variable(self,varname,filter_lang):
|
||||
"Get the variable, either in it's config or one of the above"
|
||||
|
|
@ -105,15 +105,18 @@ class WebSubTree(WebTree):
|
|||
for f in os.listdir(self.full_path):
|
||||
name=os.path.join(self.full_path,f)
|
||||
path=os.path.join(self.path,f)
|
||||
#print self.name
|
||||
if os.path.isdir(name):
|
||||
var,lang=file_parser.create_lang(f)
|
||||
new=WebSubTree(self.website_path,path)
|
||||
new.parent_node=self
|
||||
new.name=os.path.join(self.name,var) # Attempt to fix
|
||||
self.subtree=file_parser.add_to_table(var,lang,new,self.subtree)
|
||||
else:
|
||||
var,lang=file_parser.create_lang(os.path.splitext(f)[0])
|
||||
new=WebNode(self.website_path,path)
|
||||
new.parent_node=self
|
||||
new.name=os.path.join(self.name,var)
|
||||
self.nodes=file_parser.add_to_table(var,lang,new,self.nodes)
|
||||
#print( self, self.subtree)
|
||||
#print( self.nodes)
|
||||
|
|
|
|||
|
|
@ -25,11 +25,9 @@
|
|||
</button>
|
||||
<a class="navbar-brand" href="#"><i class="fa fa-square-o "></i> Tradiction</a>
|
||||
</div>
|
||||
<!-- <div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li><a href="#">Login</a></li>
|
||||
</ul>
|
||||
</div> -->
|
||||
<div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right"><li><a class="btn btn-default" href="index_en.html">English</a></li><li><a href="index_fr.html">French</a></li></ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /. NAV TOP -->
|
||||
|
|
@ -45,7 +43,7 @@
|
|||
<ul class="nav nav-second-level">
|
||||
<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="subarticle2/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>
|
||||
|
||||
|
|
|
|||
|
|
@ -25,11 +25,9 @@
|
|||
</button>
|
||||
<a class="navbar-brand" href="#"><i class="fa fa-square-o "></i> Tradiction</a>
|
||||
</div>
|
||||
<!-- <div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li><a href="#">Login</a></li>
|
||||
</ul>
|
||||
</div> -->
|
||||
<div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right"><li><a href="index_en.html">Anglais</a></li><li><a class="btn btn-default" href="index_fr.html">Français</a></li></ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /. NAV TOP -->
|
||||
|
|
@ -45,7 +43,7 @@
|
|||
<ul class="nav nav-second-level">
|
||||
<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="subarticle2/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>
|
||||
|
||||
|
|
|
|||
|
|
@ -25,11 +25,9 @@
|
|||
</button>
|
||||
<a class="navbar-brand" href="#"><i class="fa fa-square-o "></i> Tradiction</a>
|
||||
</div>
|
||||
<!-- <div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li><a href="#">Login</a></li>
|
||||
</ul>
|
||||
</div> -->
|
||||
<div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right"><li><a class="btn btn-default" href="poetry1_en.html">English</a></li><li><a href="poetry1_fr.html">French</a></li></ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /. NAV TOP -->
|
||||
|
|
@ -45,7 +43,7 @@
|
|||
<ul class="nav nav-second-level">
|
||||
<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="subarticle2/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>
|
||||
|
||||
|
|
|
|||
|
|
@ -25,11 +25,9 @@
|
|||
</button>
|
||||
<a class="navbar-brand" href="#"><i class="fa fa-square-o "></i> Tradiction</a>
|
||||
</div>
|
||||
<!-- <div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li><a href="#">Login</a></li>
|
||||
</ul>
|
||||
</div> -->
|
||||
<div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right"><li><a href="poetry1_en.html">Anglais</a></li><li><a class="btn btn-default" href="poetry1_fr.html">Français</a></li></ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /. NAV TOP -->
|
||||
|
|
@ -45,7 +43,7 @@
|
|||
<ul class="nav nav-second-level">
|
||||
<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="subarticle2/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>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,69 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Mulloland</title>
|
||||
<!-- BOOTSTRAP STYLES-->
|
||||
<link href="../../assets/css/bootstrap.css" rel="stylesheet" />
|
||||
<!-- FONTAWESOME STYLES-->
|
||||
<link href="../../assets/css/font-awesome.css" rel="stylesheet" />
|
||||
<!-- CUSTOM STYLES-->
|
||||
<link href="../../assets/css/custom.css" rel="stylesheet" />
|
||||
<!-- GOOGLE FONTS-->
|
||||
<link href='http://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css' />
|
||||
</head>
|
||||
<body>
|
||||
<div id="wrapper">
|
||||
<div class="navbar navbar-inverse navbar-fixed-top">
|
||||
<div class="adjust-nav">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".sidebar-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="#"><i class="fa fa-square-o "></i> Tradiction</a>
|
||||
</div>
|
||||
<!-- <div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li><a href="#">Login</a></li>
|
||||
</ul>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
<!-- /. NAV TOP -->
|
||||
<nav class="navbar-default navbar-side" role="navigation">
|
||||
<div class="sidebar-collapse">
|
||||
<ul class="nav" id="main-menu">
|
||||
<li class="text-center user-image-back">
|
||||
<img src="../../assets/img/logo.png" class="img-responsive" />
|
||||
</li>
|
||||
<li><a href="../index_en.html"><i class="fa fa-arrow-left "></i>Previous articles</a></li>
|
||||
<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_en.html"><i class="fa fa-book "></i>Subarticlulation</a></li>
|
||||
</ul>
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
<!-- /. NAV SIDE -->
|
||||
<div id="page-wrapper" >
|
||||
<iframe src=index_en_content_en.html width='50.0%' height='500px'>Iframes not supported</iframe><iframe src=index_en_content_fr.html width='50.0%' height='500px'>Iframes not supported</iframe>
|
||||
</div>
|
||||
<!-- /. PAGE WRAPPER -->
|
||||
</div>
|
||||
<!-- /. WRAPPER -->
|
||||
<!-- SCRIPTS -AT THE BOTOM TO REDUCE THE LOAD TIME-->
|
||||
<!-- JQUERY SCRIPTS -->
|
||||
<script src="../../assets/js/jquery-1.10.2.js"></script>
|
||||
<!-- BOOTSTRAP SCRIPTS -->
|
||||
<script src="../../assets/js/bootstrap.min.js"></script>
|
||||
<!-- METISMENU SCRIPTS -->
|
||||
<script src="../../assets/js/jquery.metisMenu.js"></script>
|
||||
<!-- CUSTOM SCRIPTS -->
|
||||
<script src="../../assets/js/custom.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Mulehollande</title>
|
||||
<!-- BOOTSTRAP STYLES-->
|
||||
<link href="../../assets/css/bootstrap.css" rel="stylesheet" />
|
||||
<!-- FONTAWESOME STYLES-->
|
||||
<link href="../../assets/css/font-awesome.css" rel="stylesheet" />
|
||||
<!-- CUSTOM STYLES-->
|
||||
<link href="../../assets/css/custom.css" rel="stylesheet" />
|
||||
<!-- GOOGLE FONTS-->
|
||||
<link href='http://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css' />
|
||||
</head>
|
||||
<body>
|
||||
<div id="wrapper">
|
||||
<div class="navbar navbar-inverse navbar-fixed-top">
|
||||
<div class="adjust-nav">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".sidebar-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="#"><i class="fa fa-square-o "></i> Tradiction</a>
|
||||
</div>
|
||||
<!-- <div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li><a href="#">Login</a></li>
|
||||
</ul>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
<!-- /. NAV TOP -->
|
||||
<nav class="navbar-default navbar-side" role="navigation">
|
||||
<div class="sidebar-collapse">
|
||||
<ul class="nav" id="main-menu">
|
||||
<li class="text-center user-image-back">
|
||||
<img src="../../assets/img/logo.png" class="img-responsive" />
|
||||
</li>
|
||||
<li><a href="../index_fr.html"><i class="fa fa-arrow-left "></i>Articles précédents</a></li>
|
||||
<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_fr.html"><i class="fa fa-book "></i>Sous articulation</a></li>
|
||||
</ul>
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
<!-- /. NAV SIDE -->
|
||||
<div id="page-wrapper" >
|
||||
<iframe src=index_fr_content_en.html width='50.0%' height='500px'>Iframes not supported</iframe><iframe src=index_fr_content_fr.html width='50.0%' height='500px'>Iframes not supported</iframe>
|
||||
</div>
|
||||
<!-- /. PAGE WRAPPER -->
|
||||
</div>
|
||||
<!-- /. WRAPPER -->
|
||||
<!-- SCRIPTS -AT THE BOTOM TO REDUCE THE LOAD TIME-->
|
||||
<!-- JQUERY SCRIPTS -->
|
||||
<script src="../../assets/js/jquery-1.10.2.js"></script>
|
||||
<!-- BOOTSTRAP SCRIPTS -->
|
||||
<script src="../../assets/js/bootstrap.min.js"></script>
|
||||
<!-- METISMENU SCRIPTS -->
|
||||
<script src="../../assets/js/jquery.metisMenu.js"></script>
|
||||
<!-- CUSTOM SCRIPTS -->
|
||||
<script src="../../assets/js/custom.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Mulloland</title>
|
||||
<!-- BOOTSTRAP STYLES-->
|
||||
<link href="../../assets/css/bootstrap.css" rel="stylesheet" />
|
||||
<!-- FONTAWESOME STYLES-->
|
||||
<link href="../../assets/css/font-awesome.css" rel="stylesheet" />
|
||||
<!-- CUSTOM STYLES-->
|
||||
<link href="../../assets/css/custom.css" rel="stylesheet" />
|
||||
<!-- GOOGLE FONTS-->
|
||||
<link href='http://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css' />
|
||||
</head>
|
||||
<body>
|
||||
<div id="wrapper">
|
||||
<div class="navbar navbar-inverse navbar-fixed-top">
|
||||
<div class="adjust-nav">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".sidebar-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="#"><i class="fa fa-square-o "></i> Tradiction</a>
|
||||
</div>
|
||||
<!-- <div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li><a href="#">Login</a></li>
|
||||
</ul>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
<!-- /. NAV TOP -->
|
||||
<nav class="navbar-default navbar-side" role="navigation">
|
||||
<div class="sidebar-collapse">
|
||||
<ul class="nav" id="main-menu">
|
||||
<li class="text-center user-image-back">
|
||||
<img src="../../assets/img/logo.png" class="img-responsive" />
|
||||
</li>
|
||||
<li><a href="../index_en.html"><i class="fa fa-arrow-left "></i>Previous articles</a></li>
|
||||
<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>Ferogo</a></li>
|
||||
</ul>
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
<!-- /. NAV SIDE -->
|
||||
<div id="page-wrapper" >
|
||||
<iframe src=index_content_en.html width='50.0%' height='500px'>Iframes not supported</iframe><iframe src=index_content_fr.html width='50.0%' height='500px'>Iframes not supported</iframe>
|
||||
</div>
|
||||
<!-- /. PAGE WRAPPER -->
|
||||
</div>
|
||||
<!-- /. WRAPPER -->
|
||||
<!-- SCRIPTS -AT THE BOTOM TO REDUCE THE LOAD TIME-->
|
||||
<!-- JQUERY SCRIPTS -->
|
||||
<script src="../../assets/js/jquery-1.10.2.js"></script>
|
||||
<!-- BOOTSTRAP SCRIPTS -->
|
||||
<script src="../../assets/js/bootstrap.min.js"></script>
|
||||
<!-- METISMENU SCRIPTS -->
|
||||
<script src="../../assets/js/jquery.metisMenu.js"></script>
|
||||
<!-- CUSTOM SCRIPTS -->
|
||||
<script src="../../assets/js/custom.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Mulehollande</title>
|
||||
<!-- BOOTSTRAP STYLES-->
|
||||
<link href="../../assets/css/bootstrap.css" rel="stylesheet" />
|
||||
<!-- FONTAWESOME STYLES-->
|
||||
<link href="../../assets/css/font-awesome.css" rel="stylesheet" />
|
||||
<!-- CUSTOM STYLES-->
|
||||
<link href="../../assets/css/custom.css" rel="stylesheet" />
|
||||
<!-- GOOGLE FONTS-->
|
||||
<link href='http://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css' />
|
||||
</head>
|
||||
<body>
|
||||
<div id="wrapper">
|
||||
<div class="navbar navbar-inverse navbar-fixed-top">
|
||||
<div class="adjust-nav">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".sidebar-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="#"><i class="fa fa-square-o "></i> Tradiction</a>
|
||||
</div>
|
||||
<!-- <div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li><a href="#">Login</a></li>
|
||||
</ul>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
<!-- /. NAV TOP -->
|
||||
<nav class="navbar-default navbar-side" role="navigation">
|
||||
<div class="sidebar-collapse">
|
||||
<ul class="nav" id="main-menu">
|
||||
<li class="text-center user-image-back">
|
||||
<img src="../../assets/img/logo.png" class="img-responsive" />
|
||||
</li>
|
||||
<li><a href="../index_fr.html"><i class="fa fa-arrow-left "></i>Articles précédents</a></li>
|
||||
<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>Ferugination</a></li>
|
||||
</ul>
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
<!-- /. NAV SIDE -->
|
||||
<div id="page-wrapper" >
|
||||
<iframe src=index_content_en.html width='50.0%' height='500px'>Iframes not supported</iframe><iframe src=index_content_fr.html width='50.0%' height='500px'>Iframes not supported</iframe>
|
||||
</div>
|
||||
<!-- /. PAGE WRAPPER -->
|
||||
</div>
|
||||
<!-- /. WRAPPER -->
|
||||
<!-- SCRIPTS -AT THE BOTOM TO REDUCE THE LOAD TIME-->
|
||||
<!-- JQUERY SCRIPTS -->
|
||||
<script src="../../assets/js/jquery-1.10.2.js"></script>
|
||||
<!-- BOOTSTRAP SCRIPTS -->
|
||||
<script src="../../assets/js/bootstrap.min.js"></script>
|
||||
<!-- METISMENU SCRIPTS -->
|
||||
<script src="../../assets/js/jquery.metisMenu.js"></script>
|
||||
<!-- CUSTOM SCRIPTS -->
|
||||
<script src="../../assets/js/custom.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -25,11 +25,9 @@
|
|||
</button>
|
||||
<a class="navbar-brand" href="#"><i class="fa fa-square-o "></i> Tradiction</a>
|
||||
</div>
|
||||
<!-- <div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li><a href="#">Login</a></li>
|
||||
</ul>
|
||||
</div> -->
|
||||
<div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right"><li><a class="btn btn-default" href="article1_en.html">English</a></li><li><a href="article1_fr.html">French</a></li></ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /. NAV TOP -->
|
||||
|
|
|
|||
|
|
@ -25,11 +25,9 @@
|
|||
</button>
|
||||
<a class="navbar-brand" href="#"><i class="fa fa-square-o "></i> Tradiction</a>
|
||||
</div>
|
||||
<!-- <div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li><a href="#">Login</a></li>
|
||||
</ul>
|
||||
</div> -->
|
||||
<div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right"><li><a href="article1_en.html">Anglais</a></li><li><a class="btn btn-default" href="article1_fr.html">Français</a></li></ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /. NAV TOP -->
|
||||
|
|
|
|||
|
|
@ -25,11 +25,9 @@
|
|||
</button>
|
||||
<a class="navbar-brand" href="#"><i class="fa fa-square-o "></i> Tradiction</a>
|
||||
</div>
|
||||
<!-- <div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li><a href="#">Login</a></li>
|
||||
</ul>
|
||||
</div> -->
|
||||
<div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right"><li><a class="btn btn-default" href="index_en.html">English</a></li><li><a href="index_fr.html">French</a></li></ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /. NAV TOP -->
|
||||
|
|
|
|||
|
|
@ -25,11 +25,9 @@
|
|||
</button>
|
||||
<a class="navbar-brand" href="#"><i class="fa fa-square-o "></i> Tradiction</a>
|
||||
</div>
|
||||
<!-- <div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li><a href="#">Login</a></li>
|
||||
</ul>
|
||||
</div> -->
|
||||
<div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right"><li><a href="index_en.html">Anglais</a></li><li><a class="btn btn-default" href="index_fr.html">Français</a></li></ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /. NAV TOP -->
|
||||
|
|
|
|||
10
test.py
10
test.py
|
|
@ -145,7 +145,7 @@ class testTree(simple):
|
|||
|
||||
|
||||
self.currentTest("tree:name")
|
||||
if webt.name!="_config.txt":
|
||||
if webt.name!="": # Not sure it's the best practice, but it's supposed to be like that
|
||||
self.addFailure("malformed name"+webt.name)
|
||||
else:
|
||||
self.addSuccess()
|
||||
|
|
@ -285,6 +285,14 @@ class testDual(simple):
|
|||
if status:
|
||||
self.addSuccess()
|
||||
|
||||
self.currentTest("dual:langselect")
|
||||
dual_select=dual.langselect([("en","index_en.html","english"),('fr',"index_fr.html","french")],"en")
|
||||
nominalselect="""<ul class="nav navbar-nav navbar-right"><li><a href="index_en.html">english</a></li><li><a href="index_fr.html">french</a></li></ul>"""
|
||||
if dual_select==nominalselect:
|
||||
self.addSuccess()
|
||||
else:
|
||||
self.addFailure("links malformed (expected {})".format(nominalselect))
|
||||
|
||||
def testThisDictOnDis(self,name,testDict,testFunction,returnType=str,returnDict=None):
|
||||
res=testFunction(**testDict)
|
||||
if returnDict==None:
|
||||
|
|
|
|||
23
vkyweb.py
23
vkyweb.py
|
|
@ -35,14 +35,19 @@ def gen_all_nodes_menu(tree,lang,previous_node,depth):
|
|||
# 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.name)
|
||||
filename=htmlNamer[lang](current_node.name)
|
||||
if args.verbose:
|
||||
print "Generating {} menus".format(filename)
|
||||
print("Generating {} menus".format(filename))
|
||||
save=savePath(filename)
|
||||
|
||||
menu=model.makeContainer(choosen_model,website,current_node,previous_node,lang,htmlNamer,depth)
|
||||
list_of_lang=[]
|
||||
for l in args.l:
|
||||
list_of_lang.append((l,htmlNamer[l](os.path.basename(current_node.name)),tree.get_variable(l,lang).capitalize()))
|
||||
|
||||
langswitch=model.makeLangSwitch(choosen_model,list_of_lang,lang)
|
||||
menu=model.makeContainer(choosen_model,website,current_node,previous_node,lang,htmlNamer[lang],depth,langswitch)
|
||||
frames=model.makeiFrame(choosen_model,iFrameFromNode(current_node))
|
||||
page=model.makePage(choosen_model,website,lang,menu,frames,depth)
|
||||
page=model.makePage(choosen_model,website,lang,menu,frames,depth,langswitch)
|
||||
|
||||
saveData(save,page)
|
||||
depth="../"+depth
|
||||
|
|
@ -50,9 +55,9 @@ def gen_all_nodes_menu(tree,lang,previous_node,depth):
|
|||
previous_node=new
|
||||
try:
|
||||
if args.verbose:
|
||||
print("Creating folder [{}]".format(new.path))
|
||||
print("Creating folder [{}]".format(new.name))
|
||||
if not args.dry:
|
||||
os.makedirs(savePath(new.path))
|
||||
os.makedirs(savePath(new.name))
|
||||
except OSError:
|
||||
pass
|
||||
gen_all_nodes_menu(new,lang,previous_node,depth)
|
||||
|
|
@ -119,8 +124,12 @@ if not args.dry:
|
|||
if args.verbose:
|
||||
print("Website will be generated in {} at {}".format(args.l,args.d))
|
||||
|
||||
htmlNamer={}
|
||||
for l in args.l:
|
||||
htmlNamer[l]=HTMLNameCreator(l,args.extension)
|
||||
|
||||
for lang in args.l: #Generate every page in .lang.html (with both contents)
|
||||
htmlNamer=HTMLNameCreator(lang,args.extension)
|
||||
#htmlNamer=HTMLNameCreator(lang,args.extension)
|
||||
htmlContentNamer=HTMLNameCreator("content_"+lang,args.extension)
|
||||
previous_node=None#website.tree.get_node("index",lang)
|
||||
gen_all_nodes_menu(website.tree,lang,previous_node=None,depth="")
|
||||
|
|
|
|||
Loading…
Reference in New Issue