Author: tveronezi
Date: Wed Jun 13 10:13:46 2012
New Revision: 1349720
URL: http://svn.apache.org/viewvc?rev=1349720&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-224
* using "twitter bootstrap" styles for panels
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/El.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Panel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Jndi.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Saved.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/tomee.css
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/El.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/El.js?rev=1349720&r1=1349719&r2=1349720&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/El.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/El.js
Wed Jun 13 10:13:46 2012
@@ -36,7 +36,7 @@ TOMEE.el = (function () {
elMap[elCfg.elName] = elCfg.el;
}
//we dont need to construct it. it is already done
- return;
+ return elCfg.el;
}
var el = $('<' + elCfg.tag + '></' + elCfg.tag + '>');
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Panel.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Panel.js?rev=1349720&r1=1349719&r2=1349720&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Panel.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Panel.js
Wed Jun 13 10:13:46 2012
@@ -29,63 +29,57 @@ TOMEE.components.Panel = function (cfg)
parentEl = $(window);
}
- var header = TOMEE.el.getElMap({
+ var myBodyCfg = {
elName:'main',
tag:'div',
- cls:'navbar',
- attributes:{
- style:'margin-bottom: 0px;'
+ cls:'t-panel',
+ attributes: {
+ height: '500px'
},
children:[
{
+ elName:'header',
tag:'div',
- cls:'navbar-inner t-navbar',
- attributes:{
- style:'padding-left: 0px; padding-right: 0px;'
- },
+ cls:'modal-header',
children:[
{
- elName:'menuItems',
- tag:'div',
- children:[
- {
- elName:'appName',
- tag:'a',
- cls:'brand',
- attributes:{
- href:'#',
- style:'padding-left: 10px; margin-left:
0px;'
- },
- html:TOMEE.utils.getSafe(cfg.title, '-')
- }
- ]
+ elName:'appName',
+ tag:'h3',
+ html:TOMEE.utils.getSafe(cfg.title, '-')
}
]
+ },
+ {
+ elName:'myBody',
+ tag:'div',
+ cls:'modal-body',
+ attributes:{
+ style:'padding: 0px;'
+ }
}
]
- });
-
- var elBottomBar = null;
+ };
if (cfg.bbar) {
- elBottomBar = TOMEE.el.getElMap({
- elName:'main',
- tag:'form',
- cls:'well form-inline',
- attributes:{
- style:'height: 27px;margin-bottom: 0px;padding-top:
1px;padding-left: 1px;padding-bottom: 1px;padding-right: 1px;'
- },
- children:[
- {
- elName:'childrenDiv',
- tag:'div',
- cls:'pull-right'
- }
- ]
- });
-
(function () {
+ var childrenDiv = [];
+ var footerCfg = {
+ elName:'footer',
+ tag:'div',
+ cls:'modal-footer',
+ children:[
+ {
+ tag:'form',
+ cls:'form-inline',
+ attributes:{
+ style:'margin-bottom: 0px;'
+ },
+ children:childrenDiv
+ }
+ ]
+ };
+ myBodyCfg.children.push(footerCfg);
+
var arr = TOMEE.utils.getArray(cfg.bbar);
- var childrenDiv = elBottomBar.childrenDiv;
var tempKey = TOMEE.Sequence.next('temp');
var newEl = null;
@@ -107,128 +101,24 @@ TOMEE.components.Panel = function (cfg)
elementsPointers[current.elName] = newEl;
}
- childrenDiv.append(newEl);
- }
- })();
- }
-
- if (cfg.headerActions) {
- var commands = TOMEE.el.getElMap({
- elName:'actionsMenu',
- tag:'div',
- cls:'btn-group pull-right',
- children:[
- {
- tag:'a',
- cls:'btn dropdown-toggle',
- attributes:{
- 'data-toggle':'dropdown',
- href:'#'
- },
- children:[
- {
- tag:'i',
- cls:'icon-cog'
- },
- {
- tag:'span',
- attributes:{
- style:'padding-left: 5px; padding-right: 5px;'
- }
- },
- {
- tag:'span',
- cls:'caret'
- }
- ]
- }
- ]
- });
- header.menuItems.append(commands.actionsMenu);
-
- (function () {
- var actionsEl = TOMEE.el.getElMap({
- elName:'main',
- tag:'ul',
- cls:'dropdown-menu',
- attributes:{
- style:'right: 5px;'
- }
-
- });
-
- var actionItem = null;
- for (var i = 0; i < cfg.headerActions.length; i++) {
- actionItem = cfg.headerActions[i];
- actionsEl.main.append(TOMEE.el.getElMap({
- elName:'actionButton',
- tag:'a',
- attributes:{
- href:'#'
- },
- html:actionItem.text,
- listeners:actionItem.listeners
- }).actionButton);
+ childrenDiv.push({
+ el:newEl
+ });
}
- commands.actionsMenu.append(actionsEl.main);
})();
-
}
var map = null;
var createMap = function () {
map = null;
- map = TOMEE.el.getElMap({
- elName:'main',
- tag:'div',
- children:[
- {
- tag:'div',
- children:[
- {
- elName:'elements',
- tag:'div',
- cls:'well t-panel',
- children:[
- {
- elName:'toolbar',
- tag:'div',
- attributes:{
- style:'position: relative;'
- }
- },
- {
- elName:'content',
- tag:'div',
- attributes:{
- style:'height: 250px; position:
relative; overflow: auto;'
- },
- createCallback:function (el) {
- if (avoidOverflow) {
- el.css('overflow', '');
- }
- }
- }
- ]
- }
- ]
- }
- ]
- });
+ map = TOMEE.el.getElMap(myBodyCfg);
};
createMap();
- if (elBottomBar) {
- map.elements.append(elBottomBar.main);
- }
-
- map.toolbar.append(header.main);
-
-
var extraStyles = cfg.extraStyles;
if (extraStyles) {
(function () {
- var content = map['content'];
+ var content = map['myBody'];
for (var key in extraStyles) {
content.css(key, extraStyles[key]);
@@ -237,9 +127,15 @@ TOMEE.components.Panel = function (cfg)
}
var setHeight = function (height) {
- var toolbarSize = header.main.height();
- var mySize = height - toolbarSize - TOMEE.el.getBorderSize(map.main) -
TOMEE.el.getBorderSize(map.content);
- map.content.height(mySize);
+ var toolbarSize = TOMEE.utils.getSafe(function () {
+ return map.header.height();
+ }, 0);
+ var footerSize = TOMEE.utils.getSafe(function () {
+ return map.footer.height();
+ }, 0);
+
+ var mySize = height - toolbarSize - TOMEE.el.getBorderSize(map.main) -
TOMEE.el.getBorderSize(map.myBody);
+ map.myBody.height(mySize);
};
var getCenter = function () {
@@ -263,7 +159,7 @@ TOMEE.components.Panel = function (cfg)
return map.main;
},
getContentEl:function () {
- return map.content;
+ return map.myBody;
},
setHeight:setHeight,
showAt:function (config) {
@@ -293,12 +189,12 @@ TOMEE.components.Panel = function (cfg)
},
close:function (killIt) {
if (killIt) {
- if(map && map.main) {
+ if (map && map.main) {
map.main.remove();
}
createMap();
} else {
- if(map && map.main) {
+ if (map && map.main) {
map.main.detach();
}
}
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js?rev=1349720&r1=1349719&r2=1349720&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js
Wed Jun 13 10:13:46 2012
@@ -25,7 +25,7 @@ TOMEE.Console = function (cfg) {
elName:'main',
tag:'textarea',
attributes:{
- style:'height: 500px; width: 100%;border: 0px;padding: 0px;margin:
0px;'
+ style:'height: 400px; width: 100%;border: 0px;padding: 0px;margin:
0px;'
}
});
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Jndi.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Jndi.js?rev=1349720&r1=1349719&r2=1349720&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Jndi.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Jndi.js
Wed Jun 13 10:13:46 2012
@@ -24,7 +24,11 @@ TOMEE.Jndi = function (cfg) {
var parentEl = cfg.parent;
var jndi = TOMEE.components.Panel({
- title:TOMEE.I18N.get('application.jdni')
+ title:TOMEE.I18N.get('application.jdni'),
+ extraStyles:{
+ height:'200px',
+ padding:'2px'
+ }
});
var tree = TOMEE.components.Tree({
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Saved.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Saved.js?rev=1349720&r1=1349719&r2=1349720&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Saved.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Saved.js
Wed Jun 13 10:13:46 2012
@@ -23,15 +23,19 @@ TOMEE.Saved = function (cfg) {
var saved = TOMEE.components.Panel({
title:TOMEE.I18N.get('application.saved.objects'),
- headerActions:[
+ extraStyles: {
+ height:'200px'
+ },
+ bbar:[
{
- text:TOMEE.I18N.get('application.saved.objects.load'),
- listeners:{
- 'click':function () {
+ tag:'button',
+ cls:'btn',
+ html:TOMEE.I18N.get('application.saved.objects.load'),
+ listeners: {
+ 'click': function() {
channel.send('application.saved.objects.load', {});
}
}
-
}
]
});
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/tomee.css
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/tomee.css?rev=1349720&r1=1349719&r2=1349720&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/tomee.css
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/tomee.css
Wed Jun 13 10:13:46 2012
@@ -19,6 +19,22 @@ body {
padding: 0px;
}
+.t-panel {
+ background-color: #ffffff;
+ border: 1px solid #999;
+ border: 1px solid rgba(0, 0, 0, 0.3);
+ *border: 1px solid #999;
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
+ -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+ -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+ box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+ -webkit-background-clip: padding-box;
+ -moz-background-clip: padding-box;
+ background-clip: padding-box;
+}
+
.sidebar-nav {
padding: 9px 0;
}
@@ -45,21 +61,6 @@ ul.tree li {
line-height: 20px;
}
-div.t-panel {
- padding: 0px;
- background-color: #ffffff;
- padding-left: 0px;
- padding-right: 0px;
- border: 2px solid #d3d3d3;
- margin-bottom: 5px;
-}
-
-h3.t-panel-title {
- position: relative;
- background-color: #d3d3d3;
- padding-left: 5px;
-}
-
div.t-action-btn {
border-left: 1px solid whiteSmoke;
border-right: 1px solid #E5E5E5;
