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/09 04:38:15 UTC
svn commit: r1348301 - in
/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee:
ApplicationController.js util/I18N.js view/ApplicationViewHome.js
view/components/Panel.js
Author: tveronezi
Date: Sat Jun 9 02:38:14 2012
New Revision: 1348301
URL: http://svn.apache.org/viewvc?rev=1348301&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-225
loading the saved objects
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/ApplicationViewHome.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/components/Panel.js
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=1348301&r1=1348300&r2=1348301&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 Sat Jun 9 02:38:14 2012
@@ -121,6 +121,10 @@ TOMEE.ApplicationController = function (
homeView.loadSavedObjects(params);
});
+ channel.bind('application.saved.objects.load', function (params) {
+ model.loadSessionData();
+ });
+
var view = TOMEE.ApplicationView({
channel:channel,
groups:{
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=1348301&r1=1348300&r2=1348301&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 Sat Jun 9 02:38:14 2012
@@ -42,6 +42,8 @@ TOMEE.I18N = (function () {
'application.log.load':'Load',
+ 'application.saved.objects.load':'Load',
+
'dummy':'dummy'
};
Modified: 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/ApplicationViewHome.js?rev=1348301&r1=1348300&r2=1348301&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/ApplicationViewHome.js Sat Jun 9 02:38:14 2012
@@ -83,7 +83,18 @@ TOMEE.ApplicationViewHome = function (cf
var savedPanel = (function () {
var saved = TOMEE.components.Panel({
- title:TOMEE.I18N.get('application.saved.objects')
+ title:TOMEE.I18N.get('application.saved.objects'),
+ actions:[
+ {
+ text:TOMEE.I18N.get('application.saved.objects.load'),
+ listeners:{
+ 'click':function () {
+ channel.send('application.saved.objects.load', {});
+ }
+ }
+
+ }
+ ]
});
var table = TOMEE.components.Table({
@@ -97,10 +108,10 @@ TOMEE.ApplicationViewHome = function (cf
return saved.getEl();
},
load:function (data) {
- var arr = TOMEE.utils.toArray(data, function(key, obj) {
+ var arr = TOMEE.utils.toArray(data, function (key, obj) {
return {
- name: key,
- value: obj
+ name:key,
+ value:obj
};
});
@@ -242,6 +253,7 @@ TOMEE.ApplicationViewHome = function (cf
if (!myTomee.hasMdbs && !myTomee.hasWebservices) {
elMapContent['right'].detach();
elMapContent['center'].css('width', '66%');
+ elMapContent['center'].css('margin-right', '0px');
} else {
if (!myTomee.hasMdbs) {
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/components/Panel.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/components/Panel.js?rev=1348301&r1=1348300&r2=1348301&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/components/Panel.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/components/Panel.js Sat Jun 9 02:38:14 2012
@@ -38,6 +38,7 @@ TOMEE.components.Panel = function (cfg)
},
children:[
{
+ elName: 'menuItems',
tag:'div',
children:[
{
@@ -49,60 +50,6 @@ TOMEE.components.Panel = function (cfg)
style:'padding-left: 10px; margin-left: 0px;'
},
html:TOMEE.utils.getSafe(cfg.title, '-')
- },
- {
- tag:'div',
- cls:'btn-group pull-right',
- children:[
- {
- tag:'a',
- cls:'btn dropdown-toggle',
- attributes:{
- 'data-toggle':'dropdown',
- href:'#'
- },
- children:[
- {
- tag:'i',
- cls:'icon-cog'
- },
- {
- 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:'actionLink',
- tag:'a',
- attributes:{
- href:'#'
- },
- html:'-'
- }
- ]
- }
- ]
-
- }
- ]
}
]
}
@@ -111,6 +58,69 @@ TOMEE.components.Panel = function (cfg)
]
});
+ if (cfg.actions) {
+ var commands = TOMEE.el.getElMap({
+ elName:'actionsMenu',
+ tag:'div',
+ cls:'btn-group pull-right',
+ children:[
+ {
+ tag:'a',
+ cls:'btn dropdown-toggle',
+ attributes:{
+ 'data-toggle':'dropdown',
+ href:'#'
+ },
+ children:[
+ {
+ tag:'i',
+ cls:'icon-cog'
+ },
+ {
+ tag:'span',
+ attributes:{
+ style:'padding-left: 5px; padding-right: 5px;'
+ }
+ },
+ {
+ tag:'span',
+ cls:'caret'
+ }
+ ]
+ }
+ ]
+ });
+ elMapToolbar.menuItems.append(commands.actionsMenu);
+
+ (function () {
+ var actions = TOMEE.el.getElMap({
+ elName: 'main',
+ tag:'ul',
+ cls:'dropdown-menu',
+ attributes:{
+ style:'right: 5px;'
+ }
+
+ });
+
+ var actionItem = null;
+ for (var i = 0; i < cfg.actions.length; i++) {
+ actionItem = cfg.actions[i];
+ actions.main.append(TOMEE.el.getElMap({
+ elName: 'actionButton',
+ tag:'a',
+ attributes:{
+ href:'#'
+ },
+ html:actionItem.text,
+ listeners: actionItem.listeners
+ }).actionButton);
+ }
+ commands.actionsMenu.append(actions.main);
+ })();
+
+ }
+
var map = TOMEE.el.getElMap({
elName:'main',
tag:'div',
@@ -123,7 +133,7 @@ TOMEE.components.Panel = function (cfg)
cls:'well t-panel',
children:[
{
- elName: 'toolbar',
+ elName:'toolbar',
tag:'div',
attributes:{
style:'position: relative;'