From 12c30fd62d5b407e60e528aab64fd0a2984fa1cd Mon Sep 17 00:00:00 2001 From: Maximilien Rigaut Date: Mon, 28 Aug 2017 15:10:11 +0200 Subject: [PATCH] Added custom js to resize iframes (courtesy of stackoverflow) --- generator/models/dual.py | 29 ++++++++++++++++++++++++---- site_base/dual/assets/css/custom.css | 6 ++++-- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/generator/models/dual.py b/generator/models/dual.py index 68c7486..468228e 100644 --- a/generator/models/dual.py +++ b/generator/models/dual.py @@ -1,9 +1,29 @@ # -*- coding: utf_8 -*- -import os +import os,hashlib def container(pagetitle="#_pagetitle_#",websitename="#_websitename_#",menu="\{menu\}",page="\{page\}",langswitch="\{langswitch\}",depth=""): "Return the global appearance of the website" + script="""""" return """ @@ -18,6 +38,7 @@ def container(pagetitle="#_pagetitle_#",websitename="#_websitename_#",menu="\{me + {script}
@@ -61,7 +82,7 @@ def container(pagetitle="#_pagetitle_#",websitename="#_websitename_#",menu="\{me - """.format(MENU=menu,PAGE=page,websitename=websitename,pagetitle=pagetitle,depth=depth,langs="",langswitch=langswitch) + """.format(MENU=menu,PAGE=page,websitename=websitename,pagetitle=pagetitle,depth=depth,langs="",langswitch=langswitch,script=script) def menu(previous="",menulist="\{menulist\}",articles="#_articles_#",depth=""): @@ -91,14 +112,14 @@ def content(content="\{content\}",title="\{title\}"): {content}
-
""".format(content=content,title=title) def iframe(list_of_pages): iframes="" percent=round(100/len(list_of_pages)) for page in list_of_pages: - iframes+="".format(page,percent) + pageid=hashlib.sha224(page).hexdigest() + iframes+="""""".format(page,percent,pageid) return iframes def assets(): diff --git a/site_base/dual/assets/css/custom.css b/site_base/dual/assets/css/custom.css index f6f58f2..c157d53 100644 --- a/site_base/dual/assets/css/custom.css +++ b/site_base/dual/assets/css/custom.css @@ -14,19 +14,21 @@ =============================================*/ body { font-family: 'Open Sans', sans-serif; + height: 100%; } #wrapper { width: 100%; margin-top:50px; + height: 100%; } #page-wrapper { padding: 15px 15px; min-height: 600px; - height: 600px; + vertical-align: top; background:#F3F3F3; - + height: 100%; } #page-inner { width:100%;