Author: tveronezi
Date: Thu Oct 18 12:09:57 2012
New Revision: 1399601
URL: http://svn.apache.org/viewvc?rev=1399601&view=rev
Log:
console cosmetic changes
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/view/ApplicationView.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.less
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=1399601&r1=1399600&r2=1399601&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
Thu Oct 18 12:09:57 2012
@@ -1,5 +1,6 @@
<div class="tomee-console">
<div class="tomee-console-output"></div>
+ <div class="splitter"></div>
<div class="tomee-code"></div>
<div class="navbar navbar-inverse bbar">
<div class="navbar-inner">
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js?rev=1399601&r1=1399600&r2=1399601&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js
Thu Oct 18 12:09:57 2012
@@ -140,10 +140,10 @@ TOMEE.ApplicationView = function () {
function updateContainerSize() {
var containerHeight,
containerWidth,
- toolbarHeight = toolbar.getEl().height();
+ toolbarHeight = toolbar.getEl().outerHeight();
- containerHeight = myWindow.height();
- containerWidth = myWindow.width();
+ containerHeight = myWindow.outerHeight();
+ containerWidth = myWindow.outerWidth();
container.css('height', containerHeight + 'px');
container.css('width', containerWidth + 'px');
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=1399601&r1=1399600&r2=1399601&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
Thu Oct 18 12:09:57 2012
@@ -22,7 +22,8 @@ TOMEE.ApplicationTabConsole = function (
var channel = TOMEE.ApplicationChannel,
container =
$(TOMEE.ApplicationTemplates.getValue('application-tab-console', {})),
codeArea = null,
- active = false;
+ active = false,
+ delayedContainerResize = TOMEE.DelayedTask();
container.find('.tomee-execute-btn').on('click', function () {
triggerScriptExecution();
@@ -44,9 +45,18 @@ TOMEE.ApplicationTabConsole = function (
var consoleOutput = container.find('.tomee-console-output'),
consoleEditor = container.find('.tomee-code'),
consoleBBar = container.find('.bbar'),
- outputHeight = data.containerHeight - consoleEditor.height() -
consoleBBar.height() - 10;
+ splitter = container.find('.splitter'),
+ availableSpace = data.containerHeight - consoleBBar.outerHeight()
- splitter.outerHeight() - 10;
- consoleOutput.height(outputHeight);
+ consoleOutput.height(availableSpace / 2);
+ consoleEditor.height(availableSpace / 2);
+
+ // This guy likes special treatment
+ delayedContainerResize.delay(function() {
+ if(codeArea) {
+ codeArea.setSize(null, availableSpace / 2);
+ }
+ }, 1000);
});
channel.bind('server-command-callback', 'RunScript', function (data) {
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/tomee.less
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/tomee.less?rev=1399601&r1=1399600&r2=1399601&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/tomee.less
(original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/tomee.less Thu
Oct 18 12:09:57 2012
@@ -27,6 +27,11 @@ body {
.tomee {
overflow: hidden;
+ .splitter {
+ background-color: #F7F7F9;
+ border: 1px solid #E1E1E8;
+ }
+
.brand, .navbar, .navbar-inner, .nav {
margin: 0;
padding: 0;
