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/10/09 02:36:15 UTC
svn commit: r1395827 - in
/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js:
ApplicationTemplates.js templates/application-tab-log-file.handlebars
templates/application-tab-log.handlebars util/I18N.js view/panels/log.js
Author: tveronezi
Date: Tue Oct 9 00:36:15 2012
New Revision: 1395827
URL: http://svn.apache.org/viewvc?rev=1395827&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-file.handlebars
- copied, changed from r1395787, 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/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/util/I18N.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/log.js
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=1395827&r1=1395826&r2=1395827&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 00:36:15 2012
@@ -49,5 +49,6 @@ TOMEE.ApplicationTemplates = (function (
'application-toolbar',
'application-tab-console',
'application-tab-console-output-line',
- 'application-tab-log'
+ 'application-tab-log',
+ 'application-tab-log-file'
]);
\ No newline at end of file
Copied: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-log-file.handlebars (from r1395787, 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-file.handlebars?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-log-file.handlebars&p1=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-log.handlebars&r1=1395787&r2=1395827&rev=1395827&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-file.handlebars Tue Oct 9 00:36:15 2012
@@ -1,20 +1 @@
-<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">Dropdown <b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a></li>
- </ul>
- </li>
- </ul>
- </div>
- </div>
- </div>
-</div>
\ No newline at end of file
+<li><a href="#">{{file}}</a></li>
\ 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=1395827&r1=1395826&r2=1395827&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 00:36:15 2012
@@ -4,14 +4,10 @@
<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">Dropdown <b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a></li>
- </ul>
+ <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>
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/I18N.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/I18N.js?rev=1395827&r1=1395826&r2=1395827&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/I18N.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/I18N.js Tue Oct 9 00:36:15 2012
@@ -32,6 +32,7 @@ TOMEE.I18N = (function () {
'application.console.run.output.empty': 'Empty',
'application.log':'Log',
+ 'application.log.select.a.file': 'Select a file',
'dummy':'dummy'
};
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=1395827&r1=1395826&r2=1395827&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 00:36:15 2012
@@ -19,13 +19,42 @@
TOMEE.ApplicationTabLog = function () {
"use strict";
- var container = $(TOMEE.ApplicationTemplates.getValue('application-tab-log', {}));
+ var channel = TOMEE.ApplicationChannel,
+ container = $(TOMEE.ApplicationTemplates.getValue('application-tab-log', {}));
+
+ channel.bind('server-callback', 'GetLog', function (params) {
+ if (!params.data.success) {
+ return;
+ }
+
+ var logFiles = container.find('.tomee-log-files');
+ logFiles.empty();
+
+ TOMEE.utils.forEach(params.data.output.files, function (value) {
+ var file = $(TOMEE.ApplicationTemplates.getValue('application-tab-log-file', {
+ file:value
+ }));
+ file.on('click', function () {
+ channel.send('ui-actions', 'log-file-selected', {
+ file:value
+ });
+ });
+ logFiles.append(file);
+ });
+ });
+
+ channel.bind('ui-actions', 'log-file-selected', function (param) {
+ var fileName = container.find('.log-file-name');
+ fileName.html(param.file);
+ });
return {
- getEl: function() {
+ getEl:function () {
return container;
},
- onAppend: function() {},
- onDetach: function() {}
+ onAppend:function () {
+ },
+ onDetach:function () {
+ }
};
};
\ No newline at end of file