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/19 18:31:08 UTC
svn commit: r1400157 - in
/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app: ./
js/templates/ js/view/ js/view/panels/
Author: tveronezi
Date: Fri Oct 19 16:31:08 2012
New Revision: 1400157
URL: http://svn.apache.org/viewvc?rev=1400157&view=rev
Log:
The webservices tab will be part of the conlose tab.
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-toolbar.handlebars
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationToolbarView.js
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/js/view/panels/webservices.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=1400157&r1=1400156&r2=1400157&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 Fri Oct 19 16:31:08 2012
@@ -4,6 +4,13 @@
<div class="tomee-code"></div>
<div class="navbar navbar-inverse bbar">
<div class="navbar-inner">
+ <div class="btn-group dropup tomee-execute-webservices-group">
+ <a class="btn dropdown-toggle tomee-execute-webservices-btn" data-toggle="dropdown" href="#">
+ {{i18n "application.webservices"}}
+ <span class="caret"></span>
+ </a>
+ <div class="dropdown-menu webservices-div"></div>
+ </div>
<div class="buttons pull-right">
<button type="button" class="btn tomee-execute-clear-btn">
{{i18n "application.console.clear.output"}}
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-toolbar.handlebars
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-toolbar.handlebars?rev=1400157&r1=1400156&r2=1400157&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-toolbar.handlebars (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-toolbar.handlebars Fri Oct 19 16:31:08 2012
@@ -4,7 +4,6 @@
<a class="brand" href="#">{{i18n "application.name"}}</a>
<ul class="nav">
<li class="toolbar-item active console"><a href="#">{{i18n "application.console"}}</a></li>
- <li class="toolbar-item webservices"><a href="#">{{i18n "application.webservices"}}</a></li>
<li class="toolbar-item log"><a href="#">{{i18n "application.log"}}</a></li>
</ul>
<div class="pull-right">
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationToolbarView.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationToolbarView.js?rev=1400157&r1=1400156&r2=1400157&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationToolbarView.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationToolbarView.js Fri Oct 19 16:31:08 2012
@@ -30,7 +30,7 @@ TOMEE.ApplicationToolbarView = function
}));
});
- })(['home', 'console', 'webservices', 'log']);
+ })(['home', 'console', 'log']);
el.find('.tomee-login-btn').on('click', function () {
var user = el.find('.tomee-login').val(),
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=1400157&r1=1400156&r2=1400157&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 Fri Oct 19 16:31:08 2012
@@ -22,8 +22,7 @@ TOMEE.ApplicationView = function () {
var channel = TOMEE.ApplicationChannel,
panelMap = {
'console':TOMEE.ApplicationTabConsole(),
- 'log':TOMEE.ApplicationTabLog(),
- 'webservices':TOMEE.ApplicationTabWebservices()
+ 'log':TOMEE.ApplicationTabLog()
},
selected = null,
container = $(TOMEE.ApplicationTemplates.getValue('application', {})),
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=1400157&r1=1400156&r2=1400157&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 Fri Oct 19 16:31:08 2012
@@ -21,10 +21,13 @@ TOMEE.ApplicationTabConsole = function (
var channel = TOMEE.ApplicationChannel,
container = $(TOMEE.ApplicationTemplates.getValue('application-tab-console', {})),
+ webservices = TOMEE.ApplicationTabWebservices(),
codeArea = null,
active = false,
delayedContainerResize = TOMEE.DelayedTask();
+ container.find('.webservices-div').append(webservices.getEl());
+
container.find('.tomee-execute-btn').on('click', function () {
triggerScriptExecution();
});
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/webservices.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/webservices.js?rev=1400157&r1=1400156&r2=1400157&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/webservices.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/webservices.js Fri Oct 19 16:31:08 2012
@@ -20,8 +20,7 @@ TOMEE.ApplicationTabWebservices = functi
"use strict";
var channel = TOMEE.ApplicationChannel,
- container = $(TOMEE.ApplicationTemplates.getValue('application-tab-webservices', {})),
- active = false;
+ container = $(TOMEE.ApplicationTemplates.getValue('application-tab-webservices', {}));
channel.bind('ui-actions', 'container-resized', function (data) {
var outputHeight = data.containerHeight - 10;
@@ -76,13 +75,6 @@ TOMEE.ApplicationTabWebservices = functi
return {
getEl:function () {
return container;
- },
- onAppend:function () {
- active = true;
- triggerRefresh();
- },
- onDetach:function () {
- active = false;
}
};
};
\ No newline at end of file
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=1400157&r1=1400156&r2=1400157&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 Fri Oct 19 16:31:08 2012
@@ -102,6 +102,17 @@ body {
border-bottom: 1px solid white;
}
+ .tomee-execute-webservices-group {
+ position: absolute;
+ bottom: 5px;
+ left: 10px;
+
+ .dropdown-menu {
+ width: 600px;
+ height: 400px;
+ }
+ }
+
.buttons {
padding-right: 10px;