--- a/server/pom.xml Tue Feb 11 01:06:22 2014 +0100
+++ b/server/pom.xml Tue Feb 11 10:18:29 2014 +0100
@@ -11,12 +11,12 @@
<surefire-version>2.16</surefire-version>
<coweb-version>1.0.1-SNAPSHOT</coweb-version>
<cowebx-version>1.0</cowebx-version>
- <jersey-version>2.3.1</jersey-version>
- <spring-version>3.2.4.RELEASE</spring-version>
- <spring-data-mongodb-version>1.3.1.RELEASE</spring-data-mongodb-version>
- <spring-security-version>3.1.4.RELEASE</spring-security-version>
+ <jersey-version>2.5.1</jersey-version>
+ <spring-version>3.2.6.RELEASE</spring-version>
+ <spring-data-mongodb-version>1.3.3.RELEASE</spring-data-mongodb-version>
+ <spring-security-version>3.2.0.RELEASE</spring-security-version>
<spring-data-commons-version>1.6.1.RELEASE</spring-data-commons-version>
- <spring-data-jpa-version>1.4.1.RELEASE</spring-data-jpa-version>
+ <spring-data-jpa-version>1.4.3.RELEASE</spring-data-jpa-version>
<jetty-plugin-version>8.1.14.v20131031</jetty-plugin-version>
<jetty-version>8.1.14.v20131031</jetty-version>
<junit-version>4.11</junit-version>
@@ -299,7 +299,7 @@
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring-version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
--- a/server/src/main/webapp/WEB-INF/spring-security.xml Tue Feb 11 01:06:22 2014 +0100
+++ b/server/src/main/webapp/WEB-INF/spring-security.xml Tue Feb 11 10:18:29 2014 +0100
@@ -3,12 +3,12 @@
xmlns:util="http://www.springframework.org/schema/util"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/security
- http://www.springframework.org/schema/security/spring-security-3.1.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-3.0.xsd"
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/security
+ http://www.springframework.org/schema/security/spring-security-3.2.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util-3.0.xsd"
>
<util:properties id="propsLocations">
--- a/server/src/main/webapp/WEB-INF/templates/projectIndex.html Tue Feb 11 01:06:22 2014 +0100
+++ b/server/src/main/webapp/WEB-INF/templates/projectIndex.html Tue Feb 11 10:18:29 2014 +0100
@@ -83,7 +83,7 @@
</div>
</div>
<footer id="footer" th:include="fragment/pageFragment :: footerFragment">
- <div id="version">© <span class="version-date">2013</span> <a href="http://www.iri.centrepompidou.fr" target="_blanck">IRI</a> - Version <span class="version-version">0.0</span></div>
+ <div id="version">© <span class="version-date">2014</span> <a href="http://www.iri.centrepompidou.fr" target="_blanck">IRI</a> - Version <span class="version-version">0.0</span></div>
</footer>
</div>
<script th:inline="javascript" >
@@ -100,7 +100,7 @@
new_renkan = {
title: renkantitle,
- description: "(empty description)",
+ description: "(empty description)",
uri: null,
space_id: /*[[${space.id}]]*/"_",
};
@@ -110,7 +110,7 @@
data:JSON.stringify(new_renkan),
type: "POST",
dataType: "json",
- contentType: "application/json; charset=UTF-8"
+ contentType: "application/json; charset=UTF-8"
}).done(function(project){
window.location.reload();
});
--- a/server/src/main/webapp/WEB-INF/templates/renkanIndex.html Tue Feb 11 01:06:22 2014 +0100
+++ b/server/src/main/webapp/WEB-INF/templates/renkanIndex.html Tue Feb 11 10:18:29 2014 +0100
@@ -68,7 +68,7 @@
</table>
</div>
<footer id="footer" th:include="fragment/pageFragment :: footerFragment">
- <div id="version">© <span class="version-date">2013</span> <a href="http://www.iri.centrepompidou.fr" target="_blanck">IRI</a> - Version <span class="version-version">0.0</span></div>
+ <div id="version">© <span class="version-date">2014</span> <a href="http://www.iri.centrepompidou.fr" target="_blanck">IRI</a> - Version <span class="version-version">0.0</span></div>
</footer>
</div>
<script th:inline="javascript" >
@@ -94,7 +94,7 @@
data:JSON.stringify(new_space),
type: "POST",
dataType: "json",
- contentType: "application/json; charset=UTF-8"
+ contentType: "application/json; charset=UTF-8"
}).done(function(space){
var template_url = /*[[@{'/s/<%=space_id%>'}]]*/"s/<%=space_id%>";
window.location = _.template(template_url, {space_id: space.id});
--- a/server/src/main/webapp/WEB-INF/templates/renkanProjectEdit.html Tue Feb 11 01:06:22 2014 +0100
+++ b/server/src/main/webapp/WEB-INF/templates/renkanProjectEdit.html Tue Feb 11 10:18:29 2014 +0100
@@ -26,11 +26,11 @@
<script type="text/javascript" src="js/config.js" th:src="@{/static/js/config.js}"></script>
<script type="text/javascript" th:inline="javascript">
var cowebConfig = {
- baseUrl: window.location.protocol + '//' + window.location.host,
- adminUrl : dojoConfig.baseUrl+'ocw_admin',
- debug: /*[[${coweb_debug}]]*/false,
- useWebSockets: /*[[${coweb_websockets}]]*/false
- };
+ baseUrl: window.location.protocol + '//' + window.location.host,
+ adminUrl : dojoConfig.baseUrl+'ocw_admin',
+ debug: /*[[${coweb_debug}]]*/false,
+ useWebSockets: /*[[${coweb_websockets}]]*/false
+ };
</script>
<script type="text/javascript" src="lib/dojo/dojo.js" data-dojo-config="isDebug: true, parseOnLoad: true" th:src="@{/static/lib/dojo/dojo.js}"></script>
<script type="text/javascript" th:inline="javascript">
@@ -75,27 +75,33 @@
/*[[@{/static/data/properties.json}]]*/ "data/properties.json",
],
};
- var space_config = /*[[${space.binConfig}?${space.binConfig}:'{}']]*/"{}";
- space_config = JSON.parse(space_config || "{}");
+ var space_config = /*[[${space.binConfig}?${space.binConfig}:'{}']]*/"{}";
+ space_config = JSON.parse(space_config || "{}");
var _renkan = new Rkns.Renkan($.extend({}, renkan_config, space_config));
var corenkanConfig = {
- projectId: /*[[${project.id}]]*/"new_project",
- renkan : _renkan
- };
+ projectId: /*[[${project.id}]]*/"new_project",
+ renkan : _renkan
+ };
- require({corenkanConfig: corenkanConfig}, ["corenkan"], function(corenkan) {
+ require({corenkanConfig: corenkanConfig}, ["corenkan"], function(corenkan) {
corenkan.app.onStatusChange = function(status) {
};
});
});
</script>
- <link href="../../static/css/style.css" rel="stylesheet" th:href="@{/static/css/style.css}"/>
- <link rel="stylesheet" href="css/renkan.css" th:href="@{/static/css/renkan.css}"/>
+ <link rel="stylesheet" href="css/renkan.css" th:href="@{/static/css/renkan.css}"/>
+ <link rel="stylesheet" href="../../static/css/style.css" th:href="@{/static/css/style.css}"/>
+ <link rel="stylesheet" href="../../static/css/renkanProject.css" th:href="@{/static/css/renkanProject.css}"/>
</head>
<body>
- <div id="renkan"></div>
- <div id="footer" th:include="fragment/pageFragment :: footerFragment">
- <div id="version">© <span class="version-date">2013</span> <a href="http://www.iri.centrepompidou.fr" target="_blanck">IRI</a> - Version <span class="version-version">0.0</span></div>
- </div>
+ <header><a href="/" th:href="@{/}">RENKAN</a> > <a href=".." th:href="@{'/s/'+${space.id}}">Space</a></header>
+ <div id="renkan-wrapper">
+ <div id="renkan-container">
+ <div id="renkan"></div>
+ </div>
+ </div>
+ <footer id="footer" th:include="fragment/pageFragment :: footerFragment">
+ <div id="version">© <span class="version-date">2014</span> <a href="http://www.iri.centrepompidou.fr" target="_blanck">IRI</a> - Version <span class="version-version">0.0</span></div>
+ </footer>
</body>
</html>
--- a/server/src/main/webapp/WEB-INF/templates/renkanProjectPublish.html Tue Feb 11 01:06:22 2014 +0100
+++ b/server/src/main/webapp/WEB-INF/templates/renkanProjectPublish.html Tue Feb 11 10:18:29 2014 +0100
@@ -38,14 +38,20 @@
});
/*]]>*/
</script>
+ <link rel="stylesheet" href="css/renkan.css" th:href="@{/static/css/renkan.css}"/>
<link href="../../static/css/style.css" rel="stylesheet" th:href="@{/static/css/style.css}"/>
- <link rel="stylesheet" href="css/renkan.css" th:href="@{/static/css/renkan.css}"/>
+ <link href="../../static/css/renkanProject.css" rel="stylesheet" th:href="@{/static/css/renkanProject.css}"/>
</head>
<body>
- <div id="renkan"></div>
- <div id="footer" th:include="fragment/pageFragment :: footerFragment">
- <div id="version">© <span class="version-date">2013</span> <a href="http://www.iri.centrepompidou.fr" target="_blanck">IRI</a> - Version <span class="version-version">0.0</span></div>
+ <header><a href="/" th:href="@{/}">RENKAN</a> > <a href=".." th:href="@{'/s/'+${space.id}}">Space</a></header>
+ <div id="renkan-wrapper">
+ <div id="renkan-container">
+ <div id="renkan"></div>
+ </div>
</div>
+ <footer id="footer" th:include="fragment/pageFragment :: footerFragment">
+ <div id="version">© <span class="version-date">2014</span> <a href="http://www.iri.centrepompidou.fr" target="_blanck">IRI</a> - Version <span class="version-version">0.0</span></div>
+ </footer>
</body>
</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/server/src/main/webapp/static/css/renkanProject.css Tue Feb 11 10:18:29 2014 +0100
@@ -0,0 +1,51 @@
+/* =============================================================================
+ Renkan
+ ========================================================================== */
+body {
+ background-color: #1E1E1E;
+}
+
+header {
+ font-size: 12px;
+ height: 15px;
+ padding: 5px 0 2px 10px;
+ color: white;
+}
+
+footer {
+ font-size: 10px;
+ position:absolute;
+ bottom: 0;
+ text-align: right;
+ width: 100%;
+ padding: 2px 0;
+ color: white;
+}
+
+a, a:VISITED, a:LINK {
+ color: white;
+ text-decoration: none;
+}
+
+a:HOVER {
+ text-decoration: underline;
+}
+
+
+#renkan-wrapper {
+ position:absolute;
+ top: 25px;
+ left: 0;
+ right: 0;
+ bottom: 18px;
+}
+
+#renkan-container {
+ min-height: 100%;
+ position: relative;
+ width: 100%;
+}
+
+#version {
+ padding-right: 5px;
+}