Author: tveronezi
Date: Wed Jun 6 00:58:28 2012
New Revision: 1346690
URL: http://svn.apache.org/viewvc?rev=1346690&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-205
preparing apps tab
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewApps.js
- copied, changed from r1346678,
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/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/view/ApplicationToolbar.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js
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=1346690&r1=1346689&r2=1346690&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
Wed Jun 6 00:58:28 2012
@@ -27,6 +27,10 @@ TOMEE.ApplicationController = function (
//The views communicate with the controller (or other components) through
this object
var channel = TOMEE.ApplicationChannel({});
+ var appsView = TOMEE.ApplicationViewApps({
+ channel:channel
+ });
+
var homeView = TOMEE.ApplicationViewHome({
channel:channel
});
@@ -119,14 +123,7 @@ TOMEE.ApplicationController = function (
channel:channel,
groups:{
'home':homeView,
- 'apps':(function () {
- var myEl = $('<div></div>');
- return {
- getEl:function () {
- return myEl;
- }
- }
- })(),
+ 'apps':appsView,
'log':(function () {
var myEl = $('<div></div>');
return {
@@ -136,7 +133,7 @@ TOMEE.ApplicationController = function (
}
})()
},
- initTab:'home'
+ initTab:'apps'
});
return {
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=1346690&r1=1346689&r2=1346690&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
Wed Jun 6 00:58:28 2012
@@ -30,6 +30,8 @@ TOMEE.I18N = (function () {
'application.apps':'Apps',
'application.log':'Log',
+ 'application.deployments': 'Deployments',
+
'application.jdni': 'Jndi',
'application.saved.objects': 'Saved Objects',
'application.console': 'Console',
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationToolbar.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationToolbar.js?rev=1346690&r1=1346689&r2=1346690&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationToolbar.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationToolbar.js
Wed Jun 6 00:58:28 2012
@@ -21,6 +21,14 @@ TOMEE.ApplicationToolbar = function (cfg
var channel = cfg.channel;
+ var btnClickHandler = function(event) {
+ var el = $(event.currentTarget);
+ var btnkey = el.attr('btnkey');
+ channel.send('toolbar.click', {
+ tab: btnkey
+ });
+ };
+
var elMapToolbar = TOMEE.el.getElMap({
elName:'main',
tag:'div',
@@ -108,20 +116,16 @@ TOMEE.ApplicationToolbar = function (cfg
children:[
{
tag:'li',
- cls:'active',
children:[
{
tag:'a',
attributes:{
+ btnkey: 'home',
href:'#'
},
html:TOMEE.I18N.get('application.home'),
listeners: {
- 'click': function
(event) {
-
channel.send('toolbar.click', {
- tab: 'home'
- });
- }
+ 'click':
btnClickHandler
}
}
]
@@ -132,15 +136,12 @@ TOMEE.ApplicationToolbar = function (cfg
{
tag:'a',
attributes:{
+ btnkey: 'apps',
href:'#'
},
html:TOMEE.I18N.get('application.apps'),
listeners: {
- 'click': function
(event) {
-
channel.send('toolbar.click', {
- tab: 'apps'
- });
- }
+ 'click':
btnClickHandler
}
}
]
@@ -151,15 +152,12 @@ TOMEE.ApplicationToolbar = function (cfg
{
tag:'a',
attributes:{
+ btnkey: 'log',
href:'#'
},
html:TOMEE.I18N.get('application.log'),
listeners: {
- 'click': function
(event) {
-
channel.send('toolbar.click', {
- tab: 'log'
- });
- }
+ 'click':
btnClickHandler
}
}
]
@@ -187,6 +185,24 @@ TOMEE.ApplicationToolbar = function (cfg
channel.send('application.logout', {});
});
+ var setActive = function(tab) {
+ var parent = elMapToolbar.tabs.children();
+ parent.each(function(index, element) {
+ var el = $(element);
+ el.removeClass('active');
+
+ var btnkey = el.children().first().attr('btnkey');
+ if(!btnkey) {
+ return;
+ }
+
+ if(btnkey === tab) {
+ el.addClass('active');
+ }
+ });
+
+ };
+
elMapToolbar.tabs.delegate('a', 'click', function(event) {
elMapToolbar.tabs.find('li').removeClass('active');
var parent = $(event.currentTarget.parentElement);
@@ -199,7 +215,8 @@ TOMEE.ApplicationToolbar = function (cfg
},
setLoggedUser:function (name) {
elMapToolbar.userNameSpan.text(name);
- }
+ },
+ setActive: setActive
};
};
\ 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=1346690&r1=1346689&r2=1346690&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 00:58:28 2012
@@ -78,6 +78,7 @@ TOMEE.ApplicationView = function (cfg) {
//show current tab
elMapContent.main.append(groups[currentTab].getEl());
+ toolbar.setActive(currentTab);
return {
setLoggedUser:function (name) {
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewApps.js
(from r1346678,
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/ApplicationViewApps.js?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewApps.js&p1=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js&r1=1346678&r2=1346690&rev=1346690&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/ApplicationViewApps.js
Wed Jun 6 00:58:28 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-TOMEE.ApplicationViewHome = function (cfg) {
+TOMEE.ApplicationViewApps = function (cfg) {
"use strict";
var channel = cfg.channel;
@@ -39,63 +39,26 @@ TOMEE.ApplicationViewHome = function (cf
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;'
+ style:'float:left; width:66%; min-width:170px;
margin-left: 5px; margin-right: 5px;'
}
}
]
});
- var jndiPanel = (function () {
- var jndi = TOMEE.components.Panel({
- title:TOMEE.I18N.get('application.jdni')
- });
-
- var tree = TOMEE.components.Tree({
- key:'jndi',
- channel:channel,
- getText:function (data) {
- return data.text;
- },
- getChildren:function (data) {
- return data.children;
- }
- });
-
- var treeEl = tree.getEl();
- jndi.getContentEl().append(treeEl);
-
- return {
- getEl:function () {
- return jndi.getEl();
- },
- load:function (data) {
- tree.load(data);
- }
- };
- })();
-
- var savedPanel = (function () {
- var saved = TOMEE.components.Panel({
- title:TOMEE.I18N.get('application.saved.objects')
+ var deployments = (function () {
+ var panel = TOMEE.components.Panel({
+ title:TOMEE.I18N.get('application.deployments')
});
var table = TOMEE.components.Table({
- channel:channel,
- columns:['colA', 'colB']
+ channel:channel
});
- saved.getContentEl().append(table.getEl());
+ panel.getContentEl().append(table.getEl());
return {
getEl:function () {
- return saved.getEl();
+ return panel.getEl();
},
load:function (data) {
table.load(data, function (bean) {
@@ -105,69 +68,25 @@ TOMEE.ApplicationViewHome = function (cf
};
})();
- elMapContent['left'].append(jndiPanel.getEl());
- elMapContent['left'].append(savedPanel.getEl());
-
-
- var consolePanel = (function () {
- var console = TOMEE.components.Panel({
- title:TOMEE.I18N.get('application.console'),
- extraStyles:{
- height:'500px'
- }
- });
-
- 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>');
-
-
- return {
- getEl:function () {
- return console.getEl();
- }
- };
- })();
-
- elMapContent['center'].append(consolePanel.getEl());
- var mdbsPanel = (function () {
- var mdbs = TOMEE.components.Panel({
- title:TOMEE.I18N.get('application.mdbs')
+ var log = (function () {
+ var panel = TOMEE.components.Panel({
+ title:'-'
});
+ panel.getContentEl().append('Log here!');
return {
getEl:function () {
- return mdbs.getEl();
+ return panel.getEl();
}
};
})();
- var wsPanel = (function () {
- var ws = TOMEE.components.Panel({
- title:TOMEE.I18N.get('application.ws')
- });
+ elMapContent['left'].append(deployments.getEl());
+ elMapContent['center'].append(log.getEl());
- return {
- getEl:function () {
- return ws.getEl();
- }
- };
- })();
-
- elMapContent['right'].append(mdbsPanel.getEl());
- elMapContent['right'].append(wsPanel.getEl());
return {
- setLoggedUser:function (name) {
- toolbar.setLoggedUser(name);
- },
- loadJndi:function (data) {
- jndiPanel.load(data);
- },
- loadSavedObjects:function (data) {
- savedPanel.load(data);
- },
getEl: function() {
return elMapContent.main;
}
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=1346690&r1=1346689&r2=1346690&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
Wed Jun 6 00:58:28 2012
@@ -30,6 +30,7 @@
<script src="js/tomee/view/ApplicationToolbar.js"></script>
<script src="js/tomee/view/ApplicationView.js"></script>
<script src="js/tomee/view/ApplicationViewHome.js"></script>
+ <script src="js/tomee/view/ApplicationViewApps.js"></script>
</head>
<body></body>
