You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@tomee.apache.org by bu...@apache.org on 2013/09/22 23:53:50 UTC
svn commit: r879490 - in /websites/staging/tomee/trunk: cgi-bin/ content/
content/examples-trunk/moviefun-rest/src/main/webapp/
content/examples-trunk/moviefun-rest/src/main/webapp/WEB-INF/
content/examples-trunk/moviefun-rest/src/main/webapp/app/ cont...
Author: buildbot
Date: Sun Sep 22 21:53:49 2013
New Revision: 879490
Log:
Staging update by buildbot for tomee
Added:
websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/index.jsp
Removed:
websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/application.jsp
Modified:
websites/staging/tomee/trunk/cgi-bin/ (props changed)
websites/staging/tomee/trunk/content/ (props changed)
websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/WEB-INF/web.xml
websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/app.less
websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/application.js
websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/model/movie.js
websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/templates/application-table-row.handlebars
websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/templates/movie.handlebars
websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/view/application.js
websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/view/movie.js
Propchange: websites/staging/tomee/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Sep 22 21:53:49 2013
@@ -1 +1 @@
-1525449
+1525456
Propchange: websites/staging/tomee/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Sep 22 21:53:49 2013
@@ -1 +1 @@
-1525449
+1525456
Modified: websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/WEB-INF/web.xml
==============================================================================
Binary files - no diff available.
Modified: websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/app.less
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/app.less (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/app.less Sun Sep 22 21:53:49 2013
@@ -41,7 +41,7 @@ body {
width: 5px;
}
- a.ux-edit-row:hover {
+ a.ux-delete-row:hover, a.ux-edit-row:hover {
cursor: hand;
}
}
Modified: websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/application.js
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/application.js (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/application.js Sun Sep 22 21:53:49 2013
@@ -66,6 +66,7 @@
success: function (total) {
var count = Math.ceil(total / max);
paginator.setCount(count);
+ applicationView.setPaginator(count);
}
});
}
Modified: websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/model/movie.js
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/model/movie.js (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/model/movie.js Sun Sep 22 21:53:49 2013
@@ -28,9 +28,11 @@
return {
'movie': this.attributes
};
+ },
+ defaults: {
+ rating: 5,
+ year: new Date().getFullYear()
}
});
});
-}());
-
-
+}());
\ No newline at end of file
Modified: websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/templates/application-table-row.handlebars
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/templates/application-table-row.handlebars (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/templates/application-table-row.handlebars Sun Sep 22 21:53:49 2013
@@ -4,5 +4,5 @@
<td>{{rating}}</td>
<td>{{year}}</td>
<td>
- <span class="glyphicon glyphicon-trash ux-delete-row"></span>
+ <a href="delete" class="ux-delete-row"><span class="glyphicon glyphicon-trash"></span></a>
</td>
\ No newline at end of file
Modified: websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/templates/movie.handlebars
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/templates/movie.handlebars (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/templates/movie.handlebars Sun Sep 22 21:53:49 2013
@@ -35,7 +35,7 @@
<div class="col-lg-10">
<input class="form-control ux-rating" id="{{id_current}}"
- type="number" placeholder="{{i18n 'rating'}}" value="{{rating}}">
+ type="number" min="0" max="10" placeholder="{{i18n 'rating'}}" value="{{rating}}">
</div>
</div>
<div class="form-group">
@@ -43,7 +43,7 @@
<div class="col-lg-10">
<input class="form-control ux-year" id="{{id_current}}" placeholder="{{i18n 'year'}}"
- type="number" value="{{year}}">
+ type="number" min="1900" max="{{currentYear}}" value="{{year}}">
</div>
</div>
</form>
Modified: websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/view/application.js
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/view/application.js (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/view/application.js Sun Sep 22 21:53:49 2013
@@ -76,11 +76,17 @@
});
tbody.append(row.render().$el);
});
+ },
+
+ setPaginator: function (count) {
+ var me = this;
+ paginator.$el.detach();
+ me.loadDataLink.detach();
var addButton = $(me.$el.find('.ux-add-btn').get(0));
- if (underscore.isEmpty(rows)) {
- addButton.before(me.loadDataLink);
- } else {
+ if (count) {
addButton.before(paginator.$el);
+ } else {
+ addButton.before(me.loadDataLink);
}
}
});
Modified: websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/view/movie.js
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/view/movie.js (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/app/js/view/movie.js Sun Sep 22 21:53:49 2013
@@ -64,7 +64,8 @@
director: me.model.get('director'),
genre: me.model.get('genre'),
rating: me.model.get('rating'),
- year: me.model.get('year')
+ year: me.model.get('year'),
+ currentYear: new Date().getFullYear()
}));
return me;
}
Added: websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/index.jsp
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/index.jsp (added)
+++ websites/staging/tomee/trunk/content/examples-trunk/moviefun-rest/src/main/webapp/index.jsp Sun Sep 22 21:53:49 2013
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title>Moviefun</title>
+ <link href="<c:url value='/app/lib/bootstrap/css/bootstrap.min.css'/>" rel="stylesheet">
+ <link href="<c:url value='/app/app.less'/>" rel="stylesheet/less" type="text/css">
+ <script src="<c:url value='/app/lib/require/require.js'/>"></script>
+ <script type="text/javascript">
+ window.ux = window.ux || {};
+ window.ux.SESSION_ID = "<%=request.getSession().getId()%>";
+ window.ux.ROOT_URL = "<c:url value='/'/>".replace(';jsessionid=' + window.ux.SESSION_ID, '');
+ </script>
+ <script src="<c:url value='/app/config.js'/>"></script>
+ <script src="<c:url value='/app/js/start.js'/>"></script>
+</head>
+<body></body>
+</html>
\ No newline at end of file