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/07 15:17:36 UTC
svn commit: r1347601 - in
/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp:
js/tomee/ApplicationController.js js/tomee/util/El.js
js/tomee/view/ApplicationView.js js/tomee/view/ApplicationViewLog.js
staging_index.html
Author: tveronezi
Date: Thu Jun 7 13:17:36 2012
New Revision: 1347601
URL: http://svn.apache.org/viewvc?rev=1347601&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-205
* log skeleton
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewLog.js
- copied, changed from r1347549, openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewApps.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/El.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=1347601&r1=1347600&r2=1347601&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 Thu Jun 7 13:17:36 2012
@@ -31,6 +31,10 @@ TOMEE.ApplicationController = function (
channel:channel
});
+ var logView = TOMEE.ApplicationViewLog({
+ channel:channel
+ });
+
var appsView = TOMEE.ApplicationViewApps({
channel:channel
});
@@ -153,14 +157,7 @@ TOMEE.ApplicationController = function (
groups:{
'home':homeView,
'apps':appsView,
- 'log':(function () {
- var myEl = $('<div></div>');
- return {
- getEl:function () {
- return myEl;
- }
- }
- })()
+ 'log':logView
},
initTab:'home'
});
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/El.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/El.js?rev=1347601&r1=1347600&r2=1347601&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/El.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/El.js Thu Jun 7 13:17:36 2012
@@ -18,6 +18,9 @@
*/
TOMEE.el = (function () {
+ var getBorderSize = function (el) {
+ return el.outerHeight(true) - el.height();
+ };
var getElMap = function (elCfg) {
var elMap = {};
@@ -28,21 +31,21 @@ TOMEE.el = (function () {
var mountEl = function (elCfg, elMap) {
var el = $('<' + elCfg.tag + '></' + elCfg.tag + '>');
- (function() {
+ (function () {
var attrs = elCfg.attributes;
- for(var key in attrs) {
+ for (var key in attrs) {
el.attr(key, attrs[key]);
}
})();
- (function() {
+ (function () {
var listeners = elCfg.listeners;
- for(var key in listeners) {
+ for (var key in listeners) {
el.bind(key, listeners[key]);
}
})();
- if(elCfg.cls) {
+ if (elCfg.cls) {
el.addClass(elCfg.cls);
}
@@ -59,7 +62,7 @@ TOMEE.el = (function () {
el.html(elCfg.html);
}
- if(elCfg.createCallback) {
+ if (elCfg.createCallback) {
elCfg.createCallback(el);
}
@@ -67,6 +70,7 @@ TOMEE.el = (function () {
};
return {
- getElMap:getElMap
+ getElMap:getElMap,
+ getBorderSize:getBorderSize
}
})();
\ 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=1347601&r1=1347600&r2=1347601&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 Thu Jun 7 13:17:36 2012
@@ -74,14 +74,10 @@ TOMEE.ApplicationView = function (cfg) {
var calculateContentSize = function () {
var myDiv = elMapContent.main;
- var getBorderSize = function (el) {
- return el.outerHeight(true) - el.height();
- };
-
var availableSpace = (function () {
var windowSize = windowEl.height();
var footerSize = elMapFooter.main.height();
- return windowSize - footerSize - getBorderSize(myDiv) - getBorderSize($('body'));
+ return windowSize - footerSize - TOMEE.el.getBorderSize(myDiv) - TOMEE.el.getBorderSize($('body'));
})();
myDiv.height(availableSpace);
Copied: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewLog.js (from r1347549, openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewApps.js)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewLog.js?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewLog.js&p1=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewApps.js&r1=1347549&r2=1347601&rev=1347601&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewApps.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewLog.js Thu Jun 7 13:17:36 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-TOMEE.ApplicationViewApps = function (cfg) {
+TOMEE.ApplicationViewLog = function (cfg) {
"use strict";
var channel = cfg.channel;
@@ -25,136 +25,12 @@ TOMEE.ApplicationViewApps = function (cf
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:66%; min-width:170px; margin-left: 5px; margin-right: 5px;'
- }
- }
- ]
+ style:'background-color: blue; padding: 5px;'
+ }
});
- var deployments = (function () {
- var panel = TOMEE.components.Panel({
- title:TOMEE.I18N.get('application.deployments'),
- avoidOverflow:true
- });
-
-
- var table = TOMEE.components.Table({
- channel:channel,
- columns:['appName']
- });
-
- var map = TOMEE.el.getElMap({
- elName:'main',
- tag:'div',
- attributes:{
- style:'height: 220px;'
- },
- children:[
- table
- ]
- });
-
- var content = panel.getContentEl();
- content.append(map.main);
-
- (function () {
- var fileUploadedHandler = function (event) {
- fileForm.myFrame.unbind('load', fileUploadedHandler);
- var text = TOMEE.utils.getSafe(function () {
- return fileForm.myFrame.contents().first()[0].body.innerText;
- }, '');
-
- var json = jQuery.parseJSON(text);
-
- channel.send('deploy.file.uploaded', json);
- };
-
- var frameId = TOMEE.Sequence.next('uploadFrame');
- var fileForm = TOMEE.el.getElMap({
- elName:'main',
- tag:'form',
- attributes:{
- style:'background-color:#EEE; border-top: 1px solid #E5E5E5; height: 30px;margin-bottom: 0px;',
- method:'post',
- enctype:'multipart/form-data',
- action:TOMEE.baseURL('upload'),
- target:frameId
- },
- children:[
- {
- elName:'myFrame',
- tag:'iframe',
- attributes:{
- id:frameId,
- style:'display: none'
- }
- },
- {
- elName:'fileField',
- tag:'input',
- attributes:{
- style:'padding-left: 5px; float: left; position: relative;',
- type:'file',
- name:'file'
- },
- listeners:{
- 'change':function (event) {
- fileForm.myFrame.bind('load', fileUploadedHandler);
- fileForm.main.submit();
- }
- }
- }
- ]
- });
-
- content.append(fileForm.main);
- })();
-
- return {
- getEl:function () {
- return panel.getEl();
- },
- load:function (data) {
- table.load(data, function (bean) {
- return [bean.name, bean.value];
- });
- }
- };
- })();
-
-
- var log = (function () {
- var panel = TOMEE.components.Panel({
- title:'-'
- });
- panel.getContentEl().append('Log here!');
-
- return {
- getEl:function () {
- return panel.getEl();
- }
- };
- })();
-
- elMapContent['left'].append(deployments.getEl());
- elMapContent['center'].append(log.getEl());
-
var setHeight = function (height) {
-
+ elMapContent.main.height(height - TOMEE.el.getBorderSize(elMapContent.main));
};
return {
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=1347601&r1=1347600&r2=1347601&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 Thu Jun 7 13:17:36 2012
@@ -31,6 +31,7 @@
<script src="js/tomee/view/ApplicationView.js"></script>
<script src="js/tomee/view/ApplicationViewHome.js"></script>
<script src="js/tomee/view/ApplicationViewApps.js"></script>
+ <script src="js/tomee/view/ApplicationViewLog.js"></script>
</head>
<body></body>