# HG changeset patch # User ymh # Date 1425458313 -3600 # Node ID 1e60ba9ae38b7be4f0bfc2d89a00512d345fb09b # Parent d95e143412a4e77fbc69e5aa49ac722cb25fbce6 css corrections on link in node description - correct dojo library config - deactivate image upload diff -r d95e143412a4 -r 1e60ba9ae38b server/java/README.md --- a/server/java/README.md Fri Mar 13 12:00:48 2015 +0100 +++ b/server/java/README.md Wed Mar 04 09:38:33 2015 +0100 @@ -10,11 +10,12 @@ mvn -DskipTests -Djava.awt.headless=true -Duser.timezone="UTC" clean jetty:run-war Commandes graddle: -./gradlew clean build -./gradlew :renkan-web:jettyRunWar + - `./gradlew clean build` + - `./gradlew :renkan-web:jettyRunWar` -Skip test : -x tests +Skip test : `-x tests` + +The war file can then be fount in renkan-web/build/libs. - diff -r d95e143412a4 -r 1e60ba9ae38b server/java/build.gradle --- a/server/java/build.gradle Fri Mar 13 12:00:48 2015 +0100 +++ b/server/java/build.gradle Wed Mar 04 09:38:33 2015 +0100 @@ -2,7 +2,7 @@ apply plugin: 'maven' group = 'org.iri_research.renkan' - version = '0.8.2' + version = '0.8.4' gradle.projectsEvaluated { diff -r d95e143412a4 -r 1e60ba9ae38b server/java/pom.xml --- a/server/java/pom.xml Fri Mar 13 12:00:48 2015 +0100 +++ b/server/java/pom.xml Wed Mar 04 09:38:33 2015 +0100 @@ -5,7 +5,7 @@ org.iri_research.renkan renkan pom - 0.8.2 + 0.8.4 Renkan project diff -r d95e143412a4 -r 1e60ba9ae38b server/java/renkan-web/src/main/webapp/WEB-INF/templates/renkanProjectEdit.html --- a/server/java/renkan-web/src/main/webapp/WEB-INF/templates/renkanProjectEdit.html Fri Mar 13 12:00:48 2015 +0100 +++ b/server/java/renkan-web/src/main/webapp/WEB-INF/templates/renkanProjectEdit.html Wed Mar 04 09:38:33 2015 +0100 @@ -38,6 +38,8 @@ var renkan_config = { static_url : /*[[@{/static/}]]*/ "", read_only: true, + change_shapes: false, + allow_image_upload : false, bins: [ { type: "Wikipedia", diff -r d95e143412a4 -r 1e60ba9ae38b server/java/renkan-web/src/main/webapp/static/css/renkanProject.css --- a/server/java/renkan-web/src/main/webapp/static/css/renkanProject.css Fri Mar 13 12:00:48 2015 +0100 +++ b/server/java/renkan-web/src/main/webapp/static/css/renkanProject.css Wed Mar 04 09:38:33 2015 +0100 @@ -27,6 +27,18 @@ text-decoration: none; } +.Rk-Main a, .Rk-Main a:LINK { + color: #080808; + text-decoration: none; +} + + +.Rk-Main a:VISITED { + color: #333333; + text-decoration: none; +} + + a:HOVER { text-decoration: underline; } diff -r d95e143412a4 -r 1e60ba9ae38b server/java/renkan-web/src/main/webapp/static/js/config.js --- a/server/java/renkan-web/src/main/webapp/static/js/config.js Fri Mar 13 12:00:48 2015 +0100 +++ b/server/java/renkan-web/src/main/webapp/static/js/config.js Wed Mar 04 09:38:33 2015 +0100 @@ -13,9 +13,9 @@ org : 'lib/org', corenkan: 'static/js/corenkan', rcolor: 'static/lib/rcolor', - underscore: 'static/lib/underscore-min', - jquery: 'static/lib/jquery.min', - filesaver: 'static/lib/FileSaver', + underscore: 'static/lib/underscore/underscore', + jquery: 'static/lib/jquery/jquery', + filesaver: 'static/lib/FileSaver/FileSaver', }, packages:[{ name: 'dojo',