Author: tveronezi
Date: Tue Oct 9 01:24:48 2012
New Revision: 1395836
URL: http://svn.apache.org/viewvc?rev=1395836&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-447
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-log-lines.handlebars
- copied, changed from r1395827,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-log.handlebars
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationController.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationTemplates.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-log.handlebars
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/log.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/tomee.css
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationController.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationController.js?rev=1395836&r1=1395835&r2=1395836&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationController.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationController.js
Tue Oct 9 01:24:48 2012
@@ -40,6 +40,13 @@ TOMEE.ApplicationController = function (
});
});
+ channel.bind('ui-actions', 'log-file-selected', function (param) {
+ model.sendMessage({
+ cmdName: 'GetLog',
+ file: param.file
+ });
+ });
+
channel.bind('server-callback', 'RunScript', function(data) {
$.meow({
message: TOMEE.I18N.get('application.console.done')
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationTemplates.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationTemplates.js?rev=1395836&r1=1395835&r2=1395836&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationTemplates.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationTemplates.js
Tue Oct 9 01:24:48 2012
@@ -50,5 +50,6 @@ TOMEE.ApplicationTemplates = (function (
'application-tab-console',
'application-tab-console-output-line',
'application-tab-log',
- 'application-tab-log-file'
+ 'application-tab-log-file',
+ 'application-tab-log-lines'
]);
\ No newline at end of file
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-log-lines.handlebars
(from r1395827,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-log.handlebars)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-log-lines.handlebars?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-log-lines.handlebars&p1=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-log.handlebars&r1=1395827&r2=1395836&rev=1395836&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-log.handlebars
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-log-lines.handlebars
Tue Oct 9 01:24:48 2012
@@ -1,16 +1,5 @@
-<div class="tomee-log">
- <div class="navbar navbar-fixed-bottom" style="position: absolute;">
- <div class="navbar-inner">
- <div class="container" style="width: auto; padding: 0 20px;">
- <ul class="nav pull-right">
- <li class="dropdown open">
- <a href="#" class="dropdown-toggle"
- data-toggle="dropdown">
- <span class="log-file-name">{{i18n
"application.log.select.a.file"}}</span></a>
- <ul class="dropdown-menu tomee-log-files"></ul>
- </li>
- </ul>
- </div>
- </div>
- </div>
-</div>
\ No newline at end of file
+<ul style="list-style: none;">
+{{#lines}}
+ <li>{{this}}</li>
+{{/lines}}
+</ul>
\ No newline at end of file
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-log.handlebars
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-log.handlebars?rev=1395836&r1=1395835&r2=1395836&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-log.handlebars
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-log.handlebars
Tue Oct 9 01:24:48 2012
@@ -1,5 +1,6 @@
<div class="tomee-log">
- <div class="navbar navbar-fixed-bottom" style="position: absolute;">
+ <div class="tomee-log-output"></div>
+ <div class="navbar navbar-fixed-bottom tomee-log-bbar" style="position:
absolute;">
<div class="navbar-inner">
<div class="container" style="width: auto; padding: 0 20px;">
<ul class="nav pull-right">
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/log.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/log.js?rev=1395836&r1=1395835&r2=1395836&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/log.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/log.js
Tue Oct 9 01:24:48 2012
@@ -22,6 +22,15 @@ TOMEE.ApplicationTabLog = function () {
var channel = TOMEE.ApplicationChannel,
container =
$(TOMEE.ApplicationTemplates.getValue('application-tab-log', {}));
+ channel.bind('ui-actions', 'container-resized', function (data) {
+ var consoleOutput = container.find('.tomee-log-output'),
+ bbar = container.find('.tomee-log-bbar'),
+ outputHeight = data.containerHeight - data.toolbarHeight -
bbar.height();
+
+ consoleOutput.css('padding-top', data.toolbarHeight + 'px');
+ consoleOutput.height(outputHeight);
+ });
+
channel.bind('server-callback', 'GetLog', function (params) {
if (!params.data.success) {
return;
@@ -41,13 +50,26 @@ TOMEE.ApplicationTabLog = function () {
});
logFiles.append(file);
});
+
+ if (params.data.output.log) {
+ setFileName(params.data.output.log.name);
+ var lines = container.find('.tomee-log-output');
+ lines.empty();
+
lines.append($(TOMEE.ApplicationTemplates.getValue('application-tab-log-lines',
{
+ lines: params.data.output.log.lines
+ })));
+ }
});
channel.bind('ui-actions', 'log-file-selected', function (param) {
- var fileName = container.find('.log-file-name');
- fileName.html(param.file);
+ setFileName(param.file);
});
+ function setFileName(name) {
+ var el = container.find('.log-file-name');
+ el.html(name);
+ }
+
return {
getEl:function () {
return container;
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/tomee.css
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/tomee.css?rev=1395836&r1=1395835&r2=1395836&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/tomee.css
(original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/tomee.css Tue
Oct 9 01:24:48 2012
@@ -37,6 +37,10 @@
padding-top: 5px;
}
+.tomee-log-output {
+ overflow: auto;
+}
+
.line-separator {
height: 1px;
margin: 9px 1px;
