css corrections on link in node description - correct dojo library config - deactivate image upload
authorymh <ymh.work@gmail.com>
Wed, 04 Mar 2015 09:38:33 +0100
changeset 394 1e60ba9ae38b
parent 393 d95e143412a4
child 395 2e8c92eb0dfa
css corrections on link in node description - correct dojo library config - deactivate image upload
server/java/README.md
server/java/build.gradle
server/java/pom.xml
server/java/renkan-web/src/main/webapp/WEB-INF/templates/renkanProjectEdit.html
server/java/renkan-web/src/main/webapp/static/css/renkanProject.css
server/java/renkan-web/src/main/webapp/static/js/config.js
--- 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.
 
 
 
-
--- 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 {
--- 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 @@
     <groupId>org.iri_research.renkan</groupId>
     <artifactId>renkan</artifactId>
     <packaging>pom</packaging>
-    <version>0.8.2</version>
+    <version>0.8.4</version>
     <name>Renkan project</name>
 
     <modules>
--- 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",
--- 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;
 }
--- 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',