You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2012/06/07 00:30:39 UTC
svn commit: r1347182 - in
/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view:
ApplicationView.js ApplicationViewHome.js
Author: tveronezi
Date: Wed Jun 6 22:30:38 2012
New Revision: 1347182
URL: http://svn.apache.org/viewvc?rev=1347182&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-205
keep footer at the bottom of the page
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js?rev=1347182&r1=1347181&r2=1347182&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js Wed Jun 6 22:30:38 2012
@@ -23,6 +23,8 @@ TOMEE.ApplicationView = function (cfg) {
var groups = cfg.groups;
var currentTab = TOMEE.utils.getSafe(cfg.initTab, 'home');
+ var windowEl = $(window);
+
var toolbar = TOMEE.ApplicationToolbar({
channel:channel
});
@@ -38,7 +40,10 @@ TOMEE.ApplicationView = function (cfg) {
var elMapContent = TOMEE.el.getElMap({
elName:'main',
- tag:'div'
+ tag:'div',
+ attributes:{
+ style:'float:left; width:100%;'
+ }
});
$('body').append(elMapContent.main);
@@ -58,7 +63,7 @@ TOMEE.ApplicationView = function (cfg) {
children:[
{
tag:'footer',
- html:'<p style="text-align: center">' + TOMEE.I18N.get('application.footer') + '</p>'
+ html:'<p style="text-align: center;margin-bottom: 0px;">' + TOMEE.I18N.get('application.footer') + '</p>'
}
]
}
@@ -66,7 +71,23 @@ TOMEE.ApplicationView = function (cfg) {
});
$('body').append(elMapFooter.main);
- var showTab = function(tab) {
+ var calculateContentSize = function () {
+ var myDiv = elMapContent.main;
+
+ var getBorderSize = function (el) {
+ return el.outerHeight(true) - el.height();
+ };
+
+ var availableSpace = (function () {
+ var windowSize = windowEl.height();
+ var footerSize = elMapFooter.main.height();
+ return windowSize - footerSize - getBorderSize(myDiv) - getBorderSize($('body'));
+ })();
+
+ myDiv.height(availableSpace);
+ };
+
+ var showTab = function (tab) {
var showingTab = groups[currentTab].getEl();
showingTab.detach();
@@ -77,9 +98,14 @@ TOMEE.ApplicationView = function (cfg) {
};
//show current tab
- elMapContent.main.append(groups[currentTab].getEl());
+ showTab(currentTab);
toolbar.setActive(currentTab);
+ windowEl.resize(function () {
+ calculateContentSize();
+ });
+ calculateContentSize();
+
return {
setLoggedUser:function (name) {
toolbar.setLoggedUser(name);
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js?rev=1347182&r1=1347181&r2=1347182&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js Wed Jun 6 22:30:38 2012
@@ -119,7 +119,7 @@ TOMEE.ApplicationViewHome = function (cf
var el = console.getContentEl();
el.append('<textarea style="height: 469px; width: 100%;border: 0px;padding: 0px;margin: 0px;"></textarea>');
- el.append('<div style="background-color:#EEE; border-top: 1px solid #E5E5E5; height: 30px;"><div class="t-action-btn"></div><div class="t-action-btn"></div></div>');
+ el.append('<div style="background-color:#EEE; border-top: 1px solid #E5E5E5; height: 30px;"><select id="select01"><option>Javascript</option><option>Grails</option></select><a class="btn">execute</a></div>');
return {