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/02/20 03:27:43 UTC
svn commit: r1291119 - in
/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging: ./
js/tomee/ js/tomee/view/
Author: tveronezi
Date: Mon Feb 20 02:27:42 2012
New Revision: 1291119
URL: http://svn.apache.org/viewvc?rev=1291119&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-130
Creating a carousel to show jndi details.
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanel.js
- copied, changed from r1291017, openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationJndiPanel.js
Removed:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationFooter.js
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/index.html
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationI18N.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationJndiPanel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationView.js
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/index.html
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/index.html?rev=1291119&r1=1291118&r2=1291119&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/index.html (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/index.html Mon Feb 20 02:27:42 2012
@@ -63,8 +63,8 @@
<script src="js/tomee/util/Sequence.js"></script>
<script src="js/tomee/view/ApplicationView.js"></script>
-<script src="js/tomee/view/ApplicationFooter.js"></script>
+<script src="js/tomee/view/ApplicationHomePanel.js"></script>
<script src="js/tomee/view/ApplicationJndiPanel.js"></script>
<script src="js/tomee/view/ApplicationHelpPanel.js"></script>
<script src="js/tomee/view/ApplicationTestPanel.js"></script>
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationI18N.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationI18N.js?rev=1291119&r1=1291118&r2=1291119&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationI18N.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationI18N.js Mon Feb 20 02:27:42 2012
@@ -33,8 +33,6 @@ TOMEE.ApplicationI18N = (function () {
'app.home.menu.setup': 'Setup',
'app.home.menu.setup.test': 'Testing your setup',
'app.home.menu.setup.test.title': 'Test Results',
- 'app.home.menu.setup.test.testname': 'Test',
- 'app.home.menu.setup.test.testsatus': 'Status',
'app.home.menu.setup.test.testname.key.homeSet': 'openejb.home is set',
'app.home.menu.setup.test.testname.key.homeExists': 'openejb.home exists',
@@ -48,13 +46,9 @@ TOMEE.ApplicationI18N = (function () {
'app.home.menu.tools': 'Tools',
- 'app.home.menu.tools.jndi': 'JNDI Browser',
- 'app.home.menu.tools.jndi.title': 'OpenEJB JNDI Namespace Browser',
- 'app.home.menu.tools.jndi.module': 'Module',
- 'app.home.menu.tools.jndi.path': 'Path',
+ 'app.home.menu.tools.jndi.browser': 'Jndi browser',
+ 'app.home.menu.tools.jndi.browser.info': 'Click to see more information about the object',
'app.home.menu.tools.jndi.name': 'Name',
- 'app.home.menu.tools.jndi.resource': 'Resource',
-
'dummy': 'dummy'
};
Copied: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanel.js (from r1291017, openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationJndiPanel.js)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanel.js?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanel.js&p1=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationJndiPanel.js&r1=1291017&r2=1291119&rev=1291119&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationJndiPanel.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanel.js Mon Feb 20 02:27:42 2012
@@ -16,70 +16,49 @@
* limitations under the License.
*/
-TOMEE.ApplicationJndiPanel = function (cfg) {
+TOMEE.ApplicationHomePanel = function (cfg) {
"use strict";
var channel = cfg.channel;
var model = cfg.jndiModel;
var elements = (function () {
- var tbodyUid = TOMEE.Sequence.next();
var tpl = [
- '<div class="well" style="overflow:auto">',
- '<legend>' + TOMEE.ApplicationI18N.get('app.home.menu.tools.jndi.title') + '</legend>',
-
- '<table class="table table-striped table-bordered table-condensed">',
- ' <thead>',
- ' <tr>',
- ' <th>' + TOMEE.ApplicationI18N.get('app.home.menu.tools.jndi.name') + '</th>',
- ' <th>' + TOMEE.ApplicationI18N.get('app.home.menu.tools.jndi.resource') + '</th>',
- ' </tr>',
- ' </thead>',
- ' <tbody id="' + tbodyUid + '"/>',
- '</table>',
-
+ '<div id="myCarousel" class="carousel slide">',
+ ' <div class="carousel-inner">',
+ ' <div class="item active" style="height: 300px">',
+ ' <div class="carousel-caption">',
+ ' <h4>First Thumbnail label</h4>',
+ ' <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>',
+ ' </div>',
+ ' </div>',
+ ' <div class="item" style="height: 300px">',
+ ' <div class="carousel-caption">',
+ ' <h4>Second Thumbnail label</h4>',
+ ' <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>',
+ ' </div>',
+ ' </div>',
+ ' <div class="item" style="height: 300px">',
+ ' <div class="carousel-caption">',
+ ' <h4>Third Thumbnail label</h4>',
+ ' <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>',
+ ' </div>',
+ ' </div>',
+ ' </div>',
+ ' <a class="left carousel-control" href="#myCarousel" data-slide="prev">‹</a>',
'</div>'
];
//create the element
var all = $(tpl.join(''));
- var tbody = all.find("#" + tbodyUid);
return {
- all: all,
- tbody: tbody
+ all: all
};
})();
- /**
- *
- * @param bean
- */
- var addRow = function (bean) {
- var row = [
- ' <tr>',
- ' <td>' + bean.name + '</td>',
- ' <td>' + bean.value + '</td>',
- ' </tr>'
- ].join('');
- elements.tbody.append($(row));
- };
-
- var loadData = function () {
- //remove the current rows if any
- elements.tbody.empty();
-
- //The user should give a "getData" method that iterates over
- //the objects that will be used to populate the grid
- model.iterateJndiBeans(function (bean) {
- addRow(bean);
- });
- };
-
-
return {
getEl: function () {
return elements.all;
- },
- loadData: loadData
+ }
};
};
\ No newline at end of file
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationJndiPanel.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationJndiPanel.js?rev=1291119&r1=1291118&r2=1291119&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationJndiPanel.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationJndiPanel.js Mon Feb 20 02:27:42 2012
@@ -25,19 +25,26 @@ TOMEE.ApplicationJndiPanel = function (c
var elements = (function () {
var tbodyUid = TOMEE.Sequence.next();
var tpl = [
- '<div class="well" style="overflow:auto">',
- '<legend>' + TOMEE.ApplicationI18N.get('app.home.menu.tools.jndi.title') + '</legend>',
+ '<div class="well">',
+ '<div id="myCarousel" class="carousel slide">',
+ ' <div class="carousel-inner">',
+ ' <div class="item active">',
+ '<div style="overflow:auto; height: 200px">',
'<table class="table table-striped table-bordered table-condensed">',
- ' <thead>',
- ' <tr>',
- ' <th>' + TOMEE.ApplicationI18N.get('app.home.menu.tools.jndi.name') + '</th>',
- ' <th>' + TOMEE.ApplicationI18N.get('app.home.menu.tools.jndi.resource') + '</th>',
- ' </tr>',
- ' </thead>',
' <tbody id="' + tbodyUid + '"/>',
'</table>',
+ '</div>',
+
+ '<br/><br/><br/>',
+ ' <div class="carousel-caption">',
+ ' <h4>' + TOMEE.ApplicationI18N.get('app.home.menu.tools.jndi.browser') + '</h4>',
+ ' <p>' + TOMEE.ApplicationI18N.get('app.home.menu.tools.jndi.browser.info') + '</p>',
+ ' </div>',
+ ' </div>',
+ ' </div>',
+ '</div>',
'</div>'
];
@@ -58,7 +65,6 @@ TOMEE.ApplicationJndiPanel = function (c
var row = [
' <tr>',
' <td>' + bean.name + '</td>',
- ' <td>' + bean.value + '</td>',
' </tr>'
].join('');
elements.tbody.append($(row));
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationView.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationView.js?rev=1291119&r1=1291118&r2=1291119&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationView.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationView.js Mon Feb 20 02:27:42 2012
@@ -22,6 +22,7 @@ TOMEE.ApplicationView = function (cfg) {
var channel = cfg.channel;
var appToolbar = TOMEE.ApplicationToolbar(cfg);
+ var home = TOMEE.ApplicationHomePanel(cfg);
var jndi = TOMEE.ApplicationJndiPanel(cfg);
var test = TOMEE.ApplicationTestPanel(cfg);
var help = TOMEE.ApplicationHelpPanel(cfg);
@@ -70,6 +71,9 @@ TOMEE.ApplicationView = function (cfg) {
} else if (key === 'help') {
return help;
+
+ } else if (key === 'home') {
+ return home;
}
return null;
};