Author: tveronezi
Date: Mon Oct 8 21:47:46 2012
New Revision: 1395787
URL: http://svn.apache.org/viewvc?rev=1395787&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-447
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-console.handlebars
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/console.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/templates/application-tab-console.handlebars
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-console.handlebars?rev=1395787&r1=1395786&r2=1395787&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-console.handlebars
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-console.handlebars
Mon Oct 8 21:47:46 2012
@@ -4,8 +4,13 @@
<div class="navbar navbar-fixed-bottom" style="position: absolute;">
<div class="navbar-inner">
<div class="container" style="width: auto; padding: 0 20px;">
- <button type="button" class="btn pull-right
tomee-execute-btn">{{i18n "application.console.run"}}</button>
-
+ <button type="button"
+ class="btn btn-primary pull-right tomee-execute-btn">
+ {{i18n "application.console.run"}}
+ </button>
+ <button type="button" class="btn pull-right
tomee-execute-clear-btn">
+ {{i18n "application.console.clear.output"}}
+ </button>
</div>
</div>
</div>
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=1395787&r1=1395786&r2=1395787&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
Mon Oct 8 21:47:46 2012
@@ -1 +1,20 @@
-<span>log</span>
+<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
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=1395787&r1=1395786&r2=1395787&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
Mon Oct 8 21:47:46 2012
@@ -26,6 +26,7 @@ TOMEE.I18N = (function () {
'application.console':'Console',
'application.console.run': 'Execute',
+ 'application.console.clear.output': 'Clear output',
'application.console.done': 'Script executed.',
'application.console.run.time': 'Time',
'application.console.run.output.empty': 'Empty',
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/console.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/console.js?rev=1395787&r1=1395786&r2=1395787&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/console.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/console.js
Mon Oct 8 21:47:46 2012
@@ -29,6 +29,11 @@ TOMEE.ApplicationTabConsole = function (
});
});
+ container.find('.tomee-execute-clear-btn').on('click', function () {
+ var consoleOutput = container.find('.tomee-console-output');
+ consoleOutput.empty();
+ });
+
channel.bind('ui-actions', 'container-resized', function (data) {
var consoleOutput = container.find('.tomee-console-output'),
consoleEditor = container.find('.tomee-code'),
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=1395787&r1=1395786&r2=1395787&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 Mon
Oct 8 21:47:46 2012
@@ -26,7 +26,8 @@
}
.tomee-console-output {
- background-color: #222222;
+ background-color: #F7F7F9;
+ border: 1px solid #E1E1E8;
color: gray;
overflow: auto;
padding: 5px;
@@ -38,6 +39,8 @@
.line-separator {
height: 1px;
- background: #717171;
- border-bottom: 1px solid #313030;
-}
+ margin: 9px 1px;
+ overflow: auto;
+ background-color: #E5E5E5;
+ border-bottom: 1px solid white;
+}
\ No newline at end of file
