+
+
+
+
+
+
+
elif line.lstrip().startswith(post.html_brline[0]): css = tools.get_css(line, post.html_brline[0][0], "?") - html_post = \ - html_post.replace( - html_post.rsplit("\n")[ln], - post.html_brline[1]%css - ) - + text_replace(html_post.rsplit("\n")[ln], post.html_brline[1]%css) #
elif line.lstrip().startswith(post.html_hrline[0]): css = tools.get_css(line, post.html_hrline[0][0], "?") - html_post = \ - html_post.replace( - html_post.rsplit("\n")[ln], - post.html_hrline[1]%css - ) + text_replace(html_post.rsplit("\n")[ln],post.html_hrline[1]%css) # Anchors elif line.lstrip().startswith(post.anchor_target[0]): @@ -281,8 +270,6 @@ def split_size(size): # Convert images tags to HTML # #-----------------------------# def images(): - global html_post - for key, val in post.cf.items("IMAGES"): if key.startswith("html"): continue @@ -343,11 +330,10 @@ def images(): style = ' style="height:%s;"'%height - html_post = \ - html_post.replace( - html_post.rsplit("\n")[ln], - html_val%(css, figcap_o, css, style, figcap_c) - ) + text_replace( + html_post.rsplit("\n")[ln], + html_val%(css, figcap_o, css, style, figcap_c) + ) #=========================================================# @@ -595,3 +581,136 @@ def convert_list(markdown_str, mark_b, mark_c): work_str += " "*(cur_rank-i-1) + CLOSING[rank_stack.pop()] return work_str + + +#=========# +# Modules #==================================================================== +#---------# +#============================================# +# Check / Create modules files (.raw + .html # +# process: "wip" or "www" # +# - navbar # +# - sidebar # +# - header # +# - footer # +#--------------------------------------------# +def get_modules(srv): + # Modules settings + raws_uris = { + "header" : domain.wrk_header, + "navbar" : domain.wrk_navbar, + "sidebar" : domain.wrk_sidebar, + "footer" : domain.wrk_footer + } + + raws_sets = \ + { + "header" : tyto.module_header%( + "/template/%s"%domain.logo, domain.about, + "/template/%s"%domain.logo, domain.about, domain.about, + domain.title, + domain.about + ), + "navbar" : langs.logs.navbar_header%( + domain.title, domain.wrk_articles, + domain.wrk_navbar, + domain.wip_navbar, + domain.www_navbar + ), + "sidebar" : langs.logs.sidebar_header%( + domain.title, domain.wrk_articles, + domain.wrk_sidebar, + domain.wip_sidebar, + domain.www_sidebar + ), + "footer" : tyto.module_footer, + } + + create_html_mods = { + "header" : navbar_check, + } + + # Create user raw files modules in modules/ directory + for module in raws_uris: + if not os.path.exists(raws_uris[module]): + tools.create_file(raws_uris[module], raws_sets[module]) + + # Create HTML module from raw files + for module in create_html_mods: + if not create_html_mods[module](srv): + return False + + return True + + +# +# Navbar Creation # +# +def navbar_check(srv): + # navbar is NOT activated in domain configuration file + navbar_contents = "" + if srv == "wip": srv_file = domain.wip_navbar + elif srv == "www": srv_file = domain.www_navbar + + if not domain.navbar: + tools.create_file(srv_file, navbar_contents) + return True + + # Create navbar HTML file in srv, from raw + if not navbar_html_create(srv_file): + return False + + return True + + +# +# Create navbar HTML file in wip, from raw +# +def navbar_html_create(srv_file): + items = False + + with open(domain.wrk_navbar, "r") as f: + navbar_raw = f.read().rsplit("\n") + navbar_html = "" + title = title_html = "" + + + for ln, line in enumerate(navbar_raw, 1): + if line.lstrip().startswith("#") or \ + not line or \ + line.isspace(): + continue + + html_line = '%s '
+
+ # Get folder title (if set)
+ if line.lstrip().startswith(">"):
+ title = line.lstrip()[1:].lstrip()
+ title_html = ' title="%s"'%title
+ continue
+
+ # Get directory name and check if exists
+ folder = line.lstrip()
+ if not os.path.join(domain.wrk_articles, folder):
+ post.error = \
+ debug.out(6, 'Navbar. %s) "%s"'%(
+ ln, folder
+ ), domain.wrk_navbar, True, 2, False)
+ return False
+ else:
+ items = True
+ if not folder.startswith("/"):
+ folder = "/%s"%folder
+ html_line = html_line%(title_html, folder, folder)
+ if not navbar_html: navbar_html = html_line
+ else: navbar_html = "%s\n%s"%(navbar_html, html_line)
+ title = title_html = ""
+
+ if not items:
+ post.error = \
+ debug.out(9, 'Navbar', domain.wrk_navbar, True, 2, False)
+ return False
+
+ tools.create_file(srv_file, tyto.module_navbar%navbar_html)
+
+ return True
diff --git a/src/var/lib/tyto/tpl_files/styles.css b/src/var/lib/tyto/tpl_files/styles.css
index 39812aa..5608a1b 100644
--- a/src/var/lib/tyto/tpl_files/styles.css
+++ b/src/var/lib/tyto/tpl_files/styles.css
@@ -1,12 +1,50 @@
/*
- * Raw empty styles used by Tyto _ Littérateur
+ * Raw empty styles used by Tyto - Littérateur
* "tyto" is default. replace with YOUR domain css name if changed
* Some classes from markers, like paragraphs, lists... can have custom classes
*/
/* ----------------------------------------------------------------------------
- * Article styles
+ * Template website
*/
+/* Contains all website, after */
+div#site_container {}
+
+
+/* ----------------------------------------------------------------------------
+ * Header (Logo, Description)
+*/
+header#site_header {}
+/* Website Logo */
+div#site_logo {}
+a#site_logo_link {}
+img#site_logo_image {}
+/* Website about*/
+div#site_infos {}
+p#site_infos_title {}
+p#site_infos_text {}
+
+
+/* ----------------------------------------------------------------------------
+ * Website Menu navbar
+*/
+nav#site_menu {}
+menu#site_menu_items {}
+li.site_menu_item {}
+
+
+/* div contains and
%s
+%s
+""" + +module_navbar = """ +""" + +module_aside = """ +""" + +module_footer = """ +""" diff --git a/src/var/lib/tyto/program/wip.py b/src/var/lib/tyto/program/wip.py index 20ab690..3425b59 100644 --- a/src/var/lib/tyto/program/wip.py +++ b/src/var/lib/tyto/program/wip.py @@ -35,8 +35,8 @@ # file program : #-------------------------- -import sys -import args, debug, tyto, tools, post, domain +import sys, os +import args, debug, tyto, tools, post, domain, check, langs #=====================================# @@ -100,14 +100,21 @@ def convert(target): if not post.is_article(target): return False - # Article has errors - if post.chk_errors: - post.error = debug.out(10, "'check'", post.uri, True, 2, False) + # Check/Create modules files + # navbar, sidebar, header, footer + if not get_modules("wip"): return False - if post.has_changed and not args.force: - post.error = debug.out(106, "'check'", post.uri, True, 1,False) - return False + # Article has errors or changed : needs check first + if post.has_changed or post.chk_errors: + if post.has_changed: debug.out(106, "'check'", post.uri, True, 1,False) + elif post.chk_errors: debug.out(10, "'check'", post.uri, True, 2, False) + args.force = True + check.is_article(target) + if post.error != 0: + return False + is_article(target) + return # Get raw post from database raw_post = tools.b64_convert("decode", post.cf.get("TEXTS", "post")) @@ -211,50 +218,32 @@ def words_tags(): # anchors, paragraphs... # #-------------------------# def sl_tags(): - global html_post - for ln, line in enumerate(html_post.rsplit("\n")): css = "" # Paragraphs if line.lstrip().startswith(post.ptags[2][0]): css = tools.get_css(line, post.ptags[2][0], "?") - html_post = \ - html_post.replace( - html_post.rsplit("\n")[ln], - post.ptags[2][3]%css - ) + text_replace(html_post.rsplit("\n")[ln], post.ptags[2][3]%css) + elif line.lstrip().startswith(post.ptags[2][1]): text_replace(line, post.ptags[2][4]) # DIVs if line.lstrip().startswith(post.ptags[4][0]): css = tools.get_css(line, post.ptags[4][0], "?") - html_post = \ - html_post.replace( - html_post.rsplit("\n")[ln], - post.ptags[4][3]%css - ) + text_replace(html_post.rsplit("\n")[ln], post.ptags[4][3]%css) elif line.lstrip().startswith(post.ptags[4][1]): text_replace(line, post.ptags[4][4]) #elif line.lstrip().startswith(post.html_brline[0]): css = tools.get_css(line, post.html_brline[0][0], "?") - html_post = \ - html_post.replace( - html_post.rsplit("\n")[ln], - post.html_brline[1]%css - ) - + text_replace(html_post.rsplit("\n")[ln], post.html_brline[1]%css) #
elif line.lstrip().startswith(post.html_hrline[0]): css = tools.get_css(line, post.html_hrline[0][0], "?") - html_post = \ - html_post.replace( - html_post.rsplit("\n")[ln], - post.html_hrline[1]%css - ) + text_replace(html_post.rsplit("\n")[ln],post.html_hrline[1]%css) # Anchors elif line.lstrip().startswith(post.anchor_target[0]): @@ -281,8 +270,6 @@ def split_size(size): # Convert images tags to HTML # #-----------------------------# def images(): - global html_post - for key, val in post.cf.items("IMAGES"): if key.startswith("html"): continue @@ -343,11 +330,10 @@ def images(): style = ' style="height:%s;"'%height - html_post = \ - html_post.replace( - html_post.rsplit("\n")[ln], - html_val%(css, figcap_o, css, style, figcap_c) - ) + text_replace( + html_post.rsplit("\n")[ln], + html_val%(css, figcap_o, css, style, figcap_c) + ) #=========================================================# @@ -595,3 +581,136 @@ def convert_list(markdown_str, mark_b, mark_c): work_str += " "*(cur_rank-i-1) + CLOSING[rank_stack.pop()] return work_str + + +#=========# +# Modules #==================================================================== +#---------# +#============================================# +# Check / Create modules files (.raw + .html # +# process: "wip" or "www" # +# - navbar # +# - sidebar # +# - header # +# - footer # +#--------------------------------------------# +def get_modules(srv): + # Modules settings + raws_uris = { + "header" : domain.wrk_header, + "navbar" : domain.wrk_navbar, + "sidebar" : domain.wrk_sidebar, + "footer" : domain.wrk_footer + } + + raws_sets = \ + { + "header" : tyto.module_header%( + "/template/%s"%domain.logo, domain.about, + "/template/%s"%domain.logo, domain.about, domain.about, + domain.title, + domain.about + ), + "navbar" : langs.logs.navbar_header%( + domain.title, domain.wrk_articles, + domain.wrk_navbar, + domain.wip_navbar, + domain.www_navbar + ), + "sidebar" : langs.logs.sidebar_header%( + domain.title, domain.wrk_articles, + domain.wrk_sidebar, + domain.wip_sidebar, + domain.www_sidebar + ), + "footer" : tyto.module_footer, + } + + create_html_mods = { + "header" : navbar_check, + } + + # Create user raw files modules in modules/ directory + for module in raws_uris: + if not os.path.exists(raws_uris[module]): + tools.create_file(raws_uris[module], raws_sets[module]) + + # Create HTML module from raw files + for module in create_html_mods: + if not create_html_mods[module](srv): + return False + + return True + + +# +# Navbar Creation # +# +def navbar_check(srv): + # navbar is NOT activated in domain configuration file + navbar_contents = "" + if srv == "wip": srv_file = domain.wip_navbar + elif srv == "www": srv_file = domain.www_navbar + + if not domain.navbar: + tools.create_file(srv_file, navbar_contents) + return True + + # Create navbar HTML file in srv, from raw + if not navbar_html_create(srv_file): + return False + + return True + + +# +# Create navbar HTML file in wip, from raw +# +def navbar_html_create(srv_file): + items = False + + with open(domain.wrk_navbar, "r") as f: + navbar_raw = f.read().rsplit("\n") + navbar_html = "" + title = title_html = "" + + + for ln, line in enumerate(navbar_raw, 1): + if line.lstrip().startswith("#") or \ + not line or \ + line.isspace(): + continue + + html_line = '