Author: tveronezi
Date: Sun Jun 10 12:13:35 2012
New Revision: 1348575
URL: http://svn.apache.org/viewvc?rev=1348575&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-224
* adjust deployment panel size
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationView.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewApps.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Panel.js
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationView.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationView.js?rev=1348575&r1=1348574&r2=1348575&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationView.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationView.js
Sun Jun 10 12:13:35 2012
@@ -113,7 +113,7 @@ TOMEE.ApplicationView = function (cfg) {
});
calculateContentSize();
- delayResize.delay(100);
+ delayResize.delay(1000);
return {
setLoggedUser:function (name) {
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewApps.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewApps.js?rev=1348575&r1=1348574&r2=1348575&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewApps.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewApps.js
Sun Jun 10 12:13:35 2012
@@ -71,6 +71,7 @@ TOMEE.ApplicationViewApps = function (cf
var content = panel.getContentEl();
content.append(map.main);
+ var fileForm = null;
(function () {
var fileUploadedHandler = function (event) {
fileForm.myFrame.unbind('load', fileUploadedHandler);
@@ -84,7 +85,7 @@ TOMEE.ApplicationViewApps = function (cf
};
var frameId = TOMEE.Sequence.next('uploadFrame');
- var fileForm = TOMEE.el.getElMap({
+ fileForm = TOMEE.el.getElMap({
elName:'main',
tag:'form',
attributes:{
@@ -132,6 +133,12 @@ TOMEE.ApplicationViewApps = function (cf
table.load(data, function (bean) {
return [bean.name, bean.value];
});
+ },
+ setHeight: function(height) {
+ panel.setHeight(height);
+
+ var myHeight = panel.getContentEl().height() -
TOMEE.el.getBorderSize(panel.getContentEl()) - (2 *
TOMEE.el.getBorderSize(fileForm.main)) - fileForm.fileField.height();
+ map.main.height(myHeight);
}
};
})();
@@ -141,11 +148,16 @@ TOMEE.ApplicationViewApps = function (cf
var panel = TOMEE.components.Panel({
title:'-'
});
- panel.getContentEl().append('Log here!');
+
+ //Log here!
+ panel.getContentEl().append('');
return {
getEl:function () {
return panel.getEl();
+ },
+ setHeight: function(height) {
+ panel.setHeight(height);
}
};
})();
@@ -154,6 +166,16 @@ TOMEE.ApplicationViewApps = function (cf
elMapContent['center'].append(log.getEl());
var setHeight = function (height) {
+ var mySize = height - TOMEE.el.getBorderSize(elMapContent.main);
+ elMapContent.main.height(mySize);
+
+ var childrenSize = mySize - TOMEE.el.getBorderSize(elMapContent.left);
+ elMapContent.left.height(childrenSize);
+ elMapContent.center.height(childrenSize);
+
+ deployments.setHeight(childrenSize);
+ log.setHeight(childrenSize);
+
};
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Panel.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Panel.js?rev=1348575&r1=1348574&r2=1348575&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Panel.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Panel.js
Sun Jun 10 12:13:35 2012
@@ -172,6 +172,11 @@ TOMEE.components.Panel = function (cfg)
})();
}
+ var setHeight = function(height) {
+ var toolbarSize = elMapToolbar.main.height();
+ var mySize = height - toolbarSize - TOMEE.el.getBorderSize(map.main) -
TOMEE.el.getBorderSize(map.content);
+ map.content.height(mySize);
+ };
return {
getEl:function () {
@@ -179,6 +184,7 @@ TOMEE.components.Panel = function (cfg)
},
getContentEl:function () {
return map.content;
- }
+ },
+ setHeight: setHeight
};
};
\ No newline at end of file
