Author: tveronezi
Date: Mon Jun 4 22:29:19 2012
New Revision: 1346182
URL: http://svn.apache.org/viewvc?rev=1346182&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-205
splitting the view and the controller.
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/El.js
- copied, changed from r1345950,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/Obj.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationToolbar.js
- copied, changed from r1345950,
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/components/Panel.js
- copied, changed from r1345950,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/I18N.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/Obj.js
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/body.html
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging_index.html
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js?rev=1346182&r1=1346181&r2=1346182&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js
Mon Jun 4 22:29:19 2012
@@ -31,10 +31,68 @@ TOMEE.ApplicationController = function (
channel: channel
});
- //The user clicked in one of the buttons in the application toolbar
- channel.bind('toolbar_button_executed', function (params) {
- var key = params.key;
- view.showPanel(key);
+ view.loadJndi([
+ { text:TOMEE.Sequence.next(), children:[] },
+ { text:TOMEE.Sequence.next() },
+ { text:TOMEE.Sequence.next() },
+ { text:TOMEE.Sequence.next() },
+ { text:TOMEE.Sequence.next() },
+ { text:TOMEE.Sequence.next(), children:[] },
+ { text:TOMEE.Sequence.next(), children:[] },
+ { text:TOMEE.Sequence.next(), children:[] },
+ { text:TOMEE.Sequence.next() }
+ ]);
+
+ view.loadSavedObjects([
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
},
+ { name:TOMEE.Sequence.next('name'), value:TOMEE.Sequence.next('value')
}
+
+ ]);
+
+ channel.bind('application.name.click', function (params) {
+ window.open('http://openejb.apache.org/', 'OpenEJB');
+ });
+
+ channel.bind('application.logout', function (params) {
+ alert('Log out!');
});
return {
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/El.js
(from r1345950,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/Obj.js)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/El.js?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/El.js&p1=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/Obj.js&r1=1345950&r2=1346182&rev=1346182&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/Obj.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/El.js
Mon Jun 4 22:29:19 2012
@@ -14,35 +14,47 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- "use strict";
+ "use strict";
*/
-TOMEE.utils = {
- getArray: function (obj) {
- if (!obj) {
- return [];
+TOMEE.el = (function () {
+
+ var getElMap = function (elCfg) {
+ var elMap = {};
+ mountEl(elCfg, elMap);
+ return elMap;
+ };
+
+ var mountEl = function (elCfg, elMap) {
+ var el = $('<' + elCfg.tag + '></' + elCfg.tag + '>');
+
+ var attrs = elCfg.attributes;
+ for(var key in attrs) {
+ el.attr(key, attrs[key]);
}
- if (obj instanceof Array) {
- return obj;
+ if(elCfg.cls) {
+ el.addClass(elCfg.cls);
}
- return [obj];
- },
+ var children = TOMEE.utils.getArray(elCfg.children);
+ for (var i = 0; i < children.length; i++) {
+ el.append(mountEl(children[i], elMap));
+ }
- getObject: function (obj) {
- if (!obj) {
- return {};
+ if (elCfg.elName) {
+ elMap[elCfg.elName] = el;
}
- return obj;
- },
- stringFormat: function(str, values) {
- var result = str;
- for (var key in values) {
- var reg = new RegExp("\\{" + key + "\\}", "gm");
- result = result.replace(reg, values[key]);
+ if (elCfg.html) {
+ el.html(elCfg.html);
}
- return result;
+
+
+ return el;
+ };
+
+ return {
+ getElMap:getElMap
}
-};
\ No newline at end of file
+})();
\ No newline at end of file
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/I18N.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/I18N.js?rev=1346182&r1=1346181&r2=1346182&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/I18N.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/I18N.js
Mon Jun 4 22:29:19 2012
@@ -14,60 +14,25 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- "use strict";
+ "use strict";
*/
TOMEE.I18N = (function () {
var messages = {
- 'application.name': 'Apache TomEE',
- 'application.footer': 'Copyright © 2011 The Apache Software
Foundation, Licensed under the Apache License, Version 2.0. Apache and the
Apache feather logo are trademarks of The Apache Software Foundation.',
+ 'application.name':'Apache TomEE',
+ 'application.footer':'Copyright © 2012 The Apache Software
Foundation, Licensed under the Apache License, Version 2.0. Apache and the
Apache feather logo are trademarks of The Apache Software Foundation.',
+ 'application.logout':'Logout',
- 'app.toolbar.home': 'Home',
- 'app.toolbar.jndi': 'Jndi',
- 'app.toolbar.test': 'Test',
- 'app.toolbar.help': 'Help',
-
- 'app.home.menu.unknown': 'Unknown',
-
- 'app.home.menu.setup': 'Setup',
- 'app.home.menu.setup.test': 'Testing your setup',
- 'app.home.menu.setup.test.title': 'Test Results',
-
- 'app.home.menu.setup.test.testname.key.homeSet': 'openejb.home is set',
- 'app.home.menu.setup.test.testname.key.homeExists': 'openejb.home
exists',
- 'app.home.menu.setup.test.testname.key.homeDirectory': 'openejb.home
is a directory',
- 'app.home.menu.setup.test.testname.key.libDirectory': 'has lib
directory',
-
- 'app.home.menu.setup.test.testname.key.openEjbInstalled': 'Were the
OpenEJB classes installed',
- 'app.home.menu.setup.test.testname.key.ejbsInstalled': 'Were the EJB
classes installed',
- 'app.home.menu.setup.test.testname.key.openEjbStarted': 'Was OpenEJB
initialized (aka started)',
- 'app.home.menu.setup.test.testname.key.testLookup': 'Performing a test
lookup',
-
- 'app.home.menu.tools': 'Tools',
-
- 'app.home.menu.tools.jndi.browser': 'Jndi browser',
- 'app.home.menu.tools.jndi.browser.info': 'Click to see more
information about the object',
- 'app.home.menu.tools.jndi.browser.bean': 'Bean',
- 'app.home.menu.tools.jndi.browser.bean.details': 'See your bean
details',
-
- 'app.home.menu.tools.jndi.browser.back': 'Back',
- 'app.home.menu.tools.jndi.browser.invoke': 'Invoke',
- 'app.home.menu.tools.jndi.browser.class': 'View class',
-
- 'app.home.menu.tools.jndi.browser.businessRemote': 'businessRemote',
- 'app.home.menu.tools.jndi.browser.businessLocal': 'businessLocal',
- 'app.home.menu.tools.jndi.browser.primaryKeyCls': 'primaryKeyCls',
- 'app.home.menu.tools.jndi.browser.beanCls': 'beanCls',
- 'app.home.menu.tools.jndi.browser.homeInterface': 'homeInterface',
- 'app.home.menu.tools.jndi.browser.remoteInterface': 'remoteInterface',
- 'app.home.menu.tools.jndi.browser.beanType': 'beanType',
- 'app.home.menu.tools.jndi.browser.value': 'value',
- 'app.home.menu.tools.jndi.browser.name': 'name',
- 'app.home.menu.tools.jndi.browser.path': 'path',
- 'app.home.menu.tools.jndi.browser.deploymentId': 'deploymentId',
+ 'application.guest':'Guest',
- 'dummy': 'dummy'
+ 'application.home':'Home',
+ 'application.log':'Log',
+
+ 'application.jdni': 'Jndi',
+ 'application.saved.objects': 'Saved Objects',
+
+ 'dummy':'dummy'
};
var get = function (key) {
@@ -80,6 +45,6 @@ TOMEE.I18N = (function () {
};
return {
- get: get
+ get:get
};
})();
\ No newline at end of file
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/Obj.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/Obj.js?rev=1346182&r1=1346181&r2=1346182&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/Obj.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/Obj.js
Mon Jun 4 22:29:19 2012
@@ -14,11 +14,18 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- "use strict";
+ "use strict";
*/
TOMEE.utils = {
- getArray: function (obj) {
+ getSafe:function (obj, defaultValue) {
+ if(obj) {
+ return obj;
+ }
+ return defaultValue;
+ },
+
+ getArray:function (obj) {
if (!obj) {
return [];
}
@@ -30,14 +37,14 @@ TOMEE.utils = {
return [obj];
},
- getObject: function (obj) {
+ getObject:function (obj) {
if (!obj) {
return {};
}
return obj;
},
- stringFormat: function(str, values) {
+ stringFormat:function (str, values) {
var result = str;
for (var key in values) {
var reg = new RegExp("\\{" + key + "\\}", "gm");
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationToolbar.js
(from r1345950,
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/ApplicationToolbar.js?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationToolbar.js&p1=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js&r1=1345950&r2=1346182&rev=1346182&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/ApplicationToolbar.js
Mon Jun 4 22:29:19 2012
@@ -16,112 +16,157 @@
* limitations under the License.
*/
-TOMEE.ApplicationView = function (cfg) {
+TOMEE.ApplicationToolbar = function (cfg) {
"use strict";
var channel = cfg.channel;
- $.ajax({
- url:'js/tomee/view/body.html',
- dataType:'text'
- }).success(function (data, textStatus, jqXHR) {
- var jndi_tree_div_id = TOMEE.Sequence.next();
- var saved_objs_div_id = TOMEE.Sequence.next();
-
- $('body').append(TOMEE.utils.stringFormat(data, {
- 'app_name':TOMEE.I18N.get('application.name'),
- 'footer':TOMEE.I18N.get('application.footer'),
- 'jndi_tree_div_id': jndi_tree_div_id,
- 'saved_objs_div_id': saved_objs_div_id
- }));
-
- var tree = TOMEE.components.Tree({
- channel: channel
- });
-
- var treeEl = tree.getEl();
- $('#' + jndi_tree_div_id).append(treeEl);
-
- tree.load([
- { text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next() }
- ], function(data) {
- return data.text;
- }, function(data) {
- return data.children;
- });
-
-
- var table = TOMEE.components.Table({
- channel: channel,
- columns: ['colA', 'colB']
- });
-
- var tableEl = table.getEl();
- $('#' + saved_objs_div_id).append(tableEl);
-
- table.load([
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') }
-
- ], function(bean) {
- return [bean.name, bean.value];
- });
-
-
-
- var a = 0;
-
-
-
- });
+ var elMapToolbar = TOMEE.el.getElMap({
+ elName:'main',
+ tag:'div',
+ cls:'navbar navbar-fixed-top',
+ children:[
+ {
+ tag:'div',
+ cls:'navbar-inner',
+ children:[
+ {
+ tag:'div',
+ children:[
+ {
+ elName: 'appName',
+ tag:'a',
+ cls:'brand',
+ attributes:{
+ href:'#',
+ style:'padding-left: 20px; margin-left:
0px;'
+ },
+ html:TOMEE.I18N.get('application.name')
+ },
+ {
+ tag:'div',
+ cls:'btn-group pull-right',
+ children:[
+ {
+ tag:'a',
+ cls:'btn dropdown-toggle',
+ attributes:{
+ 'data-toggle':'dropdown',
+ href:'#'
+ },
+ children:[
+ {
+ tag:'i',
+ cls:'icon-user'
+ },
+ {
+ tag:'span',
+ elName:'userNameSpan',
+ attributes:{
+ style:'padding-left: 5px;
padding-right: 5px;'
+ }
+ },
+ {
+ tag:'span',
+ cls:'caret'
+ }
+ ]
+ },
+ {
+ tag:'ul',
+ cls:'dropdown-menu',
+ attributes:{
+ style:'right: 5px;'
+ },
+ children:[
+ {
+ tag:'li',
+ children:[
+ {
+ elName:'signoutLink',
+ tag:'a',
+ attributes:{
+ href:'#'
+ },
+
html:TOMEE.I18N.get('application.logout')
+ }
+ ]
+ }
+ ]
+
+ }
+ ]
+ },
+ {
+ tag:'div',
+ cls:'nav-collapse',
+ children:[
+ {
+ elName: 'tabs',
+ tag:'ul',
+ cls:'nav',
+ children:[
+ {
+ tag:'li',
+ cls:'active',
+ children:[
+ {
+ tag:'a',
+ attributes:{
+ href:'#'
+ },
+
html:TOMEE.I18N.get('application.home')
+ }
+ ]
+ },
+ {
+ tag:'li',
+ children:[
+ {
+ tag:'a',
+ attributes:{
+ href:'#'
+ },
+
html:TOMEE.I18N.get('application.log')
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ ]
+
+ });
+
+
+ elMapToolbar.userNameSpan.text(TOMEE.I18N.get('application.guest'));
+
+ elMapToolbar.appName.bind('click', function () {
+ channel.send('application.name.click', {});
+ });
+
+ elMapToolbar.signoutLink.bind('click', function () {
+ channel.send('application.logout', {});
+ });
+
+ elMapToolbar.tabs.delegate('a', 'click', function(event) {
+ elMapToolbar.tabs.find('li').removeClass('active');
+ var parent = $(event.currentTarget.parentElement);
+ parent.addClass('active');
+ });
return {
+ getEl: function() {
+ return elMapToolbar.main;
+ },
+ setLoggedUser:function (name) {
+ elMapToolbar.userNameSpan.text(name);
+ }
};
};
\ No newline at end of file
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=1346182&r1=1346181&r2=1346182&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
Mon Jun 4 22:29:19 2012
@@ -21,107 +21,124 @@ TOMEE.ApplicationView = function (cfg) {
var channel = cfg.channel;
- $.ajax({
- url:'js/tomee/view/body.html',
- dataType:'text'
- }).success(function (data, textStatus, jqXHR) {
- var jndi_tree_div_id = TOMEE.Sequence.next();
- var saved_objs_div_id = TOMEE.Sequence.next();
-
- $('body').append(TOMEE.utils.stringFormat(data, {
- 'app_name':TOMEE.I18N.get('application.name'),
- 'footer':TOMEE.I18N.get('application.footer'),
- 'jndi_tree_div_id': jndi_tree_div_id,
- 'saved_objs_div_id': saved_objs_div_id
- }));
-
- var tree = TOMEE.components.Tree({
- channel: channel
- });
-
- var treeEl = tree.getEl();
- $('#' + jndi_tree_div_id).append(treeEl);
-
- tree.load([
- { text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next() }
- ], function(data) {
- return data.text;
- }, function(data) {
- return data.children;
- });
-
-
- var table = TOMEE.components.Table({
- channel: channel,
- columns: ['colA', 'colB']
- });
-
- var tableEl = table.getEl();
- $('#' + saved_objs_div_id).append(tableEl);
-
- table.load([
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') }
-
- ], function(bean) {
- return [bean.name, bean.value];
- });
+ var toolbar = TOMEE.ApplicationToolbar({
+ channel: channel
+ });
+
+ $('body').append(toolbar.getEl());
+
+ var elMapContent = TOMEE.el.getElMap({
+ elName: 'main',
+ tag: 'div',
+ attributes: {
+ style:'padding: 5px;'
+ },
+ children: [{
+ elName: 'left',
+ tag: 'div',
+ attributes: {
+ style: 'float:left; width:33%; min-width:170px;'
+ }
+ }, {
+ elName: 'center',
+ tag: 'div',
+ attributes: {
+ style: 'float:left; width:33%; min-width:170px; margin-left:
5px; margin-right: 5px;'
+ }
+ }, {
+ elName: 'right',
+ tag: 'div',
+ attributes: {
+ style: 'float:left; width:33%; min-width:170px;'
+ }
+ }]
+ });
+
+ var jndiPanel = (function() {
+ var jndi = TOMEE.components.Panel({
+ title: TOMEE.I18N.get('application.jdni')
+ });
+ var tree = TOMEE.components.Tree({
+ channel:channel
+ });
+ var treeEl = tree.getEl();
+ jndi.getContentEl().append(treeEl);
- var a = 0;
+ return {
+ getEl: function() {
+ return jndi.getEl();
+ },
+ load: function(data) {
+ tree.load(data, function (data) {
+ return data.text;
+ }, function (data) {
+ return data.children;
+ });
+ }
+ };
+ })();
+
+ var savedPanel = (function() {
+ var saved = TOMEE.components.Panel({
+ title: TOMEE.I18N.get('application.saved.objects')
+ });
+ var table = TOMEE.components.Table({
+ channel:channel,
+ columns:['colA', 'colB']
+ });
+ saved.getContentEl().append(table.getEl());
- });
+ return {
+ getEl: function() {
+ return saved.getEl();
+ },
+ load: function(data) {
+ table.load(data, function (bean) {
+ return [bean.name, bean.value];
+ });
+ }
+ };
+ })();
+
+ elMapContent['left'].append(jndiPanel.getEl());
+ elMapContent['left'].append(savedPanel.getEl());
+
+
+ $('body').append(elMapContent.main);
+
+ var elMapFooter = TOMEE.el.getElMap({
+ elName: 'main',
+ tag: 'div',
+ attributes: {
+ style: 'clear: both;'
+ },
+ children: [{
+ tag: 'hr',
+ attributes: {
+ style: 'margin-top: 0px; margin-bottom: 0px;'
+ },
+ children:[{
+ tag: 'footer',
+ html: '<p style="text-align: center">' +
TOMEE.I18N.get('application.footer') + '</p>'
+ }]
+ }]
+ });
+ $('body').append(elMapFooter.main);
return {
+ setLoggedUser:function (name) {
+ toolbar.setLoggedUser(name);
+ } ,
+ loadJndi: function(data) {
+ jndiPanel.load(data);
+ },
+ loadSavedObjects: function(data) {
+ savedPanel.load(data);
+ }
};
};
\ No newline at end of file
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/body.html
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/body.html?rev=1346182&r1=1346181&r2=1346182&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/body.html
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/body.html
Mon Jun 4 22:29:19 2012
@@ -33,48 +33,56 @@
<div style="padding: 5px;">
- <div style="float:left; width:33%; min-width:170px;">
- <div>
- <div class="well t-panel">
- <h3 style="position: relative; background-color: #d3d3d3;
padding-left: 5px">Jndi</h3>
- <div id="{jndi_tree_div_id}" style="height: 250px; position:
relative; overflow: auto;"></div>
- </div>
- </div>
- <div>
- <div class="well t-panel">
- <h3 class="t-panel-title">Saved Objects</h3>
-
- <div id="{saved_objs_div_id}" style="height: 250px; position:
relative; overflow: auto;"></div>
- </div>
- </div>
- </div>
- <div style="float:left; width:33%; min-width:170px; margin-left: 5px;
margin-right: 5px;">
- <div>
- <div class="well t-panel">
- <h3 class="t-panel-title">Console</h3>
-
- <div style="height: 500px">grid here</div>
- </div>
- </div>
- </div>
- <div style="float:left; width:33%; min-width:170px;">
- <div>
- <div class="well t-panel">
- <h3 class="t-panel-title">MDBs</h3>
-
- <div style="height: 250px">grid here</div>
- </div>
- </div>
- <div>
- <div class="well t-panel">
- <h3 class="t-panel-title">WebServices</h3>
-
- <div style="height: 250px">grid here</div>
- </div>
- </div>
+ <div style="float:left; width:33%; min-width:170px;"></div>
+ <div style="float:left; width:33%; min-width:170px; margin-left: 5px;
margin-right: 5px;"></div>
+ <div style="float:left; width:33%; min-width:170px;"></div>
+</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<div style="padding: 5px;">
+ <div style="float:left; width:100%;">
+
</div>
</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
<div style="padding-top: 50px;">
<hr style="margin-top: 0px; margin-bottom: 0px;">
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/components/Panel.js
(from r1345950,
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/components/Panel.js?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/components/Panel.js&p1=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js&r1=1345950&r2=1346182&rev=1346182&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/components/Panel.js
Mon Jun 4 22:29:19 2012
@@ -16,112 +16,42 @@
* limitations under the License.
*/
-TOMEE.ApplicationView = function (cfg) {
+TOMEE.components.Panel = function (cfg) {
"use strict";
var channel = cfg.channel;
- $.ajax({
- url:'js/tomee/view/body.html',
- dataType:'text'
- }).success(function (data, textStatus, jqXHR) {
- var jndi_tree_div_id = TOMEE.Sequence.next();
- var saved_objs_div_id = TOMEE.Sequence.next();
-
- $('body').append(TOMEE.utils.stringFormat(data, {
- 'app_name':TOMEE.I18N.get('application.name'),
- 'footer':TOMEE.I18N.get('application.footer'),
- 'jndi_tree_div_id': jndi_tree_div_id,
- 'saved_objs_div_id': saved_objs_div_id
- }));
-
- var tree = TOMEE.components.Tree({
- channel: channel
- });
-
- var treeEl = tree.getEl();
- $('#' + jndi_tree_div_id).append(treeEl);
-
- tree.load([
- { text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next() }
- ], function(data) {
- return data.text;
- }, function(data) {
- return data.children;
- });
-
-
- var table = TOMEE.components.Table({
- channel: channel,
- columns: ['colA', 'colB']
- });
-
- var tableEl = table.getEl();
- $('#' + saved_objs_div_id).append(tableEl);
-
- table.load([
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') },
- { name: TOMEE.Sequence.next('name'), value:
TOMEE.Sequence.next('value') }
-
- ], function(bean) {
- return [bean.name, bean.value];
- });
-
-
-
- var a = 0;
-
-
-
- });
+ var map = TOMEE.el.getElMap({
+ elName: 'main',
+ tag: 'div',
+ children: [{
+ tag: 'div',
+ children:[{
+ tag: 'div',
+ cls: 'well t-panel',
+ children:[{
+ tag: 'h3',
+ attributes:{
+ style: 'position: relative; background-color: #d3d3d3;
padding-left: 5px'
+ },
+ html: TOMEE.utils.getSafe(cfg.title, '-')
+ }, {
+ elName: 'content',
+ tag: 'div',
+ attributes:{
+ style: 'height: 250px; position: relative; overflow:
auto;'
+ }
+ }]
+ }]
+ }]
+ });
return {
-
+ getEl:function () {
+ return map.main;
+ },
+ getContentEl: function() {
+ return map.content;
+ }
};
};
\ No newline at end of file
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=1346182&r1=1346181&r2=1346182&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
Mon Jun 4 22:29:19 2012
@@ -4,29 +4,32 @@
<head>
<meta charset="utf-8">
<title>Apache Tomee</title>
-</head>
-
-<body>
-</body>
+ <link href="css/bootstrap.css" rel="stylesheet">
+ <link href="css/tomee.css" rel="stylesheet">
-<script src="js/jquery/jquery-1.7.1.js"></script>
-<script src="js/bootstrap/bootstrap.js"></script>
+ <script src="js/jquery/jquery-1.7.1.js"></script>
+ <script src="js/bootstrap/bootstrap.js"></script>
-<script src="js/tomee/Application.js"></script>
-<script src="js/tomee/util/DelayedTask.js"></script>
-<script src="js/tomee/util/I18N.js"></script>
-<script src="js/tomee/util/Log.js"></script>
-<script src="js/tomee/util/Obj.js"></script>
-<script src="js/tomee/util/Sequence.js"></script>
-
-<script src="js/tomee/ApplicationChannel.js"></script>
-<script src="js/tomee/ApplicationController.js"></script>
-<script src="js/tomee/ApplicationModel.js"></script>
-
-<script src="js/tomee/view/components/Base.js"></script>
-<script src="js/tomee/view/components/Tree.js"></script>
-<script src="js/tomee/view/components/Table.js"></script>
+ <script src="js/tomee/Application.js"></script>
+ <script src="js/tomee/util/DelayedTask.js"></script>
+ <script src="js/tomee/util/El.js"></script>
+ <script src="js/tomee/util/I18N.js"></script>
+ <script src="js/tomee/util/Log.js"></script>
+ <script src="js/tomee/util/Obj.js"></script>
+ <script src="js/tomee/util/Sequence.js"></script>
+
+ <script src="js/tomee/ApplicationChannel.js"></script>
+ <script src="js/tomee/ApplicationController.js"></script>
+ <script src="js/tomee/ApplicationModel.js"></script>
+
+ <script src="js/tomee/view/components/Base.js"></script>
+ <script src="js/tomee/view/components/Panel.js"></script>
+ <script src="js/tomee/view/components/Tree.js"></script>
+ <script src="js/tomee/view/components/Table.js"></script>
-<script src="js/tomee/view/ApplicationView.js"></script>
+ <script src="js/tomee/view/ApplicationToolbar.js"></script>
+ <script src="js/tomee/view/ApplicationView.js"></script>
+</head>
+<body></body>
</html>
