diff --git a/generator/models/dual.py b/generator/models/dual.py index da1afa3..6628153 100644 --- a/generator/models/dual.py +++ b/generator/models/dual.py @@ -98,7 +98,7 @@ def iframe(list_of_pages): iframes="" percent=round(100/len(list_of_pages)) for page in list_of_pages: - iframes+="".format(page,percent) + iframes+="".format(page,percent) return iframes def assets(): diff --git a/site_base/dual/assets/css/custom.css b/site_base/dual/assets/css/custom.css index 8934db7..4edbced 100644 --- a/site_base/dual/assets/css/custom.css +++ b/site_base/dual/assets/css/custom.css @@ -7,10 +7,10 @@ 100% To use For Personal And Commercial Use. IN EXCHANGE JUST GIVE US CREDITS AND TELL YOUR FRIENDS ABOUT US - + ======================================================== */ /*============================================== - GENERAL STYLES + GENERAL STYLES =============================================*/ body { font-family: 'Open Sans', sans-serif; @@ -25,7 +25,7 @@ body { padding: 15px 15px; min-height: 600px; background:#F3F3F3; - + } #page-inner { width:100%; @@ -48,7 +48,7 @@ text-transform: uppercase; padding-bottom:20px; } /*============================================== - MENU STYLES + MENU STYLES =============================================*/ @@ -102,7 +102,7 @@ color:#0000FF; } .sidebar-collapse .nav > li > a:hover, .sidebar-collapse .nav > li > a:focus { - + background:#F3F3F3; outline:0; } @@ -117,7 +117,7 @@ color:#0000FF; .navbar-side { border:none; background-color: #202020; - + } .navbar-inverse { background-color: #f3f3f3; @@ -127,7 +127,7 @@ border-color: #D3D3D3; .navbar-default { border:0px solid #DDDDDD; - + } .navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus { background-color: #B40101; @@ -167,7 +167,7 @@ background-color: #8B7BFF; } /*============================================== - DASHBOARD STYLES + DASHBOARD STYLES =============================================*/ .bg-color-blue { @@ -184,7 +184,7 @@ border-top: 0px solid #fff; } /*============================================== - BOOTSTRAP STYLE CHANGES + BOOTSTRAP STYLE CHANGES =============================================*/ .nav-tabs > li > a { -webkit-border-radius: 0px 0px 0px 0px; @@ -203,8 +203,8 @@ border-radius: 0px; -moz-border-radius: 0px; } .panel-heading { - border-top-left-radius: 0px; - border-top-right-radius: 0px; + border-top-left-radius: 0px; + border-top-right-radius: 0px; } .btn { border-radius: 0px; @@ -217,18 +217,18 @@ border-radius: 0px; -moz-border-radius: 0px; } /*============================================== - MEDIA QUERIES + MEDIA QUERIES =============================================*/ - + @media(min-width:768px) { #page-wrapper{ margin: 0 0 0 260px; padding: 15px 30px; min-height: 1200px; - + } - - + + .navbar-side { z-index: 1; position: absolute; @@ -236,9 +236,7 @@ border-radius: 0px; } .navbar { - border-radius: 0px; -} - + border-radius: 0px; } - +} diff --git a/test.py b/test.py index cc38134..effb311 100644 --- a/test.py +++ b/test.py @@ -360,7 +360,7 @@ class testDual(simple): else: self.addSuccess() - import os + impoe self.currentTest("dual:pathAssets") if os.path.exists(dual.assets()): self.addSuccess() diff --git a/vkyweb.py b/vkyweb.py index 13e6a92..fa2767e 100644 --- a/vkyweb.py +++ b/vkyweb.py @@ -31,8 +31,11 @@ def iFrameFromNode(node): def gen_all_nodes_menu(tree,lang,previous_node,depth): #previous_node=tree.parent_node #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 + shortName=os.path.basename(current_node.name) + + if (shortName[0]!="_"): #Likely add a visible: true/false tag in the future filename=htmlNamer[lang](current_node.name) if args.verbose: print("Generating {} menus".format(filename)) @@ -40,7 +43,7 @@ def gen_all_nodes_menu(tree,lang,previous_node,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())) + list_of_lang.append((l,htmlNamer[l](shortName),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) @@ -48,6 +51,7 @@ def gen_all_nodes_menu(tree,lang,previous_node,depth): page=model.makePage(choosen_model,website,lang,menu,frames,depth,langswitch) saveData(save,page) + depth="../"+depth for new in tree.get_next_subtree(lang): previous_node=new