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/02/17 12:25:13 UTC
svn commit: r1245400 - in
/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging: ./
js/tomee/ js/tomee/view/ js/tomee/view/help/ js/tomee/view/home/
Author: tveronezi
Date: Fri Feb 17 11:25:12 2012
New Revision: 1245400
URL: http://svn.apache.org/viewvc?rev=1245400&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-130
Preparing the javascript/html and java codes for the new web interface. Loading the "tests" and the "ns browser" panels.
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHelpPanel.js
- copied, changed from r1245276, openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/help/
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/home/
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/home/ApplicationHomePanelBody.js
- copied unchanged from r1245301, openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelBody.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/home/ApplicationHomePanelClass.js
- copied unchanged from r1245301, openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelClass.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/home/ApplicationHomePanelEJB.js
- copied unchanged from r1245301, openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelEJB.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/home/ApplicationHomePanelInvoker.js
- copied unchanged from r1245301, openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelInvoker.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/home/ApplicationHomePanelJndi.js
- copied unchanged from r1245301, openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelJndi.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/home/ApplicationHomePanelMenu.js
- copied unchanged from r1245276, openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelMenu.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/home/ApplicationHomePanelTest.js
- copied unchanged from r1245301, openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelTest.js
Removed:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelBody.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelClass.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelEJB.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelInvoker.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelJndi.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelMenu.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelTest.js
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/index.html
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationController.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationToolbar.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationView.js
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/index.html
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/index.html?rev=1245400&r1=1245399&r2=1245400&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/index.html (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/index.html Fri Feb 17 11:25:12 2012
@@ -66,14 +66,15 @@
<script src="js/tomee/view/ApplicationFooter.js"></script>
<script src="js/tomee/view/ApplicationHomePanel.js"></script>
-<script src="js/tomee/view/ApplicationHomePanelMenu.js"></script>
+<script src="js/tomee/view/ApplicationHelpPanel.js"></script>
+<script src="js/tomee/view/home/ApplicationHomePanelMenu.js"></script>
-<script src="js/tomee/view/ApplicationHomePanelBody.js"></script>
-<script src="js/tomee/view/ApplicationHomePanelTest.js"></script>
-<script src="js/tomee/view/ApplicationHomePanelJndi.js"></script>
-<script src="js/tomee/view/ApplicationHomePanelEJB.js"></script>
-<script src="js/tomee/view/ApplicationHomePanelClass.js"></script>
-<script src="js/tomee/view/ApplicationHomePanelInvoker.js"></script>
+<script src="js/tomee/view/home/ApplicationHomePanelBody.js"></script>
+<script src="js/tomee/view/home/ApplicationHomePanelTest.js"></script>
+<script src="js/tomee/view/home/ApplicationHomePanelJndi.js"></script>
+<script src="js/tomee/view/home/ApplicationHomePanelEJB.js"></script>
+<script src="js/tomee/view/home/ApplicationHomePanelClass.js"></script>
+<script src="js/tomee/view/home/ApplicationHomePanelInvoker.js"></script>
<script src="js/tomee/view/ApplicationToolbar.js"></script>
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationController.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationController.js?rev=1245400&r1=1245399&r2=1245400&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationController.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationController.js Fri Feb 17 11:25:12 2012
@@ -44,8 +44,10 @@ TOMEE.ApplicationController = function (
//The user clicked in one of the buttons in the application toolbar
channel.bind('toolbar_button_executed', function (params) {
- var a = 0;
-
+ var key = params.key;
+ if(key === 'home') {
+ view.getHome().getMenu().selectMenu('test');
+ }
});
//The user clicked in one of the items in the home panel
@@ -79,13 +81,18 @@ TOMEE.ApplicationController = function (
channel.bind('panel_show', function (params) {
var panel = params.panel;
- panel.getMyModel().load();
+ if (panel.getMyModel) {
+ var myModel = panel.getMyModel();
+ myModel.load();
+ }
});
- view.render(function () {
- view.getHome().getMenu().selectMenu('test');
+ channel.bind('application_view_rendered', function (params) {
+ view.getToolbar().clickButton('home');
});
+ view.render();
+
return {
};
Copied: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHelpPanel.js (from r1245276, openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanel.js)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHelpPanel.js?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHelpPanel.js&p1=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanel.js&r1=1245276&r2=1245400&rev=1245400&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanel.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHelpPanel.js Fri Feb 17 11:25:12 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-TOMEE.ApplicationHomePanel = function (cfg) {
+TOMEE.ApplicationHelpPanel = function (cfg) {
"use strict";
var channel = cfg.channel;
@@ -26,8 +26,6 @@ TOMEE.ApplicationHomePanel = function (c
var tpl = [
'<div class="container-fluid">',
'<div id="' + divBodyUid + '" class="row-fluid"/>',
- '<hr>',
- '<footer><p>' + TOMEE.ApplicationI18N.get('application.footer') + '</p></footer>',
'</div>'
];
@@ -40,21 +38,9 @@ TOMEE.ApplicationHomePanel = function (c
};
})();
- var menu = TOMEE.ApplicationHomePanelMenu(cfg);
- var body = TOMEE.ApplicationHomePanelBody(cfg);
-
- elements.body.append(menu.getEl());
- elements.body.append(body.getEl());
-
return {
getEl: function () {
return elements.all;
- },
- getMenu: function () {
- return menu;
- },
- getBody: function () {
- return body;
}
};
};
\ No newline at end of file
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanel.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanel.js?rev=1245400&r1=1245399&r2=1245400&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanel.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanel.js Fri Feb 17 11:25:12 2012
@@ -26,8 +26,6 @@ TOMEE.ApplicationHomePanel = function (c
var tpl = [
'<div class="container-fluid">',
'<div id="' + divBodyUid + '" class="row-fluid"/>',
- '<hr>',
- '<footer><p>' + TOMEE.ApplicationI18N.get('application.footer') + '</p></footer>',
'</div>'
];
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationToolbar.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationToolbar.js?rev=1245400&r1=1245399&r2=1245400&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationToolbar.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationToolbar.js Fri Feb 17 11:25:12 2012
@@ -52,6 +52,7 @@ TOMEE.ApplicationToolbar = function (cfg
var buttons = [
{
+ key: 'home',
title: TOMEE.ApplicationI18N.get('app.toolbar.home'),
callback: function () {
channel.send('toolbar_button_executed', {
@@ -60,6 +61,7 @@ TOMEE.ApplicationToolbar = function (cfg
}
},
{
+ key: 'help',
title: TOMEE.ApplicationI18N.get('app.toolbar.help'),
callback: function () {
channel.send('toolbar_button_executed', {
@@ -69,6 +71,16 @@ TOMEE.ApplicationToolbar = function (cfg
}
];
+ var buttonsMap = {};
+
+ var clickButtonCallback = function (mappedButton) {
+ var allLinks = elements.list.find('li');
+ allLinks.removeClass('active');
+
+ mappedButton.li.addClass('active');
+ mappedButton.button.callback();
+ };
+
$.each(buttons, function (i, button) {
var liUid = TOMEE.Sequence.next();
var anchorUid = TOMEE.Sequence.next();
@@ -77,19 +89,25 @@ TOMEE.ApplicationToolbar = function (cfg
var li = elements.list.find('#' + liUid);
var anchor = elements.list.find('#' + anchorUid);
- anchor.on("click", function () {
- var allLinks = elements.list.find('li');
- allLinks.removeClass('active');
-
- li.addClass('active');
+ buttonsMap[button.key] = {
+ button: button,
+ li: li,
+ anchor: anchor
+ };
- button.callback();
+ anchor.on("click", function () {
+ clickButtonCallback(buttonsMap[button.key]);
});
});
+ var clickButton = function (key) {
+ clickButtonCallback(buttonsMap[key]);
+ };
+
return {
getEl: function () {
return elements.all;
- }
+ },
+ clickButton: clickButton
};
};
\ No newline at end of file
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationView.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationView.js?rev=1245400&r1=1245399&r2=1245400&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationView.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationView.js Fri Feb 17 11:25:12 2012
@@ -19,24 +19,48 @@
TOMEE.ApplicationView = function (cfg) {
"use strict";
+ var channel = cfg.channel;
+
var appToolbar = TOMEE.ApplicationToolbar(cfg);
var home = TOMEE.ApplicationHomePanel(cfg);
+ var help = TOMEE.ApplicationHelpPanel(cfg);
+
+ var elements = (function () {
+ var containerUid = TOMEE.Sequence.next();
+ var tpl = [
+ '<div class="container-fluid">',
+ '<div id="' + containerUid + '" class="row-fluid"/>',
+ '<hr>',
+ '<footer><p>' + TOMEE.ApplicationI18N.get('application.footer') + '</p></footer>',
+ '</div>'
+ ];
- var render = function (callback) {
+ //create the element
+ var all = $(tpl.join(''));
+ var body = all.find("#" + containerUid);
+ return {
+ all: all,
+ body: body
+ };
+ })();
+
+ var render = function () {
document.title = TOMEE.ApplicationI18N.get('application.name');
$('body').append(appToolbar.getEl());
- $('body').append(home.getEl());
+ $('body').append(elements.all);
+ elements.body.append(home.getEl());
- if (callback) {
- callback();
- }
+ channel.send('application_view_rendered', {});
};
return {
render: render,
getHome: function () {
return home;
+ },
+ getToolbar: function () {
+ return appToolbar;
}
};
};
\ No newline at end of file