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 2014/02/13 04:46:55 UTC
svn commit: r1567843 - in /tomee/tomee/trunk/tomee/tomee-webaccess: ./
src/main/webapp/app/ src/main/webapp/app/js/templates/
src/main/webapp/app/js/view/
Author: tveronezi
Date: Thu Feb 13 03:46:54 2014
New Revision: 1567843
URL: http://svn.apache.org/r1567843
Log:
better alignment of the sessions grid.
Modified:
tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/app.less
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/config.js
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/sessions.handlebars
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/view/container.js
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/view/sessions.js
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml?rev=1567843&r1=1567842&r2=1567843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml Thu Feb 13 03:46:54 2014
@@ -163,6 +163,12 @@
</dependency>
<dependency>
<groupId>org.webjars</groupId>
+ <artifactId>underscore.string</artifactId>
+ <version>2.3.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
<artifactId>codemirror</artifactId>
<version>3.21</version>
<scope>runtime</scope>
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/app.less
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/app.less?rev=1567843&r1=1567842&r2=1567843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/app.less (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/app.less Thu Feb 13 03:46:54 2014
@@ -44,18 +44,14 @@ body {
left: @offset;
right: @offset;
margin-bottom: 0;
- overflow: auto;
- > div {
- margin: 0;
-
- > div.panel-body {
- margin: 5px;
- }
- }
-
- table {
- margin: 0;
+ .panel-body {
+ position: absolute;
+ top: 40px;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ overflow: auto;
}
}
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/config.js
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/config.js?rev=1567843&r1=1567842&r2=1567843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/config.js (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/config.js Thu Feb 13 03:46:54 2014
@@ -42,6 +42,8 @@ var APP_CONFIG = {
'lib/underscore': 'webjars/underscorejs/1.5.2/underscore-min',
+ 'underscore.string': 'webjars/underscore.string/2.3.0/underscore.string',
+
'lib/json2': 'webjars/json2/20110223/json2.min',
'lib/backbone': 'webjars/backbonejs/1.0.0/backbone'
@@ -66,6 +68,10 @@ var APP_CONFIG = {
deps: ['lib/jquery']
},
+ 'underscore.string': {
+ deps: ['lib/underscore']
+ },
+
'lib/underscore': {
exports: '_'
},
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/sessions.handlebars
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/sessions.handlebars?rev=1567843&r1=1567842&r2=1567843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/sessions.handlebars (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/templates/sessions.handlebars Thu Feb 13 03:46:54 2014
@@ -1,34 +1,32 @@
-<div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">{{i18n "sessions"}}</h3>
- </div>
- <div class="panel-body">
- <table class="table table-striped table-bordered">
- <thead>
- <tr>
- <th>{{i18n "session.id"}}</th>
- <th>{{i18n "session.context"}}</th>
- <th>{{i18n "session.creation.date"}}</th>
- <th>{{i18n "session.last.access"}}</th>
- <th>{{i18n "session.expiration.date"}}</th>
- </tr>
- </thead>
- <tbody>
- {{#each sessions}}
- <tr>
- <td>{{this.sessionId}}</td>
- <td>{{this.context}}</td>
- <td>{{timeStampToDate this.creationTs}}</td>
- <td>{{timeStampToDate this.lastAccessTs}}</td>
- <td>{{timeStampToDate this.expirationTs}}
- <a class="ux-expire-btn" href="expire">
+<div class="panel-heading">
+ <h3 class="panel-title">{{i18n "sessions"}}</h3>
+</div>
+<div class="panel-body">
+ <table class="table table-striped">
+ <thead>
+ <tr>
+ <th>{{i18n "session.id"}}</th>
+ <th>{{i18n "session.context"}}</th>
+ <th>{{i18n "session.creation.date"}}</th>
+ <th>{{i18n "session.last.access"}}</th>
+ <th>{{i18n "session.expiration.date"}}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {{#each sessions}}
+ <tr>
+ <td>{{this.sessionId}}</td>
+ <td>{{this.context}}</td>
+ <td>{{timeStampToDate this.creationTs}}</td>
+ <td>{{timeStampToDate this.lastAccessTs}}</td>
+ <td>{{timeStampToDate this.expirationTs}}
+ <a class="ux-expire-btn" href="expire">
<span data-session-id="{{this.sessionId}}" data-context-id="{{this.context}}"
class="glyphicon glyphicon-trash"></span>
- </a>
- </td>
- </tr>
- {{/each}}
- </tbody>
- </table>
- </div>
-</div>
+ </a>
+ </td>
+ </tr>
+ {{/each}}
+ </tbody>
+ </table>
+</div>
\ No newline at end of file
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/view/container.js
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/view/container.js?rev=1567843&r1=1567842&r2=1567843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/view/container.js (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/view/container.js Thu Feb 13 03:46:54 2014
@@ -19,8 +19,12 @@
(function () {
'use strict';
- var deps = ['app/js/templates', 'app/js/i18n', 'lib/backbone'];
- define(deps, function (templates) {
+ var deps = ['app/js/templates', 'underscore.string', 'app/js/i18n', 'lib/backbone'];
+ define(deps, function (templates, str) {
+
+ function getPanelMainClassName(clsName) {
+ return str.clean(clsName).split(' ')[0];
+ }
var View = Backbone.View.extend({
el: 'body',
@@ -38,7 +42,7 @@
view.renderCallback();
}
me.$('.ux-app-menu-item').removeClass('active');
- var myMenuItem = me.$('li.ux-app-menu-item.' + view.className);
+ var myMenuItem = me.$('li.ux-app-menu-item.' + getPanelMainClassName(view.className));
myMenuItem.addClass('active');
},
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/view/sessions.js
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/view/sessions.js?rev=1567843&r1=1567842&r2=1567843&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/view/sessions.js (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/js/view/sessions.js Thu Feb 13 03:46:54 2014
@@ -20,11 +20,11 @@
'use strict';
var deps = ['app/js/templates', 'lib/underscore', 'lib/backbone'];
- define(deps, function (templates, underscore) {
+ define(deps, function (templates) {
var View = Backbone.View.extend({
tagName: 'div',
- className: 'ux-sessions',
+ className: 'ux-sessions panel panel-default',
events: {
'click .ux-refresh-btn': function (evt) {
evt.preventDefault();