Merge with 18cb4c4c4e5ea2b4737d7141f860c2dd4f15e1ba
authorrougeronj
Fri, 11 Sep 2015 16:34:41 +0200
changeset 515 5fbcc117e8fe
parent 514 d45e95229c47 (current diff)
parent 503 18cb4c4c4e5e (diff)
child 516 7d1d44b53af5
Merge with 18cb4c4c4e5ea2b4737d7141f860c2dd4f15e1ba
client/js/defaults.js
--- a/client/js/defaults.js	Thu Sep 10 16:22:28 2015 +0200
+++ b/client/js/defaults.js	Fri Sep 11 16:34:41 2015 +0200
@@ -118,15 +118,15 @@
         /* Maximum displayed text length */
     label_untitled_nodes: "(untitled)",
         /* Label to display on untitled nodes */
-    hide_nodes: true, 
+    hide_nodes: true,
         /* allow hide/show nodes */
     change_shapes: true,
         /* Change shapes enabled */
     change_types: true,
     /* Change type enabled */
-    
+
     /* NODE EDITOR TEMPLATE*/
-    
+
     node_editor_templates: {
         "default": "templates/nodeeditor_readonly.html",
         "video": "templates/nodeeditor_video.html"
@@ -159,6 +159,7 @@
     tooltip_bottom_color: "#d0d0d0",
     tooltip_border_color: "#808080",
     tooltip_border_width: 1,
+    tooltip_opacity: 0.8,
 
     richtext_editor_config: {
         toolbarGroups: [
--- a/client/js/renderer/baseeditor.js	Thu Sep 10 16:22:28 2015 +0200
+++ b/client/js/renderer/baseeditor.js	Fri Sep 11 16:34:41 2015 +0200
@@ -17,14 +17,14 @@
             this.editor_block.add.apply(this.editor_block, _pts);
             this.editor_block.strokeWidth = this.options.tooltip_border_width;
             this.editor_block.strokeColor = this.options.tooltip_border_color;
-            this.editor_block.opacity = 0.8;
+            this.editor_block.opacity = this.options.tooltip_opacity;
             this.editor_$ = $('<div>')
-            .appendTo(this.renderer.editor_$)
-            .css({
-                position: "absolute",
-                opacity: 0.8
-            })
-            .hide();
+                .appendTo(this.renderer.editor_$)
+                .css({
+                    position: "absolute",
+                    opacity: this.options.tooltip_opacity
+                })
+                .hide();
         },
         destroy: function() {
             this.editor_block.remove();
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/test/test-writable-simple-opacity.html	Fri Sep 11 16:34:41 2015 +0200
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html lang="fr">
+    <head>
+        <meta charset="utf-8" />
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+        <title>Test de Rendu RENKAN</title>
+        <meta name="description" content="" />
+        <meta name="author" content="Institut de Recherche et d'Innovation" />
+        <script src="../lib/jquery/jquery.js"></script>
+        <script src="../lib/jquery-mousewheel/jquery.mousewheel.js"></script>
+        <script src="../lib/lodash/lodash.js"></script>
+        <script src="../lib/backbone/backbone.js"></script>
+        <script src="../lib/backbone-relational/backbone-relational.js"></script>
+        <script src="../lib/paper/paper-full.js"></script>
+        <script src="../js/main.js"></script>
+        <script src="../js/dataloader.js"></script>
+        <script src="../js/router.js"></script>
+        <script src="../js/models.js"></script>
+        <script src="../js/defaults.js"></script>
+        <script src="../js/i18n.js"></script>
+        <script src="../dist/js/templates.js"></script>
+        <script src="../js/full-json.js"></script>
+        <script src="../js/ldtjson-bin.js"></script>
+        <script src="../js/list-bin.js"></script>
+        <script src="../js/wikipedia-bin.js"></script>
+        <script data-main="../js/main-renderer" src="../lib/requirejs/require.js"></script>
+        <script type="text/javascript">
+            function startRenkan(){
+            	var _renkan = new Rkns.Renkan({
+                    property_files: [ "../data/properties.json" ],
+                    /*user_id: "u-iri",
+                    language: "fr",
+                    node_fill_color: false*/
+                    show_bins: false,
+                    tooltip_opacity: 0.5,
+                    static_url: "../"
+                });
+                Rkns.jsonIO(_renkan, {
+                    url: "/simple-persist"
+                });
+            };
+        </script>
+        <link rel="stylesheet" href="../css/renkan.css" />
+    </head>
+
+    <body>
+        <div id="renkan"></div>
+    </body>
+</html>
--- a/client/test/test-writable-simple.html	Thu Sep 10 16:22:28 2015 +0200
+++ b/client/test/test-writable-simple.html	Fri Sep 11 16:34:41 2015 +0200
@@ -31,7 +31,7 @@
                     /*user_id: "u-iri",
                     language: "fr",
                     node_fill_color: false*/
-                	show_bins: false,
+                    show_bins: false,
                     static_url: "../"
                 });
                 Rkns.jsonIO(_renkan, {