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/15 19:59:17 UTC
svn commit: r1350719 - in
/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js:
./ view/components/ view/panels/ view/tabs/
Author: tveronezi
Date: Fri Jun 15 17:59:16 2012
New Revision: 1350719
URL: http://svn.apache.org/viewvc?rev=1350719&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-228
* CollapsiblePanel.js
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/CollapsiblePanel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Panel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Jndi.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Mdbs.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Saved.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/WebServices.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/tabs/ApplicationViewHome.js
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js?rev=1350719&r1=1350718&r2=1350719&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js Fri Jun 15 17:59:16 2012
@@ -71,12 +71,13 @@ TOMEE.ApplicationController = function (
});
var homeView = TOMEE.ApplicationViewHome({
- channel:channel,
- jndiPanel:jndiPanel,
- savedPanel:savedPanel,
- mdbsPanel:mdbsPanel,
- wsPanel:wsPanel,
- consolePanel:consolePanel
+ center:consolePanel,
+ children:[
+ jndiPanel, savedPanel
+
+ //TODO mdbsPanel and wsPanel are not implemented yet. Add them when done.
+ //, mdbsPanel, wsPanel
+ ]
});
channel.bind('default.ajax.error.handler.triggered', function (params) {
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/CollapsiblePanel.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/CollapsiblePanel.js?rev=1350719&r1=1350718&r2=1350719&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/CollapsiblePanel.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/CollapsiblePanel.js Fri Jun 15 17:59:16 2012
@@ -51,10 +51,6 @@ TOMEE.components.CollapsiblePanel = func
},
children:[
{
- tag:'i',
- cls:'icon-th'
- },
- {
elName:'titleEl',
tag:'span'
}
@@ -73,7 +69,10 @@ TOMEE.components.CollapsiblePanel = func
{
elName:'bodyEl',
tag:'div',
- cls:'accordion-inner'
+ cls:'accordion-inner',
+ attributes:{
+ style:'padding: 0px;'
+ }
}
]
}
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=1350719&r1=1350718&r2=1350719&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 Fri Jun 15 17:59:16 2012
@@ -34,17 +34,17 @@ TOMEE.components.Panel = function (cfg)
var panelX = 0;
var panelY = 0;
+ var title = TOMEE.utils.getSafe(cfg.title, '-');
+
var map = null;
var createMap = function () {
map = null;
map = TOMEE.el.getElMap(myBodyCfg);
};
- var myBodyCfg = {
- elName:'main',
- tag:'div',
- cls:'t-panel',
- children:[
+ var myBodyChildren = [];
+ if (!cfg.isCollapsiblePanel) {
+ myBodyChildren.push(
{
elName:'header',
tag:'div',
@@ -53,7 +53,7 @@ TOMEE.components.Panel = function (cfg)
{
elName:'appName',
tag:'h3',
- html:TOMEE.utils.getSafe(cfg.title, '-')
+ html:title
}
],
listeners:{
@@ -84,16 +84,33 @@ TOMEE.components.Panel = function (cfg)
main.css('top', panelY + 'px');
}
}
- },
- {
- elName:'myBody',
- tag:'div',
- cls:'modal-body',
- attributes:{
- style:'padding: 0px; max-height: 2000px;'
- }
}
- ]
+
+ );
+
+ }
+ myBodyChildren.push({
+ elName:'myBody',
+ tag:'div',
+ cls:'modal-body',
+ attributes:{
+ style:'padding: 0px; max-height: 2000px;'
+ }
+ });
+
+ var myBodyCfg = {
+ elName:'main',
+ tag:'div',
+ cls:'t-panel',
+ children:myBodyChildren,
+ attributes:{
+ style:(function () {
+ if(cfg.isCollapsiblePanel) {
+ return 'border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px;';
+ }
+ return '';
+ })()
+ }
};
if (cfg.bbar) {
(function () {
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Jndi.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Jndi.js?rev=1350719&r1=1350718&r2=1350719&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Jndi.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Jndi.js Fri Jun 15 17:59:16 2012
@@ -24,6 +24,7 @@ TOMEE.Jndi = function (cfg) {
var parentEl = cfg.parent;
var jndi = TOMEE.components.Panel({
+ isCollapsiblePanel: true,
title:TOMEE.I18N.get('application.jdni'),
extraStyles:{
height:'200px',
@@ -34,8 +35,8 @@ TOMEE.Jndi = function (cfg) {
tag:'a',
cls:'btn',
html:TOMEE.I18N.get('application.jdni.load'),
- listeners: {
- 'click': function() {
+ listeners:{
+ 'click':function () {
channel.send('application.jdni.load', {});
}
}
@@ -69,6 +70,9 @@ TOMEE.Jndi = function (cfg) {
});
return {
+ getTitle:function () {
+ return TOMEE.I18N.get('application.jdni');
+ },
loadJndi:function (data) {
tree.load(data.parentEl, data.names);
},
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Mdbs.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Mdbs.js?rev=1350719&r1=1350718&r2=1350719&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Mdbs.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Mdbs.js Fri Jun 15 17:59:16 2012
@@ -22,10 +22,14 @@ TOMEE.MDBs = function (cfg) {
var channel = cfg.channel;
var mdbs = TOMEE.components.Panel({
+ isCollapsiblePanel: true,
title:TOMEE.I18N.get('application.mdbs')
});
return {
+ getTitle:function () {
+ return TOMEE.I18N.get('application.mdbs');
+ },
getEl:function () {
return mdbs.getEl();
}
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Saved.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Saved.js?rev=1350719&r1=1350718&r2=1350719&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Saved.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Saved.js Fri Jun 15 17:59:16 2012
@@ -22,6 +22,7 @@ TOMEE.Saved = function (cfg) {
var channel = cfg.channel;
var saved = TOMEE.components.Panel({
+ isCollapsiblePanel: true,
title:TOMEE.I18N.get('application.saved.objects'),
extraStyles: {
height:'200px'
@@ -47,6 +48,9 @@ TOMEE.Saved = function (cfg) {
saved.getContentEl().append(table.getEl());
return {
+ getTitle:function () {
+ return TOMEE.I18N.get('application.saved.objects');
+ },
getEl:function () {
return saved.getEl();
},
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/WebServices.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/WebServices.js?rev=1350719&r1=1350718&r2=1350719&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/WebServices.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/WebServices.js Fri Jun 15 17:59:16 2012
@@ -22,10 +22,14 @@ TOMEE.WebServices = function (cfg) {
var channel = cfg.channel;
var ws = TOMEE.components.Panel({
+ isCollapsiblePanel: true,
title:TOMEE.I18N.get('application.ws')
});
return {
+ getTitle:function () {
+ return TOMEE.I18N.get('application.ws');
+ },
getEl:function () {
return ws.getEl();
}
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/tabs/ApplicationViewHome.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/tabs/ApplicationViewHome.js?rev=1350719&r1=1350718&r2=1350719&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/tabs/ApplicationViewHome.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/tabs/ApplicationViewHome.js Fri Jun 15 17:59:16 2012
@@ -21,12 +21,6 @@ TOMEE.ApplicationViewHome = function (cf
var channel = cfg.channel;
- var jndiPanel = cfg.jndiPanel;
- var savedPanel = cfg.savedPanel;
- var mdbsPanel = cfg.mdbsPanel;
- var wsPanel = cfg.wsPanel;
- var consolePanel = cfg.consolePanel;
-
var elMapContent = TOMEE.el.getElMap({
elName:'main',
tag:'div',
@@ -45,31 +39,17 @@ TOMEE.ApplicationViewHome = function (cf
elName:'center',
tag:'div',
attributes:{
- style:'float:left; width:33%; min-width:170px;'
- }
- },
- {
- elName:'right',
- tag:'div',
- attributes:{
- style:'float:left; width:33%; min-width:170px; margin-left: 5px;'
+ style:'float:left; width:66%; min-width:170px;'
}
}
]
});
- elMapContent['left'].append((function () {
- var wrapper = $('<div style="padding-bottom: 5px"></div>');
- wrapper.append(jndiPanel.getEl());
- return wrapper;
- })());
- elMapContent['left'].append(savedPanel.getEl());
-
+ elMapContent['left'].append(TOMEE.components.CollapsiblePanel({
+ children:cfg.children
+ }).getEl());
- elMapContent['center'].append(consolePanel.getEl());
-
- elMapContent['right'].append(mdbsPanel.getEl());
- elMapContent['right'].append(wsPanel.getEl());
+ elMapContent['center'].append(cfg.center.getEl());
var setHeight = function (height) {
var mySize = height - TOMEE.el.getBorderSize(elMapContent.main);
@@ -79,7 +59,7 @@ TOMEE.ApplicationViewHome = function (cf
elMapContent.left.height(childrenSize);
elMapContent.center.height(childrenSize);
- consolePanel.setHeight(childrenSize);
+ cfg.center.setHeight(childrenSize);
};
return {
@@ -89,11 +69,11 @@ TOMEE.ApplicationViewHome = function (cf
},
setTomeeVersion:function (myTomee) {
- mdbsPanel.getEl().detach();
- wsPanel.getEl().detach();
- elMapContent['center'].css('width', '66%');
+// mdbsPanel.getEl().detach();
+// wsPanel.getEl().detach();
+// elMapContent['center'].css('width', '66%');
+
- //TODO mdbsPanel and wsPanel are not implemented yet. Add them when done.
/*