Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
recena committed May 24, 2015
1 parent 17f5227 commit e0fcf91
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 132 deletions.
49 changes: 23 additions & 26 deletions core/src/main/resources/lib/layout/layout.jelly
Expand Up @@ -227,12 +227,12 @@ ${h.initPageVariables(context)}
</div>

<div id="page-body">
<div class="row">
<div id="side-panel">
<div id="side-panel-content">
<div class="container-fluid">
<div class="row">
<div class="col-md-7" id="side-panel">
<j:set var="mode" value="side-panel" />
<d:invokeBody />

<!-- add YUI logger if debugging YUI -->
<j:if test="${h.yuiSuffix=='debug'}">
<div id="yui-logreader" style="margin-top:1em"/>
Expand All @@ -244,35 +244,32 @@ ${h.initPageVariables(context)}
</script>
</j:if>
</div>
</div>

<div id="main-panel">
<div id="main-panel-content">
<div class="col-md-17" id="main-panel">
<j:set var="mode" value="main-panel" />
<d:invokeBody/>
</div>
</div>
</div>
</div>
<div id="footer-container" class="hidden-xs">
<div id="footer">
<span class="page_generated">
${%Page generated}:
<i:formatDate value="${h.getCurrentTime()}" type="both" dateStyle="medium" timeStyle="medium"/>
</span>
<span class="rest_api">
<a href="api/">REST API</a>
</span>
<span class="jenkins_ver">
<a href="${h.getFooterURL()}">Jenkins ver. ${h.version}</a>
</span>
<j:if test="${extensionsAvailable}">
<j:forEach var="pd" items="${h.pageDecorators}">
<st:include it="${pd}" page="footer.jelly" optional="true" />
</j:forEach>
</j:if>

<footer>
<div class="container-fluid">
<div class="row">
<div class="col-md-12" id="footer"></div>
<div class="col-md-12">
<span class="page_generated">${%Page generated}: <i:formatDate value="${h.getCurrentTime()}" type="both" dateStyle="medium" timeStyle="medium"/></span>
<span class="rest_api"><a href="api/">REST API</a></span>
<span class="jenkins_ver"><a href="${h.getFooterURL()}">Jenkins ver. ${h.version}</a></span>
<j:if test="${extensionsAvailable}">
<j:forEach var="pd" items="${h.pageDecorators}">

This comment has been minimized.

Copy link
@bpedersen2

bpedersen2 Aug 3, 2015

Contributor

Putting the pageDecorator footer elements here makes it impossible to use position:absolute to get them e.g. to the top of the page. As per the comment in the source, they should be inserted right before , outside any positioning div.

See https://groups.google.com/forum/#!topic/jenkinsci-dev/GDRd2oIIBFYhttps://groups.google.com/forum/#!topic/jenkinsci-dev/GDRd2oIIBFY as well

This comment has been minimized.

Copy link
@bpedersen2
<st:include it="${pd}" page="footer.jelly" optional="true" />
</j:forEach>
</j:if>
</div>
</div>
</div>
</div>
</footer>

</body>
</html>
</j:jelly>
67 changes: 25 additions & 42 deletions war/src/main/webapp/css/style.css
Expand Up @@ -75,68 +75,51 @@ body {
}

#side-panel {
z-index: 1;
}
#main-panel {
z-index: 0;
padding: 15px 15px 80px 15px;
}

#side-panel, #main-panel {
margin: 0px;
padding: 0px;
#main-panel {
padding: 15px 15px 80px 15px;
}

.fixedGridLayout #side-panel, .fixedGridLayout #main-panel {
position: absolute;
}
/* task */

.fixedGridLayout #side-panel {
float:left;
width: 360px;
margin-left: 15px;
#tasks {
margin-bottom: 20px;
}

.fixedGridLayout #main-panel {
padding-left: 370px;
margin-right: 15px;
width: 100%
#tasks .task {
margin-bottom: 4px;
font-size: 1.1em;
white-space: nowrap;
}

#side-panel-content, #main-panel-content {
margin: 15px
}
/* buildQueue */

#tasks {
#buildQueue {
margin-bottom: 20px;
}

#side-panel-content .pane-frame {
margin-bottom: 15px;
}
/* footer */

#side-panel-content .task {
margin-bottom: 3px;
}
#side-panel-content .task-link {
font-size: 1.1em;
vertical-align: middle;
}

#footer-container {
width: 100%;
padding: 10px 0px;
footer {
padding: 10px 0;
background-color: #f6faf2;
border-top: 1px solid #d3d7cf;
}
#footer {
margin: 0px 15px 0px 15px;
width: 100%;
position: absolute;
bottom: 0;
left: 0;
font-size: 12px;
text-align: right;
font-size: 8pt;
}

#footer span {
footer span {
margin-left: 15px;
line-height: 14px;
}


/* Fonts etc */

body, table, form, input, td, th, p, textarea, select
Expand All @@ -150,7 +133,7 @@ body, table, form, td, th, p
color: #333;
}

FORM {
form {
margin: 0;
}

Expand Down
64 changes: 0 additions & 64 deletions war/src/main/webapp/scripts/hudson-behavior.js
Expand Up @@ -2046,70 +2046,6 @@ function removeZeroWidthSpaces(element) {
}
}

Element.observe(document, 'dom:loaded', function(){
if(isRunAsTest) {
return;
}

var pageHead = $('page-head');
var pageBody = $('page-body');
var sidePanel = $(pageBody).getElementsBySelector('#side-panel')[0];
var sidePanelContent = $(sidePanel).getElementsBySelector('#side-panel-content')[0];
var mainPanel = $(pageBody).getElementsBySelector('#main-panel')[0];
var mainPanelContent = $(mainPanel).getElementsBySelector('#main-panel-content')[0];
var pageFooter = $('footer-container');

function applyFixedGridLayout() {
var pageBodyWidth = Element.getWidth(pageBody);
if (pageBodyWidth > 768) {
pageBody.addClassName("fixedGridLayout");
pageBody.removeClassName("container-fluid");
sidePanel.removeClassName("col-sm-9");
mainPanel.removeClassName("col-sm-15");
return true; // It's a fixedGridLayout
} else {
pageBody.removeClassName("fixedGridLayout");
pageBody.addClassName("container-fluid");
sidePanel.addClassName("col-sm-9");
mainPanel.addClassName("col-sm-15");
return false; // It's not a fixedGridLayout
}
}

function applyFixedGridHeights() {
var windowHeight = document.viewport.getDimensions().height;
var headHeight = Element.getHeight(pageHead);
var footerHeight = Element.getHeight(pageFooter);
var sidePanelHeight = Element.getHeight(sidePanel);
var mainPanelHeight = Element.getHeight(mainPanel);
var minPageBodyHeight = (windowHeight - headHeight - footerHeight);

minPageBodyHeight = Math.max(minPageBodyHeight, sidePanelHeight);
minPageBodyHeight = Math.max(minPageBodyHeight, mainPanelHeight);

$(pageBody).setStyle({minHeight: minPageBodyHeight + 'px'});
$(sidePanel).setStyle({minHeight: minPageBodyHeight + 'px'});
$(mainPanel).setStyle({minHeight: minPageBodyHeight + 'px'});
}

var doPanelLayouts = function() {
// remove all style
pageBody.removeAttribute('style');
sidePanel.removeAttribute('style');
mainPanel.removeAttribute('style');
if (applyFixedGridLayout()) {
applyFixedGridHeights();
}
}

Event.observe(window, 'resize', doPanelLayouts);
elementResizeTracker.onResize(sidePanelContent, doPanelLayouts);
elementResizeTracker.onResize(mainPanelContent, doPanelLayouts);

doPanelLayouts();
fireBuildHistoryChanged();
});

// get the cascaded computed style value. 'a' is the style name like 'backgroundColor'
function getStyle(e,a){
if(document.defaultView && document.defaultView.getComputedStyle)
Expand Down

0 comments on commit e0fcf91

Please sign in to comment.