From 7ad236bac830b63662e9d9de00574a90846fd157 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sat, 14 May 2016 01:41:05 +0200 Subject: reproducible: move navigation menu to the left. (this will be WIP for some time…) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/reproducible_common.py | 17 +++++----- bin/reproducible_common.sh | 52 ++++++++++++++++--------------- userContent/reproducible/static/style.css | 9 ++++++ 3 files changed, 43 insertions(+), 35 deletions(-) diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py index b17f3389..2bf09477 100755 --- a/bin/reproducible_common.py +++ b/bin/reproducible_common.py @@ -135,7 +135,7 @@ html_header = Template(""" $page_title - """) + """) try: JOB_URL = os.environ['JOB_URL'] @@ -162,14 +162,14 @@ html_footer = Template(""" from the Tango Icon Library.

- + """ % (JOB_FOOTER, JENKINS_URL)) html_head_page = Template((tab*2).join(""" -
+

$page_title

- -
""".splitlines(True))) + +
""".splitlines(True))) html_foot_page_style_note = Template((tab*2).join(""" @@ -321,13 +321,10 @@ def _gen_links(suite, arch): def write_html_page(title, body, destfile, suite=defaultsuite, arch=defaultarch, noheader=False, style_note=False, noendpage=False, packages=False, refresh_every=None): now = datetime.utcnow().strftime('%Y-%m-%d %H:%M UTC') html = '' - # this removes the padding if we are writing a package page - padding = 'class="wrapper"' if packages else '' meta_refresh = '' % \ refresh_every if refresh_every is not None else '' html += html_header.substitute( page_title=title, - padding=padding, meta_refresh=meta_refresh) if not noheader: links = _gen_links(suite, arch) diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index eb5fe913..b465303c 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -202,34 +202,15 @@ write_page_header() { SPOKENTARGET["dashboard"]="dashboard" write_page "" write_page "" + write_page "" write_page "" write_page "$2" if [ "$1" != "$MAINVIEW" ] ; then - write_page "

$2

" + write_page "" write_page "" } diff --git a/userContent/reproducible/static/style.css b/userContent/reproducible/static/style.css index cb2bf2d0..4d882d1a 100644 --- a/userContent/reproducible/static/style.css +++ b/userContent/reproducible/static/style.css @@ -418,6 +418,15 @@ span.dangerous { color: orange; } padding-top: 0px; overflow: auto; } + .mainbody { + width: 80%; + float: left; + box-sizing: border-box; + border: none; + height: 100%; + padding: 0.5em; + overflow: auto; + } iframe#main { width: 80%; float: right; -- cgit v1.2.3-70-g09d2