Repository: incubator-juneau-website Updated Branches: refs/heads/asf-site 80d5c0647 -> 3ec66e4ad
Remove iframe from website. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/commit/3ec66e4a Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/tree/3ec66e4a Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/diff/3ec66e4a Branch: refs/heads/asf-site Commit: 3ec66e4ad662b6544355fd343996f227a28c100f Parents: 80d5c06 Author: jamesbognar <[email protected]> Authored: Mon Aug 8 10:14:24 2016 -0400 Committer: jamesbognar <[email protected]> Committed: Mon Aug 8 10:14:24 2016 -0400 ---------------------------------------------------------------------- content/about.html | 1 - content/community.html | 1 - content/documentation.html | 1 - content/downloads.html | 1 - content/index.html | 49 +++++++++++++++++++---------- content/issueTracking.html | 1 - content/sourceCode.html | 1 - content/styles/juneau-website-page.css | 2 -- 8 files changed, 33 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/3ec66e4a/content/about.html ---------------------------------------------------------------------- diff --git a/content/about.html b/content/about.html index eb366c3..a872002 100644 --- a/content/about.html +++ b/content/about.html @@ -4,7 +4,6 @@ <style> @import url("styles/juneau-code.css"); @import url("styles/juneau-doc.css"); - @import url("styles/juneau-website-page.css"); </style> </head> <body> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/3ec66e4a/content/community.html ---------------------------------------------------------------------- diff --git a/content/community.html b/content/community.html index 8ad6d57..1d8a7c6 100644 --- a/content/community.html +++ b/content/community.html @@ -4,7 +4,6 @@ <style> @import url("styles/juneau-code.css"); @import url("styles/juneau-doc.css"); - @import url("styles/juneau-website-page.css"); </style> </head> <body> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/3ec66e4a/content/documentation.html ---------------------------------------------------------------------- diff --git a/content/documentation.html b/content/documentation.html index 1715f75..7cde875 100644 --- a/content/documentation.html +++ b/content/documentation.html @@ -4,7 +4,6 @@ <style> @import url("styles/juneau-code.css"); @import url("styles/juneau-doc.css"); - @import url("styles/juneau-website-page.css"); </style> </head> <body> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/3ec66e4a/content/downloads.html ---------------------------------------------------------------------- diff --git a/content/downloads.html b/content/downloads.html index aa3dfae..311e10e 100644 --- a/content/downloads.html +++ b/content/downloads.html @@ -4,7 +4,6 @@ <style> @import url("styles/juneau-code.css"); @import url("styles/juneau-doc.css"); - @import url("styles/juneau-website-page.css"); </style> </head> <body> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/3ec66e4a/content/index.html ---------------------------------------------------------------------- diff --git a/content/index.html b/content/index.html index e56e910..bee4fb8 100644 --- a/content/index.html +++ b/content/index.html @@ -2,7 +2,11 @@ <html> <head> <style> - html, body { margin:0px; height: 100%; font-family: sans-serif;} + @import url("styles/juneau-code.css"); + @import url("styles/juneau-doc.css"); + @import url("styles/juneau-website-page.css"); + + html, body { margin:0px; height: 100%; width: 100%; font-family: sans-serif;} header { background-image: url('images/header.jpg'); font-size: 1.6em; @@ -43,12 +47,11 @@ nav ul a:hover { font-weight: bold; } nav ul a.selected { font-weight: bold; } article { - margin-left: 170px; - padding: 10px 0px; + margin: 0px 20px 20px 170px; + padding: 10px 2px; overflow: hidden; min-height: 500px; } - iframe { border: 0; width: 100%; } </style> <script> @@ -59,12 +62,25 @@ node.classList.add("selected"); selectedNode = node; } - function resizeIframe(node) { - var availableHeight = window.innerHeight - document.getElementById("header").clientHeight - document.getElementById("footer").clientHeight - 20; - node.style.height = availableHeight + 'px'; + // Load results from IFrame into this document. + function loadResults(buff) { + try { + var doc = buff.contentDocument || buff.contentWindow.document; + var body = doc.body; + var article = document.getElementById('article'); + var header = document.getElementById('header'); + var footer = document.getElementById('footer'); + if (body != null) { + article.innerHTML = body.innerHTML; + } + var availableHeight = window.innerHeight - header.clientHeight - footer.clientHeight - 40; + article.style.minHeight = availableHeight + 'px'; + } catch (e) { + alert(e); + } } window.onload = function() { - document.getElementById('about').click(); + document.getElementById('about').click(); } </script> </head> @@ -79,17 +95,17 @@ <nav> <ul> - <li><a id='about' href="about.html" target="article" onclick="select(this)">About</a></li> - <li><a href="documentation.html" target="article" onclick="select(this)">Documentation</a></li> - <li><a href="downloads.html" target="article" onclick="select(this)">Downloads</a></li> - <li><a href="sourceCode.html" target="article" onclick="select(this)">Source Code</a></li> - <li><a href="issueTracking.html" target="article" onclick="select(this)">Issue Tracking</a></li> - <li><a href="community.html" target="article" onclick="select(this)">Community</a></li> + <li><a id='about' href="about.html" target="buff" onclick="select(this)">About</a></li> + <li><a href="documentation.html" target="buff" onclick="select(this)">Documentation</a></li> + <li><a href="downloads.html" target="buff" onclick="select(this)">Downloads</a></li> + <li><a href="sourceCode.html" target="buff" onclick="select(this)">Source Code</a></li> + <li><a href="issueTracking.html" target="buff" onclick="select(this)">Issue Tracking</a></li> + <li><a href="community.html" target="buff" onclick="select(this)">Community</a></li> </ul> </nav> - <article> - <iframe name="article" onload="resizeIframe(this);"></iframe> + <article id='article'> + Loading... </article> <footer id='footer'> @@ -109,5 +125,6 @@ </footer> </div> +<iframe name='buff' style='display:none' onload="parent.loadResults(this)"></iframe> </body> </html> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/3ec66e4a/content/issueTracking.html ---------------------------------------------------------------------- diff --git a/content/issueTracking.html b/content/issueTracking.html index 6cfa466..b4afa31 100644 --- a/content/issueTracking.html +++ b/content/issueTracking.html @@ -4,7 +4,6 @@ <style> @import url("styles/juneau-code.css"); @import url("styles/juneau-doc.css"); - @import url("styles/juneau-website-page.css"); </style> </head> <body> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/3ec66e4a/content/sourceCode.html ---------------------------------------------------------------------- diff --git a/content/sourceCode.html b/content/sourceCode.html index 7bb9258..604bda8 100644 --- a/content/sourceCode.html +++ b/content/sourceCode.html @@ -4,7 +4,6 @@ <style> @import url("styles/juneau-code.css"); @import url("styles/juneau-doc.css"); - @import url("styles/juneau-website-page.css"); </style> </head> <body> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/3ec66e4a/content/styles/juneau-website-page.css ---------------------------------------------------------------------- diff --git a/content/styles/juneau-website-page.css b/content/styles/juneau-website-page.css deleted file mode 100755 index a610281..0000000 --- a/content/styles/juneau-website-page.css +++ /dev/null @@ -1,2 +0,0 @@ -html { margin:0px; } -body { margin:5px; font-family: sans-serif; width:95%; height:100%; color: #2E4053}
